From 773f696b5b11b66d905ba3bc13282d5ea9a33d7f Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 02:58:10 +0900 Subject: [PATCH 1/9] [add] add option '--dry' to perform a trial run --- r53update | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/r53update b/r53update index f44d1f0..70e26d9 100755 --- a/r53update +++ b/r53update @@ -145,6 +145,7 @@ class R53UpdateApp(App): default=['8.8.8.8', '8.8.4.4'], help='default: 8.8.8.8, 8.8.4.4') self._parser.add_argument('--ttl', type=int, metavar='TTL', default=300, help='default: 300') + self._parser.add_argument('--dry', action='store_true') self._parser.add_argument('--syslog', action='store_true') self._parser.add_argument('--debug', action='store_true') @@ -215,11 +216,17 @@ class R53UpdateApp(App): self.logger.debug('current a records: %s' % str(recs)) if not global_ip in recs or len(recs) > 1: - self.__update_r53_record( - self._opts.zone, - self._opts.host, - global_ip - ) + if not self._opts.dry: + self.logger.debug('updating route53 zone info') + self.__update_r53_record( + self._opts.zone, + self._opts.host, + global_ip + ) + else: + self.logger.debug('updating route53 zone info (dry-run)') + else: + self.logger.debug('route53 zone info is up to date') def show_version(self): print >>sys.stderr, "Copyrights (c)2014 Takuya Sawada All rights reserved." From 1511dd84a55d1759e18fb9c3f4f24f6cd493b9b5 Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 02:37:38 +0900 Subject: [PATCH 2/9] [add] add '--foce' option to force update route53 zone info --- r53update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r53update b/r53update index f44d1f0..bfd9dba 100755 --- a/r53update +++ b/r53update @@ -145,6 +145,7 @@ class R53UpdateApp(App): default=['8.8.8.8', '8.8.4.4'], help='default: 8.8.8.8, 8.8.4.4') self._parser.add_argument('--ttl', type=int, metavar='TTL', default=300, help='default: 300') + self._parser.add_argument('--force', action='store_true') self._parser.add_argument('--syslog', action='store_true') self._parser.add_argument('--debug', action='store_true') @@ -214,7 +215,7 @@ class R53UpdateApp(App): recs = self.__get_records_from_host(fqdn) self.logger.debug('current a records: %s' % str(recs)) - if not global_ip in recs or len(recs) > 1: + if not global_ip in recs or len(recs) > 1 or self._opts.force: self.__update_r53_record( self._opts.zone, self._opts.host, From 0449449774b368d7c0a2a56392ee5dfe490d5ba4 Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 03:16:03 +0900 Subject: [PATCH 3/9] [mod] remove old meaningless comments. --- r53update | 3 --- 1 file changed, 3 deletions(-) diff --git a/r53update b/r53update index 017ba66..a07dce6 100755 --- a/r53update +++ b/r53update @@ -237,9 +237,6 @@ class R53UpdateApp(App): ## # DOCUMENT # -# r53update [--profile PROFILE] [--dns DNS ...] [--ttl TTL] --zone ZONE --host HOST -# - if __name__ == '__main__': try: R53UpdateApp(sys.argv)() From caff77f32be0e1f073ff502013160b0691eee6fa Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 03:41:06 +0900 Subject: [PATCH 4/9] [mod] refactor the global ip resolving method --- r53update | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/r53update b/r53update index a07dce6..4999b39 100755 --- a/r53update +++ b/r53update @@ -17,6 +17,7 @@ import dns.resolver import dns.exception import logging import logging.handlers +import exceptions try: import argcomplete @@ -123,6 +124,23 @@ class R53UpdateApp(App): profiles = self.__parent.ctx.session.available_profiles return (x for x in profiles if x.startswith(prefix)) + ## + # Global IP Resolver + class GlobalIP_Resolver(object): + def __init__(self, app): + self._app = app + + def resolveGlobalIP(): + raise NotImplementedError() + + class HTTP_GlobalIP_Resolver(GlobalIP_Resolver): + def __init__(self, app, url): + super(R53UpdateApp.HTTP_GlobalIP_Resolver, self).__init__(app) + self._url = url + + def resolveGlobalIP(self): + return urllib2.urlopen(self._url).read().rstrip() + def _pre_init(self): super(R53UpdateApp, self)._pre_init() self.ctx = R53UpdateApp.Context() @@ -139,9 +157,15 @@ class R53UpdateApp(App): handler.setFormatter(self._formatter) self.logger.addHandler(handler) + # create mapping of global ip resolvers + self._gipresolvers = dict() + self._gipresolvers['ifconfig.me'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://ifconfig.me/ip') + # optional argument self._parser.add_argument('--profile', type=str, metavar='PROFILE', default='', help='プロファイル名').completer = R53UpdateApp.ProfileCompleter(self) + self._parser.add_argument('--resolver', type=str, metavar='RESOLVER', + default='ifconfig.me', help='グローバルIP 取得方法') self._parser.add_argument('--dns', nargs='+', type=str, metavar='DNS', default=['8.8.8.8', '8.8.4.4'], help='default: 8.8.8.8, 8.8.4.4') self._parser.add_argument('--ttl', type=int, metavar='TTL', @@ -169,7 +193,8 @@ class R53UpdateApp(App): self.logger.setLevel(logging.DEBUG) def __get_global_ip(self): - return urllib2.urlopen("http://ifconfig.me/ip").read().rstrip() + self.logger.debug('resolving global ip adreess with \'%s\'', self._opts.resolver) + return self._gipresolvers[self._opts.resolver].resolveGlobalIP() def __get_records_from_host(self, fqdn): resolver = dns.resolver.Resolver() From a2f83f69815efe58ebc9031cd96fd3f931b0d43a Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 03:48:31 +0900 Subject: [PATCH 5/9] [add] add global ip resolver 'ipecho.net', 'icanhazip.com' --- r53update | 3 +++ 1 file changed, 3 insertions(+) diff --git a/r53update b/r53update index 4999b39..0cc7415 100755 --- a/r53update +++ b/r53update @@ -160,6 +160,9 @@ class R53UpdateApp(App): # create mapping of global ip resolvers self._gipresolvers = dict() self._gipresolvers['ifconfig.me'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://ifconfig.me/ip') + self._gipresolvers['ipecho.net'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://ipecho.net/plain') + self._gipresolvers['icanhazip.com'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://icanhazip.com') + # optional argument self._parser.add_argument('--profile', type=str, metavar='PROFILE', default='', From 3b417df203510b263580df0c4c5bfd19a7dbfd36 Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 03:54:14 +0900 Subject: [PATCH 6/9] [add] add global ip resolver 'opendns.com' --- r53update | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/r53update b/r53update index 0cc7415..4276aa5 100755 --- a/r53update +++ b/r53update @@ -141,6 +141,22 @@ class R53UpdateApp(App): def resolveGlobalIP(self): return urllib2.urlopen(self._url).read().rstrip() + class DNS_GlobalIP_Resolver(GlobalIP_Resolver): + def __init__(self, app, hostname, resolvername): + super(R53UpdateApp.DNS_GlobalIP_Resolver, self).__init__(app) + self._hostname = hostname + self._resolvername = resolvername + + def __resolveServerName(self, servername): + resolver = dns.resolver.Resolver() + resolver.nameservers = self._app._opts.dns + return map(lambda x: x.to_text(), resolver.query(servername, 'A')) + + def resolveGlobalIP(self): + resolver = dns.resolver.Resolver() + resolver.nameservers = self.__resolveServerName(self._resolvername) + return resolver.query(self._hostname, 'A')[0].to_text() + def _pre_init(self): super(R53UpdateApp, self)._pre_init() self.ctx = R53UpdateApp.Context() @@ -162,7 +178,7 @@ class R53UpdateApp(App): self._gipresolvers['ifconfig.me'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://ifconfig.me/ip') self._gipresolvers['ipecho.net'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://ipecho.net/plain') self._gipresolvers['icanhazip.com'] = R53UpdateApp.HTTP_GlobalIP_Resolver(self, 'http://icanhazip.com') - + self._gipresolvers['opendns.com'] = R53UpdateApp.DNS_GlobalIP_Resolver(self, 'myip.opendns.com', 'resolver1.opendns.com') # optional argument self._parser.add_argument('--profile', type=str, metavar='PROFILE', default='', From e7d6e6e553a8eb71a1623f3d9f0d6590ababae5c Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 04:04:58 +0900 Subject: [PATCH 7/9] [mod] change default resolver from 'ifconfig.me' to 'opendns.com' --- r53update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r53update b/r53update index 4276aa5..aa338f1 100755 --- a/r53update +++ b/r53update @@ -184,7 +184,7 @@ class R53UpdateApp(App): self._parser.add_argument('--profile', type=str, metavar='PROFILE', default='', help='プロファイル名').completer = R53UpdateApp.ProfileCompleter(self) self._parser.add_argument('--resolver', type=str, metavar='RESOLVER', - default='ifconfig.me', help='グローバルIP 取得方法') + default='opendns.com', help='グローバルIP 取得方法') self._parser.add_argument('--dns', nargs='+', type=str, metavar='DNS', default=['8.8.8.8', '8.8.4.4'], help='default: 8.8.8.8, 8.8.4.4') self._parser.add_argument('--ttl', type=int, metavar='TTL', From 9dfcbdc39bb3e25558ad5270dc5992d95ece3820 Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Sat, 21 Mar 2015 22:53:43 +0900 Subject: [PATCH 8/9] [add] apply Apache License 2.0 --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++ bash_completion.d/r53update | 18 ++++ r53update | 14 ++- 3 files changed, 232 insertions(+), 2 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bash_completion.d/r53update b/bash_completion.d/r53update index 329dc88..a2ccd0a 100644 --- a/bash_completion.d/r53update +++ b/bash_completion.d/r53update @@ -1 +1,19 @@ +#!/usr/bin/bash +# +# R53Update Dynamic DNS Updater v0.1.0 +# (C)2014 Takuya Sawada All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + eval "$(register-python-argcomplete r53update)" diff --git a/r53update b/r53update index f44d1f0..1e4ba26 100755 --- a/r53update +++ b/r53update @@ -4,8 +4,18 @@ # R53Update Dynamic DNS Updater v0.1.0 # (C)2014 Takuya Sawada All rights reserved. # -# @author Takuya Sawada -# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# from boto.route53.connection import Route53Connection from boto.route53.record import ResourceRecordSets from botocore.session import Session From a070b7d176d9554ac98e2c220efeb28f5fd00a25 Mon Sep 17 00:00:00 2001 From: Takuya Sawada Date: Tue, 24 Mar 2015 04:10:18 +0900 Subject: [PATCH 9/9] [mod] change version number to 'v0.2.0' --- bash_completion.d/r53update | 2 +- r53update | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bash_completion.d/r53update b/bash_completion.d/r53update index a2ccd0a..c5859cf 100644 --- a/bash_completion.d/r53update +++ b/bash_completion.d/r53update @@ -1,6 +1,6 @@ #!/usr/bin/bash # -# R53Update Dynamic DNS Updater v0.1.0 +# R53Update Dynamic DNS Updater v0.2.0 # (C)2014 Takuya Sawada All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/r53update b/r53update index 0365a03..adebb98 100755 --- a/r53update +++ b/r53update @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# R53Update Dynamic DNS Updater v0.1.1 +# R53Update Dynamic DNS Updater v0.2.0 # (C)2014 Takuya Sawada All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -286,7 +286,7 @@ class R53UpdateApp(App): def show_version(self): print >>sys.stderr, "Copyrights (c)2014 Takuya Sawada All rights reserved." - print >>sys.stderr, "Route53Update Dynamic DNS Updater 0.1.1" + print >>sys.stderr, "Route53Update Dynamic DNS Updater 0.2.0" ## # DOCUMENT