← Back to branch summary

~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-201003031429

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland, Thierry Carrez, Dustin Kirkland
  • Date: 2010-02-11 16:32:06 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: james.westby@ubuntu.com-20100211163206-y1uh35xy3n19e2p5
Tags: 1.6.2~bzr1189-0ubuntu1
https://launchpad.net/bugs/504326
https://launchpad.net/bugs/513722
https://launchpad.net/bugs/453416
https://launchpad.net/bugs/513842
[ Thierry Carrez ]
* debian/rules: Start publication jobs on package install (LP: #504326)
* debian/*publication.upstart: Do not advertise Walrus, SC, CC or NC if
  eucalyptus authorized_keys is missing, since autoregistration would then
  partially fail (LP: #513722)

[ Dustin Kirkland ]
* Merge from upstream bzr revision, should fix:
  - LP: #453416 - fix metadata subdirectory lists
  - LP: #513842 - fix metadata ephemeral verbage

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/WalrusRESTBinding.java
803
803
 
804
804
        private AccessControlListType getAccessControlList(MappingHttpRequest httpRequest) throws BindingException {
805
805
                AccessControlListType accessControlList = new AccessControlListType();
 
806
                ArrayList<Grant> grants = new ArrayList<Grant>();
806
807
                try {
807
808
                        String aclString = getMessageString(httpRequest);
808
809
                        if(aclString.length() > 0) {
810
811
                                String ownerId = xmlParser.getValue("//Owner/ID");
811
812
                                String displayName = xmlParser.getValue("//Owner/DisplayName");
812
813
 
813
 
 
814
 
                                ArrayList<Grant> grants = new ArrayList<Grant>();
815
 
 
816
814
                                List<String> permissions = xmlParser.getValues("/AccessControlList/Grant/Permission");
817
815
                                if(permissions == null)
818
816
                                        throw new BindingException("malformed access control list");
844
842
                                                grants.add(grant);
845
843
                                        }
846
844
                                }
847
 
                                accessControlList.setGrants(grants);
848
845
                        }
849
846
                } catch(Exception ex) {
850
847
                        LOG.warn(ex);
851
848
                        throw new BindingException("Unable to parse access control list " + ex.getMessage());
852
849
                }
 
850
                accessControlList.setGrants(grants);
853
851
                return accessControlList;
854
852
        }
855
853