DrTrigon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/85521
Change subject: DRTRIGON-133; support of coming https security upgrade
......................................................................
DRTRIGON-133; support of coming https security upgrade
Change-Id: I4c8f02c3d014fd7f28a036e2739ac30e92973e22
---
M public_html/cgi-bin/sum_cat_disc.py
1 file changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/drtrigonbot
refs/changes/21/85521/1
diff --git a/public_html/cgi-bin/sum_cat_disc.py
b/public_html/cgi-bin/sum_cat_disc.py
index a4ccefe..1779a45 100755
--- a/public_html/cgi-bin/sum_cat_disc.py
+++ b/public_html/cgi-bin/sum_cat_disc.py
@@ -184,7 +184,7 @@
lang,
CONCAT("sql-s", server) AS dbserver,
dbname,
- CONCAT("http://";, DOMAIN, script_path, "api.php") AS url
+ CONCAT(%s, "://", DOMAIN, script_path, "api.php") AS url
FROM toolserver.wiki
WHERE family = "wikipedia"
ORDER BY SIZE DESC LIMIT %s;"""
@@ -297,8 +297,8 @@
return res
-def get_wikiinfo_db(wiki, limit=SQL_LIMIT_max):
- for item in read_db(_SQL_query_wiki_info, (limit,), limit):
+def get_wikiinfo_db(scheme, wiki, limit=SQL_LIMIT_max):
+ for item in read_db(_SQL_query_wiki_info, (scheme, limit), limit):
if item[2] == (wiki + "wiki_p"):
return item
return None
@@ -312,6 +312,8 @@
lang = locale.locale_alias.get(wiki,
locale.locale_alias['en']).split('.')[0]
locale.setlocale(locale.LC_TIME, lang)
+
+ scheme = {'NO': 'http', 'YES': 'https'}[os.environ.get('HTTP_X_TS_SSL',
'NO')]
s = datetime.datetime.strptime(start, wikitime)
p = datetime.timedelta(hours=int(period))
@@ -354,7 +356,7 @@
data['output'] += "<tr>\n <td>"
title = subrow[0][0]
title =
site.namespace(subrow[0][1]).encode('utf8') + ':' + title
- data['output'] += '<a
href="http://%s.wikipedia.org/wiki/%s"; target="_blank">%s</a>' % (wiki, title,
title.replace('_', ' '))
+ data['output'] += '<a
href="%s://%s.wikipedia.org/wiki/%s" target="_blank">%s</a>' % (scheme, wiki,
title, title.replace('_', ' '))
data['output'] += "</td>\n <td>"
# data['output'] += str(subrow[0][1:])
try:
@@ -363,7 +365,7 @@
tmsp = subrow[0][2] + " (!)"
data['output'] += tmsp
data['output'] += "</td>\n <td>"
- data['output'] += '<a
href="http://%s.wikipedia.org/wiki/User:%s"; target="_blank">%s</a>' % (wiki,
subrow[0][3], subrow[0][3])
+ data['output'] += '<a
href="%s://%s.wikipedia.org/wiki/User:%s" target="_blank">%s</a>' % (scheme,
wiki, subrow[0][3], subrow[0][3])
data['output'] += "</td>\n <td>"
data['output'] += subrow[0][4]
data['output'] += "</td>\n</tr>\n"
@@ -378,12 +380,13 @@
data['output'] += "<br>\n"
- data['output'] += '<small>%s</small><br>\n' % str(
get_wikiinfo_db(wiki) )
+ data['output'] += '<small>%s</small><br>\n' % str(
get_wikiinfo_db(scheme, wiki) )
data.update({ 'title': 'DrTrigonBot category discussion
summary',
'refresh': '',
'tsnotice': style.print_tsnotice(),
'p-status': '<tr><td><small><a
href="http://status.toolserver.org/"; target="_blank">DB
status</a></small></td></tr>',
+ #'p-status': '<tr><td><small><a
href="%s://status.toolserver.org/" target="_blank">DB
status</a></small></td></tr>' % (scheme,),
'footer': style.footer + style.footer_w3c, # wiki
(new) not CSS 2.1 compilant
'wiki': wiki,
'cat': cgi.escape( cat, quote=True), #
proper XSS secure output
--
To view, visit https://gerrit.wikimedia.org/r/85521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c8f02c3d014fd7f28a036e2739ac30e92973e22
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/drtrigonbot
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
