Bugtracker: More exactly trim CVE information.

Bugtracker/__init__.py

@@ -23,7 +23,7 @@ import supybot
 import supybot.world as world
 from importlib import reload
 
-__version__ = "5.5.0"
+__version__ = "5.6.0"
 __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@gmail.com")
 __contributors__ = {
     supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'],

Bugtracker/plugin.py

@@ -495,7 +495,7 @@ class Bugtracker(callbacks.PluginRegexp):
         else:
             do_url = False
         try:
-            report = trackers.CVE().get_bug(cveid, do_url)
+            report = trackers.CVE().get_bug(channel or msg.nick, cveid, do_url)
         except trackers.BugNotFoundError:
             if self.registryValue('replyWhenNotFound'):
                 irc.error("Could not find CVE %s" % cveid)

Bugtracker/trackers.py

@@ -72,7 +72,7 @@ cvere = re.compile(r'<th[^>]*>Description</th>.*?<td[^>]*>\s*(?P<cve>.*?)\s*</td
 cverre = re.compile(r'<h2[^>]*>\s*(?P<cverr>.*?)\s*</h2>', re.I | re.DOTALL)
 # Define CVE tracker
 class CVE:
-    def get_bug(self, cveid, do_url=True):
+    def get_bug(self, channel, cveid, do_url=True):
         url = "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s" % cveid
         try:
             cvedata = utils.web.getUrl(url).decode('utf-8')
@@ -81,8 +81,11 @@ class CVE:
         match = cvere.search(cvedata)
         if match:
             cve = utils.web.htmlToText(match.group('cve'), tagReplace='')
-            if len(cve) > 380:
-                cve = cve[:380] + '...'
+            desc_max = 450 - len(channel)
+            if do_url:
+                desc_max -= len(url) + 3
+            if len(cve) > desc_max:
+                cve = cve[:desc_max-3] + '...'
             if do_url:
                 cve += ' <%s>' % url
             return cve