Merge remote-tracking branch 'origin/master'

Author: pawel-kow

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.0.8] - 2020-06-30
 
 ### Changed
-- BUGFIX: exception on first run after initialization 
+- BUGFIX: exception on first run after initialization #30
 
 ## [0.0.7] - 2020-06-25
 

dyndns/command_line.py

@@ -12,7 +12,8 @@
 def main():
     parser = argparse.ArgumentParser(description="Config domain for DynDNS")
 
-    parser.add_argument('action', choices=['setup', 'update', 'status', 'remove'], help="action to be performed on domain(s)")
+    parser.add_argument('action', choices=['setup', 'update', 'status', 'remove'], help="action to be performed on "
+                                                                                        "domain(s)")
     parser.add_argument('--config', type=str, default='settings.txt', help="config file path")
     parser.add_argument('--backup_file', default=None, help="backup file path for remove domain")
     parser.add_argument('--ignore-previous-ip', action='store_true', dest='ignore_previous_ip',

dyndns/domain_remove.py

@@ -43,4 +43,3 @@ def main(domain, settings='settings.txt', backup_file=None):
     with open(settings, "w") as settings_file:
         json.dump(config, settings_file, sort_keys=True, indent=1)
     return "Domain {} successfully removed.".format(domain)
-

dyndns/domain_setup.py

@@ -1,11 +1,10 @@
 import json
 import os.path
-import sys
-
-import requests
-from domainconnect import DomainConnect, DomainConnectAsyncCredentials, TemplateNotSupportedException
-from builtins import input
 import webbrowser
+from builtins import input
+
+from domainconnect import DomainConnect, DomainConnectAsyncCredentials, TemplateNotSupportedException, \
+    NoDomainConnectRecordException, NoDomainConnectSettingsException
 
 dc = DomainConnect()
 
@@ -66,24 +65,26 @@ def main(domain, protocols, settings='settings.txt'):
     mode = 'r+'
     if not os.path.exists(settings):
         mode = 'w+'
-    with open(settings, mode) as settings_file:
-        try:
-            existing_config = json.load(settings_file)
-        except ValueError:
-            existing_config = {}
-        settings_file.seek(0)
-        settings_file.truncate()
-        existing_config.update({
-            domain: {
-                'provider_name': config.providerName,
-                'url_api': config.urlAPI,
-                'access_token': context.access_token,
-                'refresh_token': context.refresh_token,
-                'iat': context.iat,
-                'access_token_expires_in': context.access_token_expires_in,
-                'protocols': protocols
-            }
-        })
-        json.dump(existing_config, settings_file, sort_keys=True, indent=1)
-        return "Domain {} has been successfully configured.".format(domain)
-    return "Could not store domain config."
+    try:
+        with open(settings, mode) as settings_file:
+            try:
+                existing_config = json.load(settings_file)
+            except ValueError:
+                existing_config = {}
+            settings_file.seek(0)
+            settings_file.truncate()
+            existing_config.update({
+                domain: {
+                    'provider_name': config.providerName,
+                    'url_api': config.urlAPI,
+                    'access_token': context.access_token,
+                    'refresh_token': context.refresh_token,
+                    'iat': context.iat,
+                    'access_token_expires_in': context.access_token_expires_in,
+                    'protocols': protocols
+                }
+            })
+            json.dump(existing_config, settings_file, sort_keys=True, indent=1)
+            return "Domain {} has been successfully configured.".format(domain)
+    except Exception as e:
+        return "Could not store domain config: {}".format(e)

dyndns/domain_status.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-import time
 
 
 def main(domain, settings='settings.txt'):

dyndns/domain_update.py

@@ -27,6 +27,7 @@ def allowed_gai_family_ipv6():
     family = socket.AF_INET6
     return family
 
+
 # END Force requests to use IPv4 / IPv6
 
 
@@ -63,8 +64,8 @@ def main(domain, settings='settings.txt', ignore_previous_ip=False):
     print("Read {} config.".format(domain))
 
     protocols = {
-        'IP':   {'version': 4, 'api': 'https://api.ipify.org', 'record_type': 'A',
-                 'protocol_enforce': allowed_gai_family_ipv4},
+        'IP': {'version': 4, 'api': 'https://api.ipify.org', 'record_type': 'A',
+               'protocol_enforce': allowed_gai_family_ipv4},
         'IPv4': {'version': 4, 'api': 'https://api.ipify.org', 'record_type': 'A',
                  'protocol_enforce': allowed_gai_family_ipv4},
         'IPv6': {'version': 6, 'api': 'https://api6.ipify.org', 'record_type': 'AAAA',
@@ -123,8 +124,8 @@ def main(domain, settings='settings.txt', ignore_previous_ip=False):
 
         # get public ip
         try:
+            allowed_gai_family_orig = urllib3_cn.allowed_gai_family
             try:
-                allowed_gai_family_orig = urllib3_cn.allowed_gai_family
                 urllib3_cn.allowed_gai_family = protocols[proto]['protocol_enforce']
                 response = requests.get(protocols[proto]['api'], params={'format': 'json'})
             finally:
@@ -180,7 +181,6 @@ def main(domain, settings='settings.txt', ignore_previous_ip=False):
             settings_file.write(new_settings)
         return "All records up to date. No update required."
 
-
     # update DNS records
     success = True
     try:

dyndns/tests/test_dyndns.py

@@ -1,11 +1,11 @@
 from __future__ import print_function
+
 import json
 import os
+import unittest
 from sys import stdin
 
-from domainconnect import DomainConnect
 from unittest2 import TestCase
-import unittest
 
 from dyndns import domain_setup, domain_update
 
@@ -23,8 +23,9 @@ def tearDown(self):
         if os.path.exists('settings.txt'):
             os.remove('settings.txt')
 
-    def _setup_domain(self, domain):
-        domain_setup.main(domain)
+    @staticmethod
+    def _setup_domain(domain):
+        domain_setup.main(domain, ['ipv4'])
 
     @unittest.skipIf(not stdin.isatty(), "Skipping interactive test.")
     def test_setup_one_domain(self):
@@ -62,7 +63,7 @@ def test_setup_two_domains(self):
 
     @unittest.skipIf(not stdin.isatty(), "Skipping interactive test.")
     def test_update_domain(self):
-        domain_setup.main(self.host + self.domain)
+        domain_setup.main(self.host + self.domain, ['ipv4'])
         assert (os.path.exists('settings.txt')), 'Settings file missing'
         result = domain_update.main(self.host + self.domain)
         assert (result in ['A record up to date.', 'DNS record successfully updated.']), result

requirements.txt

@@ -3,7 +3,11 @@ coveralls==1.5.0
 domain-connect==0.0.7
 pytest==3.7.4
 unittest2==1.1.0
-validators==0.12.6
+validators~=0.14.0
 mock==2.0.0
 requests==2.21.0
 ipaddress==1.0.23; python_version < '3.3'
+
+argparse~=1.4.0
+dnspython~=1.16.0
+setuptools~=40.8.0