indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon

main
Bob Mottram 2021-05-19 12:47:16 +01:00
parent 5311815208 6765f7b02f
commit d93d36257c
3 changed files with 106 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
locations.txt
View File

@ -3923,92 +3923,76 @@ PAYA LEBAR, SINGAPORE:1.36028:103.909
TENGAH, SINGAPORE:1.38722:103.709 TENGAH, SINGAPORE:1.38722:103.709
SINGAPORE, SINGAPORE:1.41694:103.867 SINGAPORE, SINGAPORE:1.41694:103.867
SINGAPORE, SINGAPORE:1.35556:103.987 SINGAPORE, SINGAPORE:1.35556:103.987
BRISBANE, AUSTRALIA:-27.5703:153.008 BRISBANE, AUSTRALIA:-27.467778:153.028056:1000
AMBERLEY, AUSTRALIA:-10.9508:142.459 AMBERLEY, AUSTRALIA:-10.9508:142.459:26
ALICE SPRINGS, AUSTRALIA:-23.8069:133.902 ALICE SPRINGS, AUSTRALIA:-23.8069:133.902:148
BRISBANE, AUSTRALIA:-27.3842:153.118 COOLANGATTA, AUSTRALIA:-28.1644:153.505:2
COOLANGATTA, AUSTRALIA:-28.1644:153.505 CAIRNS, AUSTRALIA:-16.8858:145.755:1687
CAIRNS, AUSTRALIA:-16.8858:145.755 CHARLIEVILLE, AUSTRALIA:-26.4133:146.262:687
CHARLIEVILLE, AUSTRALIA:-26.4133:146.262 MOUNT ISA, AUSTRALIA:-20.6639:139.489:62
MOUNT ISA, AUSTRALIA:-20.6639:139.489 MAROOCHYDORE, AUSTRALIA:-26.6033:153.091:55
MAROOCHYDORE, AUSTRALIA:-26.6033:153.091 MACKAY, AUSTRALIA:-21.1717:149.18:208
MACKAY, AUSTRALIA:-21.1717:149.18 OAKEY, AUSTRALIA:-27.4114:151.735:127
OAKEY, AUSTRALIA:-27.4114:151.735 PROSSERPINE, AUSTRALIA:-20.495:148.552:25
PROSSERPINE, AUSTRALIA:-20.495:148.552 ROCKHAMPTON, AUSTRALIA:-23.3819:150.475:580
ROCKHAMPTON, AUSTRALIA:-23.3819:150.475 TOWNSVILLE, AUSTRALIA:-19.2525:146.765:693
TOWNSVILLE, AUSTRALIA:-19.2525:146.765 WEIPA, AUSTRALIA:-12.6786:141.925:10
WEIPA, AUSTRALIA:-12.6786:141.925 ALBURY, AUSTRALIA:-36.0678:146.958:64
AVALON, AUSTRALIA:-38.0394:144.469 MELBOURNE, AUSTRALIA:-37.7682:145.0622:15
ALBURY, AUSTRALIA:-36.0678:146.958 HOBART, AUSTRALIA:-42.8361:147.51:1696
MELBOURNE, AUSTRALIA:-37.7281:144.902 LAUNCESTON, AUSTRALIA:-41.5453:147.214:435
EAST SALE, AUSTRALIA:-38.0989:147.149 POINT COOK, AUSTRALIA:-37.9322:144.753:9
HOBART, AUSTRALIA:-42.8361:147.51 ADELAIDE, AUSTRALIA:-34.9213:138.6186:500
LAUNCESTON, AUSTRALIA:-41.5453:147.214 EDINBURGH, AUSTRALIA:-34.7025:138.621:18
MELBOURNE, AUSTRALIA:-37.9758:145.102 PERTH, AUSTRALIA:-32.0972:115.881:1000
MELBOURNE, AUSTRALIA:-37.6733:144.843 KARRATHA, AUSTRALIA:-20.7122:116.773:10
POINT COOK, AUSTRALIA:-37.9322:144.753 KALGOORLIE, AUSTRALIA:-30.7894:121.462:75
ADELAIDE, AUSTRALIA:-34.945:138.531 KUNUNURRA, AUSTRALIA:-15.7781:128.707:1
ARGYLE, AUSTRALIA:-32.5069:137.717 SYDNEY, AUSTRALIA:-33.9244:150.988:1000
EDINBURGH, AUSTRALIA:-34.7025:138.621 CANBERRA, AUSTRALIA:-35.3083:149.194:814
PERTH, AUSTRALIA:-32.0972:115.881 COFF'S HARBOUR, AUSTRALIA:-30.3206:153.116:505
KARRATHA, AUSTRALIA:-20.7122:116.773 CAMDEN, AUSTRALIA:-34.0403:150.687:201
KALGOORLIE, AUSTRALIA:-30.7894:121.462 DUBBO, AUSTRALIA:-32.2167:148.575:182
KUNUNURRA, AUSTRALIA:-15.7781:128.707 RICHMOND, AUSTRALIA:-33.6006:150.781:3
LEARMONTH, AUSTRALIA:-22.2356:114.089 TAMWORTH, AUSTRALIA:-31.0839:150.847:240
PORT HEDLAND, AUSTRALIA:-20.3778:118.626 WAGGA WAGGA, AUSTRALIA:-35.1653:147.466:2
ADELAIDE, AUSTRALIA:-34.7933:138.633 BEIJING, CHINA:40.08:116.584:16808
PERTH, AUSTRALIA:-31.9403:115.967 HUHHOT, CHINA:40.8533:111.822:17186
WOOMERA, AUSTRALIA:-31.1442:136.817 HAILAR, CHINA:49.205:119.825:1320
CHRISTMAS ISLAND, CHRISTMAS ISLAND:-10.4506:105.69 SHIJIAZHUANG, CHINA:38.2806:114.696:15849
SYDNEY, AUSTRALIA:-33.9244:150.988 TIANJIN, CHINA:39.1239:117.346:11760
CANBERRA, AUSTRALIA:-35.3083:149.194 TAIYUAN, CHINA:37.7467:112.629:6956
COFF'S HARBOUR, AUSTRALIA:-30.3206:153.116 GUANGZHOU, CHINA:23.1842:113.266:7434
CAMDEN, AUSTRALIA:-34.0403:150.687 CHANGCHA, CHINA:28.1889:113.219:11819
DUBBO, AUSTRALIA:-32.2167:148.575 GUILIN, CHINA:25.2178:110.039:27809
NORFOLK ISLAND, AUSTRALIA:-29.0414:167.939 NANNING, CHINA:22.6081:108.172:22189
RICHMOND, AUSTRALIA:-33.6006:150.781 SHANTOU, CHINA:23.4:116.683:2248
SYDNEY, AUSTRALIA:-33.9461:151.177 SHENZHEN, CHINA:22.6394:113.812:2050
TAMWORTH, AUSTRALIA:-31.0839:150.847 ZHENGZHOU, CHINA:34.5194:113.841:7507
WAGGA WAGGA, AUSTRALIA:-35.1653:147.466 WUHAN, CHINA:30.7836:114.208:8494
BEIJING, CHINA:40.08:116.584 TICHANG, CHINA:30.5522:111.469:21338
HUHHOT, CHINA:40.8533:111.822 PYONGYANG, KOREA:39.0333:125.783:2000
HAILAR, CHINA:49.205:119.825 LANZHOU, CHINA:36.5167:103.622:13087
SHIJIAZHUANG, CHINA:38.2806:114.696 XI'AN, CHINA:34.4458:108.752:10000
TIANJIN, CHINA:39.1239:117.346
TAIYUAN, CHINA:37.7467:112.629
GUANGZHOU, CHINA:23.1842:113.266
CHANGCHA, CHINA:28.1889:113.219
GUILIN, CHINA:25.2178:110.039
NANNING, CHINA:22.6081:108.172
SHANTOU, CHINA:23.4:116.683
SHENZHEN, CHINA:22.6394:113.812
ZHENGZHOU, CHINA:34.5194:113.841
WUHAN, CHINA:30.7836:114.208
TICHANG, CHINA:30.5522:111.469
PYONGYANG, KOREA:39.0333:125.783
LANZHOU, CHINA:36.5167:103.622
XI'AN, CHINA:34.4458:108.752
ULAN BATOR, MONGOLIA:47.8431:106.766 ULAN BATOR, MONGOLIA:47.8431:106.766
JINGHONGGASA, CHINA:21.975:100.76 KUNMING, CHINA:24.9922:102.743:21507
KUNMING, CHINA:24.9922:102.743 XIAMEN, CHINA:24.5439:118.127:1701
XIAMEN, CHINA:24.5439:118.127 NANCHANG, CHINA:28.6:115.917:7194
NANCHANG, CHINA:28.6:115.917 FUZHOU, CHINA:25.9333:119.662:12232
FUZHOU, CHINA:25.9333:119.662 HANGZHOU, CHINA:30.2283:120.432:8000
HANGZHOU, CHINA:30.2283:120.432 NINBO, CHINA:29.8247:121.465:9816
NINBO, CHINA:29.8247:121.465 NANJING, CHINA:31.74:118.86:6596
NANJING, CHINA:31.74:118.86 HEFEI, CHINA:31.78:117.298:11434
HEFEI, CHINA:31.78:117.298 QINGDAO, CHINA:36.2625:120.375:1632
QINGDAO, CHINA:36.2625:120.375 SHANGHAI, CHINA:31.1978:121.336:6340
SHANGHAI, CHINA:31.1978:121.336 YANTAI, CHINA:37.4017:121.372:13740
YANTAI, CHINA:37.4017:121.372 CHENGDU, CHINA:30.5783:103.947:14378
CHONGQING, CHINA:29.7189:106.641 XICHANG, CHINA:27.9886:102.184:2655
CHENGDU, CHINA:30.5783:103.947 KASHI, CHINA:39.5433:76.0217:1057
XICHANG, CHINA:27.9886:102.184 HOTAN, CHINA:37.0378:79.8658:465
KASHI, CHINA:39.5433:76.0217 URUMQI, CHINA:43.9069:87.4742:14577
HOTAN, CHINA:37.0378:79.8658 HARBIN, CHINA:45.6233:126.25:53068
URUMQI, CHINA:43.9069:87.4742 JIAMUSI, CHINA:46.8433:130.465:882
HARBIN, CHINA:45.6233:126.25 MUDANJIANG, CHINA:44.5239:129.569:2495
JIAMUSI, CHINA:46.8433:130.465 DALIAN, CHINA:38.9656:121.538:13237
MUDANJIANG, CHINA:44.5239:129.569 YANJI, CHINA:42.8817:129.448:1748
DALIAN, CHINA:38.9656:121.538
YANJI, CHINA:42.8817:129.448

7
tests.py
View File

@ -2268,6 +2268,11 @@ def testDangerousMarkup():
'.innerHTML = "evil";</script></p>' '.innerHTML = "evil";</script></p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess)) assert(dangerousMarkup(content, allowLocalNetworkAccess))
content = '<p>This is a valid-looking message. But wait... ' + \
'&lt;script&gt;document.getElementById("concentrated")' + \
'.innerHTML = "evil";&lt;/script&gt;</p>'
assert(dangerousMarkup(content, allowLocalNetworkAccess))
content = '<p>This html contains more than you expected... ' + \ content = '<p>This html contains more than you expected... ' + \
'<script language="javascript">document.getElementById("abc")' + \ '<script language="javascript">document.getElementById("abc")' + \
'.innerHTML = "def";</script></p>' '.innerHTML = "def";</script></p>'
@ -3646,8 +3651,6 @@ def testSpoofGeolocation() -> None:
"%Y-%m-%d %H:%M") "%Y-%m-%d %H:%M")
coords = spoofGeolocation('', 'new york, usa', currTime, coords = spoofGeolocation('', 'new york, usa', currTime,
decoySeed, citiesList) decoySeed, citiesList)
#coords = spoofGeolocation('', 'berlin, germany', currTime,
# decoySeed, citiesList)
longitude = coords[1] longitude = coords[1]
if coords[3] == 'W': if coords[3] == 'W':
longitude = -coords[1] longitude = -coords[1]

21
utils.py
View File

@ -663,21 +663,26 @@ def getLocalNetworkAddresses() -> []:
def dangerousMarkup(content: str, allowLocalNetworkAccess: bool) -> bool: def dangerousMarkup(content: str, allowLocalNetworkAccess: bool) -> bool:
"""Returns true if the given content contains dangerous html markup """Returns true if the given content contains dangerous html markup
""" """
if '<' not in content: separators = (['<', '>'], ['&lt;', '&gt;'])
return False for separatorStyle in separators:
if '>' not in content: startChar = separatorStyle[0]
return False endChar = separatorStyle[1]
contentSections = content.split('<') if startChar not in content:
continue
if endChar not in content:
continue
contentSections = content.split(startChar)
invalidPartials = () invalidPartials = ()
if not allowLocalNetworkAccess: if not allowLocalNetworkAccess:
invalidPartials = getLocalNetworkAddresses() invalidPartials = getLocalNetworkAddresses()
invalidStrings = ('script', 'canvas', 'style', 'abbr', invalidStrings = ('script', 'noscript',
'canvas', 'style', 'abbr',
'frame', 'iframe', 'html', 'body', 'frame', 'iframe', 'html', 'body',
'hr', 'allow-popups', 'allow-scripts') 'hr', 'allow-popups', 'allow-scripts')
for markup in contentSections: for markup in contentSections:
if '>' not in markup: if endChar not in markup:
continue continue
markup = markup.split('>')[0].strip() markup = markup.split(endChar)[0].strip()
for partialMatch in invalidPartials: for partialMatch in invalidPartials:
if partialMatch in markup: if partialMatch in markup:
return True return True