ronin-rb
diff --git a/‎lib/ronin/db/arch.rb‎
Lines changed: 3 additions & 2 deletions b/‎lib/ronin/db/arch.rb‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎lib/ronin/db/cert.rb‎
Lines changed: 8 additions & 7 deletions b/‎lib/ronin/db/cert.rb‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎lib/ronin/db/dns_query.rb‎
Lines changed: 136 additions & 16 deletions b/‎lib/ronin/db/dns_query.rb‎
Lines changed: 136 additions & 16 deletions
@@ -45,8 +45,9 @@ class Arch < ActiveRecord::Base
       #   Endianness of the architecture.
       #
       #   @return ["little", "big"]
-      enum :endian, {little: 'little', big: 'big'}
-      validates :endian, presence: true
+      attribute :endian, :string
+      validates :endian, presence: true,
+                         inclusion: {in: %w[little big]}
 
       # @!attribute [rw] word_size
       #   Address length of the architecture.
 
@@ -87,9 +87,10 @@ class Cert < ActiveRecord::Base
       # @!attribute [rw] public_key_algorithm
       #   The public key algorithm.
       #
-      #   @return ["rsa", "dsa", "dh", "ec"]
-      enum :public_key_algorithm, {rsa: 'RSA', dsa: 'DSA', dh: 'DH', ec: 'EC'}
-      validates :public_key_algorithm, presence: true
+      #   @return ["RSA", "DSA", "DH", "EC"]
+      attribute :public_key_algorithm, :string
+      validates :public_key_algorithm, presence: true,
+                                       inclusion: {in: %w[RSA DSA DH EC]}
 
       # @!attribute [rw] public_key_size
       #   The public key size in bits.
@@ -370,16 +371,16 @@ def self.lookup(cert)
       def self.import(cert)
         case (public_key = cert.public_key)
         when OpenSSL::PKey::RSA
-          public_key_algorithm = :rsa
+          public_key_algorithm = 'RSA'
           public_key_size      = public_key.n.num_bits
         when OpenSSL::PKey::DSA
-          public_key_algorithm = :dsa
+          public_key_algorithm = 'DSA'
           public_key_size      = public_key.p.num_bits
         when OpenSSL::PKey::DH
-          public_key_algorithm = :dh
+          public_key_algorithm = 'DH'
           public_key_size      = public_key.p.num_bits
         when OpenSSL::PKey::EC
-          public_key_algorithm = :ec
+          public_key_algorithm = 'EC'
 
           public_key_text = public_key.to_text
           public_key_size = if (match = public_key_text.match(/\((\d+) bit\)/))
 
@@ -44,22 +44,25 @@ class DNSQuery < ActiveRecord::Base
       #   The queried record type.
       #
       #   @return [String]
-      enum type: {
-        a:     'A',
-        aaaa:  'AAAA',
-        any:   'ANY',
-        cname: 'CNAME',
-        hinfo: 'HINFO',
-        loc:   'LOC',
-        mx:    'MX',
-        ns:    'NS',
-        ptr:   'PTR',
-        soa:   'SOA',
-        srv:   'SRV',
-        txt:   'TXT',
-        wks:   'WKS'
-      }, _suffix: :query
-      validates :type, presence: true
+      attribute :type, :string
+      validates :type, presence: true,
+                       inclusion: {
+                         in: %w[
+                           A
+                           AAAA
+                           ANY
+                           CNAME
+                           HINFO
+                           LOC
+                           MX
+                           NS
+                           PTR
+                           SOA
+                           SRV
+                           TXT
+                           WKS
+                         ]
+                       }
 
       # @!attribute [rw] label
       #   The queried domain label.
@@ -92,6 +95,123 @@ class DNSQuery < ActiveRecord::Base
       #   @return [Array<DNSRecord>]
       has_many :records, class_name: 'DNSRecord'
 
+      #
+      # Determines if the DNS query is an A record query.
+      #
+      # @return [Boolean]
+      #
+      def a_query?
+        self.type == 'A'
+      end
+
+      #
+      # Determines if the DNS query is an AAAA record query.
+      #
+      # @return [Boolean]
+      #
+      def aaaa_query?
+        self.type == 'AAAA'
+      end
+
+      #
+      # Determines if the DNS query is an ANY record query.
+      #
+      # @return [Boolean]
+      #
+      def any_query?
+        self.type == 'ANY'
+      end
+
+      #
+      # Determines if the DNS query is an CNAME record query.
+      #
+      # @return [Boolean]
+      #
+      def cname_query?
+        self.type == 'CNAME'
+      end
+
+      #
+      # Determines if the DNS query is an HINFO record query.
+      #
+      # @return [Boolean]
+      #
+      def hinfo_query?
+        self.type == 'HINFO'
+      end
+
+      #
+      # Determines if the DNS query is an LOC record query.
+      #
+      # @return [Boolean]
+      #
+      def loc_query?
+        self.type == 'LOC'
+      end
+
+      #
+      # Determines if the DNS query is an MX record query.
+      #
+      # @return [Boolean]
+      #
+      def mx_query?
+        self.type == 'MX'
+      end
+
+      #
+      # Determines if the DNS query is an NS record query.
+      #
+      # @return [Boolean]
+      #
+      def ns_query?
+        self.type == 'NS'
+      end
+
+      #
+      # Determines if the DNS query is an PTR record query.
+      #
+      # @return [Boolean]
+      #
+      def ptr_query?
+        self.type == 'PTR'
+      end
+
+      #
+      # Determines if the DNS query is an SOA record query.
+      #
+      # @return [Boolean]
+      #
+      def soa_query?
+        self.type == 'SOA'
+      end
+
+      #
+      # Determines if the DNS query is an SRV record query.
+      #
+      # @return [Boolean]
+      #
+      def srv_query?
+        self.type == 'SRV'
+      end
+
+      #
+      # Determines if the DNS query is an TXT record query.
+      #
+      # @return [Boolean]
+      #
+      def txt_query?
+        self.type == 'TXT'
+      end
+
+      #
+      # Determines if the DNS query is an WKS record query.
+      #
+      # @return [Boolean]
+      #
+      def wks_query?
+        self.type == 'WKS'
+      end
+
     end
   end
 end