Skip to content

Commit dfa1b6e

Browse files
postmodernmoozzi
authored andcommitted
Upate ActiveRecord enum syntax (closes #143).
1 parent dfa29f8 commit dfa1b6e

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

lib/ronin/db/dns_query.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class DNSQuery < ActiveRecord::Base
4444
# The queried record type.
4545
#
4646
# @return [String]
47-
enum type: {
47+
enum :type, {
4848
a: 'A',
4949
aaaa: 'AAAA',
5050
any: 'ANY',
@@ -58,7 +58,7 @@ class DNSQuery < ActiveRecord::Base
5858
srv: 'SRV',
5959
txt: 'TXT',
6060
wks: 'WKS'
61-
}, _suffix: :query
61+
}, suffix: :query
6262
validates :type, presence: true
6363

6464
# @!attribute [rw] label

lib/ronin/db/http_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class HTTPRequest < ActiveRecord::Base
5050
# The request method.
5151
#
5252
# @return ["copy", "delete", "get", "head", "lock", "mkcol", "move", "options", "patch", "post", "propfind", "proppatch", "put", "trace", "unlock"]
53-
enum request_method: {
53+
enum :request_method, {
5454
copy: 'COPY',
5555
delete: 'DELETE',
5656
get: 'GET',
@@ -66,7 +66,7 @@ class HTTPRequest < ActiveRecord::Base
6666
put: 'PUT',
6767
trace: 'TRACE',
6868
unlock: 'UNLOCK'
69-
}, _suffix: :request
69+
}, suffix: :request
7070
validates :request_method, presence: true
7171

7272
# @!attribute [rw] path

lib/ronin/db/web_vuln.rb

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ class WebVuln < ActiveRecord::Base
5050
# The type of vuln.
5151
#
5252
# @return ["lfi", "rfi", "sqli", "ssti", "open_redirect", "reflected_xss", "command_injection"]
53-
enum type: {
53+
enum :type,
54+
{
5455
lfi: 'lfi',
5556
rfi: 'rfi',
5657
sqli: 'sqli',
@@ -90,7 +91,7 @@ class WebVuln < ActiveRecord::Base
9091
# The request method for the URL.
9192
#
9293
# @return ["copy", "delete", "get", "head", "lock", "mkcol", "move", "options", "patch", "post", "propfind", "proppatch", "put", "trace", "unlock"]
93-
enum request_method: {
94+
enum :request_method, {
9495
copy: 'COPY',
9596
delete: 'DELETE',
9697
get: 'GET',
@@ -106,16 +107,16 @@ class WebVuln < ActiveRecord::Base
106107
put: 'PUT',
107108
trace: 'TRACE',
108109
unlock: 'UNLOCK'
109-
}, _suffix: :request
110+
}, suffix: :request
110111

111112
# @!attribute [rw] lfi_os
112113
# The LFI os.
113114
#
114115
# @return [:unix, :windows, nil]
115-
enum lfi_os: {
116+
enum :lfi_os, {
116117
unix: 'unix',
117118
windows: 'windows'
118-
}, _prefix: true
119+
}, prefix: true
119120

120121
# @!attribute [rw] lfi_depth
121122
# The LFI depth.
@@ -127,47 +128,47 @@ class WebVuln < ActiveRecord::Base
127128
# The LFI filter bypass.
128129
#
129130
# @return [:null_byte, :base64, :rot13, :zlib, nil]
130-
enum lfi_filter_bypass: {
131+
enum :lfi_filter_bypass, {
131132
null_byte: 'null_byte',
132133
base64: 'base64',
133134
rot13: 'rot13',
134135
zlib: 'zlib'
135-
}, _prefix: true
136+
}, prefix: true
136137

137138
# @!attribute [rw] rfi_script_lang
138139
# The RFI script lang.
139140
#
140141
# @return [:asp, :asp_net, :cold_fusion, :jsp, :php, :perl, nil]
141-
enum rfi_script_lang: {
142+
enum :rfi_script_lang, {
142143
asp: 'asp',
143144
asp_net: 'asp_net',
144145
cold_fusion: 'cold_fusion',
145146
jsp: 'jsp',
146147
php: 'php',
147148
perl: 'perl'
148-
}, _prefix: true
149+
}, prefix: true
149150

150151
# @!attribute [rw] rfi_filter_bypass
151152
# The RFI filter bypass.
152153
#
153154
# @return [:null_byte, :double_encode, nil]
154-
enum rfi_filter_bypass: {
155+
enum :rfi_filter_bypass, {
155156
null_byte: 'null_byte',
156157
double_encode: 'double_encode'
157-
}, _prefix: true
158+
}, prefix: true
158159

159160
# @!attribute [rw] ssti_escape_type
160161
# The SSTI escape type.
161162
#
162163
# @return [:double_curly_braces, :dollar_curly_braces, :dollar_double_curly_braces, :pound_curly_braces, :angle_brackets_percent, :custom, nil]
163-
enum ssti_escape_type: {
164+
enum :ssti_escape_type, {
164165
double_curly_braces: 'double_curly_braces',
165166
dollar_curly_braces: 'dollar_curly_braces',
166167
dollar_double_curly_braces: 'dollar_double_curly_braces',
167168
pound_curly_braces: 'pound_curly_braces',
168169
angle_brackets_percent: 'angle_brackets_percent',
169170
custom: 'custom'
170-
}, _prefix: true
171+
}, prefix: true
171172

172173
# @!attribute [rw] sqli_escape_quote
173174
# The SQLi escape quote.

0 commit comments

Comments
 (0)