From 1a4fd0d320bafa4d9723764a0b48034155cd52a4 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Thu, 21 Apr 2011 20:46:42 +0200 Subject: [PATCH] paste* backends: Stricter URL matching --- weboob/backends/pastealacon/browser.py | 2 +- weboob/backends/pastebin/browser.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/weboob/backends/pastealacon/browser.py b/weboob/backends/pastealacon/browser.py index 541094ca..bc522015 100644 --- a/weboob/backends/pastealacon/browser.py +++ b/weboob/backends/pastealacon/browser.py @@ -44,7 +44,7 @@ class PastealaconBrowser(BaseBrowser): @id2url(PastealaconPaste.id2url) def get_paste(self, url): - _id = re.match(self.PASTE_URL, url).groupdict()['id'] + _id = re.match('^%s$' % self.PASTE_URL, url).groupdict()['id'] return PastealaconPaste(_id) def fill_paste(self, paste): diff --git a/weboob/backends/pastebin/browser.py b/weboob/backends/pastebin/browser.py index e58663cf..3d68ae67 100644 --- a/weboob/backends/pastebin/browser.py +++ b/weboob/backends/pastebin/browser.py @@ -55,7 +55,7 @@ class PastebinBrowser(BaseBrowser): @id2url(PastebinPaste.id2url) def get_paste(self, url): - _id = re.match(self.PASTE_URL, url).groupdict()['id'] + _id = re.match('^%s$' % self.PASTE_URL, url).groupdict()['id'] return PastebinPaste(_id) def get_contents(self, _id): @@ -84,7 +84,7 @@ class PastebinBrowser(BaseBrowser): data['api_paste_name'] = paste.title.encode(self.ENCODING) res = self.readurl(self.API_URL, urllib.urlencode(data)).decode(self.ENCODING) self._validate_api_response(res) - paste.id = re.match(self.PASTE_URL, res).groupdict()['id'] + paste.id = re.match('^%s$' % self.PASTE_URL, res).groupdict()['id'] def _validate_api_response(self, res): matches = re.match('Bad API request, (?P.+)', res)