From 34211dec8714f5dec52af16bd0cfc521236596b6 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 9 Jun 2018 23:54:08 +0200
Subject: [PATCH] fix auth method

---
 authenticator.py | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/authenticator.py b/authenticator.py
index 7ee40db..a8e74de 100644
--- a/authenticator.py
+++ b/authenticator.py
@@ -8,6 +8,8 @@ import os
 import json
 import urlparse
 import configparser
+import sys
+import logging
 
 
 def api_auth(user, passwd, host):
@@ -16,27 +18,51 @@ def api_auth(user, passwd, host):
     data["password"] = passwd
     json_data = json.dumps(data)
 
-    url = urlparse.urljoin(host, "auth", "token")
+    url = urlparse.urljoin(host, os.path.join("auth", "token"))
     r = requests.post(url, data=json_data)
-    return r
+    return r.json()
+
+
+def setup_logger():
+    # seup logging
+    logger = logging.getLogger("certbot_dns_corenetworks")
+    logging.basicConfig(level=logging.INFO)
+    # create console handler
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.INFO)
+
+    formatter = logging.Formatter(
+        '%(asctime)s - %(name)s- %(levelname)s - %(message)s')
+    ch.setFormatter(formatter)
+    # add handler to logger
+    logger.addHandler(ch)
+    logger.propagate = False
+    return logger
 
 
 def main():
     """Main logic entrypoint"""
 
+    logger = setup_logger()
+
     try:
-        config_path = os.path.join(os.path.expanduser("~"), "config.ini")
+        config_path = os.path.join(
+            os.path.expanduser("~"),
+            ".certbot_dns_corenetworks",
+            "config.ini"
+        )
         config = configparser.ConfigParser()
         config.read(config_path)
 
         API_HOST = config['API']['HOST']
         API_USER = config['API']['USER']
         PASSWORD = config['API']['PASSWORD']
-    except configparser.Error:
-        return
+    except KeyError, e:
+        logger.error("Key %s not found in config" % (e))
+        sys.exit(0)
 
-    auth_token = api_auth(API_USER, PASSWORD, API_HOST)
-    print auth_token
+    auth = api_auth(API_USER, PASSWORD, API_HOST)
+    print auth["token"]
 
 
 if __name__ == "__main__":