diff --git a/.github/actions/gitPush/action.yaml b/.github/actions/gitPush/action.yaml new file mode 100644 index 0000000..cb3b16e --- /dev/null +++ b/.github/actions/gitPush/action.yaml @@ -0,0 +1,17 @@ +runs: + using: "composite" + steps: + - name: Push changes back to the repo + shell: bash + run: | + timestamp=`date "+%Y.%m.%d %H:%M:%S"` + git config --global user.name "${{ env.REPO_OWNER }}" + git config --global user.email "${{ env.REPO_OWNER }}@github.com" + git add ${{ env.PUSH_FILES }} + git diff --staged --quiet || CHANGED=true + if [ "$CHANGED" = true ]; then + git commit -m "Update $timestamp" + git push https://${{ env.GH_PAT }}@github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git + else + echo "No changes to commit" + fi diff --git a/.github/workflows/bl.yml b/.github/workflows/bl.yml deleted file mode 100644 index 34ac123..0000000 --- a/.github/workflows/bl.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: BlackLists updater - -env: - GH_PAT: ${{ secrets.GH_PAT }} - REPO_NAME: AS_Network_List - REPO_OWNER: C24Be - -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * *' - -jobs: - build: - name: 'BL/Update' - - runs-on: ubuntu-22.04 - - defaults: - run: - shell: bash - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # this is required to fetch all history for all branches and tags - token: ${{ env.GH_PAT }} - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - run: ./requirements.sh - - run: curl -s ifconfig.io - - run: ./blacklists_updater.sh - - name: Push changes back to the repo - run: | - timestamp=`date "+%Y.%m.%d %H:%M:%S"` - git config --global user.name "${{ env.REPO_OWNER }}" - git config --global user.email "${{ env.REPO_OWNER }}@github.com" - git add auto/blacklist*txt - git diff --staged --quiet || CHANGED=true - if [ "$CHANGED" = true ]; then - git commit -m "Update $timestamp" - git push https://${{ env.GH_PAT }}@github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git - else - echo "No changes to commit" - fi diff --git a/.github/workflows/update_blacklists.yml b/.github/workflows/update_blacklists.yml new file mode 100644 index 0000000..c8ea541 --- /dev/null +++ b/.github/workflows/update_blacklists.yml @@ -0,0 +1,35 @@ +name: BlackLists updater + +env: + GH_PAT: ${{ secrets.GH_PAT }} + REPO_NAME: AS_Network_List + REPO_OWNER: C24Be + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * *' + +jobs: + build: + name: 'BL/Update' + + runs-on: ubuntu-22.04 + + defaults: + run: + shell: bash + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # this is required to fetch all history for all branches and tags + token: ${{ env.GH_PAT }} + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - run: ./requirements.sh + - run: ./blacklists_updater.sh + - uses: ./.github/actions/dockerBuildPHP + env: + PUSH_FILES: auto/blacklist*txt diff --git a/.github/workflows/update_ru_all_lists.yml b/.github/workflows/update_ru_all_lists.yml new file mode 100644 index 0000000..d524b6a --- /dev/null +++ b/.github/workflows/update_ru_all_lists.yml @@ -0,0 +1,35 @@ +name: All RU Networks and ASN updater + +env: + GH_PAT: ${{ secrets.GH_PAT }} + REPO_NAME: AS_Network_List + REPO_OWNER: C24Be + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 0' + +jobs: + build: + name: 'BL/Update' + + runs-on: ubuntu-22.04 + + defaults: + run: + shell: bash + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # this is required to fetch all history for all branches and tags + token: ${{ env.GH_PAT }} + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - run: ./requirements.sh + - run: ./get_info_from_ripe.py + - uses: ./.github/actions/dockerBuildPHP + env: + PUSH_FILES: auto/all-ru-*txt diff --git a/auto/blacklist.txt b/auto/blacklist.txt deleted file mode 100644 index e432670..0000000 --- a/auto/blacklist.txt +++ /dev/null @@ -1,127 +0,0 @@ -195.209.123.0/24 -212.192.157.0/24 -195.209.120.0/24 -185.224.228.0/24 -212.192.156.0/24 -185.224.229.0/24 -212.192.158.0/24 -185.224.231.0/24 -185.224.230.0/24 -195.209.122.0/24 -195.209.121.0/24 -46.228.0.232/29 -78.108.192.0/21 -217.106.0.0/16 -217.107.0.0/18 -46.61.208.0/24 -81.176.70.0/26 -91.227.32.0/24 -92.39.128.0/21 -31.217.218.96/29 -94.199.64.0/21 -95.173.128.0/19 -109.207.0.0/20 -178.237.240.0/20 -194.165.22.0/23 -31.217.218.96/29 -195.149.110.0/24 -62.28.169.168/30 -82.200.64.0/24 -213.24.76.0/23 -193.47.146.0/24 -85.90.98.144/30 -95.167.76.160/27 -91.198.38.0/24 -217.106.150.80/29 -82.198.176.16/29 -217.106.203.88/29 -217.107.5.24/29 -217.23.88.168/29 -87.226.156.64/26 -93.153.144.60/30 -88.200.208.112/29 -213.59.91.128/27 -213.24.160.0/28 -95.167.157.156/30 -90.150.176.52/30 -77.34.209.160/28 -78.108.192.0/21 -95.167.68.216/29 -82.208.81.0/24 -31.217.218.96/29 -92.50.198.72/30 -213.59.91.48/29 -91.226.250.0/24 -213.59.59.128/29 -213.59.59.16/29 -94.25.90.240/29 -88.151.200.0/24 -80.73.16.0/20 -217.106.147.0/29 -46.29.152.0/22 -46.29.156.0/23 -194.8.70.0/23 -217.107.5.8/29 -81.195.118.48/30 -217.106.150.88/29 -217.106.150.72/29 -217.106.93.192/26 -217.106.95.112/28 -83.219.5.248/29 -194.8.246.0/23 -95.167.162.236/30 -195.98.73.56/29 -217.106.115.168/29 -188.128.98.204/30 -94.25.70.64/30 -217.20.86.128/26 -217.20.86.192/27 -217.20.86.224/29 -213.59.59.120/29 -217.107.5.40/29 -193.232.70.0/24 -195.42.75.8/29 -46.20.70.160/28 -89.28.253.168/29 -217.107.5.16/29 -82.179.86.32/27 -195.80.224.0/24 -37.28.161.48/30 -83.219.6.72/29 -87.117.21.32/29 -87.117.21.8/29 -87.117.21.16/29 -87.117.21.80/29 -87.117.21.0/29 -87.117.21.48/29 -87.117.21.56/29 -87.117.21.72/29 -87.117.21.40/29 -87.117.21.24/29 -87.117.21.64/29 -87.117.20.64/27 -87.117.18.144/29 -95.167.4.168/29 -85.236.29.160/27 -84.53.210.144/28 -87.117.18.144/29 -213.234.8.8/30 -89.175.8.68/30 -77.82.124.112/29 -89.109.7.176/29 -77.35.76.80/28 -85.114.93.88/29 -212.119.174.0/24 -46.47.211.0/24 -80.247.32.0/24 -80.247.32.0/20 -81.177.156.0/24 -195.3.240.0/22 -109.73.4.224/27 -91.215.168.0/22 -195.128.157.0/24 -77.37.128.0/17 -217.172.18.0/23 -217.172.20.0/22 -89.111.176.0/22 -31.177.95.0/24 diff --git a/auto/blacklist_with_comments.txt b/auto/blacklist_with_comments.txt deleted file mode 100644 index 093d152..0000000 --- a/auto/blacklist_with_comments.txt +++ /dev/null @@ -1,239 +0,0 @@ -# Networks announced by AS61280 -195.209.123.0/24 -212.192.157.0/24 -195.209.120.0/24 -185.224.228.0/24 -212.192.156.0/24 -185.224.229.0/24 -212.192.158.0/24 -185.224.231.0/24 -185.224.230.0/24 -195.209.122.0/24 -195.209.121.0/24 -# Network name: Roskomnadzor-net -46.228.0.232/29 -# Network name: SPEZSVYAZ -78.108.192.0/21 -# Network name: RU-RTCOMM-20001220 -217.106.0.0/16 -217.107.0.0/18 -# Network name: MMT -46.61.208.0/24 -# Network name: RTCOMM-GNIVC -81.176.70.0/26 -# Network name: GOZNAK-AS -91.227.32.0/24 -# Network name: RU-WEST-CALL-20080227 -92.39.128.0/21 -# Network name: RSNET -31.217.218.96/29 -# Network name: RU-ATOMLINK-20081107 -94.199.64.0/21 -# Network name: RU-FGS-20090305 -95.173.128.0/19 -# Network name: Electronic-government -109.207.0.0/20 -# Network name: RU-MSRN-20100701 -178.237.240.0/20 -# Network name: GRFC-NET -194.165.22.0/23 -# Network name: RSNET -31.217.218.96/29 -# Network name: ATLAS-NW-NET -195.149.110.0/24 -# Network name: ATLAS-NET -62.28.169.168/30 -# Network name: ATLASNSK -82.200.64.0/24 -# Network name: RT-CLNT-FSB-RF -213.24.76.0/23 -# Network name: GOSNIIAS-NET -193.47.146.0/24 -# Network name: NCPLG-NET -85.90.98.144/30 -# Network name: FSKN-Vologda -95.167.76.160/27 -# Network name: UFK-KMR-NET -91.198.38.0/24 -# Network name: RU-CHUVASHIA-NALOG -217.106.150.80/29 -# Network name: MosOblDuma-NET -82.198.176.16/29 -# Network name: UMNS-CHERKESSK -217.106.203.88/29 -# Network name: UMNS-SARATOV -217.107.5.24/29 -# Network name: MCHS-Saratov -217.23.88.168/29 -# Network name: SCLI-NET-MinJust -87.226.156.64/26 -# Network name: KALININGRADSKAYA-OBLASTNAYA-DUMA-LAN -93.153.144.60/30 -# Network name: MCHS -88.200.208.112/29 -# Network name: UMNS-PSKOV -213.59.91.128/27 -# Network name: UMNS-VOLOGDA -213.24.160.0/28 -# Network name: FSKN_po_Amurskoj_oblasti -95.167.157.156/30 -# Network name: PERMGORDUMA-NET -90.150.176.52/30 -# Network name: POL-MCHS-NET -77.34.209.160/28 -# Network name: SPEZSVYAZ -78.108.192.0/21 -# Network name: Upravlenie_FSKN_Rossii_po_PK -95.167.68.216/29 -# Network name: NALOG-NET -82.208.81.0/24 -# Network name: RSNET -31.217.218.96/29 -# Network name: RU_FSKN -92.50.198.72/30 -# Network name: UMNS-NOVGOROD -213.59.91.48/29 -# Network name: FOMS -91.226.250.0/24 -# Network name: UMNS-KAZAN -213.59.59.128/29 -# Network name: UMNS-PERM -213.59.59.16/29 -# Network name: Smolensk-Duma -94.25.90.240/29 -# Network name: ROSATOM-INET-INTERNAL-USERS-1 -88.151.200.0/24 -# Network name: RU-CTSPI-20050201 -80.73.16.0/20 -# Network name: UMNS-TSK -217.106.147.0/29 -# Network name: GLAVNIVZ -46.29.152.0/22 -46.29.156.0/23 -# Network name: MOIA-NET -194.8.70.0/23 -# Network name: UMNS-MORDOVIA -217.107.5.8/29 -# Network name: MTU-CUST-D8D9FB95 -81.195.118.48/30 -# Network name: RU-KIROV-NALOG -217.106.150.88/29 -# Network name: RU-PRIVOL-NALOG -217.106.150.72/29 -# Network name: TREASURY-VLADIKAVKAZ -217.106.93.192/26 -# Network name: MINFIN-RND-NET -217.106.95.112/28 -# Network name: Ten_OTRYAD-MCHS -83.219.5.248/29 -# Network name: FSK-ESS-OJSC-NET -194.8.246.0/23 -# Network name: FSKN_Rossii_RU_po_Altajskomu_kraju -95.167.162.236/30 -# Network name: VRNOBLDUMA-NET -195.98.73.56/29 -# Network name: UMNS-KARELIA -217.106.115.168/29 -# Network name: FSKN_RF__Khabarovsk -188.128.98.204/30 -# Network name: FSKN -94.25.70.64/30 -# Network name: MNSHMAO -217.20.86.128/26 -217.20.86.192/27 -217.20.86.224/29 -# Network name: UMNS-TUMEN -213.59.59.120/29 -# Network name: UMNS-SAMARA -217.107.5.40/29 -# Network name: GIVC -193.232.70.0/24 -# Network name: MTU-CUST-D10EF4E3 -195.42.75.8/29 -# Network name: SAMARA-TTK-NET-12S0348 -46.20.70.160/28 -# Network name: RU-ARBUZ-MAGGORDUMA-NET -89.28.253.168/29 -# Network name: UMNS-ORENBURG -217.107.5.16/29 -# Network name: MON-RUNNET -82.179.86.32/27 -# Network name: MINFINPI-NET -195.80.224.0/24 -# Network name: SLED-IZOLYATOR-FSIN-LAN -37.28.161.48/30 -# Network name: ROS-POTREB-NADZOR -83.219.6.72/29 -# Network name: ROSPOTREBNADZOR-KSHAXTINSK-NET -87.117.21.32/29 -# Network name: ROSPOTREBNADZOR-AZOV-NET -87.117.21.8/29 -# Network name: ROSPOTREBNADZOR-BKALITVA-NET -87.117.21.16/29 -# Network name: ROSPOTREBNADZOR-NOVOCHERKASSK-NET -87.117.21.80/29 -# Network name: ROSPOTREBNADZOR-VOLGODONSK-NET -87.117.21.0/29 -# Network name: ROSPOTREBNADZOR-ORLOVKA-NET -87.117.21.48/29 -# Network name: ROSPOTREBNADZOR-SALSK-NET -87.117.21.56/29 -# Network name: ROSPOTREBNADZOR-VESHKI-NET -87.117.21.72/29 -# Network name: ROSPOTREBNADZOR-MILLEROVO-NET -87.117.21.40/29 -# Network name: ROSPOTREBNADZOR-CIMLYANSK-NET -87.117.21.24/29 -# Network name: ROSPOTREBNADZOR-SHAXTU-NET -87.117.21.64/29 -# Network name: ROSPOTREBNADZOR-ROSTOV-NET -87.117.20.64/27 -# Network name: ROSPOTREBNADZOR-TAGANROG-NET -87.117.18.144/29 -# Network name: Rospotrebnadzor_Ryazan -95.167.4.168/29 -# Network name: Rospotrebnadzor-ru-net -85.236.29.160/27 -# Network name: RPN33 -84.53.210.144/28 -# Network name: ROSPOTREBNADZOR-TAGANROG-NET -87.117.18.144/29 -# Network name: VLG-RPN-Angarsky-2 -213.234.8.8/30 -# Network name: TNTrade-NET -89.175.8.68/30 -# Network name: Rospotrebnadzor-Kam -77.82.124.112/29 -# Network name: Rospotrebnadzor-NET -89.109.7.176/29 -# Network name: POL-PROSECUTORS-NET -77.35.76.80/28 -# Network name: KHT-GEN-PROCURATURA -85.114.93.88/29 -# Network name: RU-METROCOM-2011011701 -212.119.174.0/24 -# Network name: ATS-SMOLNOGO-LAN -46.47.211.0/24 -# Network name: VGTRK-ITD -80.247.32.0/24 -# Network name: RU-VGTRK-20020919 -80.247.32.0/20 -# Network name: ORTNET -81.177.156.0/24 -# Network name: NTV-net -195.3.240.0/22 -# Network name: NewsMediaRus -109.73.4.224/27 -# Network name: BEST-HOSTER-NET -91.215.168.0/22 -# Network name: ONLANTA-NET -195.128.157.0/24 -# Network name: RU-RTK-20070321 -77.37.128.0/17 -# Network name: STARNET-VPN -217.172.18.0/23 -217.172.20.0/22 -# Network name: CCC-HC -89.111.176.0/22 -# Network name: RU-NIC-HOSTING -31.177.95.0/24 diff --git a/get_info_from_ripe.py b/get_info_from_ripe.py new file mode 100755 index 0000000..713f859 --- /dev/null +++ b/get_info_from_ripe.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +import requests + +url = "https://stat.ripe.net/data/country-resource-list/data.json?resource=RU&v4_format=prefix" + +out_file_asn = "auto/all-ru-asn.txt" +out_file_ipv4 = "auto/all-ru-ipv4.txt" +out_file_ipv6 = "auto/all-ru-ipv6.txt" + +response = requests.get(url) +response.raise_for_status() + +data = response.json() + +with open(out_file_asn, 'w') as f: + for asn in data['data']['resources']['asn']: + f.write(str("AS"+asn) + '\n') + +with open(out_file_ipv4, 'w') as f: + for ipv4 in data['data']['resources']['ipv4']: + f.write(str(ipv4) + '\n') + +with open(out_file_ipv6, 'w') as f: + for ipv6 in data['data']['resources']['ipv6']: + f.write(str(ipv6) + '\n')