From d2ba94a6117695fbca5fe397f60b2b34fbce2cbb Mon Sep 17 00:00:00 2001 From: Postmodern Date: Tue, 11 Feb 2025 15:01:26 -0800 Subject: [PATCH] Upate ActiveRecord `enum` syntax (closes #143). --- lib/ronin/db/dns_query.rb | 4 ++-- lib/ronin/db/http_request.rb | 4 ++-- lib/ronin/db/web_vuln.rb | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/ronin/db/dns_query.rb b/lib/ronin/db/dns_query.rb index 46c4d9a8..34eea233 100644 --- a/lib/ronin/db/dns_query.rb +++ b/lib/ronin/db/dns_query.rb @@ -44,7 +44,7 @@ class DNSQuery < ActiveRecord::Base # The queried record type. # # @return [String] - enum type: { + enum :type, { a: 'A', aaaa: 'AAAA', any: 'ANY', @@ -58,7 +58,7 @@ class DNSQuery < ActiveRecord::Base srv: 'SRV', txt: 'TXT', wks: 'WKS' - }, _suffix: :query + }, suffix: :query validates :type, presence: true # @!attribute [rw] label diff --git a/lib/ronin/db/http_request.rb b/lib/ronin/db/http_request.rb index 4f139d85..5f17da73 100644 --- a/lib/ronin/db/http_request.rb +++ b/lib/ronin/db/http_request.rb @@ -50,7 +50,7 @@ class HTTPRequest < ActiveRecord::Base # The request method. # # @return ["copy", "delete", "get", "head", "lock", "mkcol", "move", "options", "patch", "post", "propfind", "proppatch", "put", "trace", "unlock"] - enum request_method: { + enum :request_method, { copy: 'COPY', delete: 'DELETE', get: 'GET', @@ -66,7 +66,7 @@ class HTTPRequest < ActiveRecord::Base put: 'PUT', trace: 'TRACE', unlock: 'UNLOCK' - }, _suffix: :request + }, suffix: :request validates :request_method, presence: true # @!attribute [rw] path diff --git a/lib/ronin/db/web_vuln.rb b/lib/ronin/db/web_vuln.rb index 51505e86..3c3c5396 100644 --- a/lib/ronin/db/web_vuln.rb +++ b/lib/ronin/db/web_vuln.rb @@ -50,7 +50,7 @@ class WebVuln < ActiveRecord::Base # The type of vuln. # # @return ["lfi", "rfi", "sqli", "ssti", "open_redirect", "reflected_xss", "command_injection"] - enum type: { + enum :type, { lfi: 'lfi', rfi: 'rfi', sqli: 'sqli', @@ -90,7 +90,7 @@ class WebVuln < ActiveRecord::Base # The request method for the URL. # # @return ["copy", "delete", "get", "head", "lock", "mkcol", "move", "options", "patch", "post", "propfind", "proppatch", "put", "trace", "unlock"] - enum request_method: { + enum :request_method, { copy: 'COPY', delete: 'DELETE', get: 'GET', @@ -106,16 +106,16 @@ class WebVuln < ActiveRecord::Base put: 'PUT', trace: 'TRACE', unlock: 'UNLOCK' - }, _suffix: :request + }, suffix: :request # @!attribute [rw] lfi_os # The LFI os. # # @return [:unix, :windows, nil] - enum lfi_os: { + enum :lfi_os, { unix: 'unix', windows: 'windows' - }, _prefix: true + }, prefix: true # @!attribute [rw] lfi_depth # The LFI depth. @@ -127,47 +127,47 @@ class WebVuln < ActiveRecord::Base # The LFI filter bypass. # # @return [:null_byte, :base64, :rot13, :zlib, nil] - enum lfi_filter_bypass: { + enum :lfi_filter_bypass, { null_byte: 'null_byte', base64: 'base64', rot13: 'rot13', zlib: 'zlib' - }, _prefix: true + }, prefix: true # @!attribute [rw] rfi_script_lang # The RFI script lang. # # @return [:asp, :asp_net, :cold_fusion, :jsp, :php, :perl, nil] - enum rfi_script_lang: { + enum :rfi_script_lang, { asp: 'asp', asp_net: 'asp_net', cold_fusion: 'cold_fusion', jsp: 'jsp', php: 'php', perl: 'perl' - }, _prefix: true + }, prefix: true # @!attribute [rw] rfi_filter_bypass # The RFI filter bypass. # # @return [:null_byte, :double_encode, nil] - enum rfi_filter_bypass: { + enum :rfi_filter_bypass, { null_byte: 'null_byte', double_encode: 'double_encode' - }, _prefix: true + }, prefix: true # @!attribute [rw] ssti_escape_type # The SSTI escape type. # # @return [:double_curly_braces, :dollar_curly_braces, :dollar_double_curly_braces, :pound_curly_braces, :angle_brackets_percent, :custom, nil] - enum ssti_escape_type: { + enum :ssti_escape_type, { double_curly_braces: 'double_curly_braces', dollar_curly_braces: 'dollar_curly_braces', dollar_double_curly_braces: 'dollar_double_curly_braces', pound_curly_braces: 'pound_curly_braces', angle_brackets_percent: 'angle_brackets_percent', custom: 'custom' - }, _prefix: true + }, prefix: true # @!attribute [rw] sqli_escape_quote # The SQLi escape quote.