home · contact · privacy
Add some more checks against evil URLs.
[plomlombot-irc.git] / plomlombot.py
index b312eb2..7fa9194 100644 (file)
@@ -1,16 +1,18 @@
 import socket
-import datetime 
+import datetime
 import select
 import time
 import re
 import urllib.request
 import html
 
+servernet = "irc.freenode.net"
+port = 6667
 servername = ""
-timeout = 480
+timeout = 240
 username = "plomlombot"
 nickname = username
-channel = "#zrolaps"
+channel = "#zrolaps-test"
 
 class IO:
 
@@ -69,7 +71,7 @@ class IO:
             line)
         return line
 
-io = IO("irc.freenode.net", 6667)
+io = IO(servernet, port)
 io.send_line("NICK " + nickname)
 io.send_line("USER " + username + " 0 * : ")
 io.send_line("JOIN " + channel)
@@ -101,7 +103,11 @@ while 1:
             for i in range(len(matches)):
                 url = matches[i]
                 webpage = urllib.request.urlopen(url)
+                content_type = webpage.info().get_content_type()
                 charset = webpage.info().get_content_charset()
+                if not charset or not content_type in ('text/html', 'text/xml',
+                    'application/xhtml+xml'):
+                    continue
                 content = webpage.read().decode(charset)
                 title = str(content).split('<title>')[1].split('</title>')[0]
                 title = html.unescape(title)