diff options
| -rw-r--r-- | README | 40 | ||||
| -rw-r--r-- | gpl-2.0.txt | 339 | ||||
| -rwxr-xr-x | log/run | 2 | ||||
| -rw-r--r-- | passfile | 1 | ||||
| -rwxr-xr-x | run | 2 | ||||
| -rwxr-xr-x | tinydns-dynamic | 137 | ||||
| -rwxr-xr-x | tinydnsdyn | 124 | ||||
| -rwxr-xr-x | tinydnsdyn-client | 61 |
8 files changed, 548 insertions, 158 deletions
@@ -3,21 +3,22 @@ server 'tinydns' by Dan Bernstein. REQUIREMENTS: -* Administrative access to a server running tinydns -* Administrative access to a unix box behind your NAT router -* Python install on both client and server +* Administrative access to a server running tinydns and hence + daemontools or similar +* Administrative access to a *nix box on you local network +* Python installed on both client and server INSTALLATION To install the server code: -1. Copy script and all files onto your server ie. /etc/tinydns-dynamic/ -2. The supplied 'run' script is tailored for debian/ubuntu and may need to be - changed. Also true for the 'log/run' script +1. Copy script and all files onto your server (i.e. /etc/tinydnsdyn/) +2. The supplied 'run' script is tailored for debian/ubuntu and may + need to be changed. 3. Create a password file that contains the password on the first line -4. Symlink this directory into your svscan directory, - (i.e. "ln $(pwd) /etc/service/" ) -5. An existing entry in the tinydns data file should already exist. +4. Start the service by symlinking this directory into your svscan + directory (i.e. "ln $(pwd) /etc/service/" ). +5. An existing entry in the tinydns data file should already exist. This script will NOT add one. Only those hosts listed (with prefixes '+' and '=') are able to update their entries. @@ -29,19 +30,24 @@ To install the server code: +*.groucho.example.com:192.168.0.2:60 +*.groucho.example.com:192.168.0.2 - Will all get updated if the host groucho.example.com does a request. + will all get updated if the host groucho.example.com does a request. To install the client code: -1. Copy the 'tinydns-dynamic' script into your DNS client's path ie. /usr/local/bin/ -2. Arrange to periodically run the "tinydns-dynamic" program (via cron et al) as: +1. Copy the 'tinydnsdyn-client' script into your DNS client's path + (i.e. /usr/local/bin/) +2. Arrange to periodically run the 'tinydnsdyn-client' program (via + cron et al) like so: - tinydns-dynamic --hostname=<myhostname> --remote-server=<mydnsserver> <passfile> + tinydnsdyn-client --hostname=<myhostname> --server=<mydnsserver> <passfile> -3. The password must obviously be the same and the requested host name must - exist in the 'data' file. + Only the passfile option is required. +3. The password must obviously be the same and the requested host name + must exist in the 'data' file. -I take no responsibility for anything that may happen to any of your machines. -That said, let me know if there are any issues. + +The Python code is basic and inefficient but it should work. I take no +responsibility for anything that may happen to any of your machines. +That said, please let me know if there are any issues. diff --git a/gpl-2.0.txt b/gpl-2.0.txt new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/log/run b/log/run deleted file mode 100755 index 9bdaa51..0000000 --- a/log/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec setuidgid dnslog multilog t ./main diff --git a/passfile b/passfile deleted file mode 100644 index 5ff6fa1..0000000 --- a/passfile +++ /dev/null @@ -1 +0,0 @@ -this-could-be-anything @@ -1,3 +1,3 @@ #!/bin/sh exec 2>&1 -exec envuidgid tinydns ./tinydns-dynamic --server --data-dir=/etc/tinydns/root passfile +exec envuidgid tinydns ./tinydnsdyn --data-dir=/etc/tinydns/root ./passfile diff --git a/tinydns-dynamic b/tinydns-dynamic deleted file mode 100755 index 8652ef4..0000000 --- a/tinydns-dynamic +++ /dev/null @@ -1,137 +0,0 @@ -#!/usr/bin/python - -# Copyright 2008 Felix McCoey <felix.mccoey@gmail.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA - -import sys -import os -import shutil -import socket -import hashlib -import time -from optparse import OptionParser - -def main(): - usage = "usage: %prog --hostname <yourhost> --remote-server <dnsserver> [options] passfile" - parser = OptionParser(usage=usage) - parser.add_option("-s", "--server", action="store_true", dest="server", - help="act as aserver, otherwise be a client") - parser.add_option("-d", "--data-dir", dest="data_dir", - help="[server] absolute path to the tinydns data directory") - parser.add_option("-t", "--ttl", dest="ttl", - help="[server] Time To Live") - parser.add_option("-n", "--hostname", dest="ddns_hostname", - help="[client] your desired DDNS hostname") - parser.add_option("-r", "--remote-server", dest="ddns_server", - help="[client] the DDNS server hostname") - parser.add_option("-p", "--port", dest="ddns_port", - help="the port to use") - parser.set_defaults(data_dir="/var/services/tinydns/root", ddns_port=5300, ttl=60) - (options, args) = parser.parse_args() - if len(args) != 1: - parser.error("Incorrect number of parameters") - exit(-1) - else: - password = open(args[0],"r").readline().strip() - - def processDDNSRequest(address, hostname): - result = -1 - try: data_tmp_file = open(data_tmp_path,"w") - except: - print "ERROR: Unable to create temporary data file" - exit(-1) - - for line in data_file: - if line[0] in ['+','=']: - fields = line.split(":",2) - # i think these prefixes should work?! - if fields[0].lstrip("+=.*") == hostname: - if fields[1] != address: - line = "%s:%s:%s\n" % (fields[0],address,options.ttl) - result = 1 - else: - result = 0 - data_tmp_file.write(line) - data_tmp_file.close() - return result - - def createHash(key): - return hashlib.sha1("%s%s" % (key,password)).hexdigest() - - # main selection between server and client - if options.server: - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.bind(("",options.ddns_port)) - sock.listen(2) - print "Server started on port", options.ddns_port - os.chdir(options.data_dir) - while 1: - # receive data from client, "hostname|hash" - (clientsock, addr) = sock.accept() - # create auth seed - key = time.asctime() - print "created key: %s" % key - # send auth key - clientsock.send(key) - # wait for reply - data = clientsock.recv(1024) - print "received data: %s" % data - # check hash, get hostname - rq_hostname, rq_hsh = data.split("|",1) - if rq_hsh == createHash(key): - data_path = os.path.join(options.data_dir, "data") - data_tmp_path = os.path.join(options.data_dir, "data.tmp") - try: data_file = open(data_path,"r") - except: - print "ERROR: Unable to open tinydns data file" - exit(-1) - result = processDDNSRequest(addr[0],rq_hostname) - if result == 1: - # now overwrite data file with temp one - try: - shutil.move(data_tmp_path, data_path) - print "CHANGED: %s = %s" % (rq_hostname, addr[0]) - except: - print "ERROR: Unable to overwrite data file" - # now run the tinydns-data prog - if (os.system("tinydns-data") == -1): - print "ERROR: Unable to execute tinydns-data program" - - elif result == 0: - print "NO CHANGE: %s = %s" % (rq_hostname, addr[0]) - else: - print "FAILED: %s is an invalid hostname request" % rq_hostname - data_file.close() - else: - print "FAILED: Authentication failed" - cliensock.close() - sys.stdout.flush() - - else: - # create and connect the socket - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.connect((options.ddns_server,options.ddns_port)) - # get auth key - key = sock.recv(1024) - print "got key: %s" % key - # hash key and password - data = "%s|%s" % (options.ddns_hostname, createHash(key)) - # send hostname, hash - sock.send(data) - sock.close() - -if __name__ == "__main__": - main() diff --git a/tinydnsdyn b/tinydnsdyn new file mode 100755 index 0000000..12d0bc8 --- /dev/null +++ b/tinydnsdyn @@ -0,0 +1,124 @@ +#!/usr/bin/python + +# Copyright 2009 Felix Hanley <felix@seconddrawer.com.au> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, as +# published by the Free Software Foundation. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA + +import sys +import os +import shutil +import socket +import hashlib +import time +from optparse import OptionParser + +def main(): + usage = "usage: %prog [options] passfile" + parser = OptionParser(usage=usage) + parser.add_option("-d", "--data-dir", dest="data_dir", + help="absolute path to the tinydns data directory") + parser.add_option("-t", "--ttl", dest="ttl", + help="Time To Live") + parser.add_option("-p", "--port", dest="port", + help="the port to listen on") + + # defaults + parser.set_defaults(data_dir="/var/services/tinydns/root", port=5300, ttl=60) + (options, args) = parser.parse_args() + + if len(args) != 1: + parser.error("ERROR: You must provide a passfile") + exit(-1) + + # check some basics + try: password = open(args[0],"r").readline().strip() + except: + print "ERROR: error opening passfile '%s'" % args[0] + exit(-1) + + def _update_datafile(address, hostname): + result = -1 + try: tmpfile = open(tmpfile_path,"w") + except: + print "ERROR: unable to create temporary data file '%s'" % tmpfile_path + exit(-1) + + for line in datafile: + if line[0] in ['+','=']: + fields = line.split(":",2) + # i think these prefixes should work?! + if fields[0].lstrip("+=.*") == hostname: + if fields[1] != address: + line = "%s:%s:%s\n" % (fields[0],address,options.ttl) + result = 1 + else: + result = 0 + tmpfile.write(line) + tmpfile.close() + return result + + + # set up socket and listen + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.bind(("",options.port)) + sock.listen(2) + print "Server started on port", options.port + + # this makes the data file ops easier + os.chdir(options.data_dir) + while 1: + # receive data from client, "hostname|hash" + (clientsock, addr) = sock.accept() + # create auth seed and send it + key = time.asctime() + clientsock.send(key) + # check returned hash and get hostname + data = clientsock.recv(1024) + client_hostname, client_hsh = data.split("|",1) + our_hsh = hashlib.sha1("%s%s" % (key,password)).hexdigest() + + if client_hsh == our_hsh: + datafile_path = os.path.join(options.data_dir, "data") + tmpfile_path = os.path.join(options.data_dir, "data.tmp") + try: datafile = open(datafile_path,"r") + except: + print "ERROR: unable to open tinydns data file" + exit(-1) + + # make the changes to the file + result = _update_datafile(addr[0],client_hostname) + if result == 1: + # now overwrite data file with temp one + try: + shutil.move(tmpfile_path, datafile_path) + print "CHANGED: %s = %s" % (client_hostname, addr[0]) + except: + print "ERROR: unable to overwrite data file" + # now run the tinydns-data prog + if (os.system("make") != 0): + print "ERROR: problem executing Makefile" + + elif result == 0: + print "NO CHANGE: %s = %s" % (client_hostname, addr[0]) + else: + print "FAILED: invalid hostname request '%s'" % client_hostname + datafile.close() + else: + print "FAILED: Authentication failed" + clientsock.close() + sys.stdout.flush() + +if __name__ == "__main__": + main() diff --git a/tinydnsdyn-client b/tinydnsdyn-client new file mode 100755 index 0000000..4e16348 --- /dev/null +++ b/tinydnsdyn-client @@ -0,0 +1,61 @@ +#!/usr/bin/python + +# Copyright 2009 Felix Hanley <felix@seconddrawer.com.au> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2, as +# published by the Free Software Foundation. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA + +import sys +import socket +import hashlib +from optparse import OptionParser + +def main(): + usage = "usage: %prog --hostname <yourhost> --server <dnsserver> [options] passfile" + parser = OptionParser(usage=usage) + parser.add_option("-n", "--hostname", dest="hostname", + help="your desired DDNS hostname") + parser.add_option("-s", "--server", dest="server", + help="the DDNS server hostname") + parser.add_option("-p", "--port", dest="port", + help="the port to use") + + # defaults + parser.set_defaults(port=5300) + (options, args) = parser.parse_args() + + if len(args) != 1: + parser.error("ERROR: you must provide a passfile") + exit(-1) + + try: password = open(args[0],"r").readline().strip() + except: + print "ERROR: error opening passfile '%s'" % args[0] + exit(-1) + + + # create and connect the socket + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect((options.server,options.port)) + # get auth key + key = sock.recv(1024) + # hash key and password + data = "%s|%s" % (options.hostname, + hashlib.sha1("%s%s" % (key,password)).hexdigest()) + # send hostname, hash + sock.send(data) + sock.close() + +if __name__ == "__main__": + main() |