mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-16 08:34:50 +02:00
Paul Schaub
1f731f6318
Changes:
Rework integration tests
New structure of base integration test classes
bump dependency on signal-protocol-java from 2.4.0 to 2.6.2
Introduced CachingOmemoStore implementations
Use CachingOmemoStore classes in integration tests
Removed OmemoSession classes (replaced with more logical OmemoRatchet classes)
Consequently also removed load/storeOmemoSession methods from OmemoStore
Removed some clutter from KeyUtil classes
Moved trust decision related code from OmemoStore to TrustCallback
Require authenticated connection for many functions
Add async initialization function in OmemoStore
Refactor omemo test package (/java/org/jivesoftware/smack/omemo -> /java/org/jivesoftware/smackx)
Remove OmemoStore method isFreshInstallation() as well as defaultDeviceId related stuff
FileBasedOmemoStore: Add cleaner methods to store/load base data types (Using tryWithResource, only for future releases, once Android API gets bumped)
Attempt to make OmemoManager thread safe
new logic for getInstanceFor() deviceId determination
OmemoManagers encrypt methods now don't throw exceptions when encryption for some devices fails. Instead message gets encrypted when possible and more information about failures gets returned alongside the message itself
Added OmemoMessage class for that purpose
Reworked entire OmemoService class
Use safer logic for creating trust-ignoring messages (like ratchet-update messages)
Restructure elements/provider in order to prepare for OMEMO namespace bumps
Remove OmemoManager.regenerate() methods in favor of getInstanceFor(connection, randomDeviceId)
Removed some unnecessary configuration options
Prepare for support of more AES message key types
Simplify session creation
Where possible, avoid side effects in methods
Add UntrustedOmemoIdentityException
Add TrustState enum
More improved tests
94 lines
3.3 KiB
Java
94 lines
3.3 KiB
Java
/**
|
|
*
|
|
* Copyright 2017 Paul Schaub
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.jivesoftware.smackx.omemo.exceptions;
|
|
|
|
import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
|
|
import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
|
|
|
|
/**
|
|
* Exception that gets thrown when we try to en-/decrypt a message for an untrusted contact.
|
|
* This might either be because the user actively untrusted a device, or we receive a message from a contact
|
|
* which contains an identityKey that differs from the one the user trusted.
|
|
*/
|
|
public class UntrustedOmemoIdentityException extends Exception {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
private final OmemoDevice device;
|
|
private final OmemoFingerprint trustedKey, untrustedKey;
|
|
|
|
/**
|
|
* Constructor for when we receive a message with an identityKey different from the one we trusted.
|
|
*
|
|
* @param device device which sent the message.
|
|
* @param fpTrusted fingerprint of the identityKey we previously had and trusted.
|
|
* @param fpUntrusted fingerprint of the new key which is untrusted.
|
|
*/
|
|
public UntrustedOmemoIdentityException(OmemoDevice device, OmemoFingerprint fpTrusted, OmemoFingerprint fpUntrusted) {
|
|
super();
|
|
this.device = device;
|
|
this.trustedKey = fpTrusted;
|
|
this.untrustedKey = fpUntrusted;
|
|
}
|
|
|
|
/**
|
|
* Constructor for when encryption fails because the user untrusted a recipients device.
|
|
*
|
|
* @param device device the user wants to encrypt for, but which has been marked as untrusted.
|
|
* @param untrustedKey fingerprint of that device.
|
|
*/
|
|
public UntrustedOmemoIdentityException(OmemoDevice device, OmemoFingerprint untrustedKey) {
|
|
this(device, null, untrustedKey);
|
|
}
|
|
|
|
/**
|
|
* Return the device which sent the message.
|
|
* @return omemoDevice.
|
|
*/
|
|
public OmemoDevice getDevice() {
|
|
return device;
|
|
}
|
|
|
|
/**
|
|
* Return the fingerprint of the key we expected.
|
|
* This might return null in case this exception got thrown during encryption process.
|
|
* @return
|
|
*/
|
|
public OmemoFingerprint getTrustedFingerprint() {
|
|
return trustedKey;
|
|
}
|
|
|
|
/**
|
|
* Return the fingerprint of the unexpected untrusted key.
|
|
* @return
|
|
*/
|
|
public OmemoFingerprint getUntrustedFingerprint() {
|
|
return untrustedKey;
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
if (trustedKey != null) {
|
|
return "Untrusted OMEMO Identity encountered:\n" +
|
|
"Fingerprint of trusted key:\n" + trustedKey.blocksOf8Chars() + "\n" +
|
|
"Fingerprint of untrusted key:\n" + untrustedKey.blocksOf8Chars();
|
|
} else {
|
|
return "Untrusted OMEMO Identity encountered:\n" +
|
|
"Fingerprint of untrusted key:\n" + untrustedKey.blocksOf8Chars();
|
|
}
|
|
}
|
|
}
|