diff --git a/README.md b/README.md index ea797e7..c5247be 100644 --- a/README.md +++ b/README.md @@ -22,17 +22,17 @@ Or quoi de plus bas que de profiter de l'ignorance des gens pour les espionner e Mais octave est egalement un logiciel du GNU (cf https://octave.org ). Donc nous utiliserons septime dans les prochaines versions. -SeptimE : une version amelioree d'Octave, en cours de developpement, utilisant +La version de départ d'octave est dans le répertoire du même nom. +Ce code n'évoluera plus. + +Septime : une version amelioree d'Octave, en cours de developpement, utilisant les listes chainees et IPv6. Le nom de l'application est un acronyme signifiant : Stoppe les Executions de Programmes caches, les Tentatives d'Intrusion et les Modifications d'Environnement. -La version de départ d'octave est dans le répertoire du même nom. -Ce code n'évoluera plus. - Enjoy ! P. Foubet -E2L - Juin 2024 +E2L - Juin 2025 diff --git a/Septime/src/regles.txt b/Septime/src/regles.txt index e24c21c..8d67d82 100644 --- a/Septime/src/regles.txt +++ b/Septime/src/regles.txt @@ -6,11 +6,6 @@ .org .fr windy.com -deepl.com -boursorama.com -boursobank.com -github.com -kimsufi.com qwant.com mediadecathlon.com decathlon.io @@ -18,8 +13,13 @@ docs.rs gandi.net # Les CIDRs peuvent etre suivis de ";nom du proprietaire" +# l'ordre croissant permet de verifier rapidement mais n'est pas obligatoire #IPV4 +2.57.149.0/24;Auction LLC Russia 3.0.0.0/8;Amazon Technologies Inc. +4.240.0.0/12;Microsoft Corporation +5.255.192.0/18;Yandex enterprise network +8.209.201.0/24;Alibaba.com Singapore 13.24.0.0/13;Amazon Technologies Inc. 13.244.0.0/14;Amazon Technologies Inc. 13.248.0.0/14;Amazon Technologies Inc. @@ -34,9 +34,9 @@ gandi.net 15.200.0.0/16;Amazon Technologies Inc. 15.236.0.0/14;Amazon Technologies Inc. 17.0.0.0/8;Apple Inc. -18.128.0.0/9;Amazon Technologies Inc. 18.32.0.0/11;Amazon Technologies Inc. 18.64.0.0/10;Amazon Technologies Inc. +18.128.0.0/9;Amazon Technologies Inc. 20.0.0.0/11;Microsoft Corporation 20.33.0.0/16;Microsoft Corporation 20.34.0.0/15;Microsoft Corporation @@ -45,10 +45,17 @@ gandi.net 20.48.0.0/12;Microsoft Corporation 20.64.0.0/10;Microsoft Corporation 20.128.0.0/16;Microsoft Corporation +23.20.0.0/14;Amazon.com, Inc. 23.40.112.0/20;Akamai Technologies, Inc. +27.106.112.0/20;HUAWEI INTERNATIONAL PTE. LTD. +27.106.96.0/20;HUAWEI INTERNATIONAL PTE. LTD. 34.128.0.0/10;Google LLC 34.192.0.0/10;Amazon Technologies Inc. 34.64.0.0/10;Google LLC +35.71.128.0/17;Amazon Technologies Inc. +35.71.64.0/18;Amazon Technologies Inc. +35.72.0.0/13;Amazon Technologies Inc. +35.80.0.0/12;Amazon Technologies Inc. 35.152.0.0/13;Amazon Technologies Inc. 35.160.0.0/12;Amazon Technologies Inc. 35.176.0.0/13;Amazon Technologies Inc. @@ -57,19 +64,49 @@ gandi.net 35.208.0.0/12;Google LLC 35.224.0.0/12;Google LLC 35.240.0.0/13;Google LLC -35.71.128.0/17;Amazon Technologies Inc. -35.71.64.0/18;Amazon Technologies Inc. -35.72.0.0/13;Amazon Technologies Inc. -35.80.0.0/12;Amazon Technologies Inc. 37.157.2.0/24;Adform Secondary DTC IPv4 Network +40.74.0.0/15;Microsoft Corporation +40.76.0.0/14;Microsoft Corporation +40.80.0.0/12;Microsoft Corporation +40.96.0.0/12;Microsoft Corporation +40.112.0.0/13;Microsoft Corporation +40.120.0.0/14;Microsoft Corporation +40.124.0.0/16;Microsoft Corporation +40.125.0.0/17;Microsoft Corporation 44.192.0.0/10;Amazon.com, Inc. +45.33.0.0/17;Akamai Technologies, Inc. +45.79.0.0/16;Akamai Technologies, Inc. +45.93.4.0/22;Viter Evgeniy Vasilevich +45.134.26.0/24;Proton66 LLC Russia +45.135.232.0/24;Proton66 LLC Russia +45.135.95.0/24;Data-center IMAQLIQ Ltd. Russia +45.140.17.0/24;Proton66 LLC Russia +45.141.84.0/24;MediaLand RU +47.128.0.0/14;Amazon Data Services Singapore 47.235.0.0/16;Alibaba Cloud LLC 47.236.0.0/14;Alibaba Cloud LLC 47.240.0.0/14;Alibaba Cloud LLC 47.244.0.0/15;Alibaba Cloud LLC 47.246.0.0/16;Alibaba Cloud LLC +47.250.0.0/15;Alibaba Cloud LLC +47.252.0.0/15;Alibaba Cloud LLC +47.254.0.0/16;Alibaba Cloud LLC +49.0.200.0/21;HUAWEI INTERNATIONAL PTE. LTD. +49.0.240.0/20;HUAWEI INTERNATIONAL PTE. LTD. +49.112.0.0/13;China Telecom +50.16.0.0/14;Amazon.com, Inc. 50.31.128.0/17;Geofeed Network Operations 52.0.0.0/10;Amazon Technologies Inc. +52.64.0.0/12;Amazon Technologies Inc. +52.84.0.0/14;Amazon Technologies Inc. +52.88.0.0/13;Amazon Technologies Inc. +52.96.0.0/12;Microsoft Corporation (MSFT) +52.112.0.0/14;Microsoft Corporation (MSFT) +52.145.0.0/16;Microsoft Corporation (MSFT) +52.146.0.0/15;Microsoft Corporation (MSFT) +52.148.0.0/14;Microsoft Corporation (MSFT) +52.152.0.0/13;Microsoft Corporation (MSFT) +52.160.0.0/11;Microsoft Corporation (MSFT) 52.192.0.0/12;Amazon Technologies Inc. 52.208.0.0/13;Amazon Technologies Inc. 52.216.0.0/14;Amazon Technologies Inc. @@ -77,9 +114,7 @@ gandi.net 52.222.128.0/17;Amazon Technologies Inc. 52.223.0.0/17;Amazon Technologies Inc. 52.223.128.0/18;Amazon Technologies Inc. -52.64.0.0/12;Amazon Technologies Inc. -52.84.0.0/14;Amazon Technologies Inc. -52.88.0.0/13;Amazon Technologies Inc. +54.64.0.0/11;Amazon Technologies Inc. 54.144.0.0/12;Amazon Technologies Inc. 54.160.0.0/11;Amazon Technologies Inc. 54.192.0.0/12;Amazon Technologies Inc. @@ -87,49 +122,125 @@ gandi.net 54.216.0.0/14;Amazon Technologies Inc. 54.220.0.0/15;Amazon Technologies Inc. 54.224.0.0/11;Amazon Technologies Inc. -54.64.0.0/11;Amazon Technologies Inc. +57.141.0.0/24;Facebook +59.172.0.0/15;China Telecom +60.190.224.0/19;Zhejiang Telecom +62.148.12.0/24;JSC "WTC Moscow" +62.204.41.0/24;Chang Way Technologies Co. Limited 63.32.0.0/14;Amazon.com, Inc. +66.220.144.0/20;Facebook, Inc. +66.249.64.0/19;Google LLC 67.55.4.0/22;Distributel Communications Limited 67.55.8.0/21;Distributel Communications Limited 67.55.16.0/20;Distributel Communications Limited 67.55.32.0/19;Distributel Communications Limited +69.171.224.0/19;Facebook, Inc. 69.173.144.0/20;The Rubicon Project, Inc. 76.223.0.0/17;Amazon.com, Inc. 76.223.128.0/19;Amazon.com, Inc. 76.223.160.0/20;Amazon.com, Inc. 81.17.55.0/24;LeaseWeb Netherlands B.V. +82.147.84.0/23;Nerushenko Vyacheslav Nikolaevich +85.209.11.0/24;Chang Way Technologies Co. Limited +85.208.96.0/24;Semrush_Net 88.221.198.0/24;Akamai Technologies 89.149.192.0/18;LeaseWeb Netherlands B.V. +91.215.85.0/24;PROSPERO OOO RU 92.122.166.0/24;Akamai Technologies +92.255.57.0/24;Chang Way Technologies Co. Limited +95.108.128.0/17;Yandex enterprise network +98.80.0.0/12;Amazon.com, Inc. 99.80.0.0/15;Amazon.com, Inc. 99.85.128.0/17;Amazon.com, Inc. 99.86.0.0/16;Amazon.com, Inc. 99.87.0.0/17;Amazon.com, Inc. 99.87.128.0/18;Amazon.com, Inc. +100.20.0.0/14;Amazon.com, Inc. +100.24.0.0/13;Amazon.com, Inc. +101.44.160.0/20;HUAWEI INTERNATIONAL PTE. LTD. +101.44.248.0/22;HUAWEI INTERNATIONAL PTE. LTD. +101.44.64.0/20;HUAWEI INTERNATIONAL PTE. LTD. +101.204.0.0/14;China Unicom Sichuan Province Network 104.16.0.0/12;Cloudflare, Inc. +104.40.0.0/13;Microsoft Corporation 104.64.0.0/10;Akamai Technologies, Inc. 104.244.40.0/21;Twitter Inc. +106.75.0.0/14;Shanghai UCloud Information +107.20.0.0/14;Amazon.com, Inc. 108.128.0.0/13;Amazon.com, Inc. 108.136.0.0/14;Amazon.com, Inc. +110.238.104.0/21;HUAWEI INTERNATIONAL PTE. LTD. +111.119.192.0/20;HUAWEI INTERNATIONAL PTE. LTD. +111.119.208.0/20;HUAWEI INTERNATIONAL PTE. LTD. +111.119.224.0/20;HUAWEI INTERNATIONAL PTE. LTD. +113.128.0.0/13;China Telecom +113.204.0.0/14;ChinaUnicom Hostmaster +115.48.0.0/12;CNC Group CHINA169 Henan Province Network +119.8.32.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.38.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.41.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.42.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.45.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.46.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.47.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.61.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.105.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.107.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.111.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.115.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.117.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.121.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.123.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.8.232.0/21;HUAWEI INTERNATIONAL PTE. LTD. +119.8.96.0/24;HUAWEI INTERNATIONAL PTE. LTD. +119.13.80.0/21;HUAWEI INTERNATIONAL PTE. LTD. +119.13.88.0/22;HUAWEI INTERNATIONAL PTE. LTD. +119.13.100.0/24;HUAWEI INTERNATIONAL PTE. LTD. +120.76.0.0/14;Alibaba (US) Technology Co., Ltd. +124.243.128.0/18;HUAWEI INTERNATIONAL PTE. LTD. 142.250.0.0/15;Google LLC 151.101.0.0/16;Fastly, Inc. 152.199.0.0/16;Verizon Business +154.83.15.0/24;Yisu Cloud Ltd +157.54.0.0/15;Microsoft Corporation +157.56.0.0/14;Microsoft Corporation +157.60.0.0/16;Microsoft Corporation +159.138.0.0/16;Huawei-HK-CLOUDS 162.158.0.0/15;Cloudflare, Inc. +166.108.192.0/18;HUAWEI INTERNATIONAL PTE. LTD. 172.64.0.0/13;Cloudflare, Inc. +172.104.0.0/15;Akamai Technologies, Inc. +172.160.0.0/11;Microsoft Limited 172.217.0.0/16;Google LLC +173.252.64.0/18;Facebook, Inc. +178.20.208.0/24;AEZA GROUP Ltd (Russia) 178.250.1.0/24;Criteo Europe Infrastructures +182.32.0.0/12;China Telecom +182.160.0.0/20;HUAWEI INTERNATIONAL PTE. LTD. +183.128.0.0/12;Zhejiang Telecom +184.72.0.0/15;Amazon.com, Inc. 185.64.189.0/24;Abuce-c PubMatic 185.74.70.0/24;Infomaniak Network SA 185.89.210.0/23;IPAdmin 185.235.86.0/24;Criteo Network Operations Center 185.235.87.0/24;Criteo Network Operations Center +189.1.208.0/20;HUAWEI INTERNATIONAL PTE. LTD. +189.1.224.0/20;HUAWEI INTERNATIONAL PTE. LTD. +189.1.240.0/20;HUAWEI INTERNATIONAL PTE. LTD. +190.92.208.0/24;HUAWEI INTERNATIONAL PTE. LTD. +190.92.220.0/24;HUAWEI INTERNATIONAL PTE. LTD. +190.92.221.0/24;HUAWEI INTERNATIONAL PTE. LTD. 192.124.249.0/24;Sucuri 192.229.128.0/17;Edgecast Inc. 193.8.206.0/24;France Televisions SA 199.59.148.0/22;Twitter Inc. 199.232.0.0/16;Fastly, Inc. +202.107.226.0/28;CHINANET-ZJ Hangzhou +202.112.0.0/15;China Education and Research Network (CERNET) 205.251.192.0/18;Amazon.com, Inc. +207.46.0.0/16;Microsoft Corporation 209.67.0.0/16;CenturyLink Communications, LLC +213.180.192.0/19;Yandex enterprise network 216.58.192.0/19;Google LLC # IPv6 @@ -147,21 +258,12 @@ gandi.net arin.net media.adeo.com mozilla.com -manomano.com -www.dailymotion.com -aliexpress.com -cloudflare.com linkinghub.elsevier.com www.sciencedirect.com pdf.sciencedirectassets.com -ocsp.usertrust.com proton.me -hackaday.com -ed-diamond.com maree.info stackoverflow.com -villiers.yoga -verisign-grs.com duckduckgo.com linux-console.net opendatasoft.com @@ -169,8 +271,6 @@ mysql.com mozilla.net debian.map.fastlydns.net www.cdiscount.com -experts-exchange.com -stackexchange.com fnac.com fnac-static.com denx.de @@ -179,3 +279,28 @@ hackster.io bootlin.com rt-thread.io lesnumeriques.com +princetonnj.gov +ed-diamond.com +epdf.tips +ariadne.space +cyberbits.eu +reporterre.net +docker.com +ovh.com +ovhcloud.com +independant.io +n26.com +dlink.com +umu.se +qemu.eu +wikiwix.com +tech-faq.com +mappy.com +qrcode.com +jquery.com +denso-wave.com +getpocket.com +nayuki.io +harvard.edu +darty.com +fnacdarty.com diff --git a/Septime/src/scannet.c b/Septime/src/scannet.c index 4d250fc..3404dcd 100644 --- a/Septime/src/scannet.c +++ b/Septime/src/scannet.c @@ -117,19 +117,50 @@ static long long NbAddCidrs = 0, NbAddCidrs6=0; /* #### gestion dynamique des CIDR */ -#define NBC 200 /* nb de CIDR */ -static char* Tcidr[NBC]; -static char* Ncidr[NBC]; -static unsigned char Ttip[NBC]; +#define ANBC 10 /* ajout nb de CIDR */ +static int NBC=0; +static char** Tcidr; +static char** Ncidr; +static unsigned char* Ttip; static int iC=0; +void ajouteCidrs(void) +{ +char **STc, **SNc; +unsigned char *STt; + STc = Tcidr; + SNc = Ncidr; + STt = Ttip; + Tcidr = (char **)malloc(sizeof(char*)*(NBC+ANBC)); + Ncidr = (char **)malloc(sizeof(char*)*(NBC+ANBC)); + Ttip = (unsigned char *)malloc(NBC+ANBC); + if (NBC != 0) { + memcpy(Tcidr,STc,sizeof(char*)*NBC); free((void*)STc); + memcpy(Ncidr,SNc,sizeof(char*)*NBC); free((void*)SNc); + memcpy(Ttip,STt,NBC); free((void*)STt); + } + NBC += ANBC; +} + static int rejectIP(char*, int); static int addCidr(char * c, char * n, int v6) /* v6=0 IPv4 sinon IPv6 */ { -int i=iC; +int i,j; char *r; - if (i==NBC) return i; + if (iC==NBC) ajouteCidrs(); + /* recherche du i */ + for (i=0; i Ttip[i]) continue; + if (strcmp(Tcidr[i],c) > 0) break; + } + if (ii; j--) { + Tcidr[j] = Tcidr[j-1]; + Ncidr[j] = Ncidr[j-1]; + Ttip[j] = Ttip[j-1]; + } + } Tcidr[i] = (char*)malloc(strlen(c)+1); strcpy(Tcidr[i],c); Ttip[i] = (char)v6; @@ -164,8 +195,8 @@ int i; for(i=0;i