Merge branch 'master' of github.com:MISP/misp-modules into new_module

README.md

@@ -505,14 +505,14 @@ sudo git checkout MyModBranch
 
 Remove the contents of the build directory and re-install misp-modules.
 
-~~~python
+~~~bash
 sudo rm -fr build/*
 sudo pip3 install --upgrade .
 ~~~
 
 SSH in with a different terminal and run `misp-modules` with debugging enabled.
 
-~~~python
+~~~bash
 sudo killall misp-modules
 misp-modules -d
 ~~~

misp_modules/modules/expansion/btc_steroids.py

@@ -91,6 +91,7 @@ def mprint(input):
 def handler(q=False):
     global result_text
     global conversion_rates
+    result_text = ""
     # start_time = time.time()
     # now = time.time()
     if q is False:
@@ -105,7 +106,6 @@ def handler(q=False):
         btc = request['btc']
     else:
         return False
-
     mprint("\nAddress:\t" + btc)
     try:
         req = requests.get(blockchain_all.format(btc, "&limit=50"))
@@ -113,8 +113,18 @@ def handler(q=False):
     except Exception:
         # print(e)
         print(req.text)
-        result_text = ""
-        sys.exit(1)
+        result_text = "Not a valid BTC address"
+        r = {
+            'results': [
+                {
+                    'types': ['text'],
+                    'values':[
+                        str(result_text)
+                    ]
+                }
+            ]
+        }
+        return r
 
     n_tx = jreq['n_tx']
     balance = float(jreq['final_balance'] / 100000000)