phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 19:52:50 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

switch random strings from hex-encoded to base32-encoded

Browse source
This commit is contained in:
Micah Lee 2014-06-23 16:15:02 -04:00
parent 272092f877
commit 4ac7111011
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
onionshare/onionshare.py
View file

@ -1,4 +1,4 @@
import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect import os, sys, subprocess, time, hashlib, platform, json, locale, socket, argparse, Queue, inspect, base64
from random import randint from random import randint
from functools import wraps from functools import wraps
@ -10,11 +10,9 @@ from flask import Flask, Markup, Response, request, make_response, send_from_dir
class NoTor(Exception): class NoTor(Exception):
pass pass
app = Flask(__name__) def random_string(num_bytes):
b = os.urandom(num_bytes)
strings = {} return base64.b32encode(b).lower().replace('=','')
onionshare_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
slug = os.urandom(16).encode('hex')
# information about the file # information about the file
filename = filesize = filehash = None filename = filesize = filehash = None
@ -24,14 +22,19 @@ def set_file_info(new_filename, new_filehash, new_filesize):
filehash = new_filehash filehash = new_filehash
filesize = new_filesize filesize = new_filesize
app = Flask(__name__)
strings = {}
onionshare_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
slug = random_string(16)
download_count = 0
REQUEST_LOAD = 0 REQUEST_LOAD = 0
REQUEST_DOWNLOAD = 1 REQUEST_DOWNLOAD = 1
REQUEST_PROGRESS = 2 REQUEST_PROGRESS = 2
REQUEST_OTHER = 3 REQUEST_OTHER = 3
q = Queue.Queue() q = Queue.Queue()
download_count = 0
def add_request(type, path, data=None): def add_request(type, path, data=None):
global q global q
q.put({ q.put({
@ -149,7 +152,7 @@ def choose_port():
def start_hidden_service(port): def start_hidden_service(port):
# come up with a hidden service directory name # come up with a hidden service directory name
hidserv_dir_rand = os.urandom(8).encode('hex') hidserv_dir_rand = random_string(8)
if get_platform() == "Windows": if get_platform() == "Windows":
if 'Temp' in os.environ: if 'Temp' in os.environ:
temp = os.environ['Temp'].replace('\\', '/') temp = os.environ['Temp'].replace('\\', '/')

14
test/onionshare_test.py
View file

@ -68,17 +68,17 @@ def test_load_strings_loads_other_languages():
assert onionshare.strings['calculating_sha1'] == "Calculer un hachage SHA-1." assert onionshare.strings['calculating_sha1'] == "Calculer un hachage SHA-1."
def test_generate_slug_length(): def test_generate_slug_length():
"generates a 32-character slug" "generates a 26-character slug"
assert len(slug) == 32 assert len(slug) == 26
def test_generate_slug_characters(): def test_generate_slug_characters():
"generates a hex slug" "generates a base32-encoded slug"
def is_hex(string): def is_b32(string):
hex_alphabet = "01234556789abcdef" b32_alphabet = "01234556789abcdefghijklmnopqrstuvwxyz"
return all(char in hex_alphabet for char in string) return all(char in b32_alphabet for char in string)
assert is_hex(slug) assert is_b32(slug)
def test_starts_with_empty_strings(): def test_starts_with_empty_strings():
"creates an empty strings dict by default" "creates an empty strings dict by default"