dyndyndong 0.0.1 → 0.0.2

data/bin/dyndyndong

@@ -29,6 +29,9 @@ def help
 DynDynDong v#{DynDynDong::VERSION} is distributed under the GNU Affero General Public License.
 
 USAGE: #{$0} [-d|-h|-1] [-c <config file>] [-D <delay>] [-s <service> <service args>]
+  -l|--logfile  Set the logfile (default /var/log/dyndyndong.log).
+  -P|--pidfile  Set pidfile (default /var/run/dyndyndong.pid).
+  --            Null action, to breaks parsing of a service.
   -d|--daemon   Run DynDynDong as a daemon (default no).
   -h|--help     Show this help.
   -D|--delay    Set time to wait between two cycles (default 600).
@@ -52,6 +55,8 @@ end
 
 CONFIG = '/etc/dyndyndong.conf'
 DEFAULT_CONFIG = CONFIG.dup
+PIDFILE = '/var/run/dyndyndong.pid'
+LOGFILE = '/var/log/dyndyndong.log'
 oneshot = daemon = false
 
 i, SERVICES = 0, {
@@ -63,8 +68,26 @@ i, SERVICES = 0, {
 while i < ARGV.size
   parsed = false
   case ARGV[i]
+  when '--'
+    parsed = true
+  when /^-l/, '--logfile'
+    if %w{-l --logfile}.include?(ARGV[i])
+      LOGFILE.replace ARGV[i += 1]
+    else
+      LOGFILE.replace ARGV[i].gsub(/^-l/, '')
+    end
+    STDERR.reopen(File.open(LOGFILE))
+    STDOUT.reopen(STDERR)
+    parsed = true
+  when /^-P/, '--pidfile'
+    if %w{-P --pidfile}.include?(ARGV[i])
+      PIDFILE.replace ARGV[i += 1]
+    else
+      PIDFILE.replace ARGV[i].gsub(/^-P/, '')
+    end
+    parsed = true
   when '-d', '--daemon'
-    daemon = true
+    daemon = parsed = true
   when '-h', '--help'
     help
   when /^-D/, '--delay'
@@ -209,7 +232,16 @@ else
 end
 
 if DAEMONIZE
-  DynDynDong::Daemon.start
+  Daemons.daemonize
+
+  File.open(PIDFILE) {|f|
+    f.write(Process.pid.to_s)
+  }
+
+  STDOUT.reopen(File.open(LOGFILE))
+  STDERR.reopen(STDOUT)
+
+  DynDynDong::Client.start_loop
 else
   if oneshot
     DynDynDong::Client.start

data/lib/dyndyndong.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,8 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 require 'dyndyndong/client'
 require 'dyndyndong/daemon'

data/lib/dyndyndong/client.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,8 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 require 'dyndyndong/services'
 require 'dyndyndong/dyndyndong'

data/lib/dyndyndong/daemon.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,8 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 require 'dyndyndong/client'
 require 'daemons'

data/lib/dyndyndong/dyndyndong.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,8 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 module DynDynDong
   def self.delay

data/lib/dyndyndong/services.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,10 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+$DEBUG = true
 
 module DynDynDong
 
@@ -28,24 +32,24 @@ class Service
 
   def fetch
     begin
-      prefetch if (self.method(:prefetch) rescue nil)
+      prefetch if self.respond_to?(:prefetch)
     rescue Exception => e
       STDERR.puts("Prefetch error: #{e}, skipping...")
       return
     end
 
     @hosts.each {|args|
-      STDOUT.write("Aliasing #{args.first}...")
+      STDOUT.write("Aliasing #{args.is_a?(Array) ? args.first : args}...")
       begin
         res = alias_host(*args)
-        STDOUT.write("\r--- #{args.first}        \n\t#{res.gsub(/\n/, "\n\t")}\n")
+        STDOUT.write("\r--- #{args.is_a?(Array) ? args.first : args}        \n\t#{res.gsub(/\n/, "\n\t")}\n")
       rescue Exception => e
         STDERR.puts("\tFetch error: #{e}, skipping...")
       end
     }
 
     begin
-      postfetch if self.method(:postfetch) rescue nil
+      postfetch if self.respond_to?(:postfetch)
     rescue Exception => e
       STDERR.puts("Postfetch error: #{e}")
     end
@@ -87,5 +91,6 @@ end
 
 end
 
-require 'dyndyndong/services/afraid'
-require 'dyndyndong/services/dyndns'
+%w{afraid dyndns zoneedit}.each {|s|
+  require "dyndyndong/services/#{s}"
+}

data/lib/dyndyndong/services/afraid.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,7 +14,8 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 require 'net/http'
 

data/lib/dyndyndong/services/dyndns.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,27 +14,31 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 require 'net/http'
+require 'resolv'
 
 module DynDynDong
 
 class DynDNS < Service
-  MSGTABLE = {
-    'badauth'         => 'The username and password pair do not match a real user.',
-    '!donator'        => 'Option available only to credited users.',
-    'good'            => 'The update was successful, and the hostname is now updated.',
-    'nochg'           => 'The update changed no settings, and is considered abusive.',
-    'notfqdn'         => 'The hostname specified is not a fully-qualified domain name.',
-    'nohost'          => 'The hostname specified does not exist in this user account.',
-    'numhost'         => 'Too many hosts specified in an update.',
-    'abuse'           => 'The hostname specified is blocked for update abuse.',
-    'badagent'        => 'The user agent was not sent or HTTP method is not permitted.',
-    'good 127.0.0.1'  => 'Request was ignored because of agent that does not follow our specifications.',
-    'dnserr'          => 'DNS error encountered.',
-    '911'             => 'There is a problem or scheduled maintenance on our side.'
-  }
+  def MSGTABLE(x)
+    {
+      'badauth'         => 'The username and password pair do not match a real user.',
+      '!donator'        => 'Option available only to credited users.',
+      'good'            => 'The update was successful, and the hostname is now updated.',
+      'nochg'           => 'The update changed no settings, and is considered abusive.',
+      'notfqdn'         => 'The hostname specified is not a fully-qualified domain name.',
+      'nohost'          => 'The hostname specified does not exist in this user account.',
+      'numhost'         => 'Too many hosts specified in an update.',
+      'abuse'           => 'The hostname specified is blocked for update abuse.',
+      'badagent'        => 'The user agent was not sent or HTTP method is not permitted.',
+      'good 127.0.0.1'  => 'Request was ignored because of agent that does not follow our specifications.',
+      'dnserr'          => 'DNS error encountered.',
+      '911'             => 'There is a problem or scheduled maintenance on our side.'
+    }[x]
+  end
 
   def initialize(*args)
     @user = nil
@@ -78,24 +83,29 @@ class DynDNS < Service
   def alias_host(h, ip, offline = false)
     return "Nothing to update." if ip == @ip
 
-    Net::HTTP.start('members.dyndns.org') {|http|
+    Net::HTTP.start(update_host) {|http|
       req = Net::HTTP::Get.new('/nic/update?hostname=%s&myip=%s&offline=%s' % [
-          URI.escape(h), @ip, (offline ? 'YES' : 'NOCHG')])
+          URI.escape(h), @ip, offline?(offline)])
       req.basic_auth @user, @pass
       x = http.request(req).body.gsub(/#{Regexp.escape(@ip)}/, '').strip
-      MSGTABLE[x]
+      self::MSGTABLE(x)
     }
   end
 
 private
+  def update_host
+    'members.dyndns.org'
+  end
+
+  def offline?(offline)
+    offline ? 'YES' : 'NOCHG'
+  end
+
   def getip(h = nil)
     if h
-      addr = Socket::getaddrinfo(h, 'www', nil, Socket::SOCK_STREAM)[0][3]
-      if addr == Socket::getaddrinfo(Socket::gethostname, 'www', nil, Socket::SOCK_STREAM)[0][3]
-        return @ip
-      else
-        return addr
-      end
+      hosts = ""
+      Resolv.new.each_address(h){|ho| hosts = ho }
+      return hosts
     end
     str = Net::HTTP.get(URI.parse('http://checkip.dyndns.org/')).
       match(/<body>(.+?)<\/body>/)[1] rescue ""

data/lib/dyndyndong/services/no-ip.rb

@@ -0,0 +1,47 @@
+#--
+# Copyleft shura. [shura1991@gmail.com]
+#
+# This file is part of DynDynDong.
+#
+# DynDynDong is free software: you can redistribute it and/or modify 
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DynDynDong is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module DynDynDong
+
+class NoIp < DynDNS
+  def MSGTABLE(x)
+    {
+      'good'      => 'DNS hostname update successful.',
+      'nochg'     => 'IP address is current, no update performed.',
+      'nohost'    => 'Hostname supplied does not exist under specified account.',
+      'badauth'   => 'Invalid username password combination.',
+      'badagent'  => 'Client disabled.',
+      '!donator'  => 'An update request was sent including a feature that is not available to that particular user such as offline options.',
+      'abuse'     => 'Username is blocked due to abuse.',
+      '911'       => 'A fatal error on our side such as a database outage.'
+    }
+  end
+
+private
+
+  def update_host
+    'dynupdate.no-ip.com'
+  end
+
+  def offline?(offline)
+    super(offline).gsub(/CHG$/, '')
+  end
+end
+
+end

data/lib/dyndyndong/services/zoneedit.rb

@@ -0,0 +1,60 @@
+#--
+# Copyleft shura. [shura1991@gmail.com]
+#
+# This file is part of DynDynDong.
+#
+# DynDynDong is free software: you can redistribute it and/or modify 
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DynDynDong is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module DynDynDong
+
+class ZoneEdit < Service
+  def initialize(*args)
+    @user = nil
+    @pass = nil
+    super(*args)
+  end
+
+  def username(u)
+    @user = u.to_s
+  end
+
+  def password(p)
+    @pass = p.to_s
+  end
+
+  alias username= username
+  alias password= password
+
+  def host(h)
+    @hosts << h.to_s
+  end
+
+  def prefetch
+    if !(@user and @pass)
+      raise "username or password ungiven"
+    end
+  end
+
+  def alias_host(h)
+    Net::HTTP.start('dynamic.zoneedit.com') {|http|
+      req = Net::HTTP::Get.new('/auth/dynamic.html?host=%s' % [URI.escape(h)])
+      req.basic_auth @user, @pass
+      http.request(req)
+      "DONE"
+    }
+  end
+end
+
+end

data/lib/dyndyndong/version.rb

@@ -1,3 +1,4 @@
+#--
 # Copyleft shura. [shura1991@gmail.com]
 #
 # This file is part of DynDynDong.
@@ -13,10 +14,11 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with failirc. If not, see <http://www.gnu.org/licenses/>.
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
 
 module DynDynDong
 
-VERSION = '0.0.1'
+VERSION = '0.0.2'
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - shura
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,13 +40,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/dyndyndong.rb
+- lib/dyndyndong/dyndyndong.rb
 - lib/dyndyndong/services.rb
-- lib/dyndyndong/version.rb
+- lib/dyndyndong/services/zoneedit.rb
 - lib/dyndyndong/services/dyndns.rb
 - lib/dyndyndong/services/afraid.rb
-- lib/dyndyndong/dyndyndong.rb
+- lib/dyndyndong/services/no-ip.rb
 - lib/dyndyndong/daemon.rb
 - lib/dyndyndong/client.rb
+- lib/dyndyndong/version.rb
 - bin/dyndyndong
 has_rdoc: true
 homepage: http://github.com/shurizzle/DynDynDong