From 9364859ce99d834efb3b56f8f9830ef0ae8fec21 Mon Sep 17 00:00:00 2001
From: Sebdraven <sebdraven@protonmail.com>
Date: Thu, 22 Apr 2021 15:05:29 +0200
Subject: [PATCH] refactoring of the module

---
 misp_modules/modules/expansion/onyphe.py | 96 ++++++------------------
 1 file changed, 24 insertions(+), 72 deletions(-)

diff --git a/misp_modules/modules/expansion/onyphe.py b/misp_modules/modules/expansion/onyphe.py
index d8db477..cff803f 100644
--- a/misp_modules/modules/expansion/onyphe.py
+++ b/misp_modules/modules/expansion/onyphe.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import json
+
+from pymisp import MISPEvent
+
 try:
     from onyphe import Onyphe
 except ImportError:
@@ -9,9 +12,10 @@ except ImportError:
 misperrors = {'error': 'Error'}
 
 mispattributes = {'input': ['ip-src', 'ip-dst', 'hostname', 'domain'],
-                  'output': ['hostname', 'domain', 'ip-src', 'ip-dst', 'url']}
+                  'output': ['hostname', 'domain', 'ip-src', 'ip-dst', 'url'],
+                  'format': 'misp_standard'}
 # possible module-types: 'expansion', 'hover' or both
-moduleinfo = {'version': '1', 'author': 'Sebastien Larinier @sebdraven',
+moduleinfo = {'version': '2', 'author': 'Sebastien Larinier @sebdraven',
               'description': 'Query on Onyphe',
               'module-type': ['expansion', 'hover']}
 
@@ -19,85 +23,33 @@ moduleinfo = {'version': '1', 'author': 'Sebastien Larinier @sebdraven',
 moduleconfig = ['apikey']
 
 
+class OnypheClient:
+
+    def __init__(self, api_key, attribute):
+        self.onyphe_client = Onyphe(api_key=api_key)
+        self.attribute = attribute
+        self.misp_event = MISPEvent()
+        self.misp_event.add_attribute(**attribute)
+
+    def parser_results(self):
+        pass
+
+    def get_results(self):
+        event = json.loads(self.misp_event.to_json())
+        results = {key: event[key] for key in ('Attribute', 'Object') if key in event}
+        return results
+
+
 def handler(q=False):
     if q:
 
         request = json.loads(q)
+        attribute = request['attribute']
 
         if not request.get('config') or not request['config'].get('apikey'):
             misperrors['error'] = 'Onyphe authentication is missing'
             return misperrors
 
-        api = Onyphe(request['config'].get('apikey'))
-
-        if not api:
-            misperrors['error'] = 'Onyphe Error instance api'
-
-        ip = ''
-        if request.get('ip-src'):
-            ip = request['ip-src']
-        elif request.get('ip-dst'):
-            ip = request['ip-dst']
-        else:
-            misperrors['error'] = "Unsupported attributes type"
-            return misperrors
-
-        return handle_expansion(api, ip, misperrors)
-    else:
-        return False
-
-
-def handle_expansion(api, ip, misperrors):
-    result = api.ip(ip)
-
-    if result['status'] == 'nok':
-        misperrors['error'] = result['message']
-        return misperrors
-
-    # categories = list(set([item['@category'] for item in result['results']]))
-
-    result_filtered = {"results": []}
-    urls_pasties = []
-    asn_list = []
-    os_list = []
-    domains_resolver = []
-    domains_forward = []
-
-    for r in result['results']:
-        if r['@category'] == 'pastries':
-            if r['source'] == 'pastebin':
-                urls_pasties.append('https://pastebin.com/raw/%s' % r['key'])
-        elif r['@category'] == 'synscan':
-            asn_list.append(r['asn'])
-            os_target = r['os']
-            if os_target != 'Unknown':
-                os_list.append(r['os'])
-        elif r['@category'] == 'resolver' and r['type'] == 'reverse':
-            domains_resolver.append(r['reverse'])
-        elif r['@category'] == 'resolver' and r['type'] == 'forward':
-            domains_forward.append(r['forward'])
-
-    result_filtered['results'].append({'types': ['url'], 'values': urls_pasties,
-                                       'categories': ['External analysis']})
-
-    result_filtered['results'].append({'types': ['AS'], 'values': list(set(asn_list)),
-                                       'categories': ['Network activity']})
-
-    result_filtered['results'].append({'types': ['target-machine'],
-                                       'values': list(set(os_list)),
-                                       'categories': ['Targeting data']})
-
-    result_filtered['results'].append({'types': ['domain'],
-                                       'values': list(set(domains_resolver)),
-                                       'categories': ['Network activity'],
-                                       'comment': 'resolver to %s' % ip})
-
-    result_filtered['results'].append({'types': ['domain'],
-                                       'values': list(set(domains_forward)),
-                                       'categories': ['Network activity'],
-                                       'comment': 'forward to %s' % ip})
-    return result_filtered
-
 
 def introspection():
     return mispattributes