dyndomain

@@ -68,17 +68,15 @@ def load_conf():
 
 
 def ping(hostname):
-    cmd = "ping -4 -c1 -w3 %s" % hostname
+    cmd = "ping -c1 -w3 %s" % hostname
     ret = subprocess.run(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     return 0 if ret.returncode else 1
 
 
 def get_hosts():
-    r = sysbus.requete('Devices:get', silent=True)
+    r = sysbus.requete('Devices:get')
-    hosts = { 'A': {}, 'AAAA': {} }
-    if not r:
-        return hosts
 
+    hosts = { 'A': {}, 'AAAA': {} }
     for h in r['status']:
         ns = {}
         for n in h['Names']:
@@ -104,11 +102,8 @@ def get_hosts():
 
 
 def get_wan_addr():
-    r = sysbus.requete('NMC:getWANStatus', silent=True)
+    r = sysbus.requete('NMC:getWANStatus')
     wan = dict()
-    if not r or not r.get('data') or not r['data'].get('IPAddress') or not r['data'].get('IPv6Address'):
-        log('get_wan_addr: {}'.format(r))
-        return None
     wan['ipv4'] = r['data']['IPAddress']
     wan['ipv6'] = r['data']['IPv6Address']
     if wan['ipv4'] == '0.0.0.0':
@@ -164,18 +159,17 @@ def process_zone(zone, stamp, grace_period, sync_zone):
     update = { 'add': [], 'delete': [] }
     for prot in zone:
         for name in zone[prot]:
-            active = False
+            add = False
             for addr in zone[prot][name]:
                 e = zone[prot][name][addr]
-                if e['first'] == stamp:
+                if e['first'] == stamp and not sync_zone:
                     update['add'].append([prot, name, addr])
-                if e['last'] == stamp:
+                    add = True
-                    active = True
             for addr in zone[prot][name]:
                 e = zone[prot][name][addr]
-                if active and e['last'] < stamp:
+                if add and e['last'] < stamp:
                     update['delete'].append([prot, name, addr])
-                elif not active and stamp - e['last'] > grace_period:
+                elif not add and stamp - e['last'] > grace_period:
                     update['delete'].append([prot, name, addr])
                 elif sync_zone:
                     update['add'].append([prot, name, addr])
@@ -207,13 +201,9 @@ def write_zone_list(zone_filename, zone, update):
 
 def log(msg):
     stamp = time.strftime("%Y-%m-%d %H:%M:%S")
-    if sys.stdout.isatty():
+    with open(log_filename, 'a') as logfile:
         for line in msg.split('\n'):
-            print("%s - %s" % (stamp, msg))
+            logfile.write("%s - %s\n" % (stamp, msg))
-    else:
-        with open(log_filename, 'a') as logfile:
-            for line in msg.split('\n'):
-                logfile.write("%s - %s\n" % (stamp, msg))
 
 
 def log_update_zone(update):
@@ -236,7 +226,7 @@ def ovh_update_zone(domain, zone, update, sync_zone):
                     result = client.get('/domain/zone/{}/record'.format(domain),
                                         fieldType=prot, subDomain=name)
                     for id in result:
-                        log('OVH: delete entry #{} {} {}'.format(id, name, prot))
+                        print('OVH: delete entry #{} {} {}'.format(id, name, prot))
                         client.delete('/domain/zone/{}/record/{}'.format(domain, id))
 
         for prot, name, addr in update['delete']:
@@ -248,59 +238,57 @@ def ovh_update_zone(domain, zone, update, sync_zone):
             for id in result:
                 r = client.get('/domain/zone/%s/record/%d' % (domain, id))
                 if r['fieldType'] == prot and r['target'] == addr:
-                    log("OVH: delete entry for %s %s %s (#%s)" % (name, prot, addr, id))
+                    print("OVH: delete entry for %s %s %s (#%s)" % (name, prot, addr, id))
                     client.delete('/domain/zone/%s/record/%d' % (domain, id))
 
         for prot, name, addr in update['add']:
             if not prot in ['A', 'AAAA']:
                 continue
-            log("OVH: create entry for %s %s %s" % (name, prot, addr))
+            print("OVH: create entry for %s %s %s" % (name, prot, addr))
             client.post('/domain/zone/%s/record' % domain,
                     fieldType=prot,
                     subDomain=name,
                     target=addr,
                     ttl=60)
 
-        log("OVH: Refresh zone %s" % domain)
+        print("OVH: Refresh zone %s" % domain)
         client.post('/domain/zone/%s/refresh' % domain)
         return True
     except:
-        log('OVH update error\n')
+        print('OVH update error\n')
         return False
 
-
 def livebox_rule_id(words):
     id='dyndomain_{}'.format('_'.join(words))
     id = id.replace('.', '_')
     return id
  
-
 def livebox_delete_port_nat(port, addr):
-    log('livebox: delete PortNat {} to {}'.format(port, addr))
+    print('livebox: delete PortNat {} to {}'.format(port, addr))
     id = livebox_rule_id([port])
-    r = sysbus.requete('Firewall:deletePortForwarding', { 'id': id, 'origin': 'webui' }, silent=True)
+    r = sysbus.requete('Firewall:deletePortForwarding', { 'id': id, 'origin': 'webui' })
 
 def livebox_delete_pinhole(port, addr):
-    log('livebox: delete pinhole {} to {}'.format(port, addr))
+    print('livebox: delete pinhole {} to {}'.format(port, addr))
     id = livebox_rule_id([port, addr])
-    r = sysbus.requete('Firewall:deletePinhole', { 'id': id, 'origin': 'webui' }, silent=True)
+    r = sysbus.requete('Firewall:deletePinhole', { 'id': id, 'origin': 'webui' })
 
 def livebox_add_port_nat(port, addr):
-    log('livebox: add PortNat {} to {}'.format(port, addr))
+    print('livebox: add PortNat {} to {}'.format(port, addr))
     id = livebox_rule_id([port])
     a = {
         'id': id,
         'origin': 'webui',
         'sourceInterface': 'data',
         'destinationIPAddress': addr,
-        'protocol': '6,17',
+        'protocol': '6',
         'internalPort': port,
         'enable': True,
     }
-    r = sysbus.requete('Firewall:setPortForwarding', a, silent=True)
+    r = sysbus.requete('Firewall:setPortForwarding', a)
 
 def livebox_add_pinhole(port, addr):
-    log('livebox: add pinhole {} to {}'.format(port, addr))
+    print('livebox: add pinhole {} to {}'.format(port, addr))
     id = livebox_rule_id([port, addr])
     a = {
         'id': id,
@@ -308,11 +296,10 @@ def livebox_add_pinhole(port, addr):
         'sourceInterface': 'data',
         'destinationPort': port,
         'destinationIPAddress': addr,
-        'protocol': '6,17',
+        'protocol': '6',
-        'ipversion': '6',
         'enable': True,
     }
-    r = sysbus.requete('Firewall:setPinhole', a, silent=True)
+    r = sysbus.requete('Firewall:setPinhole', a)
 
 def livebox_update_fw(zone, update, sync_zone):
     for prot, addr, port in update['delete']:
@@ -339,7 +326,7 @@ def send_update_mail(mail_to, mail_from, zone_domain, update, mail_ignore_list,
     if not okmail:
         return
 
-    log('Send email to %s' % mail_to)
+    print('Send email to %s' % mail_to)
     msg = EmailMessage()
 
     msg['Subject'] = "Livebox update in %s" % zone_domain
@@ -347,27 +334,27 @@ def send_update_mail(mail_to, mail_from, zone_domain, update, mail_ignore_list,
     msg['To' ] = mail_to
 
     txt = "Livebox update\n\n"
-
-
-    if updated['add']:
-        txt = txt + "\nUpdated entries:\n"
-        for prot,name,addr in update['add']:
-            txt = txt + "  %-20s %-4s %s\n" % (name,prot,addr)
-
-    if update['delete']:
-        txt = txt + "\nRemoved entries:\n"
-        for prot,name,addr in update['delete']:
-            txt = txt + "  %-20s %-4s %s\n" % (name,prot,addr)
-
-    txt = txt + '\n'
     txt = txt + "WAN IPv4 : %s\n" % wan['ipv4']
     txt = txt + "WAN IPv6 : %s\n" % wan['ipv6']
 
+    txt = txt + "\nZone %s has been updated:\n" % zone_domain
+
+    for prot,name,addr in update['add']:
+        txt = txt + "  %-20s %-4s %s\n" % (name,prot,addr)
+
+    txt = txt + "\nRemoved entries:\n"
+
+    for prot,name,addr in update['delete']:
+        txt = txt + "  %-20s %-4s %s\n" % (name,prot,addr)
+
+    txt = txt + '\n'
+
     msg.set_content(txt)
 
     s = smtplib.SMTP('localhost')
     s.send_message(msg)
     s.quit()
+    #print(txt)
 
 
 load_conf()
@@ -377,19 +364,13 @@ if not ping(wan_hostname):
     sys.exit(0)
 
 sysbus.load_conf()
-try:
+r = sysbus.auth(False)
-    r = sysbus.auth(False)
+if not r:
-    if not r:
+    print('Error: cannot authenticate on livebox')
-        log('Error: cannot authenticate on livebox')
-        sys.exit(1)
-except Exception as e:
-    log('Error: %s'.format(e))
     sys.exit(1)
 
 hosts = get_hosts()
 wan = get_wan_addr()
-if not wan:
-    sys.exit(0)
 
 zone = read_zone_list(zone_filename)
 sync_zone = False
@@ -405,9 +386,6 @@ if update:
     success = ovh_update_zone(zone_domain, zone, update, sync_zone)
     livebox_update_fw(zone, update, sync_zone)
     if success:
-        try:
+        send_update_mail(mail_to, mail_from, zone_domain, update, mail_ignore_list, wan)
-            send_update_mail(mail_to, mail_from, zone_domain, update, mail_ignore_list, wan)
-        except:
-            pass
 
 write_zone_list(zone_filename, zone, update)

sysbus

@@ -1 +1 @@
-Subproject commit 87040a0906df80ade21ea863452838a8a574bdbd
+Subproject commit 5526cb53641e5620dfe9d688b9a4b90a40076f91