LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

An attempt to fix wrong length exception from security.Store on some systems 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5314 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2018-02-26 10:07:38 +00:00
parent 156aeb36e7
commit d2cb5336e6
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ccm-core/src/com/arsdigita/kernel/security/Store.java
View File

@ -32,17 +32,19 @@ import org.apache.log4j.Logger;
/** /**
* Provides access to the key store in which the secret is stored. * Provides access to the key store in which the secret is stored.
* *
* @author Vadim Nasardinov (vadimn@redhat.com) * @author Vadim Nasardinov (vadimn@redhat.com)
* @since 2003-12-18 * @since 2003-12-18
* @version $Revision: #7 $ $DateTime: 2004/08/16 18:10:38 $ * @version $Revision: #7 $ $DateTime: 2004/08/16 18:10:38 $
**/ *
*/
final class Store implements KeyStorage { final class Store implements KeyStorage {
final static Store INSTANCE = new Store(); final static Store INSTANCE = new Store();
private final static Logger s_log = Logger.getLogger(Store.class); private final static Logger s_log = Logger.getLogger(Store.class);
private final static String TYPE = "com.arsdigita.kernel.security.KeyStore"; private final static String TYPE = "com.arsdigita.kernel.security.KeyStore";
private final static String ID = "id"; private final static String ID = "id";
private final static String OWNER = "owner"; private final static String OWNER = "owner";
private final static String STORE = "store"; private final static String STORE = "store";
@ -51,7 +53,8 @@ final class Store implements KeyStorage {
private byte[] m_secret; private byte[] m_secret;
Store() {} Store() {
}
static byte[] newKey() { static byte[] newKey() {
byte[] key = new byte[SecurityConfig.SECRET_KEY_BYTES]; byte[] key = new byte[SecurityConfig.SECRET_KEY_BYTES];
@ -60,9 +63,8 @@ final class Store implements KeyStorage {
} }
public synchronized void init() { public synchronized void init() {
if ( hasBeenInitialized() ) { if (hasBeenInitialized()) {
throw new UncheckedWrapperException throw new UncheckedWrapperException("key store had been initialized");
("key store had been initialized");
} }
init(ID_VALUE, OWNER_VALUE, newKey()); init(ID_VALUE, OWNER_VALUE, newKey());
} }
@ -75,18 +77,24 @@ final class Store implements KeyStorage {
return result; return result;
} }
/** /**
* This method is exposed as package-scoped solely for the purpose of * This method is exposed as package-scoped solely for the purpose of
* white-box unit-testing. * white-box unit-testing.
* *
* @throws NullPointerException if any of the parameters is null. * @throws NullPointerException if any of the parameters is null.
**/ *
*/
void init(BigInteger id, String owner, byte[] store) { void init(BigInteger id, String owner, byte[] store) {
if ( id == null ) { throw new NullPointerException("id"); } if (id == null) {
if ( owner == null ) { throw new NullPointerException("owner"); } throw new NullPointerException("id");
if ( store == null ) { throw new NullPointerException("store"); } }
if ( store.length < 1 ) { if (owner == null) {
throw new NullPointerException("owner");
}
if (store == null) {
throw new NullPointerException("store");
}
if (store.length < 1) {
throw new IllegalArgumentException("empty store"); throw new IllegalArgumentException("empty store");
} }
@ -101,20 +109,23 @@ final class Store implements KeyStorage {
* *
*/ */
synchronized byte[] loadSecret() { synchronized byte[] loadSecret() {
if ( m_secret != null ) { return m_secret; } if (m_secret != null) {
return m_secret;
DataObject dobj = SessionManager.getSession().retrieve
(new OID(TYPE, ID_VALUE));
m_secret = (byte[]) dobj.get(STORE);
if ( m_secret == null ) {
throw new IllegalStateException
("the store is null");
} }
if ( m_secret.length != SecurityConfig.SECRET_KEY_BYTES * 2 - 1 ) {
throw new IllegalArgumentException DataObject dobj = SessionManager.getSession().retrieve(new OID(TYPE,
("wrong length. expected=" + SecurityConfig.SECRET_KEY_BYTES + ID_VALUE));
", but got " + m_secret.length); m_secret = (byte[]) dobj.get(STORE);
if (m_secret == null) {
throw new IllegalStateException("the store is null");
}
if (m_secret.length != SecurityConfig.SECRET_KEY_BYTES * 2 - 1
&& m_secret.length != SecurityConfig.SECRET_KEY_BYTES) {
throw new IllegalArgumentException("wrong length. expected="
+ SecurityConfig.SECRET_KEY_BYTES
+ ", but got " + m_secret.length);
} }
return m_secret; return m_secret;
} }
} }