Merge lp:~graziano.obertelli/eucalyptus/2.0.0-fix-737335 into lp:eucalyptus/2.0

[graziano obertelli]

Fix lp:737335

[graziano obertelli (graziano.obertelli)]

our QA tests identified a typo.

Compile error during compilation with javac.
/root/euca_builder/2.0.0-fix-737335/clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java:531: cannot find symbol
symbol : method getPermission()
location: class com.eucalyptus.images.ImageInfo
      if ( this.getPermission().contains( imgAuth ) ) {
               ^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
1 error

1 error

make[1]: Leaving directory `/root/euca_builder/2.0.0-fix-737335/clc'

review: Needs Fixing

[lp:~graziano.obertelli/eucalyptus/2.0.0-fix-737335]

1260. By graziano obertelli on 2011-12-23

Fixes the bug for real (previous commit got a typo).

[graziano obertelli (graziano.obertelli)]

The new version worked well, and it is confirmed to fix the issues in our QA system.

review: Approve

=== modified file 'clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java'
--- clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java	2010-08-13 07:17:47 +0000
+++ clc/modules/msgs/src/main/java/com/eucalyptus/images/ImageInfo.java	2011-12-23 02:03:29 +0000
@@ -524,10 +524,14 @@
     } catch ( NoSuchUserException e ) {
       return false;
     }
-    //    for ( UserGroupEntity g : this.getUserGroups() )
-    //      if ( "all".equals( g.getName() ) )
-    return true;
-    //    return this.getPermissions().contains( user );
+      if ( this.getImagePublic() ) {
+         return true;
+      }
+      ImageAuthorization imgAuth = new ImageAuthorization( user.getUserName( ) );
+      if ( this.getPermissions().contains( imgAuth ) ) {
+         return true;
+      }
+      return false;
   }
   
   public static ImageInfo named( String imageId ) throws EucalyptusCloudException {