dyndnsd 0.0.1 → 0.0.2

data/lib/dyndnsd/generator/bind.rb

@@ -2,9 +2,9 @@
 module Dyndnsd
   module Generator
     class Bind
-      def initialize(config)
+      def initialize(domain, config)
+        @domain = domain
         @ttl = config['ttl']
-        @origin = config['origin']
         @dns = config['dns']
         @email_addr = config['email_addr']
       end
@@ -12,13 +12,13 @@ module Dyndnsd
       def generate(zone)
         out = []
         out << "$TTL #{@ttl}"
-        out << "$ORIGIN #{@origin}"
+        out << "$ORIGIN #{@domain}."
         out << ""
         out << "@ IN SOA #{@dns} #{@email_addr} ( #{zone['serial']} 3h 5m 1w 1h )"
         out << "@ IN NS #{@dns}"
         out << ""
         zone['hosts'].each do |hostname,ip|
-          name = hostname.chomp('.' + @origin[0..-2])
+          name = hostname.chomp('.' + @domain)
           out << "#{name} IN A #{ip}"
         end
         out << ""

data/lib/dyndnsd/responder/dyndns_style.rb

@@ -0,0 +1,21 @@
+
+module Dyndnsd
+  module Responder
+    class DynDNSStyle
+      def response_for_error(state)
+        # general http errors
+        return [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]] if state == :method_forbidden
+        return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] if state == :not_found
+        # specific errors
+        return [200, {"Content-Type" => "text/plain"}, ["notfqdn"]] if state == :hostname_missing
+        return [200, {"Content-Type" => "text/plain"}, ["nohost"]] if state == :host_forbidden
+        return [200, {"Content-Type" => "text/plain"}, ["notfqdn"]] if state == :hostname_malformed
+      end
+      
+      def response_for_changes(states, ip)
+        body = states.map { |state| "#{state} #{ip}" }.join("\n")
+        return [200, {"Content-Type" => "text/plain"}, [body]]
+      end
+    end
+  end
+end

data/lib/dyndnsd/responder/rest_style.rb

@@ -2,7 +2,7 @@
 module Dyndnsd
   module Responder
     class RestStyle
-      def response_for(state)
+      def response_for_error(state)
         # general http errors
         return [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]] if state == :method_forbidden
         return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] if state == :not_found
@@ -10,9 +10,11 @@ module Dyndnsd
         return [422, {"Content-Type" => "text/plain"}, ["Hostname missing"]] if state == :hostname_missing
         return [403, {"Content-Type" => "text/plain"}, ["Forbidden"]] if state == :host_forbidden
         return [422, {"Content-Type" => "text/plain"}, ["Hostname malformed"]] if state == :hostname_malformed
-        # OKs
-        return [200, {"Content-Type" => "text/plain"}, ["Good"]] if state == :good
-        return [200, {"Content-Type" => "text/plain"}, ["No change"]] if state == :nochg
+      end
+      
+      def response_for_changes(states, ip)
+        body = states.map { |state| state == :good ? "Changed to #{ip}" : "No change needed for #{ip}" }.join("\n")
+        return [200, {"Content-Type" => "text/plain"}, [body]]
       end
     end
   end

data/lib/dyndnsd/updater/command_with_bind_zone.rb

@@ -2,10 +2,10 @@
 module Dyndnsd
   module Updater
     class CommandWithBindZone
-      def initialize(config)
+      def initialize(domain, config)
         @zone_file = config['zone_file']
         @command = config['command']
-        @generator = Generator::Bind.new(config)
+        @generator = Generator::Bind.new(domain, config)
       end
       
       def update(zone)

data/lib/dyndnsd/version.rb

@@ -1,4 +1,4 @@
 
 module Dyndnsd
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/dyndnsd.rb

@@ -3,10 +3,12 @@
 require 'logger'
 require 'ipaddr'
 require 'json'
+require 'yaml'
 require 'rack'
 
 require 'dyndnsd/generator/bind'
 require 'dyndnsd/updater/command_with_bind_zone'
+require 'dyndnsd/responder/dyndns_style'
 require 'dyndnsd/responder/rest_style'
 require 'dyndnsd/database'
 require 'dyndnsd/version'
@@ -29,6 +31,7 @@ module Dyndnsd
   class Daemon
     def initialize(config, db, updater, responder)
       @users = config['users']
+      @domain = config['domain']
       @db = db
       @updater = updater
       @responder = responder
@@ -43,22 +46,34 @@ module Dyndnsd
       @updater.update(@db)
     end
     
+    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 call(env)
-      return @responder.response_for(:method_forbidden) if env["REQUEST_METHOD"] != "GET"
-      return @responder.response_for(:not_found) if env["PATH_INFO"] != "/nic/update"
+      return @responder.response_for_error(:method_forbidden) if env["REQUEST_METHOD"] != "GET"
+      return @responder.response_for_error(:not_found) if env["PATH_INFO"] != "/nic/update"
       
       params = Rack::Utils.parse_query(env["QUERY_STRING"])
       
-      return @responder.response_for(:hostname_missing) if not params["hostname"]
+      return @responder.response_for_error(:hostname_missing) if not params["hostname"]
       
-      hostname = params["hostname"]
+      hostnames = params["hostname"].split(',')
       
-      # Check if hostname(s) match rules
-      #return @responder.response_for(:hostname_malformed) if XY
+      # Check if hostname match rules
+      hostnames.each do |hostname|
+        return @responder.response_for_error(:hostname_malformed) if not is_fqdn_valid?(hostname)
+      end
       
       user = env["REMOTE_USER"]
       
-      return @responder.response_for(:host_forbidden) if not @users[user]['hosts'].include? hostname
+      hostnames.each do |hostname|
+        return @responder.response_for_error(:host_forbidden) if not @users[user]['hosts'].include? hostname
+      end
       
       # no myip?
       if not params["myip"]
@@ -74,16 +89,23 @@ module Dyndnsd
       
       myip = params["myip"]
       
-      @db['hosts'][hostname] = myip    
+      changes = []
+      hostnames.each do |hostname|
+        if (not @db['hosts'].include? hostname) or (@db['hosts'][hostname] != myip)
+          changes << :good
+          @db['hosts'][hostname] = myip
+        else
+          changes << :nochg
+        end
+      end
       
       if @db.changed?
         @db['serial'] += 1
         @db.save
         update
-        return @responder.response_for(:good)
       end
       
-      @responder.response_for(:nochg)
+      @responder.response_for_changes(changes, myip)
     end
 
     def self.run!
@@ -105,11 +127,11 @@ module Dyndnsd
       Dyndnsd.logger.info "DynDNSd version #{Dyndnsd::VERSION}"
       Dyndnsd.logger.info "Using config file #{config_file}"
 
-      config = JSON.load(File.open(config_file, 'r') { |f| f.read })
+      config = YAML::load(File.open(config_file, 'r') { |f| f.read })
 
-      db = Database.new(config['db_file'])
-      updater = Updater::CommandWithBindZone.new(config['updater_params']) if config['updater'] == 'command_with_bind_zone'
-      responder = Responder::RestStyle.new
+      db = Database.new(config['db'])
+      updater = Updater::CommandWithBindZone.new(config['domain'], config['updater']['params']) if config['updater']['name'] == 'command_with_bind_zone'
+      responder = Responder::DynDNSStyle.new
       
       app = Daemon.new(config, db, updater, responder)
       app = Rack::Auth::Basic.new(app, "DynDNS") do |user,pass|

data/spec/daemon_spec.rb

@@ -5,16 +5,17 @@ describe Dyndnsd::Daemon do
   
   def app
     config = {
+      'domain' => 'example.org',
       'users' => {
         'test' => {
           'password' => 'secret',
-          'hosts' => ['foo.example.org']
+          'hosts' => ['foo.example.org', 'bar.example.org']
         }
       }
     }
     db = Dyndnsd::DummyDatabase.new({})
     updater = Dyndnsd::Updater::Dummy.new
-    responder = Dyndnsd::Responder::RestStyle.new
+    responder = Dyndnsd::Responder::DynDNSStyle.new
     app = Dyndnsd::Daemon.new(config, db, updater, responder)
     
     Rack::Auth::Basic.new(app, "DynDNS") do |user,pass|
@@ -25,6 +26,9 @@ describe Dyndnsd::Daemon do
   it 'requires authentication' do
     get '/'
     last_response.status.should == 401
+    
+    pending 'Need to find a way to add custom body on 401 responses'
+    last_response.should be_ok 'badauth'
   end
   
   it 'only supports GET requests' do
@@ -42,13 +46,54 @@ describe Dyndnsd::Daemon do
   it 'requires the hostname query parameter' do
     authorize 'test', 'secret'
     get '/nic/update'
-    last_response.status.should == 422
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+  end
+
+  it 'supports multiple hostnames in request' do
+    authorize 'test', 'secret'
+    get '/nic/update?hostname=foo.example.org,bar.example.org&myip=1.2.3.4'
+    last_response.should be_ok
+    last_response.body.should == "good 1.2.3.4\ngood 1.2.3.4"
+  end
+
+  it 'rejects request if one hostname is invalid' do
+    authorize 'test', 'secret'
+    
+    get '/nic/update?hostname=test'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+    
+    get '/nic/update?hostname=test.example.com'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+    
+    get '/nic/update?hostname=test.example.org.me'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+    
+    get '/nic/update?hostname=foo.test.example.org'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+    
+    get '/nic/update?hostname=in%20valid.example.org'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
+    
+    get '/nic/update?hostname=valid.example.org,in.valid.example.org'
+    last_response.should be_ok
+    last_response.body.should == 'notfqdn'
   end
   
-  it 'forbids changing hosts a user does not own' do
+  it 'rejects request if user does not own one hostname' do
     authorize 'test', 'secret'
     get '/nic/update?hostname=notmyhost.example.org'
-    last_response.status.should == 403
+    last_response.should be_ok
+    last_response.body.should == 'nohost'
+    
+    get '/nic/update?hostname=foo.example.org,notmyhost.example.org'
+    last_response.should be_ok
+    last_response.body.should == 'nohost'
   end
   
   it 'updates a host on change' do
@@ -57,9 +102,9 @@ describe Dyndnsd::Daemon do
     get '/nic/update?hostname=foo.example.org&myip=1.2.3.4'
     last_response.should be_ok
     
-    get '/nic/update?hostname=foo.example.org&myip=1.2.3.400'
+    get '/nic/update?hostname=foo.example.org&myip=1.2.3.40'
     last_response.should be_ok
-    last_response.body.should == 'Good'
+    last_response.body.should == 'good 1.2.3.40'
   end
   
   it 'returns no change' do
@@ -70,18 +115,25 @@ describe Dyndnsd::Daemon do
     
     get '/nic/update?hostname=foo.example.org&myip=1.2.3.4'
     last_response.should be_ok
-    last_response.body.should == 'No change'
-  end
-  
-  it 'forbids invalid hostnames' do
-    pending
+    last_response.body.should == 'nochg 1.2.3.4'
   end
   
   it 'outputs status per hostname' do
-    pending
+    authorize 'test', 'secret'
+
+    get '/nic/update?hostname=foo.example.org&myip=1.2.3.4'
+    last_response.should be_ok
+    last_response.body.should == 'good 1.2.3.4'
+    
+    get '/nic/update?hostname=foo.example.org,bar.example.org&myip=1.2.3.4'
+    last_response.should be_ok
+    last_response.body.should == "nochg 1.2.3.4\ngood 1.2.3.4"
   end
   
-  it 'supports multiple hostnames in request' do
-    pending
+  it 'uses clients remote address if myip not specified' do
+    authorize 'test', 'secret'
+    get '/nic/update?hostname=foo.example.org'
+    last_response.should be_ok
+    last_response.body.should == 'good 127.0.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyndnsd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &79022390 !ruby/object:Gem::Requirement
+  requirement: &70281418775580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79022390
+  version_requirements: *70281418775580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &79022140 !ruby/object:Gem::Requirement
+  requirement: &70281418775080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *79022140
+  version_requirements: *70281418775080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79021930 !ruby/object:Gem::Requirement
+  requirement: &70281418774660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79021930
+  version_requirements: *70281418774660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79021700 !ruby/object:Gem::Requirement
+  requirement: &70281418774200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79021700
+  version_requirements: *70281418774200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &79021490 !ruby/object:Gem::Requirement
+  requirement: &70281418773780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79021490
+  version_requirements: *70281418773780
 description: A small, lightweight and extensible DynDNS server written with Ruby and
   Rack.
 email: chrnicolai@gmail.com
@@ -85,6 +85,7 @@ files:
 - lib/dyndnsd.rb
 - lib/dyndnsd/database.rb
 - lib/dyndnsd/generator/bind.rb
+- lib/dyndnsd/responder/dyndns_style.rb
 - lib/dyndnsd/responder/rest_style.rb
 - lib/dyndnsd/updater/command_with_bind_zone.rb
 - lib/dyndnsd/version.rb