Revision 4a105ce2 snf-pithos-backend/pithos/backends/modular.py

b/snf-pithos-backend/pithos/backends/modular.py
84 84
DEFAULT_BLOCK_PARAMS = { 'mappool': None, 'blockpool': None }
85 85
#DEFAULT_QUEUE_HOSTS = '[amqp://guest:guest@localhost:5672]'
86 86
#DEFAULT_QUEUE_EXCHANGE = 'pithos'
87
DEFAULT_ALPHABET = ('0123456789'
88
                    'abcdefghijklmnopqrstuvwxyz'
89
                    'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
90
DEFAULT_MIN_LENGTH = 8
87
DEFAULT_PUBLIC_URL_ALPHABET = ('0123456789'
88
                               'abcdefghijklmnopqrstuvwxyz'
89
                               'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
90
DEFAULT_PUBLIC_URL_SECURITY = 8
91 91

  
92 92
QUEUE_MESSAGE_KEY_PREFIX = 'pithos.%s'
93 93
QUEUE_CLIENT_ID = 'pithos'
......
153 153
                 quotaholder_url=None, quotaholder_token=None,
154 154
                 quotaholder_client_poolsize=None,
155 155
                 free_versioning=True, block_params=None,
156
                 public_url_min_length=None,
156
                 public_url_security=None,
157 157
                 public_url_alphabet=None):
158 158
        db_module = db_module or DEFAULT_DB_MODULE
159 159
        db_connection = db_connection or DEFAULT_DB_CONNECTION
......
167 167
        #queue_hosts = queue_hosts or DEFAULT_QUEUE_HOSTS
168 168
        #queue_exchange = queue_exchange or DEFAULT_QUEUE_EXCHANGE
169 169

  
170
        self.public_url_min_length = public_url_min_length or DEFAULT_MIN_LENGTH
171
        self.public_url_alphabet = public_url_alphabet or DEFAULT_ALPHABET
170
        self.public_url_security = public_url_security or DEFAULT_PUBLIC_URL_SECURITY
171
        self.public_url_alphabet = public_url_alphabet or DEFAULT_PUBLIC_URL_ALPHABET
172 172

  
173 173
        self.hash_algorithm = 'sha256'
174 174
        self.block_size = 4 * 1024 * 1024  # 4MB
......
838 838
            self.permissions.public_unset(path)
839 839
        else:
840 840
            self.permissions.public_set(
841
                path, self.public_url_min_length, self.public_url_alphabet
841
                path, self.public_url_security, self.public_url_alphabet
842 842
            )
843 843

  
844 844
    @backend_method

Also available in: Unified diff