aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools/crypto.py
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-08-22 22:34:06 +0530
committerAditi <aditi.iitr@gmail.com>2013-08-22 22:34:06 +0530
commit70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch)
tree7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/tools/crypto.py
parente018b2120ac4131afab6611c84f8cfbe0926e640 (diff)
parente7b8059f17c98ee88d933af52b0c4d858e882e8e (diff)
downloadmediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz
mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz
mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/tools/crypto.py')
-rw-r--r--mediagoblin/tools/crypto.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py
index 1379d21b..917e674c 100644
--- a/mediagoblin/tools/crypto.py
+++ b/mediagoblin/tools/crypto.py
@@ -14,6 +14,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+import base64
+import string
import errno
import itsdangerous
import logging
@@ -24,6 +26,9 @@ from mediagoblin import mg_globals
_log = logging.getLogger(__name__)
+# produces base64 alphabet
+alphabet = string.ascii_letters + "-_"
+base = len(alphabet)
# Use the system (hardware-based) random number generator if it exists.
# -- this optimization is lifted from Django
@@ -111,3 +116,13 @@ def get_timed_signer_url(namespace):
assert __itsda_secret is not None
return itsdangerous.URLSafeTimedSerializer(__itsda_secret,
salt=namespace)
+
+def random_string(length):
+ """ Returns a URL safe base64 encoded crypographically strong string """
+ rstring = ""
+ for i in range(length):
+ n = getrandbits(6) # 6 bytes = 2^6 = 64
+ n = divmod(n, base)[1]
+ rstring += alphabet[n]
+
+ return rstring