ssl_check_cert option does not have to be given

[dyn-nsupdate.git] / server-scripts / update

diff --git a/server-scripts/update b/server-scripts/update
index d5fbca39c945b90ed5ad5292ad341b68587d8cf4..a7535cea84be8ecde2623f483b8d1fb358659f94 100755 (executable)
--- a/server-scripts/update
+++ b/server-scripts/update
@@ -1,29 +1,65 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
+# Copyright (c) 2014, Ralf Jung <post@ralfj.de>
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

 import cgi, os, sys, subprocess
 import cgi, os, sys, subprocess

-form = cgi.FieldStorage()
+form = cgi.FieldStorage(keep_blank_values=True)

 
 # print headers
 print "Content-Type: text/plain"
 print ""
 
 # get input
 
 # print headers
 print "Content-Type: text/plain"
 print ""
 
 # get input

-if "password" not in form or "domain" not in form or "ip" not in form:
-    print "Mandatory argument missing: You must supply all of 'password', 'domain', 'ip'"
+if "password" not in form or "domain" not in form or ("ip" not in form and "ipv6" not in form):
+    print "Mandatory argument missing: You must supply all of 'password', 'domain' and at least either 'ip' or 'ipv6'"

     sys.exit()
 
     sys.exit()
 

-ip = form["ip"].value
-domain = form["domain"].value
-password = form["password"].value
+domain = form.getfirst("domain")
+password = form.getfirst("password")
+ip = form.getfirst("ip")
+ipv6 = form.getfirst("ipv6")
+assert domain is not None and password is not None
+assert ip is not None or ipv6 is not None

 
 # run update program
 
 # run update program

-p = subprocess.Popen(["/var/lib/named/dyn-nsupdate", domain, password, ip], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+args = ["/var/lib/bind/dyn-nsupdate", "--domain", domain, "--password", password]
+if ip is not None:
+    args += ["--ipv4", ip]
+if ipv6 is not None:
+    args += ["--ipv6", ipv6]
+p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

 (stdout, stderr) = p.communicate()
 
 # check what it did
 if p.returncode or stderr or stdout:
 (stdout, stderr) = p.communicate()
 
 # check what it did
 if p.returncode or stderr or stdout:

-       # error :/
-       print "There was an error while updating the DNS: Return code %d" % p.returncode
-       if stdout: print stdout
-       if stderr: print stderr
+    # error :/
+    print "There was an error while updating the DNS: Return code %d" % p.returncode
+    if stdout: print stdout
+    if stderr: print stderr

 else:
 else:

-       print "good",ip
+    print "good",
+    if ip is not None:
+        print ip,
+    if ipv6 is not None:
+        print ipv6,
+    print