Added create/expire times if available

dnspy3-server.py

@@ -1,7 +1,6 @@
 from flask import Flask, request
 from flask_restful import Resource, Api
 import utils
-import json
 
 app = Flask(__name__)
 api = Api(app)

utils/whoisData.py

@@ -12,11 +12,27 @@ class WhoIS():
         self.registrar = whoisData.get('Registrar')
         self.status = whoisData.get('Status')
         self.registrant = self.buildRegistrantInfo(whoisData)
-        self.nameservers = whoisData.get('NameServer')
+        self.nameservers = self.splitNameservers(
+            whoisData.get('NameServer'))
+        self.createDate = whoisData.get('CreationDate')
+        self.expireDate = whoisData.get('ExpirationDate')
+        # self.nameservers = whoisData.get('NameServer')
 
     def buildRegistrantInfo(self, whoisData):
+        print(whoisData)
         ret = {}
         ret['registrantName'] = whoisData.get('RegistrantName')
         ret['eligibilityType'] = whoisData.get('EligibilityType')
         ret['registrantID'] = whoisData.get('RegistrantID')
         return ret
+
+# I hate this, kill me now
+    def splitNameservers(self, nameservers):
+        ret = []
+        if '\n' in nameservers[0]:
+            nameservers = nameservers[0]
+            nameservers = nameservers.split('\n')
+            for x in nameservers:
+                ret.append(x.strip())
+            return ret
+        return nameservers