arl 2.2

Readme.md

@@ -29,6 +29,7 @@ git clone https://github.com/TophantTechnology/ARL
 cd ARL/docker/
 docker-compose up -d 
 ```
+详细说明可以参考: [Docker 环境安装 ARL](https://github.com/TophantTechnology/ARL/wiki/Docker-%E7%8E%AF%E5%A2%83%E5%AE%89%E8%A3%85-ARL)
 
 ### 截图
 登录页面，默认端口5003, 默认用户名密码admin/arlpass  
@@ -80,15 +81,21 @@ docker-compose up -d
 | ARL.AUTH          | 是否开启认证，不开启有安全风险          |
 | ARL.API_KEY       | arl后端API调用key，如果设置了请注意保密 |
 | ARL.BLACK_IPS     | 为了防止SSRF，屏蔽的IP地址或者IP段      |
+| ARL.PORT_TOP_10     | 自定义端口，对应前端端口测试选项      |
+| ARL.DOMAIN_DICT     | 域名爆破字典，对应前端大字典选项      |
+| ARL.FILE_LEAK_DICT     | 文件泄漏字典      |
 
 
 
-### 密码修改
+### 密码重置
 
+可以执行下面的命令，然后使用 `admin/admin123` 就可以登录了。
 ```
 docker exec -ti arl_mongodb mongo -u admin -p admin
+use arl
+db.user.drop()
+db.user.insert({ username: 'admin',  password: hex_md5('arlsalt!@#'+'admin123') })
 ```
-使用`use arl`切换数据库，复制docker目录下的mongo-init.js文件的内容执行进行修改密码。
 
 
 ### 本地安装
@@ -126,7 +133,14 @@ alien -i nmap-7.80-1.x86_64.rpm
 rpm -vhU https://nmap.org/dist/nmap-7.80-1.x86_64.rpm
 ```
 
+#### 配置RabbitMQ
 
+```
+rabbitmqctl add_user arl arlpassword
+rabbitmqctl add_vhost arlv2host
+rabbitmqctl set_user_tags arl arltag
+rabbitmqctl set_permissions -p arlv2host arl ".*" ".*" ".*"
+```
 
 ### 本地编译Docker镜像 并启动
 
@@ -146,4 +160,4 @@ docker-compose up -d
 ### 写在最后
 
 目前ARL仅仅只是完成了对资产的部分维度的发现和收集，自动发现过程中难免出现覆盖度不全、不精准、不合理等缺陷的地方还请反馈至我们。  
-后续还有更多有意思的功能，如资产管理、监控部分等功能，敬请期待。 
+

app/celerytask.py

@@ -1,10 +1,11 @@
-import os
 import signal
-import psutil
-from app.config import  Config
+import time
+from bson import ObjectId
+from app.config import Config
 from celery import Celery, platforms
 from app import utils
 from app import tasks as wrap_tasks
+from app.modules import CeleryAction, TaskSyncStatus
 logger = utils.get_logger()
 
 celery = Celery('task', broker=Config.CELERY_BROKER_URL)
@@ -19,20 +20,80 @@ class CeleryConfig:
 platforms.C_FORCE_ROOT = True
 
 
-
 @celery.task(queue='arltask')
 def arl_task(options):
     signal.signal(signal.SIGTERM, utils.exit_gracefully)
+
+    action = options.get("celery_action")
+    data = options.get("data")
+    action_map = {
+        CeleryAction.DOMAIN_TASK_SYNC_TASK: domain_task_sync,
+        CeleryAction.DOMAIN_EXEC_TASK: domain_exec,
+        CeleryAction.DOMAIN_TASK: domain_task,
+        CeleryAction.IP_TASK: ip_task,
+        CeleryAction.ADD_DOMAIN_TO_SCOPE: add_domain_to_scope
+    }
+    logger.info(options)
+    start_time = time.time()
+    logger.info("start {} time: {}".format(action, start_time))
     try:
-        target = options["target"]
-        task_options = options["options"]
-        task_id = options["task_id"]
-        logger.info(options)
-        task_type = options["type"]
-        if task_type == "domain":
-            wrap_tasks.domain_task(target, task_id, task_options)
-        if task_type == "ip":
-            wrap_tasks.ip_task(target, task_id, task_options)
+        fun = action_map.get(action)
+        if fun:
+            fun(data)
+    except Exception as e:
+        logger.exception(e)
+
+    elapsed = time.time() - start_time
+    logger.info("end {} elapsed: {}".format(action, elapsed))
 
+
+def domain_exec(options):
+    """域名监测任务"""
+    scope_id = options.get("scope_id")
+    domain = options.get("domain")
+    job_id = options.get("job_id")
+    monitor_options = options.get("monitor_options")
+    name = options.get("name")
+    wrap_tasks.domain_executors(base_domain=domain, job_id=job_id,
+                                scope_id=scope_id, options=monitor_options, name=name)
+
+
+def domain_task_sync(options):
+    """域名同步任务"""
+    scope_id = options.get("scope_id")
+    task_id = options.get("task_id")
+    query = {"_id": ObjectId(task_id)}
+    try:
+        update = {"$set": {"sync_status": TaskSyncStatus.RUNNING}}
+        utils.conn_db('task').update_one(query, update)
+
+        wrap_tasks.sync_asset(task_id, scope_id, update_flag=False)
+
+        update = {"$set": {"sync_status": TaskSyncStatus.DEFAULT}}
+        utils.conn_db('task').update_one(query, update)
     except Exception as e:
+        update = {"$set": {"sync_status": TaskSyncStatus.ERROR}}
+        utils.conn_db('task').update_one(query, update)
         logger.exception(e)
+
+
+def domain_task(options):
+    """常规域名任务"""
+    target = options["target"]
+    task_options = options["options"]
+    task_id = options["task_id"]
+    wrap_tasks.domain_task(target, task_id, task_options)
+
+
+def ip_task(options):
+    """常规IP任务"""
+    target = options["target"]
+    task_options = options["options"]
+    task_id = options["task_id"]
+    wrap_tasks.ip_task(target, task_id, task_options)
+
+
+def add_domain_to_scope(options):
+    domain = options["domain"]
+    scope_id = options["scope_id"]
+    wrap_tasks.add_domain_to_scope(domain=domain, scope_id=scope_id)

app/config.py

@@ -4,6 +4,7 @@
 
 basedir = os.path.abspath(os.path.dirname(__file__))
 
+
 class Config(object):
     CELERY_BROKER_URL = "amqp://arl:arlpassword@localhost:5672/arlv2host"
 
@@ -32,9 +33,9 @@ class Config(object):
 
     TOP_1000 = "1,3-4,6-7,9,13,17,19-26,30,32-33,37,42-43,49,53,68-70,79-85,88-90,99-100,106,109-111,113,119,125,135,139,143-144,146,161,163,179,199,211-212,222,254-256,259,264,280,301,306,311,340,366,389,406-407,416-417,425,427,443-445,458,464-465,481,497,500,512-515,524,541,543-546,548,554-555,563,587,593,616-617,623,625,631,636,646,648,666-668,683,687,691,700,705,711,714,720,722,726,749,765,777,783,787,800-801,808,843,873,880,888,898,900-903,911-912,981,987,990,992-993,995,999-1002,1007,1009-1011,1021-1100,1102,1104-1108,1110-1114,1117,1119,1121-1124,1126,1130-1132,1137-1138,1141,1145,1147-1149,1151-1152,1154,1163-1166,1169,1174-1175,1183,1185-1187,1192,1194,1198-1199,1201,1213,1216-1218,1233-1234,1236,1244,1247-1248,1259,1271-1272,1277,1287,1296,1300-1301,1309-1311,1322,1328,1334,1337,1352,1417,1433-1434,1443,1455,1461,1494,1500-1501,1503,1521,1524,1533,1556,1580,1583,1594,1600,1641,1658,1666-1667,1687-1688,1700,1717-1721,1723,1755,1761,1782-1783,1801,1805,1812,1839-1840,1862-1864,1875,1900,1914,1935,1947,1971-1972,1974,1984,1998-2010,2013,2020-2022,2030,2033-2035,2038,2040-2043,2045-2049,2065,2068,2099-2100,2103,2105-2107,2111,2119,2121,2126,2135,2144,2160-2161,2170,2179,2181,2190-2191,2196,2200,2222,2233,2251,2260,2288,2301,2323,2366,2375,2379,2381-2383,2393-2394,2399,2401,2443,2492,2500,2522,2525,2557,2601-2602,2604-2605,2607-2608,2638,2701-2702,2710,2717-2718,2725,2800,2809,2811,2869,2875,2888,2909-2910,2920,2967-2968,2998,3000-3001,3003,3005-3007,3011,3013,3017,3030-3031,3052,3071,3077,3128,3168,3211,3221,3260-3261,3268-3269,3283,3300-3301,3306,3322-3325,3333,3351,3367,3369-3372,3389-3390,3404,3476,3493,3517,3520,3527,3546,3551,3580,3659,3689-3690,3703,3737,3766,3772-3773,3784,3800-3801,3809,3814,3826-3828,3851,3869,3871,3878,3880,3888-3889,3905,3914,3918,3920,3945,3971,3986,3995,3998,4000-4006,4045,4111,4125-4126,4129,4224,4242,4279,4321,4343,4369,4443-4446,4449,4550,4560,4567,4662,4848,4899-4900,4998,5000-5004,5006,5009,5030,5033,5050-5051,5054,5060-5061,5080,5087,5100-5102,5111,5120,5151,5190,5200,5214,5221-5222,5225-5226,5269,5280,5298,5355,5357,5387,5405,5414,5431-5432,5440,5500,5510,5544,5550,5555,5560,5566,5601,5631-5633,5666,5672,5678-5679,5718,5722,5730,5800-5802,5810-5811,5815,5822,5825,5850,5859,5862,5877,5900-5904,5906-5907,5910-5911,5915,5922,5925,5950,5952,5959-5963,5987-5989,5998-6007,6009,6025,6059,6080,6093,6100-6101,6106,6112,6123,6129,6156,6161,6182,6346,6379,6389,6443,6502,6510,6543,6547,6565-6567,6580,6646,6666-6669,6689,6692,6699,6779,6788-6789,6792,6839,6881,6901,6969,7000-7008,7019,7025,7070,7100,7103,7106,7180,7182,7200-7201,7337,7402,7435,7443,7474,7496,7512,7625,7627,7676,7680,7687,7741,7777-7778,7800,7911,7920-7921,7937-7938,7999-8002,8007-8011,8016,8020-8022,8025,8030-8033,8040-8042,8045,8050,8060,8069-8070,8080-8091,8093,8099-8100,8123-8124,8161,8180-8181,8188,8192-8194,8200,8222,8254,8290-8292,8300,8333,8383,8400,8402,8443,8480-8481,8500,8600,8649,8651-8652,8654,8701,8744,8800,8873,8888-8889,8898-8899,8983,8989,8994,9000-9003,9009-9011,9040,9043,9050,9071,9080-9083,9090-9092,9094-9095,9099-9103,9110-9111,9200,9207,9220,9222,9290,9293,9300,9389,9391-9392,9415,9418,9443,9485,9500,9502-9503,9535,9575,9593-9595,9618,9666,9876-9878,9898,9900,9917,9929,9943-9944,9968,9987-9988,9994-10004,10009-10010,10012,10020,10024-10025,10030,10033,10050-10051,10080-10082,10101,10180,10215,10243,10250-10252,10255-10256,10566,10616-10617,10621,10626,10628-10629,10666,10778,11000-11001,11080,11110-11111,11211,11443,11967,12000,12174,12234,12265,12306,12345,12669,12750,12801-12804,12999,13456,13562,13722,13782-13783,14000,14238,14441-14442,15000,15002-15004,15660,15672,15742,16000-16001,16010,16012,16016,16018,16020,16030,16080,16113,16666,16992-16993,17877,17988,18040,18080,18089,18101,18988,19101,19283,19315,19350,19780,19801,19842,19888,19890,20000,20005-20006,20031,20221-20222,20828,20880,21000,21443,21571,22939,23502,24444,24800,25672,25734-25735,26214,27000,27017-27018,27352-27353,27355-27356,27715,28201,30000,30718,30951,31038,31337,32768-32785,33354,33899,34451,34528,34571-34573,35500,36359,37257,37310,38243,38292,38914,39297,40193,40654,40911,41084,41414,41511,42424,42510,43761,44176,44442-44443,44501,44838,45100,46675,48080,49152-49161,49163,49165-49167,49175-49176,49400,49664-49667,49670,49692,49697,49999-50003,50006,50010,50020,50070,50075,50090-50091,50095,50100,50105,50300,50389,50470,50475,50500,50636,50800,51103,51493,52673,52822,52848,52869,54045,54321,54328,54345,54485,54488,55055-55056,55555,55600,56341,56737-56738,57294,57797,58080,58316,60000,60010,60020,60030,60443,61532,61616,61900,62078,63331,64623,64680,65000,65129,65389,65512,6677,8484,8360,7080,41516,8880,8881,3505,1980,8003,8004,8006,8012,7890,86,8280,8028,9060,38501,38888,28017,8053,889,9085"
 
-    TOP_100 = "22,3389,3306,1433,21,25,8080,80,81,8081,7001,8000,8088,8888,9090,8090,88,8001,82,9080,8082,8089,9000,8443,9999,8002,89,8083,8200,8008,90,8086,801,8011,8085,9001,9200,8100,8012,85,8084,8070,7002,8091,8003,99,7777,8010,443,8028,8087,83,7003,10000,808,38888,8181,800,18080,8099,8899,86,8360,8300,8800,8180,3505,7000,9002,8053,1000,7080,8989,28017,9060,888,3000,8006,41516,880,8484,6677,8016,84,7200,9085,5555,8280,7005,1980,8161,9091,7890,8060,6080,8880,8020,7070,889,8881,9081,8009,7007,8004,38501,1010"
+    TOP_100 = "22,3389,3306,1433,21,25,8080,80,81,8081,7001,8000,8088,8888,9090,8090,88,8001,82,9080,8082,8089,9000,8443,9999,8002,89,8083,8200,8008,90,8086,801,8011,8085,9001,9200,8100,8012,85,8084,8070,7002,8091,8003,99,7777,8010,443,8028,8087,83,7003,10000,808,38888,8181,800,18080,8099,8899,86,8360,8300,8800,8180,3505,7000,9002,8053,1000,7080,8989,28017,9060,888,3000,8006,41516,880,8484,6677,8016,84,7200,9085,5555,8280,7005,1980,8161,9091,7890,8060,6080,6379,8880,8020,7070,889,8881,9081,8009,7007,8004,38501,1010"
 
-    TOP_10 = "22,80,443,3389,8007-8011,8080-8091,8093,8099,5000-5004,2222,3306,1433,21,25"
+    TOP_10 = "22,25,80,81,88,443,3389,8009,8080,8081,7001,5000,3000,6379,3306,8443"
 
     RISKIQ_EMAIL = ""
     RISKIQ_KEY = ""
@@ -54,6 +55,7 @@ class Config(object):
     FILE_LEAK_TOP_2k = os.path.join(basedir, 'dicts/file_top_2000.txt')
     FILE_LEAK_TOP_200 = os.path.join(basedir, 'dicts/file_top_200.txt')
 
+
 try:
     with open(os.path.join(basedir, 'config.yaml')) as f:
         y = yaml.load(f, Loader=yaml.SafeLoader)
@@ -77,6 +79,23 @@ class Config(object):
     Config.API_KEY = y["ARL"]["API_KEY"]
     Config.BLACK_IPS = y["ARL"]["BLACK_IPS"]
 
+    if y["ARL"].get("TOP_10"):
+        Config.TOP_10 = y["ALR"]["TOP_10"]
+
+    if y["ARL"].get("FILE_LEAK_DICT"):
+        file_leak_dict = y["ARL"]["FILE_LEAK_DICT"]
+        if os.path.isfile(file_leak_dict):
+            Config.FILE_LEAK_TOP_2k = file_leak_dict
+        else:
+            print("Warning {} is not file".format(file_leak_dict))
+
+    if y["ARL"].get("DOMAIN_DICT"):
+        domain_dict = y["ARL"]["DOMAIN_DICT"]
+        if os.path.isfile(domain_dict):
+            Config.DOMAIN_DICT_2W = domain_dict
+        else:
+            print("Warning {} is not file".format(domain_dict))
+
 except Exception as e:
     print("Parse config.yaml error {}".format(e))
     sys.exit(-1)

app/config.yaml.example

@@ -34,4 +34,10 @@ ARL:
     - 100.0.0.0/8
     #- 10.0.0.0/8
     #- 192.168.0.0/16
+  #端口对应前端测试选项
+  PORT_TOP_10: "22,25,80,81,88,443,3389,8009,8080,8081,7001,5000,3000,6379,3306,8443,11211"
+  #域名爆破字典前端大字典选项，空即系统默认
+  DOMAIN_DICT: ""
+  #文件泄漏字典， 空即系统默认
+  FILE_LEAK_DICT: ""
 

app/dicts/blackdomain.txt

@@ -15,4 +15,10 @@
 .fe.baidu.com
 .hiphotos.baidu.com
 .openwebgame.qq.com
-.ke.qq.com
+.ke.qq.com
+.book.2.qq.com
+.tcdn.1.qq.com
+.tcdn.2.qq.com
+.book.3.qq.com
+.book.4.qq.com
+.o.tencent.com

app/dicts/dnsserver.txt

@@ -1,5 +1,5 @@
 119.29.29.29
 182.254.116.116
-1.1.1.1
-114.114.115.115
-114.114.114.114
+1.0.0.1
+208.67.222.222
+208.67.220.220

app/dicts/domain_2w.txt

@@ -6598,7 +6598,6 @@ imt
 imtest
 imvu
 imwxsecure
-IN
 in
 ina
 inb
@@ -14452,7 +14451,6 @@ umcdn
 umfrage
 ums
 umwelt
-UN
 un
 uncheckout
 underdog

app/dicts/domain_dict_test.txt

@@ -3,4 +3,5 @@ test
 blog
 service
 mi
-ebank
+ebank
+un

app/main.py

@@ -1,8 +1,9 @@
 from flask import Flask
+from flask_restplus import Api
 
 from app import routes
+from app.utils import arl_update
 
-from flask_restplus import Api
 
 arl_app = Flask(__name__)
 arl_app.config['BUNDLE_ERRORS'] = True
@@ -15,8 +16,8 @@
     }
 }
 
-api = Api(arl_app, prefix="/api", doc = "/doc", title='ARL backend API', authorizations = authorizations,
-    description='ARL（Asset Reconnaissance Lighthouse）资产侦察灯塔系统', security="ApiKeyAuth")
+api = Api(arl_app, prefix="/api", doc = "/api/doc", title='ARL backend API', authorizations = authorizations,
+    description='ARL（Asset Reconnaissance Lighthouse）资产侦察灯塔系统', security="ApiKeyAuth", version="2.2")
 
 
 api.add_namespace(routes.task_ns)
@@ -30,6 +31,13 @@
 api.add_namespace(routes.service_ns)
 api.add_namespace(routes.filleak_ns)
 api.add_namespace(routes.export_ns)
+api.add_namespace(routes.asset_scope_ns)
+api.add_namespace(routes.asset_domain_ns)
+api.add_namespace(routes.asset_ip_ns)
+api.add_namespace(routes.asset_site_ns)
+api.add_namespace(routes.scheduler_ns)
+
+arl_update()
 
 if __name__ == '__main__':
     arl_app.run(debug=True, port=5018, host="0.0.0.0")