← Back to branch summary

~coreygoldberg/uci-engine/subunit-results

« back to all changes in this revision

Viewing changes to gatekeeper/gatekeeper/datastore/tempurl.py

Merge trunk, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
gatekeeper/gatekeeper/datastore/tempurl.py
61
61
        It allow access from unauthenticated clients.
62
62
        """
63
63
        if expires is None:
64
 
            expires = self.options.expires
65
 
        host = '/'.join(self.url.split('/')[:3])
 
64
            expires = int(self.options.expires)
 
65
        if self.options.public_host:
 
66
            host = self.options.public_host
 
67
        else:
 
68
            host = '/'.join(self.url.split('/')[:3])
66
69
        path = self._get_path(container, object_name)
67
70
        expires = int(time.time() + expires)
68
71
        sig = self._get_temp_signature(method, expires, path)