| Chunk |
|---|
| Conflicting content |
|---|
}
public boolean start( ) throws Exception {
<<<<<<< HEAD
this.eusureSystemAdminExist( );
this.ensureCountersExist( );
this.ensureVmTypesExist( );
LdapSync.start( );
// Remove once done.
//AuthTest.test( );
=======
if(Components.lookup( "eucalyptus" ).isAvailableLocally( )) {
if (ENABLE) {
this.checkUserEnabled( );
AuthBootstrapHelper.ensureStandardGroupsExists( );
AuthBootstrapHelper.ensureAdminExists( );
}
this.ensureCountersExist( );
this.ensureVmTypesExist( );
}
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
return true;
}
|
| Solution content |
|---|
}
public boolean start( ) throws Exception {
if(Components.lookup( "eucalyptus" ).isAvailableLocally( )) {
this.eusureSystemAdminExist( );
this.ensureCountersExist( );
this.ensureVmTypesExist( );
LdapSync.start( );
// Remove once done.
//AuthTest.test( );
}
return true;
}
|
| File |
|---|
| DatabaseAuthBootstrapper.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import org.w3c.dom.Document; <<<<<<< HEAD import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.NoSuchUserException; import com.eucalyptus.component.auth.SystemCredentialProvider; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.auth.util.Hashes; |
| Solution content |
|---|
import org.w3c.dom.Document; import com.eucalyptus.auth.AuthException; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.auth.util.Hashes; |
| File |
|---|
| WalrusUtil.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.apache.log4j.Logger; import com.eucalyptus.auth.Authentication; import com.eucalyptus.auth.Groups; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.X509Cert; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.crypto.Certs; import com.eucalyptus.auth.crypto.Hmacs; import com.eucalyptus.auth.entities.ClusterCredentials; |
| Solution content |
|---|
import org.apache.log4j.Logger; import com.eucalyptus.auth.Authentication; import com.eucalyptus.auth.Groups; import com.eucalyptus.auth.crypto.Certs; import com.eucalyptus.auth.crypto.Hmacs; import com.eucalyptus.auth.entities.ClusterCredentials; |
| File |
|---|
| ClusterBuilder.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.jboss.netty.util.internal.ConcurrentHashMap; import com.eucalyptus.auth.DatabaseAuthProvider; import com.eucalyptus.auth.Groups; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.UserInfoStore; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.crypto.Hmacs; import com.eucalyptus.component.auth.EucaKeyStore; |
| Solution content |
|---|
import org.jboss.netty.util.internal.ConcurrentHashMap; import com.eucalyptus.auth.DatabaseAuthProvider; import com.eucalyptus.auth.Groups; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.crypto.Hmacs; import com.eucalyptus.component.auth.EucaKeyStore; |
| File |
|---|
| StandalonePersistence.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.bouncycastle.util.encoders.Base64; import com.eucalyptus.auth.Authentication; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; import com.eucalyptus.auth.SystemCredentialProvider; import com.eucalyptus.auth.entities.ClusterCredentials; import com.eucalyptus.auth.util.X509CertHelper; ======= import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.ClusterCredentials; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.X509Cert; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.bootstrap.Component; import com.eucalyptus.entities.EntityWrapper; import com.eucalyptus.util.EucalyptusCloudException; |
| Solution content |
|---|
import org.bouncycastle.util.encoders.Base64; import com.eucalyptus.auth.Authentication; import com.eucalyptus.auth.entities.ClusterCredentials; import com.eucalyptus.auth.util.X509CertHelper; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.bootstrap.Component; import com.eucalyptus.entities.EntityWrapper; import com.eucalyptus.util.EucalyptusCloudException; |
| File |
|---|
| BlockStorageUtil.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package com.eucalyptus.auth.principal; <<<<<<< HEAD import java.util.List; import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.principal.domain.UserDomain; ======= import com.google.common.collect.ImmutableList; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 /** * @author decker |
| Solution content |
|---|
package com.eucalyptus.auth.principal; import java.util.List; import com.eucalyptus.auth.AuthException; /** * @author decker |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
* @author decker
*
*/
<<<<<<< HEAD
public interface Group extends java.security.acl.Group, Cloneable, UserDomain {
=======
public interface Group extends java.security.acl.Group, Cloneable {
/**
* @see java.security.Principal#getName()
* @return
*/
public abstract String getName( );
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
public String getGroupId( );
|
| Solution content |
|---|
* @author decker
*
*/
public interface Group extends java.security.acl.Group, Cloneable {
public String getGroupId( );
|
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Interface signature |
| Method interface |
| Chunk |
|---|
| Conflicting content |
|---|
super( );
}
<<<<<<< HEAD
public static long getRate( ) {
return RATE;
}
public static void setupTimer( ) {
=======
private static void setupTimer( ) {
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
synchronized(SystemClock.class) {
if( timer == null ) {
timer = new Timer("SystemClockTimer"); |
| Solution content |
|---|
super( );
}
public static long getRate( ) {
return RATE;
}
public static void setupTimer( ) {
synchronized(SystemClock.class) {
if( timer == null ) {
timer = new Timer("SystemClockTimer"); |
| File |
|---|
| SystemClock.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
clock = new SystemClock();
hertz = new HzClock( );
ListenerRegistry.getInstance( ).register( ClockTick.class, new Dummy() );
<<<<<<< HEAD
timer.scheduleAtFixedRate( clock, 0, getRate( ) );//TODO: make configurable
final Timer ref = timer;
=======
ListenerRegistry.getInstance( ).register( Hertz.class, new Dummy() );
timer.scheduleAtFixedRate( clock, 0, 10000 );//TODO: make configurable
hzTimer.scheduleAtFixedRate( hertz, 0, 1000 );
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
Runtime.getRuntime( ).addShutdownHook( new Thread() {
|
| Solution content |
|---|
clock = new SystemClock();
hertz = new HzClock( );
ListenerRegistry.getInstance( ).register( ClockTick.class, new Dummy() );
ListenerRegistry.getInstance( ).register( Hertz.class, new Dummy() );
timer.scheduleAtFixedRate( clock, 0, 10000 );//TODO: make configurable
hzTimer.scheduleAtFixedRate( hertz, 0, 1000 );
Runtime.getRuntime( ).addShutdownHook( new Thread() {
@Override |
| File |
|---|
| SystemClock.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.bouncycastle.util.encoders.Base64; import com.eucalyptus.auth.Authentication; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; import com.eucalyptus.auth.entities.ClusterCredentials; ======= import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.X509Cert; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.util.Hashes; import com.eucalyptus.auth.util.X509CertHelper; import com.eucalyptus.config.StorageControllerBuilder; |
| Solution content |
|---|
import org.bouncycastle.util.encoders.Base64; import com.eucalyptus.auth.Authentication; import com.eucalyptus.auth.entities.ClusterCredentials; import com.eucalyptus.auth.util.Hashes; import com.eucalyptus.auth.util.X509CertHelper; import com.eucalyptus.config.StorageControllerBuilder; |
| File |
|---|
| OverlayManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.Groups; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.NoSuchUserException; import com.eucalyptus.component.auth.SystemCredentialProvider; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.api.BaseLoginModule; import com.eucalyptus.auth.principal.User; |
| Solution content |
|---|
import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.Groups; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.api.BaseLoginModule; import com.eucalyptus.auth.principal.User; |
| File |
|---|
| WalrusComponentLoginModule.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.Authentication; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.NoSuchUserException; import com.eucalyptus.component.auth.SystemCredentialProvider; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.component.auth.EucaKeyStore; |
| Solution content |
|---|
import com.eucalyptus.auth.AuthException; import com.eucalyptus.auth.Authentication; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.component.auth.EucaKeyStore; |
| File |
|---|
| WalrusImageManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.w3c.dom.Element; import org.w3c.dom.Node; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.NoSuchUserException; import com.eucalyptus.component.auth.SystemCredentialProvider; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.auth.util.Hashes; |
| Solution content |
|---|
import org.w3c.dom.Element; import org.w3c.dom.Node; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.principal.User; import com.eucalyptus.auth.util.Hashes; |
| File |
|---|
| WalrusImageManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
EventRecord.here( ServiceSinkHandler.class, EventType.MSG_RECEIVED, msg.getClass( ).getSimpleName( ) ).trace( );
if ( this.msgReceiver == null ) {
ServiceSinkHandler.dispatchRequest( msg );
<<<<<<< HEAD
} else if ( ( user == null ) || ( ( user != null ) && user.isSystemAdmin( ) ) ) {
this.dispatchRequest( ctx, request, msg );
=======
} else if ( ( user == null ) || ( ( user != null ) && user.isAdministrator( ) ) ) {
// this.dispatchRequest( ctx, request, msg );
ServiceSinkHandler.dispatchRequest( msg );
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
} else {
Contexts.clear( Contexts.lookup( msg.getCorrelationId( ) ) );
ctx.getChannel( ).write( new MappingHttpResponse( request.getProtocolVersion( ), HttpResponseStatus.FORBIDDEN ) ); |
| Solution content |
|---|
EventRecord.here( ServiceSinkHandler.class, EventType.MSG_RECEIVED, msg.getClass( ).getSimpleName( ) ).trace( );
if ( this.msgReceiver == null ) {
ServiceSinkHandler.dispatchRequest( msg );
} else if ( ( user == null ) || ( ( user != null ) && user.isSystemAdmin( ) ) ) {
this.dispatchRequest( ctx, request, msg );
ServiceSinkHandler.dispatchRequest( msg );
} else {
Contexts.clear( Contexts.lookup( msg.getCorrelationId( ) ) );
ctx.getChannel( ).write( new MappingHttpResponse( request.getProtocolVersion( ), HttpResponseStatus.FORBIDDEN ) ); |
| File |
|---|
| ServiceSinkHandler.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import org.jboss.netty.handler.codec.http.HttpVersion; import com.eucalyptus.auth.Authentication; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.NoSuchUserException; import com.eucalyptus.component.auth.SystemCredentialProvider; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.crypto.Hmac; import com.eucalyptus.auth.login.AuthenticationException; |
| Solution content |
|---|
import org.jboss.netty.handler.codec.http.HttpVersion; import com.eucalyptus.auth.Authentication; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.crypto.Hmac; import com.eucalyptus.auth.login.AuthenticationException; |
| File |
|---|
| WalrusAuthenticationHandler.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.jboss.netty.channel.ChannelPipelineCoverage; import org.jboss.netty.channel.MessageEvent; import org.w3c.dom.Element; <<<<<<< HEAD import com.eucalyptus.auth.SystemCredentialProvider; ======= import com.eucalyptus.auth.DatabaseWrappedUser; import com.eucalyptus.component.auth.SystemCredentialProvider; import com.eucalyptus.auth.UserEntity; >>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8 import com.eucalyptus.auth.Users; import com.eucalyptus.auth.login.SecurityContext; import com.eucalyptus.auth.principal.User; |
| Solution content |
|---|
import org.jboss.netty.channel.ChannelPipelineCoverage; import org.jboss.netty.channel.MessageEvent; import org.w3c.dom.Element; import com.eucalyptus.auth.Users; import com.eucalyptus.auth.login.SecurityContext; |
| File |
|---|
| InternalWsSecHandler.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
throw new SerializableException ("Operation restricted to owner and administrator");
}
<<<<<<< HEAD
// set expiration for admin setting password for the first time
if (oldRecord.isAdministrator() && oldRecord.getEmail().equalsIgnoreCase("n/a")) {
long now = System.currentTimeMillis();
oldRecord.setPasswordExpires( new Long(now + pass_expiration_ms) );
}
=======
// only an admin should be able to change this settings
if (callerRecord.isAdministrator()) {
>>>>>>> 71e7b2ae02a9a4b67162208d467bb90a01c650d8
// set password and expiration for admin when logging in for the first time
if (oldRecord.getEmail().equalsIgnoreCase(UserInfo.BOGUS_ENTRY)) { |
| Solution content |
|---|
throw new SerializableException ("Operation restricted to owner and administrator");
}
// set expiration for admin setting password for the first time
if (oldRecord.isAdministrator() && oldRecord.getEmail().equalsIgnoreCase("n/a")) {
long now = System.currentTimeMillis();
oldRecord.setPasswordExpires( new Long(now + pass_expiration_ms) );
}
/* TODO: Any checks? */
// only an admin should be able to change this settings
if (callerRecord.isAdministrator()) {
//TODO:ASAP:REVIEW:YE
// set password and expiration for admin when logging in for the first time |
| File |
|---|
| EucalyptusWebBackendImpl.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |