diff --git a/boards/utils.py b/boards/utils.py --- a/boards/utils.py +++ b/boards/utils.py @@ -1,24 +1,22 @@ """ This module contains helper functions and helper classes. """ -import hashlib +import time import uuid -from boards.abstracts.constants import FILE_DIRECTORY -from random import random -import time +import hashlib import hmac - +import magic +import os +from django import forms from django.core.cache import cache from django.db.models import Model -from django import forms from django.template.defaultfilters import filesizeformat from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -import magic -import os import boards +from boards.abstracts.constants import FILE_DIRECTORY from boards.settings import get_bool from neboard import settings @@ -58,20 +56,6 @@ def datetime_to_epoch(datetime): * 1000000 + datetime.microsecond) -def get_websocket_token(user_id='', timestamp=''): - """ - Create token to validate information provided by new connection. - """ - - sign = hmac.new(settings.CENTRIFUGE_PROJECT_SECRET.encode()) - sign.update(settings.CENTRIFUGE_PROJECT_ID.encode()) - sign.update(user_id.encode()) - sign.update(timestamp.encode()) - token = sign.hexdigest() - - return token - - # TODO Test this carefully def cached_result(key_method=None): """ @@ -117,7 +101,7 @@ def get_file_hash(file) -> str: def validate_file_size(size: int): max_size = boards.settings.get_int('Forms', 'MaxFileSize') - if max_size > 0 and size > max_size: + if 0 < max_size < size: raise forms.ValidationError( _('File must be less than %s but is %s.') % (filesizeformat(max_size), filesizeformat(size)))