PsychoticNinja/ChanTracker
1
0
Fork 0
mirror of https://github.com/ncoevoet/ChanTracker.git synced 2025-04-26 13:01:06 -05:00
Code Issues Projects Releases Wiki Activity

Also HTML-escape comments on web page, fix a few minor things.

Browse Source
This commit is contained in:
Krytarik Raido 2021-06-29 19:56:04 +02:00
parent 9c41bf5466
commit af16cbf9de
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
server.py
View File

@ -15,6 +15,7 @@ channels = [] # empty to allow view of all channels recorded, otherwise restrict
auth = '%s:%s' % (username,password) auth = '%s:%s' % (username,password)
base64string = base64.b64encode(auth.encode('utf-8')).decode('utf-8') base64string = base64.b64encode(auth.encode('utf-8')).decode('utf-8')
def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True, def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
weeks=True, days=True, hours=True, minutes=True, seconds=True): weeks=True, days=True, hours=True, minutes=True, seconds=True):
"""Given <elapsed> seconds, returns a string with an English description of """Given <elapsed> seconds, returns a string with an English description of
@ -58,6 +59,10 @@ def timeElapsed(elapsed, short=False, leadingZeroes=False, years=True,
else: else:
return format('%L', ret) return format('%L', ret)
def htmlEscape(text):
return text.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;').replace('"','&quot;')
class MyHandler(http.server.BaseHTTPRequestHandler): class MyHandler(http.server.BaseHTTPRequestHandler):
if not standalone: if not standalone:
def log_request(self, *args): def log_request(self, *args):
@ -148,11 +153,11 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
ban = r[0] ban = r[0]
(id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by) = ban (bid,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by) = ban
if not channels or channel in channels: if not channels or channel in channels:
body.extend([ body.extend([
'<h3>#%d</h3>' % id, '<h3>#%d</h3>' % bid,
'<p>#%d by <a href="%s%s&%s">%s</a>' % (id,h,q,utils.web.urlencode({'oper':oper}),oper), '<p>#%d by <a href="%s%s&%s">%s</a>' % (bid,h,q,utils.web.urlencode({'oper':oper}),oper),
'in <a href="%s%s&channel=%s">%s</a>:' % (h,q,channel.split('#')[1],channel), 'in <a href="%s%s&channel=%s">%s</a>:' % (h,q,channel.split('#')[1],channel),
'+%s <a href="%s%s&%s">%s</a></p>' % (kind,h,q,utils.web.urlencode({'mask':mask}),mask), '+%s <a href="%s%s&%s">%s</a></p>' % (kind,h,q,utils.web.urlencode({'mask':mask}),mask),
'<p>Begin at %s</p>' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at))) '<p>Begin at %s</p>' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at)))
@ -170,28 +175,25 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
body.extend(['<p>Removed after %s' % timeElapsed(float(removed_at)-float(begin_at)), body.extend(['<p>Removed after %s' % timeElapsed(float(removed_at)-float(begin_at)),
'on %s' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(removed_at))), 'on %s' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(removed_at))),
'by <a href="%s%s&%s">%s</a></p>' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)]) 'by <a href="%s%s&%s">%s</a></p>' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)])
c.execute("""SELECT full,log FROM nicks WHERE ban_id=?""",(id,)) c.execute("""SELECT full,log FROM nicks WHERE ban_id=?""",(bid,))
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
body.append('<h3>Logs</h3>') body.append('<h3>Logs</h3>')
for nick in r: for (full,log) in r:
(full,log) = nick
body.append('<p>for %s</p>' % full) body.append('<p>for %s</p>' % full)
if log != '': if log != '':
body.append('<ul>') body.append('<ul>')
for line in log.split('\n'): for line in log.split('\n'):
if line != '': if line != '':
body.append('<li>%s</li>' % line.replace( body.append('<li>%s</li>' % htmlEscape(line))
'&','&amp;').replace('<','&lt;').replace('>','&gt;').replace('"','&quot;'))
body.append('</ul>') body.append('</ul>')
c.execute("""SELECT oper,at,comment FROM comments WHERE ban_id=?""",(id,)) c.execute("""SELECT oper,at,comment FROM comments WHERE ban_id=?""",(bid,))
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
body.extend(['<h3>Comments</h3>', '<ul>']) body.extend(['<h3>Comments</h3>', '<ul>'])
for comment in r: for (oper,at,com) in r:
(oper,at,com) = comment
s = time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(at))) s = time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(at)))
body.append('<li>%s by %s: %s</li>' % (s,oper,com)) body.append('<li>%s by %s: %s</li>' % (s,oper,htmlEscape(com)))
body.append('</ul>') body.append('</ul>')
c.close() c.close()
write(subtitle, body) write(subtitle, body)
@ -223,13 +225,12 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
L = [] L = []
a = {} a = {}
if len(r): if len(r):
d = {} d = []
for ban in r: for (bid,full) in r:
(id,full) = ban if bid not in d:
if id not in d: d.append(bid)
d[id] = id for bid in d:
for id in d: c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(bid,))
c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(id,))
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
for ban in r: for ban in r:
@ -261,13 +262,12 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
L = [] L = []
a = {} a = {}
if len(r): if len(r):
d = {} d = []
for ban in r: for (bid,full) in r:
(id,full) = ban if bid not in d:
if id not in d: d.append(bid)
d[id] = id for bid in d:
for id in d: c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(bid,))
c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(id,))
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
for ban in r: for ban in r:
@ -285,14 +285,13 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
r = c.fetchall() r = c.fetchall()
else: else:
r = [] r = []
d = {}
if len(r): if len(r):
for ban in r: d = []
(id,full) = ban for (bid,full) in r:
d[id] = id d.append(bid)
for id in d: for bid in d:
if id not in a: if bid not in a:
c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(id,)) c.execute("""SELECT id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by FROM bans WHERE id=?""",(bid,))
r = c.fetchall() r = c.fetchall()
if len(r): if len(r):
for ban in r: for ban in r:
@ -311,12 +310,12 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
'<tbody>' '<tbody>'
]) ])
for ban in ar: for ban in ar:
(id,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by) = ban (bid,channel,oper,kind,mask,begin_at,end_at,removed_at,removed_by) = ban
if not channels or channel in channels: if not channels or channel in channels:
s = time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at))) s = time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at)))
body.extend([ body.extend([
'<tr>', '<tr>',
'<td><a href="%s%s&id=%d">%d</a></td>' % (h,q,id,id), '<td><a href="%s%s&id=%d">%d</a></td>' % (h,q,bid,bid),
'<td><a href="%s%s&channel=%s">%s</a></td>' % (h,q,channel.split('#')[1],channel), '<td><a href="%s%s&channel=%s">%s</a></td>' % (h,q,channel.split('#')[1],channel),
'<td><a href="%s%s&%s">%s</a></td>' % (h,q,utils.web.urlencode({'oper':oper}),oper), '<td><a href="%s%s&%s">%s</a></td>' % (h,q,utils.web.urlencode({'oper':oper}),oper),
'<td>+%s</td>' % kind, '<td>+%s</td>' % kind,
@ -339,7 +338,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
body.append('<td></td>') body.append('<td></td>')
# affected = '' # affected = ''
# try: # try:
# c.execute("""SELECT full, log FROM nicks WHERE ban_id=?""",(id,)) # c.execute("""SELECT full, log FROM nicks WHERE ban_id=?""",(bid,))
# affected = len(c.fetchall()) # affected = len(c.fetchall())
# except: # except:
# affected = '' # affected = ''
@ -383,6 +382,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler):
db.commit() db.commit()
return db return db
def httpd(handler_class=MyHandler, server_address=('', port)): def httpd(handler_class=MyHandler, server_address=('', port)):
srvr = http.server.HTTPServer(server_address, handler_class) srvr = http.server.HTTPServer(server_address, handler_class)
srvr.serve_forever() srvr.serve_forever()