cn/dyndnsd
1
0
Fork 0
mirror of https://github.com/cmur2/dyndnsd.git synced 2024-12-21 14:54:22 +01:00
Code Releases Activity

helpers: refactor for simple functions

Browse Source
This commit is contained in:
cn 2018-02-03 21:40:44 +01:00
parent 9195d40344
commit acf3d7ed74
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dyndnsd.rb
View File

@ -14,6 +14,7 @@ require 'dyndnsd/updater/command_with_bind_zone'
require 'dyndnsd/responder/dyndns_style' require 'dyndnsd/responder/dyndns_style'
require 'dyndnsd/responder/rest_style' require 'dyndnsd/responder/rest_style'
require 'dyndnsd/database' require 'dyndnsd/database'
require 'dyndnsd/helper'
require 'dyndnsd/version' require 'dyndnsd/version'
module Dyndnsd module Dyndnsd
@ -87,23 +88,6 @@ module Dyndnsd
private private
def is_fqdn_valid?(hostname)
return false if hostname.length < @domain.length + 2
return false if not hostname.end_with?(@domain)
name = hostname.chomp(@domain)
return false if not name.match(/^[a-zA-Z0-9_-]+\.$/)
true
end
def is_ip_valid?(ip)
begin
IPAddr.new(ip)
return true
rescue ArgumentError
return false
end
end
def extract_v4_and_v6_address(env, params) def extract_v4_and_v6_address(env, params)
return [] if not params["myip"] return [] if not params["myip"]
begin begin
@ -120,10 +104,10 @@ module Dyndnsd
return extract_v4_and_v6_address(env, params) if params.has_key?("myip6") return extract_v4_and_v6_address(env, params) if params.has_key?("myip6")
# check whether myip parameter has valid IPAddr # check whether myip parameter has valid IPAddr
return [params["myip"]] if params.has_key?("myip") and is_ip_valid?(params["myip"]) return [params["myip"]] if params.has_key?("myip") and Helper.is_ip_valid?(params["myip"])
# check whether X-Real-IP header has valid IPAddr # check whether X-Real-IP header has valid IPAddr
return [env["HTTP_X_REAL_IP"]] if env.has_key?("HTTP_X_REAL_IP") and is_ip_valid?(env["HTTP_X_REAL_IP"]) return [env["HTTP_X_REAL_IP"]] if env.has_key?("HTTP_X_REAL_IP") and Helper.is_ip_valid?(env["HTTP_X_REAL_IP"])
# fallback value, always present # fallback value, always present
[env["REMOTE_ADDR"]] [env["REMOTE_ADDR"]]
@ -162,7 +146,7 @@ module Dyndnsd
hostnames = params["hostname"].split(',') hostnames = params["hostname"].split(',')
# check for invalid hostnames # check for invalid hostnames
invalid_hostnames = hostnames.select { |hostname| not is_fqdn_valid?(hostname) } invalid_hostnames = hostnames.select { |hostname| not Helper.is_fqdn_valid?(hostname, @domain) }
return [422, {'X-DynDNS-Response' => 'hostname_malformed'}, []] if invalid_hostnames.any? return [422, {'X-DynDNS-Response' => 'hostname_malformed'}, []] if invalid_hostnames.any?
user = env["REMOTE_USER"] user = env["REMOTE_USER"]

23
lib/dyndnsd/helper.rb Normal file
View File

@ -0,0 +1,23 @@
require 'ipaddr'
module Dyndnsd
class Helper
def self.is_fqdn_valid?(hostname, domain)
return false if hostname.length < domain.length + 2
return false if not hostname.end_with?(domain)
name = hostname.chomp(domain)
return false if not name.match(/^[a-zA-Z0-9_-]+\.$/)
true
end
def self.is_ip_valid?(ip)
begin
IPAddr.new(ip)
return true
rescue ArgumentError
return false
end
end
end
end