Merge branch 'master' into master

Author: wh0am1i

.DS_Store

@@ -51,23 +51,23 @@ def main():
     parser_info.set_defaults(func=core.info)
 
     # query zoomeye data
-    parser_search = subparsers.add_parser(
+    P_search = subparsers.add_parser(
         "search",
         help="Search the ZoomEye database"
     )
 
-    parser_search.add_argument(
+    P_search.add_argument(
         "dork",
         help="The ZoomEye search keyword or ZoomEye exported file"
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-num",
         default=20,
         help="The number of search results that should be returned, support 'all'",
         type=str,
         metavar='value'
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-facet",
         default=None,
         nargs='?',
@@ -80,7 +80,7 @@ def main():
         '''),
         metavar='field'
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-filter",
         default=None,
         metavar='field=regexp',
@@ -93,7 +93,7 @@ def main():
               web field: [app,headers,keywords,title,site,city,country,webapp,component,framework,server,waf,os,timestamp,*]
         ''')
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         '-stat',
         default=None,
         metavar='field',
@@ -106,7 +106,7 @@ def main():
               web field: [webapp,component,framework,server,waf,os,country]
         ''')
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-save",
         default=None,
         metavar='field=regexp',
@@ -118,18 +118,18 @@ def main():
         type=str,
         const='all'
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-count",
         help="The total number of results in ZoomEye database for a search",
         action="store_true"
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-figure",
         help="Pie chart or bar chart showing data，can only be used under facet and stat",
         choices=('pie', 'hist'),
         default=None
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-type",
         help=(
             """
@@ -139,7 +139,7 @@ def main():
         choices={'web', 'host'},
         default="host"
     )
-    parser_search.add_argument(
+    P_search.add_argument(
         "-force",
         help=(
             """
@@ -148,12 +148,12 @@ def main():
         ),
         action="store_true"
     )
-    parser_search.set_defaults(func=core.search)
+    P_search.set_defaults(func=core.search)
 
     # initial account configuration related commands
-    parser_init = subparsers.add_parser("init", help="Initialize the token for ZoomEye-python")
-    parser_init.add_argument("-apikey", help="ZoomEye API Key", default=None, metavar='[api key]')
-    parser_init.set_defaults(func=core.init)
+    P_init = subparsers.add_parser("init", help="Initialize the token for ZoomEye-python")
+    P_init.add_argument("-apikey", help="ZoomEye API Key", default=None, metavar='[api key]')
+    P_init.set_defaults(func=core.init)
 
     parser_ip_info = subparsers.add_parser("ip", help="Query IP information")
     parser_ip_info.add_argument("ip", help="search device IP", metavar='ip', type=str)
@@ -219,8 +219,9 @@ def main():
     parser_domain.set_defaults(func=core.associated_domain_query)
 
     args = parser.parse_args()
+    ver=args.version()
 
-    if args.version:
+    if ver:
         get_version()
         exit(0)
 

zoomeye/cli.py

@@ -11,6 +11,7 @@
 """
 from zoomeye import __version__, __site__
 
+seconds_of_fiveday = 60 * 60 * 24 * 5
 
 # save api key file and json web token file path
 ZOOMEYE_CONFIG_PATH = "~/.config/zoomeye/setting"
@@ -19,7 +20,7 @@
 ZOOMEYE_CACHE_PATH = "~/.config/zoomeye/cache"
 
 # cache expired time, five day
-EXPIRED_TIME = 60 * 60 * 24 * 5
+EXPIRED_TIME = seconds_of_fiveday
 
 # print data max length
 STRING_MAX_LENGTH = 23

zoomeye/config.py

@@ -16,7 +16,8 @@
 zoomeye_dir = os.path.expanduser(config.ZOOMEYE_CONFIG_PATH)
 
 
-def key_init(key):#初始化API密钥并将其保存在本地配置文件中
+def init_key(key): #初始化API密钥并将其保存在本地配置文件中
+
     """
     initialize through the api key, write the api key to the local configuration file,
     theoretically it will never expire unless you remake the api key
@@ -52,7 +53,7 @@ def init(args):#根据用户输入的参数来选择初始化方法，可以通
     api_key = args.apikey
     # use api key init
     if api_key:
-        key_init(api_key)
+        init_key(api_key)
         return
     # invalid parameter
     show.printf("input parameter error", color="red")

zoomeye/core.py

@@ -162,10 +162,10 @@ def regexp(keys, field_table, data_list):
     return result
 
 
-def filter_search_data(keys, field_table, data):
+def filter_search_data(datakeys, field_table, data):
     """
     get the data of the corresponding field
-    :param keys: list, user input field
+    :param datakeys: list, user input field
     :param field_table: dict, fileds
     :param data: list, zoomeye api data
     :return: list, ex: [[1,2,3...],[1,2,3...],[1,2,3...]...]
@@ -174,7 +174,7 @@ def filter_search_data(keys, field_table, data):
     for d in data:
         item = []
         zmdict = ZoomEyeDict(d)
-        for key in keys:
+        for key in datakeys:
             if field_table.get(key.strip()) is None:
                 support_fields = ','.join(list(field_table.keys()))
                 show.printf("filter command has unsupport fields [{}], support fields has [{}]"
@@ -736,11 +736,11 @@ def filter_information(self, filters):
         result_data, has_equal, not_equal = process_filter(filters, info_data, fields_ip)
         if len(result_data) == 0:
             return
-        for item in not_equal:
-            if fields_ip.get(item.strip()) is None:
+        for items in not_equal:
+            if fields_ip.get(items.strip()) is None:
                 support_fields = ','.join(list(fields_ip.keys()))
                 show.printf(
-                    "filter command has unsupport fields [{}], support fields has [{}]".format(item, support_fields),
+                    "filter command has unsupport fields [{}], support fields has [{}]".format(items, support_fields),
                     color='red')
                 exit(0)
         show.print_info_filter(not_equal, result_data, has_equal)

zoomeye/data.py

@@ -16,23 +16,25 @@
 zoomeye_dir = os.path.expanduser(config.ZOOMEYE_CONFIG_PATH)
 
 
+
+
 def get_api_key(path) -> str:
     """
     obtain api key from local configuration when querying data
     :param path:
     :return:
     """
-    key_file = zoomeye_dir + "/apikey"
+    key_fl = zoomeye_dir + "/apikey"
     # api key config does not exits
     # raise FileNotFoundError
-    if not os.path.exists(key_file):
+    if not os.path.exists(key_fl):
         raise FileNotFoundError("not found api key config")
     # determine whether the permission of the configuration file is read-only,
     # if not, set it to read-only
-    if not oct(os.stat(key_file).st_mode).endswith("600"):
-        os.chmod(key_file, 0o600)
+    if not oct(os.stat(key_fl).st_mode).endswith("600"):
+        os.chmod(key_fl, 0o600)
     # return read file content
-    with open(key_file, 'r') as f:
+    with open(key_fl, 'r') as f:
         return f.read().strip()
 
 
@@ -42,18 +44,19 @@ def get_jwt_token(path) -> str:
     :param path:
     :return:
     """
-    key_file = zoomeye_dir + "/jwt"
+    key_fl = zoomeye_dir + "/jwt"
     # json web token does not exits
     # raise FileNotFoundError
-    if not os.path.exists(key_file):
+    if not os.path.exists(key_fl):
         raise FileNotFoundError("not found access token config")
 
+
     # determine whether the permission of the configuration file is read-only,
     # if not, set it to read-only
-    if not oct(os.stat(key_file).st_mode).endswith("600"):
-        os.chmod(key_file, 0o600)
+    if not oct(os.stat(key_fl).st_mode).endswith("600"):
+        os.chmod(key_fl, 0o600)
     # return read config content
-    with open(key_file, 'r') as f:
+    with open(key_fl, 'r') as f:
         return f.read().strip()
 
 

zoomeye/file.py

@@ -134,20 +134,20 @@ def generate_histogram(values, labels=None, force_ascii=False):
     else:
         chars = [" ", "#", "#", "#", "#", "#", "#", "#", "#"]
 
-    fmt = []
+    ft = []
     if labels is not None:
         cfmt = "{{:{}s}}".format(max([len(str(label)) for label in labels]))
-        fmt.append(cfmt)
+        ft.append(cfmt)
     # show values
     all_int = all(val == int(val) for val in values)
     if all_int:
         cfmt = "{{:{}d}}".format(max([len(str(val)) for val in values]))
     else:
         cfmt = "{}"
-    fmt.append("[" + cfmt + "]")
+    ft.append("[" + cfmt + "]")
 
-    fmt.append("{}")
-    fmt = "  ".join(fmt)
+    ft.append("{}")
+    ft = "  ".join(ft)
 
     out = []
     for k, (val, row) in enumerate(zip(values, matrix)):
@@ -159,7 +159,7 @@ def generate_histogram(values, labels=None, force_ascii=False):
         # cut off trailing zeros
         r = trim_zeros(row)
         data.append("".join(chars[item] for item in r))
-        out.append(fmt.format(*data))
+        out.append(ft.format(*data))
     for item in out:
         print(' ' + item)
 

zoomeye/plotlib.py

@@ -14,7 +14,7 @@
 
 import requests
 
-import graphviz
+import graphviz  # Attention!
 
 fields_tables_host = {
     "ip": "ip",

zoomeye/sdk.py

@@ -110,7 +110,7 @@ def show_web_default_data(data_list, count):
          "site", "title", "country", "banner"), color="green")
     num = 0
     for item in data_list:
-        num += 1
+        num = num+1
         item_dict = ZoomEyeDict(item)
         content = ''
         for item_key in data.default_table_web.keys():
@@ -427,7 +427,7 @@ def print_info_filter(filters, raw_data, condition=None):
         printf(content)
 
 
-def show_domain_info(info_list, total, page):
+def show_domain_info(information_list, total, page):
     """
     show query domain info
     Args:
@@ -437,10 +437,10 @@ def show_domain_info(info_list, total, page):
         None
     """
 
-    if len(info_list) == 0:
+    if len(information_list) == 0:
         return
     printf("{:<55}{:<15}{:<25}".format("name", "timestamp", "ip"), color="green")
-    for d in info_list:
+    for d in information_list:
         name, timestamp, ip = d.values()
         printf("{:<55}{:<15}{:<25}".format(name, timestamp, json.dumps(ip)))
     print()