catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

dsa_watcher: fetch internally and print package name

Browse Source
This commit is contained in:
urlbot
2015-07-19 21:05:09 +02:00
parent d1bbf13d6e
commit c687f84c02
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins.py
View File

@@ -877,10 +877,28 @@ def command_dsa_watcher(argv, **args):
dsa = conf_load().get('plugin_conf', {}).get('last_dsa', 1000) dsa = conf_load().get('plugin_conf', {}).get('last_dsa', 1000)
url = 'https://security-tracker.debian.org/tracker/DSA-%d-1' % dsa url = 'https://security-tracker.debian.org/tracker/DSA-%d-1' % dsa
status, title = extract_title(url) err = None
if 0 == status: try:
send_reply('new Debian Security Announce found: %s' % url) request = urllib.request.Request(url)
request.add_header('User-Agent', '''Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Firefox/31.0 Iceweasel/31.0''')
response = urllib.request.urlopen(request)
html_text = response.read(BUFSIZ) # ignore more than BUFSIZ
except Exception as e:
log.warn('failed: %s' % e)
err = e
if not err:
if str != type(html_text):
html_text = str(html_text)
result = re.match(r'.*?Description</b></td><td>(.*?)</td>.*?', html_text, re.S | re.M | re.IGNORECASE)
package = 'error extracting package name'
if result:
package = result.groups()[0]
send_reply('new Debian Security Announce found (%s): %s' % (package, url))
if conf('persistent_locked'): if conf('persistent_locked'):
msg = "couldn't get exclusive lock" msg = "couldn't get exclusive lock"
@@ -901,19 +919,17 @@ def command_dsa_watcher(argv, **args):
conf_save(blob) conf_save(blob)
set_conf('persistent_locked', False) set_conf('persistent_locked', False)
msg = 'new Debian Security Announce found: %s' % url msg = 'new Debian Security Announce found (%s): %s' % (package, url)
log.plugin(msg) log.plugin(msg)
out.append(msg) out.append(msg)
elif 3 == status: else:
if not '404' in title: if not '404' in err:
msg = 'error for #%s: %s' % (url, title) msg = 'error for %s: %s' % (url, err)
log.warn(msg) log.warn(msg)
out.append(msg) out.append(msg)
log.plugin('no dsa for %d, trying again...' % dsa) log.plugin('no dsa for %d, trying again...' % dsa)
# that's good, no error, just 404 -> DSA not released yet # that's good, no error, just 404 -> DSA not released yet
else:
log.plugin('unknown status %d' % status)
crawl_at = time.time() + conf('dsa_watcher_interval') crawl_at = time.time() + conf('dsa_watcher_interval')
register_event(crawl_at, command_dsa_watcher, (['dsa-watcher', 'crawl'],)) register_event(crawl_at, command_dsa_watcher, (['dsa-watcher', 'crawl'],))