mirror of
https://github.com/soxoj/maigret.git
synced 2026-05-07 06:24:35 +00:00
Merge pull request #92 from soxoj/ignore403-bugfix
Fixed bug with ignore403 for engine-based sites
This commit is contained in:
+1
-1
@@ -266,7 +266,7 @@ def process_site_result(response, query_notify, logger, results_info, site: Maig
|
|||||||
|
|
||||||
if status_code and not error_text:
|
if status_code and not error_text:
|
||||||
error_text, site_error_text = detect_error_page(html_text, status_code, failure_errors,
|
error_text, site_error_text = detect_error_page(html_text, status_code, failure_errors,
|
||||||
site.ignore_403)
|
site.ignore403)
|
||||||
|
|
||||||
if site.activation and html_text:
|
if site.activation and html_text:
|
||||||
is_need_activation = any([s for s in site.activation['marks'] if s in html_text])
|
is_need_activation = any([s for s in site.activation['marks'] if s in html_text])
|
||||||
|
|||||||
@@ -1567,24 +1567,12 @@
|
|||||||
},
|
},
|
||||||
"XSS.is": {
|
"XSS.is": {
|
||||||
"tags": [
|
"tags": [
|
||||||
"in",
|
"hacking",
|
||||||
"ru"
|
"ru"
|
||||||
],
|
],
|
||||||
"activation": {
|
"engine": "XenForo",
|
||||||
"method": "xssis",
|
|
||||||
"marks": [
|
|
||||||
"errorHtml"
|
|
||||||
],
|
|
||||||
"url": "https://xss.is/login/keep-alive",
|
|
||||||
"src": "csrf",
|
|
||||||
"dst": "x-guest-token"
|
|
||||||
},
|
|
||||||
"checkType": "status_code",
|
|
||||||
"getParams": {
|
|
||||||
"_xfToken": "1611179947,a2710362e45dad9aa1da381e21941a38"
|
|
||||||
},
|
|
||||||
"alexaRank": 165220,
|
"alexaRank": 165220,
|
||||||
"url": "https://xss.is/index.php?members/find&q={username}&_xfRequestUri=%2Fmembers%2F%3Fkey%3Dmost_messages&_xfWithData=1&_xfResponseType=json",
|
"ignore403": true,
|
||||||
"urlMain": "https://xss.is",
|
"urlMain": "https://xss.is",
|
||||||
"usernameClaimed": "adam",
|
"usernameClaimed": "adam",
|
||||||
"usernameUnclaimed": "noonewouldeverusethis7"
|
"usernameUnclaimed": "noonewouldeverusethis7"
|
||||||
@@ -12129,7 +12117,7 @@
|
|||||||
"us"
|
"us"
|
||||||
],
|
],
|
||||||
"headers": {
|
"headers": {
|
||||||
"authorization": "Bearer BQCyNy7oN-nOZ-rNK_jL0R4GHS7f3uWdK8AdxZ9m-pg9dbm7t-mLNaaHCG2BpDeV4AekGfl4AscbXLMqeB4"
|
"authorization": "Bearer BQAhjPM0jv30LtMfeJXLPMYFBmAKG4RGzVUncYmOS9ufDGyNie5scjyVt8ujXA2bayqRX4f690lZUz0Kx9w"
|
||||||
},
|
},
|
||||||
"errors": {
|
"errors": {
|
||||||
"Spotify is currently not available in your country.": "Access denied in your country, use proxy/vpn"
|
"Spotify is currently not available in your country.": "Access denied in your country, use proxy/vpn"
|
||||||
@@ -13431,7 +13419,7 @@
|
|||||||
"sec-ch-ua": "Google Chrome\";v=\"87\", \" Not;A Brand\";v=\"99\", \"Chromium\";v=\"87\"",
|
"sec-ch-ua": "Google Chrome\";v=\"87\", \" Not;A Brand\";v=\"99\", \"Chromium\";v=\"87\"",
|
||||||
"authorization": "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA",
|
"authorization": "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA",
|
||||||
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
|
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
|
||||||
"x-guest-token": "1373570939997335554"
|
"x-guest-token": "1376173136807403521"
|
||||||
},
|
},
|
||||||
"errors": {
|
"errors": {
|
||||||
"Bad guest token": "x-guest-token update required"
|
"Bad guest token": "x-guest-token update required"
|
||||||
@@ -13808,7 +13796,7 @@
|
|||||||
"video"
|
"video"
|
||||||
],
|
],
|
||||||
"headers": {
|
"headers": {
|
||||||
"Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTYzMjE3MDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.yS9-vO94E_Ad_e2krnmOoqXWcaLxhZSrRvjUVHkgIPk"
|
"Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTY5NDExNDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.ArAL1V2XErUD3C2FnZSmcj96Nc2sfG6WHbUw_AtrSqA"
|
||||||
},
|
},
|
||||||
"activation": {
|
"activation": {
|
||||||
"url": "https://vimeo.com/_rv/viewer",
|
"url": "https://vimeo.com/_rv/viewer",
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ class MaigretSite:
|
|||||||
|
|
||||||
self.disabled = False
|
self.disabled = False
|
||||||
self.similar_search = False
|
self.similar_search = False
|
||||||
self.ignore_403 = False
|
self.ignore403 = False
|
||||||
self.tags = []
|
self.tags = []
|
||||||
|
|
||||||
self.type = 'username'
|
self.type = 'username'
|
||||||
|
|||||||
@@ -26,6 +26,13 @@ def test_case_convert_snake_to_title():
|
|||||||
assert b == 'Camel cased string'
|
assert b == 'Camel cased string'
|
||||||
|
|
||||||
|
|
||||||
|
def test_case_convert_camel_with_digits_to_snake():
|
||||||
|
a = 'ignore403'
|
||||||
|
b = CaseConverter.camel_to_snake(a)
|
||||||
|
|
||||||
|
assert b == 'ignore403'
|
||||||
|
|
||||||
|
|
||||||
def test_is_country_tag():
|
def test_is_country_tag():
|
||||||
assert is_country_tag('ru') == True
|
assert is_country_tag('ru') == True
|
||||||
assert is_country_tag('FR') == True
|
assert is_country_tag('FR') == True
|
||||||
|
|||||||
Reference in New Issue
Block a user