You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/22 16:06:05 UTC
svn commit: r1686872 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security:
AutoGeneratedSelfSignedKeyStore.java AutoGeneratedSelfSignedKeyStoreImpl.java
Author: rgodfrey
Date: Mon Jun 22 14:06:05 2015
New Revision: 1686872
URL: http://svn.apache.org/r1686872
Log:
QPID-6604 : [Java Broker] add operation to allow regeneration of certificate
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java?rev=1686872&r1=1686871&r2=1686872&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java Mon Jun 22 14:06:05 2015
@@ -24,6 +24,7 @@ import org.apache.qpid.server.model.Deri
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.ManagedOperation;
@ManagedObject( category = false, type = "AutoGeneratedSelfSigned" )
public interface AutoGeneratedSelfSignedKeyStore<X extends AutoGeneratedSelfSignedKeyStore<X>> extends KeyStore<X>
@@ -47,4 +48,7 @@ public interface AutoGeneratedSelfSigned
String getEncodedCertificate();
@DerivedAttribute(persist = true, secure = true)
String getEncodedPrivateKey();
+
+ @ManagedOperation
+ void regenerateCertificate();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java?rev=1686872&r1=1686871&r2=1686872&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java Mon Jun 22 14:06:05 2015
@@ -218,7 +218,18 @@ public class AutoGeneratedSelfSignedKeyS
@StateTransition(currentState = { State.UNINITIALIZED, State.STOPPED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> activate()
{
- if(_generated && !_created)
+ if(!_created)
+ {
+ saveDerivedAttributesIfNecessary();
+ }
+ setState(State.ACTIVE);
+
+ return Futures.immediateFuture(null);
+ }
+
+ private void saveDerivedAttributesIfNecessary()
+ {
+ if(_generated)
{
final Object encodedCertificate = getEncodedCertificate();
@@ -229,9 +240,6 @@ public class AutoGeneratedSelfSignedKeyS
_generated = false;
}
- setState(State.ACTIVE);
-
- return Futures.immediateFuture(null);
}
@StateTransition(currentState = {State.UNINITIALIZED, State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
@@ -391,4 +399,11 @@ public class AutoGeneratedSelfSignedKeyS
}
}
+
+ @Override
+ public void regenerateCertificate()
+ {
+ generatePrivateKeyAndCertificate();
+ saveDerivedAttributesIfNecessary();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org