Incorporated Swauth into Swift as an optional DevAuth replacement.

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

gholt

2010年12月01日 17:08:49 -08:00

parent a595321c97

commit 35f3487879

28 changed files with 2580 additions and 45 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

5
test/functional/sample.conf

View File

@@ -1,7 +1,12 @@

# sample config

auth_host = 127.0.0.1

# For DevAuth:

auth_port = 11000

# For Swauth:

# auth_port = 8080

auth_ssl = no

# For Swauth:

# auth_prefix = /auth/

# Primary functional test account (needs admin access to the account)

account = test

7
test/functional/swift.py

View File

@@ -82,6 +82,7 @@ class Connection(object):

self.auth_host = config['auth_host']

self.auth_port = int(config['auth_port'])

self.auth_ssl = config['auth_ssl'] in ('on', 'true', 'yes', '1')

self.auth_prefix = config.get('auth_prefix', '/')

self.account = config['account']

self.username = config['username']

@@ -105,11 +106,11 @@ class Connection(object):

return

headers = {

'x-storage-user': self.username,

'x-storage-pass': self.password,

'x-auth-user': '%s:%s' % (self.account, self.username),

'x-auth-key': self.password,

}

path = '/v1/%s/auth' % (self.account)

path = '%sv1.0' % (self.auth_prefix)

if self.auth_ssl:

connection = httplib.HTTPSConnection(self.auth_host,

port=self.auth_port)