From 94ebe8e6e03bd5c0b5df34eb709206279ae763aa Mon Sep 17 00:00:00 2001 From: LandGrey Date: Tue, 1 Aug 2017 22:33:43 +0800 Subject: [PATCH] common update 1. add extend configuration 2. modify other Options --- README.md | 7 ++++--- README_CN.md | 20 ++++++++++---------- funcfg/extend.conf | 14 ++++++++++---- lib/data/data.py | 2 +- tools/combiner.py | 2 +- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index c6bab3a..27dfc05 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ python pydictor.py #### function and scope of support wordlist number -| function | support number | description | +| function | number (wordlist) | description | |:---------- | :--------------------------- |:-------------------------------------------------------- | | len | 1 2 3 4 5 6 7 9 10 11 12 14 | lenght scope | | head | 1 2 3 4 5 6 7 9 10 11 12 14 | add items prefix | @@ -89,12 +89,12 @@ python pydictor.py #### 1: generate the basic wordlsit based on digital lenght of 4 ``` -python pydictor.py -base d --len 4 4 --output D:\exits\or\not\dict.txt +python pydictor.py -base d --len 4 4 --output D:\exists\or\not\dict.txt ``` ### 2: encode the wordlist ``` -python pydictor.py -base c --len 1 3 --encode b64 +python pydictor.py -base L --len 1 3 --encode b64 ``` #### 3: use d(digital) L(lowercase letter) c(capital letter) generating wordlist @@ -191,6 +191,7 @@ supported encoding: url urlencode sha256 sha256 digest algorithm sha512 sha512 digest algorithm + test interface for customized encode function ``` diff --git a/README_CN.md b/README_CN.md index a009d99..d11405d 100644 --- a/README_CN.md +++ b/README_CN.md @@ -76,12 +76,12 @@ python pydictor.py #### 字典类型与功能适用范围对照表 -| 功能 | 适用范围(编号) | 说明 | +| 功能 | 适用范围(字典类型编号) | 说明 | |:---------- | :--------------------------- |:------------------------------------ | | len | 1 2 3 4 5 6 7 9 10 11 12 14 | 定义长度范围 | -| head | 1 2 3 4 5 6 7 9 10 11 12 14 | 添加字典条目前缀 | -| tail | 1 2 3 4 5 6 7 9 10 11 12 14 | 添加字典条目后缀 | -| encode | 1 2 3 4 5 6 7 9 10 11 12 14 | 对字典条目进行编码 | +| head | 1 2 3 4 5 6 7 9 10 11 12 14 | 添加前缀 | +| tail | 1 2 3 4 5 6 7 9 10 11 12 14 | 添加后缀 | +| encode | 1 2 3 4 5 6 7 9 10 11 12 14 | 编码或自定义加密方法 | | occur | 3 4 5 7 9 10 11 12 14 | 字母、数字、特殊字符出现次数范围筛选 | | types | 3 4 5 7 9 10 11 12 14 | 字母、数字、特殊字符各种类数范围筛选 | | regex | 3 4 5 7 9 10 11 12 14 | 正则筛选 | @@ -90,14 +90,14 @@ python pydictor.py ## 使用实例 -#### 1: 生成4位纯数字爆破字典, 并保存到'D:\exits\or\not\dict.txt'文件中 +#### 1: 生成4位纯数字爆破字典, 并保存到'D:\exists\or\not\dict.txt'文件中 ``` -python pydictor.py -base d --len 4 4 --output D:\exits\or\not\dict.txt +python pydictor.py -base d --len 4 4 --output D:\exists\or\not\dict.txt ``` -#### 2: 生成1-3位小写字母——名字首字母拼音缩写爆破字典, 并用base64编码 +#### 2: 生成1-3位小写字母—名字首字母拼音缩写爆破字典, 并用base64编码 ``` -python pydictor.py -base c --len 1 3 --encode b64 +python pydictor.py -base L --len 1 3 --encode b64 ``` #### 示例3: 生成包含数字、小写与大写字母的1-4位(默认)爆破字典,保存到'/awesome/pwd' 目录 @@ -195,7 +195,7 @@ python pydictor.py --conf /my/other/awesome.conf 使用/my/other/awesome.conf url urlencode sha256 sha256 摘要算法 sha512 sha512 摘要算法 - test 修改/lib/fun/encode.py中的test_encode方法，自定义加密方式 + test 修改/lib/fun/encode.py中的test_encode方法，自定义加密方式 ``` #### 示例10: 字典处理工具 @@ -334,7 +334,7 @@ s = 5 ">=0" ">=0" ">=0" ``` -#### 示例12: 字典筛选社会工程学字典 +#### 示例12: 社会工程学字典 ``` _ _ _ diff --git a/funcfg/extend.conf b/funcfg/extend.conf index 8363378..c33475d 100644 --- a/funcfg/extend.conf +++ b/funcfg/extend.conf @@ -32,13 +32,13 @@ 1 win 1 [fuck, nima, ] 1 19[8,9]{1,1}[0-9]{1,1}[.,_,@]{1,1} -1 20[0-2]{1,1}[0,9]{1,1}[.,_,@]{1,1} +1 20[0-2]{1,1}[0-9]{1,1}[.,_,@]{1,1} 2 [a-z] 2 [2-9] 2 [0-1]{2,2} 2 [001, 111, 123, 1qa, 2ws, aaa, abc, adm, qaz, web, ] 2 19[8,9]{1,1}[0-9]{1,1} -2 20[0-2]{1,1}[0,9]{1,1} +2 20[0-2]{1,1}[0-9]{1,1} 2 [1qa@, 2ws@, qwer, site, test, ] 2 [admin, qwer_, qwert, site_, ] 2 [111abc, admin., admin@, admin_, admini, qazxsw, qweasd, qwert_, ] @@ -71,11 +71,17 @@ 1 _1q2w3e4r 1 [000000, 222222, 333333, 444444, 555555, 777777, ] 1 .19[8,9]{1,1}[0-9]{1,1} -1 .20[0-2]{1,1}[0,9]{1,1} +1 .20[0-2]{1,1}[0-9]{1,1} +1 @19[8,9]{1,1}[0-9]{1,1} +1 @20[0-2]{1,1}[0-9]{1,1} +1 _19[8,9]{1,1}[0-9]{1,1} +1 _20[0-2]{1,1}[0-9]{1,1} +1 !19[8,9]{1,1}[0-9]{1,1} +1 !20[0-2]{1,1}[0-9]{1,1} 2 [_,@]{1,1}19[8,9]{1,1}[0-9]{1,1} 2 [_,@]{1,1}20[0-2]{1,1}[0,9]{1,1} 2 19[8,9]{1,1}[0-9]{1,1} -2 20[0-2]{1,1}[0,9]{1,1} +2 20[0-2]{1,1}[0-9]{1,1} 2 [11, 12, 88, aa, ] 2 [741, 999, @qq, aaa, ] 2 [#123, @126, @163, abcd, asdf, qwer, test, ] diff --git a/lib/data/data.py b/lib/data/data.py index 9290a07..a98b576 100644 --- a/lib/data/data.py +++ b/lib/data/data.py @@ -141,7 +141,7 @@ def init_pyoptions(): pyoptions.dir_rewrite_count = 1 # counter tool max count - pyoptions.vs_counter_switcher = 10000 + pyoptions.vs_counter_switcher = 100000 # counter tool split word pyoptions.counter_split = "\n" diff --git a/tools/combiner.py b/tools/combiner.py index 882fabb..51894fe 100644 --- a/tools/combiner.py +++ b/tools/combiner.py @@ -22,7 +22,7 @@ def combiner_enter(directory=os.path.abspath(sys.argv[0]), need_uniqifer=False): filepaths = [] combine_list = [] storepath = finalsavepath(paths.results_path, pystrs.COMBINER_prefix, mybuildtime(), pyoptions.filextension, - paths.results_file_name) + paths.results_file_name if not need_uniqifer else None) for rootpath, subdirsname, filenames in os.walk(directory): filepaths.extend([os.path.abspath(os.path.join(rootpath, _)) for _ in filenames]) if len(filepaths) > 0: