From 9f8831d9d2eb9741ef5bdf9e7c92dd3657eaabc0 Mon Sep 17 00:00:00 2001 From: httpnotonly Date: Tue, 2 Apr 2019 12:55:49 +0300 Subject: [PATCH] + some outputs --- __init__.py | 7 +++++-- nimbusland.py | 12 ++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/__init__.py b/__init__.py index cc32dd5..d4d22c6 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,4 @@ -from flask import Flask, request, render_template +from flask import Flask, request, render_template, jsonify from nimbusland import Nimbusland app = Flask(__name__) @@ -16,7 +16,10 @@ def nimbusland(): nl = Nimbusland() ip_info = nl.get_aws_ip_info(target_ip) ip_info = ip_info if ip_info else nl.get_azure_ip_info(target_ip) - + if request.form['json']: + return jsonify({'result': ip_info}) + if request.form['plain']: + return ip_info except Exception as e: error = True error_message = str(e) diff --git a/nimbusland.py b/nimbusland.py index 2e4f3a2..51f3370 100644 --- a/nimbusland.py +++ b/nimbusland.py @@ -1,20 +1,12 @@ -#!/usr/bin/python - -# --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # - import requests from netaddr import IPNetwork, IPAddress import json from xml.dom import minidom -# --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # - __author__ = '@TweekFawkes' __website__ = 'Stage2Sec.com' __blog__ = 'https://Stage2Sec.com/blog/' -# --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # --- # - ''' --- Nimbusland - AWS and Azure IP Check - Alpha v0.0.7 --- @@ -23,6 +15,7 @@ ''' + class Nimbusland: def __init__(self): @@ -55,5 +48,4 @@ def get_azure_ip_info(self, target_ip): cidr = str(r.attributes['Subnet'].value) if IPAddress(target_ip) in IPNetwork(cidr): return [target_ip, cidr, str(region_name), 'Azure', "Microsoft"] - - return False \ No newline at end of file + return False