jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633353 )
Change subject: [bugfix] Ignore ssl certificate validation in generate_family_file.py
......................................................................
[bugfix] Ignore ssl certificate validation in generate_family_file.py
If a FatalServerError occurs ask whether ssl certificate validation
should be ignored in generate_family_file.py to create the family file.
Add verify_SSL_certificate method in that case.
Bug: T265210
Change-Id: I77bcb0ea8054906fd0456ae71ba890461dfb794e
---
M generate_family_file.py
M pywikibot/site_detect.py
2 files changed, 46 insertions(+), 16 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_family_file.py b/generate_family_file.py
index e4464df..404553a 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
"""This script generates a family file from a given
URL."""
#
-# (C) Pywikibot team, 2010-2020
+# (C) Pywikibot team, 2010-2021
#
# Distributed under the terms of the MIT license
#
@@ -49,11 +49,31 @@
self.wikis = {} # {'https://wiki/$1': Wiki('https://wiki/$1'),
...}
self.langs = [] # [Wiki('https://wiki/$1'), ...]
+ def get_wiki(self):
+ """Get wiki from base_url."""
+ import pywikibot
+ print('Generating family file from ' + self.base_url)
+ for verify in (True, False):
+ try:
+ w = self.Wiki(self.base_url, verify=verify)
+ except pywikibot.FatalServerError:
+ print('ERROR: '
+ + pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG)
+ pywikibot.exception()
+ if not pywikibot.bot.input_yn(
+ 'Retry with disabled ssl certificate validation',
+ automatic_quit=False):
+ break
+ else:
+ return w, verify
+ return None, None
+
def run(self):
"""Main method, generate family file."""
- print('Generating family file from ' + self.base_url)
+ w, verify = self.get_wiki()
+ if w is None:
+ return
- w = self.Wiki(self.base_url)
self.wikis[w.lang] = w
print('\n=================================='
'\nAPI url: {w.api}'
@@ -62,7 +82,7 @@
self.getlangs(w)
self.getapis()
- self.writefile()
+ self.writefile(verify)
def getlangs(self, w):
"""Determine language of a site."""
@@ -82,13 +102,14 @@
'prefix': w.lang,
'url': w.iwpath})
- if len(self.langs) > 1:
+ code_len = len(self.langs)
+ if code_len > 1:
if self.dointerwiki is None:
makeiw = input(
- '\nThere are %i languages available.'
+ '\nThere are {} languages available.'
'\nDo you want to generate interwiki links? '
'This might take a long time. ([y]es/[N]o/[e]dit)'
- % len(self.langs)).lower()
+ .format(code_len)).lower()
else:
makeiw = self.dointerwiki
@@ -124,7 +145,7 @@
else:
print('in cache')
- def writefile(self):
+ def writefile(self, verify):
"""Write the family file."""
fn = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'pywikibot', 'families',
@@ -153,12 +174,20 @@
code=k, protocol=urlparse(w.server).scheme
) for k, w in self.wikis.items())
+ content = family_template % {
+ 'url': self.base_url, 'name': self.name,
+ 'code_hostname_pairs': code_hostname_pairs,
+ 'code_path_pairs': code_path_pairs,
+ 'code_protocol_pairs': code_protocol_pairs}
+ if not verify:
+ # assuming this is the same for all codes
+ content += """
+
+ def verify_SSL_certificate(self, code: str) -> bool:
+ return False
+"""
with codecs.open(fn, 'w', 'utf-8') as fh:
- fh.write(family_template % {
- 'url': self.base_url, 'name': self.name,
- 'code_hostname_pairs': code_hostname_pairs,
- 'code_path_pairs': code_path_pairs,
- 'code_protocol_pairs': code_protocol_pairs})
+ fh.write(content)
family_template = """\
diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index 0093615..084306c 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -1,6 +1,6 @@
"""Classes for detecting a MediaWiki site."""
#
-# (C) Pywikibot team, 2010-2020
+# (C) Pywikibot team, 2010-2021
#
# Distributed under the terms of the MIT license.
#
@@ -28,7 +28,7 @@
"""Minimal wiki site class."""
- def __init__(self, fromurl):
+ def __init__(self, fromurl, **kwargs):
"""
Initializer.
@@ -39,7 +39,8 @@
"""
if fromurl.endswith('$1'):
fromurl = fromurl[:-2]
- r = fetch(fromurl)
+
+ r = fetch(fromurl, **kwargs)
check_response(r)
if fromurl != r.url:
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633353
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I77bcb0ea8054906fd0456ae71ba890461dfb794e
Gerrit-Change-Number: 633353
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Adithyak1997 <adithyak04(a)gmail.com>
Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-MessageType: merged