accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubbsii <...@git.apache.org>
Subject [GitHub] accumulo pull request #163: ACCUMULO-2278 Return value from in.read() should...
Date Wed, 12 Oct 2016 21:29:07 GMT
Github user ctubbsii commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/163#discussion_r83102811
  
    --- Diff: core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java
---
    @@ -81,7 +81,10 @@ private void doKeyEncryptionOperation(int encryptionMode, CryptoModuleParameters
           Cipher cipher = DefaultCryptoModuleUtils.getCipher(params.getAllOptions().get(Property.CRYPTO_DEFAULT_KEY_STRATEGY_CIPHER_SUITE.getKey()));
     
           try {
    -        cipher.init(encryptionMode, new SecretKeySpec(keyEncryptionKey, params.getAlgorithmName()));
    +    	if (keyEncryptionKey.length > 0)
    --- End diff --
    
    The original reported issue is that the return value of the read is not captured or checked.
The conditional being checked here only verifies that the allocated array was larger than
an empty array. What it actually needs to check is that the number of bytes read into the
array is the same as the value of the length field, regardless of what else we want to check.
The conditional in this patch is sufficient only if we switch to using `readFully` instead
of `read`, which throws an EOFException if the number of bytes read from the input stream
isn't enough to fill the buffer (e.g. doesn't match the expected keyEncryptionKeyLength).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message