Reverted the pulling out of various middleware:

Code Issues Proposed changes

RateLimit
StaticWeb
TempURL/FormPOST
Change-Id: I988e93e6f4aacb817a2e354d43a04e47516fdf88

This commit is contained in:

gholt

2012年05月16日 21:08:34 +00:00

parent 3d3ed34f44

commit 1c3b75c291

18 changed files with 5497 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

70
bin/swift-form-signature Executable file

View File

@@ -0,0 +1,70 @@

#!/usr/bin/env python

import hmac

from hashlib import sha1

from os.path import basename

from sys import argv, exit

from time import time

if __name__ == '__main__':

if len(argv) != 7:

prog = basename(argv[0])

print 'Syntax: %s <path> <redirect> <max_file_size> ' \

'<max_file_count> <seconds> <key>' % prog

print

print 'Where:'

print ' <path> The prefix to use for form uploaded'

print ' objects. For example:'

print ' /v1/account/container/object_prefix_ would'

print ' ensure all form uploads have that path'

print ' prepended to the browser-given file name.'

print ' <redirect> The URL to redirect the browser to after'

print ' the uploads have completed.'

print ' <max_file_size> The maximum file size per file uploaded.'

print ' <max_file_count> The maximum number of uploaded files'

print ' allowed.'

print ' <seconds> The number of seconds from now to allow'

print ' the form post to begin.'

print ' <key> The X-Account-Meta-Temp-URL-Key for the'

print ' account.'

print

print 'Example output:'

print ' Expires: 1323842228'

print ' Signature: 18de97e47345a82c4dbfb3b06a640dbb'

exit(1)

path, redirect, max_file_size, max_file_count, seconds, key = argv[1:]

try:

max_file_size = int(max_file_size)

except ValueError:

max_file_size = -1

if max_file_size < 0:

print 'Please use a <max_file_size> value greater than or equal to 0.'

exit(1)

try:

max_file_count = int(max_file_count)

except ValueError:

max_file_count = 0

if max_file_count < 1:

print 'Please use a positive <max_file_count> value.'

exit(1)

try:

expires = int(time() + int(seconds))

except ValueError:

expires = 0

if expires < 1:

print 'Please use a positive <seconds> value.'

exit(1)

parts = path.split('/', 4)

# Must be four parts, ['', 'v1', 'a', 'c'], must be a v1 request, have

# account and container values, and optionally have an object prefix.

if len(parts) < 4 or parts[0] or parts[1] != 'v1' or not parts[2] or \

not parts[3]:

print '<path> must point to a container at least.'

print 'For example: /v1/account/container'

print ' Or: /v1/account/container/object_prefix'

exit(1)

sig = hmac.new(key, '%s\n%s\n%s\n%s\n%s' % (path, redirect, max_file_size,

max_file_count, expires), sha1).hexdigest()

print ' Expires:', expires

print 'Signature:', sig

59
bin/swift-temp-url Executable file

View File

@@ -0,0 +1,59 @@

#!/usr/bin/env python

import hmac

from hashlib import sha1

from os.path import basename

from sys import argv, exit

from time import time

if __name__ == '__main__':

if len(argv) != 5:

prog = basename(argv[0])

print 'Syntax: %s <method> <seconds> <path> <key>' % prog

print

print 'Where:'

print ' <method> The method to allow, GET or PUT.'

print ' Note: HEAD will also be allowed.'

print ' <seconds> The number of seconds from now to allow requests.'

print ' <path> The full path to the resource.'

print ' Example: /v1/AUTH_account/c/o'

print ' <key> The X-Account-Meta-Temp-URL-Key for the account.'

print

print 'Example output:'

print ' /v1/AUTH_account/c/o?temp_url_sig=34d49efc32fe6e3082e411e' \

'eeb85bd8a&temp_url_expires=1323482948'

print

print 'This can be used to form a URL to give out for the access '

print 'allowed. For example:'

print ' echo https://swift-cluster.example.com`%s GET 60 ' \

'/v1/AUTH_account/c/o mykey`' % prog

print

print 'Might output:'

print ' https://swift-cluster.example.com/v1/AUTH_account/c/o?' \

'temp_url_sig=34d49efc32fe6e3082e411eeeb85bd8a&' \

'temp_url_expires=1323482948'

exit(1)

method, seconds, path, key = argv[1:]

if method not in ('GET', 'PUT'):

print 'Please use either the GET or PUT method.'

exit(1)

try:

expires = int(time() + int(seconds))

except ValueError:

expires = 0

if expires < 1:

print 'Please use a positive <seconds> value.'

exit(1)

parts = path.split('/', 4)

# Must be five parts, ['', 'v1', 'a', 'c', 'o'], must be a v1 request, have

# account, container, and object values, and the object value can't just

# have '/'s.

if len(parts) != 5 or parts[0] or parts[1] != 'v1' or not parts[2] or \

not parts[3] or not parts[4].strip('/'):

print '<path> must point to an object.'

print 'For example: /v1/account/container/object'

exit(1)

sig = hmac.new(key, '%s\n%s\n%s' % (method, expires, path),

sha1).hexdigest()

print '%s?temp_url_sig=%s&temp_url_expires=%s' % (path, sig, expires)