-#!/usr/bin/python
-#
# Copyright (C) 2013 Simo Sorce <simo@redhat.com>
#
# see file 'COPYING' for use and warranty information
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import cherrypy
from ipsilon.util.log import Log
from ipsilon.util.user import UserSession
from ipsilon.util.trans import Transaction
from urllib import unquote
-import cherrypy
+try:
+ from urlparse import urlparse
+ from urlparse import parse_qs
+except ImportError:
+ # pylint: disable=no-name-in-module, import-error
+ from urllib.parse import urlparse
+ from urllib.parse import parse_qs
def admin_protect(fn):
self.default_headers = dict()
self.auth_protect = False
- def _compare_urls(self, url1, url2):
- u1 = unquote(url1)
- u2 = unquote(url2)
- if u1 == u2:
+ def get_url(self):
+ return cherrypy.url(relative=False)
+
+ def instance_base_url(self):
+ url = self.get_url()
+ s = urlparse(unquote(url))
+ return '%s://%s%s' % (s.scheme, s.netloc, self.basepath)
+
+ def _check_referer(self, referer, url):
+ r = urlparse(unquote(referer))
+ u = urlparse(unquote(url))
+ if r.scheme != u.scheme:
+ return False
+ if r.netloc != u.netloc:
+ return False
+ if r.path.startswith(self.basepath):
return True
return False
if callable(op):
# Basic CSRF protection
if cherrypy.request.method != 'GET':
- url = cherrypy.url(relative=False)
+ url = self.get_url()
if 'referer' not in cherrypy.request.headers:
self._debug("Missing referer in %s request to %s"
% (cherrypy.request.method, url))
raise cherrypy.HTTPError(403)
referer = cherrypy.request.headers['referer']
- if not self._compare_urls(referer, url):
+ if not self._check_referer(referer, url):
self._debug("Wrong referer %s in request to %s"
% (referer, url))
raise cherrypy.HTTPError(403)
def get_valid_transaction(self, provider, **kwargs):
try:
- return Transaction(provider, **kwargs)
+ t = Transaction(provider)
+ # Try with kwargs first
+ tid = t.find_tid(kwargs)
+ if not tid:
+ # If no TID yet See if we have it in a referer
+ if 'referer' in cherrypy.request.headers:
+ r = urlparse(unquote(cherrypy.request.headers['referer']))
+ if r.query:
+ tid = t.find_tid(parse_qs(r.query))
+ if not tid:
+ t.create_tid()
+ return t
except ValueError:
msg = 'Transaction expired, or cookies not available'
raise cherrypy.HTTPError(401, msg)