dyndnsd 1.0.0 → 1.1.0

data/README.md

@@ -24,6 +24,9 @@ Create a configuration file in YAML format somewhere:
 # listen address and port
 host: "0.0.0.0"
 port: "80"
+# optional: drop priviliges in case you want to but you may need sudo for external commands
+user: "nobody"
+group: "nogroup"
 # logfile is optional, logs to STDOUT else
 logfile: "dyndnsd.log"
 # interal database file

data/dyndnsd.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'rack'
   s.add_runtime_dependency 'json'
+  s.add_runtime_dependency 'metriks'
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'

data/lib/dyndnsd/updater/command_with_bind_zone.rb

@@ -15,6 +15,8 @@ module Dyndnsd
         pid = fork do
           exec @command
         end
+        # detach so children don't become zombies
+        Process.detach(pid)
       end
     end
   end

data/lib/dyndnsd/version.rb

@@ -1,4 +1,4 @@
 
 module Dyndnsd
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/dyndnsd.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
+require 'etc'
 require 'logger'
 require 'ipaddr'
 require 'json'
 require 'yaml'
 require 'rack'
+require 'metriks'
 
 require 'dyndnsd/generator/bind'
 require 'dyndnsd/updater/command_with_bind_zone'
@@ -74,7 +76,7 @@ module Dyndnsd
       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"]
         params["myip"] = env["REMOTE_ADDR"]
@@ -89,6 +91,7 @@ module Dyndnsd
       
       myip = params["myip"]
       
+      Metriks.meter('requests.valid').mark
       Dyndnsd.logger.info "Request to update #{hostnames} to #{myip} for user #{user}"
       
       changes = []
@@ -96,8 +99,10 @@ module Dyndnsd
         if (not @db['hosts'].include? hostname) or (@db['hosts'][hostname] != myip)
           changes << :good
           @db['hosts'][hostname] = myip
+          Metriks.meter('requests.good').mark
         else
           changes << :nochg
+          Metriks.meter('requests.nochg').mark
         end
       end
       
@@ -106,6 +111,7 @@ module Dyndnsd
         Dyndnsd.logger.info "Committing update ##{@db['serial']}"
         @db.save
         update
+        Metriks.meter('updates.committed').mark
       end
       
       @responder.response_for_changes(changes, myip)
@@ -139,15 +145,34 @@ module Dyndnsd
       Dyndnsd.logger.formatter = LogFormatter.new
 
       Dyndnsd.logger.info "Starting..."
+      
+      # drop privs (first change group than user)
+      Process::Sys.setgid(Etc.getgrnam(config['group']).gid) if config['group']
+      Process::Sys.setuid(Etc.getpwnam(config['user']).uid) if config['user']
 
+      # configure metriks
+      reporter = Metriks::Reporter::ProcTitle.new
+      reporter.add 'good', 'sec' do
+        Metriks.meter('requests.good').mean_rate
+      end
+      reporter.add 'nochg', 'sec' do
+        Metriks.meter('requests.nochg').mean_rate
+      end
+      reporter.start
+
+      # configure daemon
       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
       
+      # configure rack
       app = Daemon.new(config, db, updater, responder)
       app = Rack::Auth::Basic.new(app, "DynDNS") do |user,pass|
         allow = (config['users'].has_key? user) and (config['users'][user]['password'] == pass)
-        Dyndnsd.logger.warn "Login failed for #{user}" if not allow
+        if not allow
+          Dyndnsd.logger.warn "Login failed for #{user}"
+          Metriks.meter('requests.auth_failed').mark
+        end
         allow
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyndnsd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000Z
+date: 2013-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &75210720 !ruby/object:Gem::Requirement
+  requirement: &76957690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75210720
+  version_requirements: *76957690
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &75210510 !ruby/object:Gem::Requirement
+  requirement: &76957480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75210510
+  version_requirements: *76957480
+- !ruby/object:Gem::Dependency
+  name: metriks
+  requirement: &76957270 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *76957270
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75210260 !ruby/object:Gem::Requirement
+  requirement: &76957020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *75210260
+  version_requirements: *76957020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75210050 !ruby/object:Gem::Requirement
+  requirement: &76956810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75210050
+  version_requirements: *76956810
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75209820 !ruby/object:Gem::Requirement
+  requirement: &76956580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75209820
+  version_requirements: *76956580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &75209610 !ruby/object:Gem::Requirement
+  requirement: &76956370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75209610
+  version_requirements: *76956370
 description: A small, lightweight and extensible DynDNS server written with Ruby and
   Rack.
 email: chrnicolai@gmail.com