← Back to branch summary

~ubuntu-core-dev/ubuntu/maverick/eucalyptus/devel

« back to all changes in this revision

Viewing changes to clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusAuthenticationHandler.java

  • Committer: Dustin Kirkland
  • Date: 2010-07-22 08:41:57 UTC
  • mfrom: (1050.1.19 ubuntu)
  • Revision ID: kirkland@x200-20100722084157-zh2p8dkawznvxxpn
Approving Dave Walker's merge of new upstream Eucalyptus 2.0 release.

Dustin Kirkland <kirkland@canonical.com>

* New major upstream version merge, 2.0 (r1211).
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusAuthenticationHandler.java
180
180
                        String addrString = addrStrings[0];
181
181
 
182
182
                        if(addrStrings.length > 1) {
183
 
                                for(WalrusProperties.SubResource subResource : WalrusProperties.SubResource.values()) {
184
 
                                        if(addr.endsWith(subResource.toString().toLowerCase())) {
185
 
                                                addrString += "?" + subResource.toString().toLowerCase();
186
 
                                                break;
 
183
                                String[] subResourcesCandidates = addrStrings[1].split("&");
 
184
                                for(String subResourceCandidate : subResourcesCandidates) {
 
185
                                        for(WalrusProperties.SubResource subResource : WalrusProperties.SubResource.values()) {
 
186
                                                if(subResourceCandidate.equals(subResource.toString().toLowerCase())) {
 
187
                                                        addrString += "?" + subResource.toString().toLowerCase();
 
188
                                                        break;
 
189
                                                }
187
190
                                        }
188
191
                                }
189
192
                        }
333
336
                String auth_part = httpRequest.getAndRemoveHeader(SecurityParameter.Authorization.toString());
334
337
                if(auth_part != null) {
335
338
                        String sigString[] = getSigInfo(auth_part);
336
 
                        if(sigString.length < 2) {
337
 
                            throw new AuthenticationException("Invalid authentication header");
 
339
                        if(sigString.length < 2) {
 
340
                                throw new AuthenticationException("Invalid authentication header");
338
341
                        }
339
342
                        String accessKeyId = sigString[0];
340
343
                        String signature = sigString[1];
341
344
                        try {
342
 
                            SecurityContext.getLoginContext(new WalrusWrappedCredentials(httpRequest.getCorrelationId(), data, accessKeyId, signature)).login();
 
345
                                SecurityContext.getLoginContext(new WalrusWrappedCredentials(httpRequest.getCorrelationId(), data, accessKeyId, signature)).login();
343
346
                        } catch(Exception ex) {
344
 
                            LOG.error(ex);
345
 
                            throw new AuthenticationException(ex);
 
347
                                LOG.error(ex);
 
348
                                throw new AuthenticationException(ex);
346
349
                        }
347
350
                } else {
348
351
                        throw new AuthenticationException("User authentication failed. Invalid policy signature.");