jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #4736: Display network prefix length (if present) in API key IP whitelist.

Browse Source
This commit is contained in:
evazion
2021-03-01 02:23:05 -06:00
parent e5bbc039ae
commit 35a0c6b11f
8 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/api_key.rb
View File

@@ -1,4 +1,7 @@
class ApiKey < ApplicationRecord
attribute :permitted_ip_addresses, :ip_address, array: true
attribute :last_ip_address, :ip_address
array_attribute :permissions
array_attribute :permitted_ip_addresses

5
app/models/ip_address.rb
View File

@@ -1,7 +1,7 @@
class IpAddress < ApplicationRecord
belongs_to :model, polymorphic: true
belongs_to :user
attribute :ip_addr, IpAddressType.new
attribute :ip_addr, :ip_address
def self.model_types
%w[Post User Comment Dmail ArtistVersion ArtistCommentaryVersion NoteVersion WikiPageVersion]
@@ -41,8 +41,7 @@ class IpAddress < ApplicationRecord
end
def to_s
# include the subnet mask only when the IP denotes a subnet.
(ip_addr.size > 1) ? ip_addr.to_string : ip_addr.to_s
ip_addr.to_s
end
def readonly?