diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..aa93d42 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +[*] +charset=utf-8 +end_of_line=lf +insert_final_newline=false +indent_style=space +indent_size=4 + +[*.json] +indent_style=space +indent_size=2 + diff --git a/pom.xml b/pom.xml index 4f13331..f99ba93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,136 +1,165 @@ - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.1.4.RELEASE - - - org.muzima - turkana - 0.0.1-SNAPSHOT - war - Turkana - Message Backup Server - - - - - Samuel Owino - samuelowino43@gmail.com - mUzima - www.muzima.org - - - - Mhawila Mhawila (Willa) - a.mhawila@gmail.com - VUMC - www.vumc.org - - - - - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - - mysql - mysql-connector-java - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - com.querydsl - querydsl-jpa - ${querydsl.version} - - - com.h2database - h2 - ${h2.version} - test - - - - io.springfox - springfox-swagger2 - 2.9.2 - - - -     io.springfox -     springfox-swagger-ui -     2.9.2 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + org.muzima + turkana + 0.0.1-SNAPSHOT + war + Turkana + Message Backup Server + + + + + Samuel Owino + samuelowino43@gmail.com + mUzima + www.muzima.org + + + + Mhawila Mhawila (Willa) + a.mhawila@gmail.com + VUMC + www.vumc.org + + + + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + com.querydsl + querydsl-jpa + ${querydsl.version} + + + com.h2database + h2 + ${h2.version} + test + + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + + io.springfox + springfox-swagger2 + 2.9.2 + org.whispersystems signal-service-java 2.7.2 + + + + + + + + + com.google.gcm + gcm-server + 1.0.0 + + + com.google.gcm + gcm-server + 1.0.0 + + + net.coobird + thumbnailator + 0.4.8 + + + + + + + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - com.mysema.maven - apt-maven-plugin - 1.1.3 - - - - process - - - target/generated-sources/java - com.querydsl.apt.jpa.JPAAnnotationProcessor - - - - - - com.querydsl - querydsl-apt - ${querydsl.version} - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + com.mysema.maven + apt-maven-plugin + 1.1.3 + + + + process + + + target/generated-sources/java + com.querydsl.apt.jpa.JPAAnnotationProcessor + + + + + + com.querydsl + querydsl-apt + ${querydsl.version} + + + + + diff --git a/src/main/java/org/muzima/turkana/data/IdentityKeyRepository.java b/src/main/java/org/muzima/turkana/data/IdentityKeyRepository.java new file mode 100644 index 0000000..c6be510 --- /dev/null +++ b/src/main/java/org/muzima/turkana/data/IdentityKeyRepository.java @@ -0,0 +1,9 @@ +package org.muzima.turkana.data; + +import org.muzima.turkana.model.IdentityKey; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IdentityKeyRepository extends JpaRepository { +} diff --git a/src/main/java/org/muzima/turkana/data/OneTimePrekeyRepository.java b/src/main/java/org/muzima/turkana/data/OneTimePrekeyRepository.java new file mode 100644 index 0000000..745d1d5 --- /dev/null +++ b/src/main/java/org/muzima/turkana/data/OneTimePrekeyRepository.java @@ -0,0 +1,9 @@ +package org.muzima.turkana.data; + +import org.muzima.turkana.model.OneTimePreKey; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface OneTimePrekeyRepository extends JpaRepository { +} diff --git a/src/main/java/org/muzima/turkana/data/SignedPrekeyRepository.java b/src/main/java/org/muzima/turkana/data/SignedPrekeyRepository.java new file mode 100644 index 0000000..5d851ad --- /dev/null +++ b/src/main/java/org/muzima/turkana/data/SignedPrekeyRepository.java @@ -0,0 +1,9 @@ +package org.muzima.turkana.data; + +import org.muzima.turkana.model.SignedPreKey; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SignedPrekeyRepository extends JpaRepository { +} diff --git a/src/main/java/org/muzima/turkana/data/TextSecurePreKeyStore.java b/src/main/java/org/muzima/turkana/data/TextSecurePreKeyStore.java new file mode 100644 index 0000000..a2dc4f8 --- /dev/null +++ b/src/main/java/org/muzima/turkana/data/TextSecurePreKeyStore.java @@ -0,0 +1,118 @@ +package org.muzima.turkana.data; + +import org.muzima.turkana.model.Identity; +import org.muzima.turkana.model.SignedPreKey; +import org.muzima.turkana.service.OneTimePrekeyService; +import org.muzima.turkana.service.SignedPrekeyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.whispersystems.libsignal.IdentityKey; +import org.whispersystems.libsignal.InvalidKeyIdException; +import org.whispersystems.libsignal.SignalProtocolAddress; +import org.whispersystems.libsignal.state.PreKeyRecord; +import org.whispersystems.libsignal.state.PreKeyStore; +import org.whispersystems.libsignal.state.SignedPreKeyRecord; +import org.whispersystems.libsignal.state.SignedPreKeyStore; + +import java.util.List; +import java.util.Random; + +@Component +public class TextSecurePreKeyStore implements PreKeyStore, SignedPreKeyStore { + + @SuppressWarnings("unused") + private static final String TAG = TextSecurePreKeyStore.class.getSimpleName(); + + private static final Object FILE_LOCK = new Object(); + + @Autowired + SignedPrekeyService signedPrekeyService; + + @Autowired + OneTimePrekeyService prekeyService; + + @Autowired + IdentityKeyRepository identityKeyRepository; + + public TextSecurePreKeyStore() { + } + + @Override + public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException { + synchronized (FILE_LOCK) { + PreKeyRecord preKeyRecord = prekeyService.getPreKey(preKeyId); + + if (preKeyRecord == null) throw new InvalidKeyIdException("No such key: " + preKeyId); + else return preKeyRecord; + } + } + + @Override + public SignedPreKeyRecord loadSignedPreKey(int signedPreKeyId) throws InvalidKeyIdException { + synchronized (FILE_LOCK) { + SignedPreKeyRecord signedPreKeyRecord = signedPrekeyService.getSignedPreKey(signedPreKeyId); + + if (signedPreKeyRecord == null) + throw new InvalidKeyIdException("No such signed prekey: " + signedPreKeyId); + else + return signedPreKeyRecord; + } + } + + @Override + public List loadSignedPreKeys() { + synchronized (FILE_LOCK) { + return signedPrekeyService.getAllSignedPreKeys(); + } + } + + @Override + public void storePreKey(int preKeyId, PreKeyRecord record) { + synchronized (FILE_LOCK) { + prekeyService.insertPreKey(preKeyId, record); + } + } + + @Override + public void storeSignedPreKey(int signedPreKeyId, SignedPreKeyRecord record) { + synchronized (FILE_LOCK) { + signedPrekeyService.insertSignedPreKey(signedPreKeyId, record); + } + } + + @Override + public boolean containsPreKey(int preKeyId) { + return prekeyService.getPreKey(preKeyId) != null; + } + + @Override + public boolean containsSignedPreKey(int signedPreKeyId) { + return signedPrekeyService.getSignedPreKey(signedPreKeyId) != null; + } + + @Override + public void removePreKey(int preKeyId) { + prekeyService.removePreKey(preKeyId); + } + + @Override + public void removeSignedPreKey(int signedPreKeyId) { + signedPrekeyService.removeSignedPreKey(signedPreKeyId); + } + + public int getLocalRegistrationId() { + return 12; + } + + public boolean saveIdentity(SignalProtocolAddress signalProtocolAddress, IdentityKey identityKey) { + org.muzima.turkana.model.IdentityKey identityKeyValue = new org.muzima.turkana.model.IdentityKey(identityKey.getPublicKey()); + identityKeyRepository.save(identityKeyValue); + return true; + } + + public void purgeKeyStore() { + identityKeyRepository.deleteAll(); + signedPrekeyService.deleteAll(); + prekeyService.deleteAll(); + } +} diff --git a/src/main/java/org/muzima/turkana/data/TurkanaKeyStore.java b/src/main/java/org/muzima/turkana/data/TurkanaKeyStore.java deleted file mode 100644 index f47e0d4..0000000 --- a/src/main/java/org/muzima/turkana/data/TurkanaKeyStore.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.muzima.turkana.data; - -import org.springframework.stereotype.Component; -import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.IdentityKeyPair; -import org.whispersystems.libsignal.InvalidKeyIdException; -import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.PreKeyRecord; -import org.whispersystems.libsignal.state.SessionRecord; -import org.whispersystems.libsignal.state.SignalProtocolStore; -import org.whispersystems.libsignal.state.SignedPreKeyRecord; -import org.whispersystems.libsignal.util.KeyHelper; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @uthor Willa Mhawila on 7/30/19. - */ - -@Component -public class TurkanaKeyStore implements SignalProtocolStore { - private static Map PRE_KEY_STORE = new HashMap<>(); - private static Map SESSION_STORE = new HashMap<>(); - private static Map SIGNED_PREKEYS_STORE = new HashMap<>(); - - private static final IdentityKeyPair IDENTITY_KEY_PAIR = KeyHelper.generateIdentityKeyPair(); - - @Override - public IdentityKeyPair getIdentityKeyPair() { - return IDENTITY_KEY_PAIR; - } - - @Override - public int getLocalRegistrationId() { - return 12; - } - - @Override - public boolean saveIdentity(SignalProtocolAddress signalProtocolAddress, IdentityKey identityKey) { - - return true; - } - - @Override - public boolean isTrustedIdentity(SignalProtocolAddress signalProtocolAddress, IdentityKey identityKey, Direction direction) { - return true; - } - - @Override - public PreKeyRecord loadPreKey(int i) throws InvalidKeyIdException { - return PRE_KEY_STORE.get(i); - } - - @Override - public void storePreKey(int i, PreKeyRecord preKeyRecord) { - PRE_KEY_STORE.put(i, preKeyRecord); - } - - @Override - public boolean containsPreKey(int i) { - return PRE_KEY_STORE.containsKey(i); - } - - @Override - public void removePreKey(int i) { - if(PRE_KEY_STORE.containsKey(i)) { - PRE_KEY_STORE.remove(i); - } - } - - @Override - public SessionRecord loadSession(SignalProtocolAddress signalProtocolAddress) { - if(SESSION_STORE.containsKey(signalProtocolAddress)) { - return SESSION_STORE.get(signalProtocolAddress); - } - return null; - } - - @Override - public List getSubDeviceSessions(String s) { - return null; - } - - @Override - public void storeSession(SignalProtocolAddress signalProtocolAddress, SessionRecord sessionRecord) { - SESSION_STORE.put(signalProtocolAddress, sessionRecord); - } - - @Override - public boolean containsSession(SignalProtocolAddress signalProtocolAddress) { - return SESSION_STORE.containsKey(signalProtocolAddress); - } - - @Override - public void deleteSession(SignalProtocolAddress signalProtocolAddress) { - if(SESSION_STORE.containsKey(signalProtocolAddress)) { - SESSION_STORE.remove(signalProtocolAddress); - } - } - - @Override - public void deleteAllSessions(String s) { - - } - - @Override - public SignedPreKeyRecord loadSignedPreKey(int i) throws InvalidKeyIdException { - return SIGNED_PREKEYS_STORE.get(i); - } - - @Override - public List loadSignedPreKeys() { - return SIGNED_PREKEYS_STORE.values().stream().collect(Collectors.toList()); - } - - @Override - public void storeSignedPreKey(int i, SignedPreKeyRecord signedPreKeyRecord) { - SIGNED_PREKEYS_STORE.put(i, signedPreKeyRecord); - } - - @Override - public boolean containsSignedPreKey(int i) { - return SIGNED_PREKEYS_STORE.containsKey(i); - } - - @Override - public void removeSignedPreKey(int i) { - if(SIGNED_PREKEYS_STORE.containsKey(i)) { - SIGNED_PREKEYS_STORE.remove(i); - } - } -} diff --git a/src/main/java/org/muzima/turkana/data/impl/RegistrationQueryImpl.java b/src/main/java/org/muzima/turkana/data/impl/RegistrationQueryImpl.java index 4ef7089..370f44c 100644 --- a/src/main/java/org/muzima/turkana/data/impl/RegistrationQueryImpl.java +++ b/src/main/java/org/muzima/turkana/data/impl/RegistrationQueryImpl.java @@ -19,6 +19,7 @@ @Repository public class RegistrationQueryImpl implements RegistrationQuery { + @PersistenceContext private EntityManager entityManager; diff --git a/src/main/java/org/muzima/turkana/model/Identity.java b/src/main/java/org/muzima/turkana/model/Identity.java new file mode 100644 index 0000000..b6c2794 --- /dev/null +++ b/src/main/java/org/muzima/turkana/model/Identity.java @@ -0,0 +1,112 @@ +package org.muzima.turkana.model; + +import org.springframework.context.annotation.Primary; + +import javax.persistence.*; + +@Entity +@Table(name = "identity") +public class Identity { + + @Column(name = "_id") + @Id + @GeneratedValue + private String id; + + @Column(name = "address") + private String address; + + @Column(name = "identity_key") + private String identity_key; + + @Column(name = "timestamp") + private String timestamp; + + @Column(name = "first_use_status") + private boolean first_use; + + @Column(name = "non_blocking_approval") + private boolean nonblocking_approval; + + @Column(name = "verified_status") + private String verified; + + public Identity(String id, String address, String identity_key, String timestamp, boolean first_use, boolean nonblocking_approval, String verified) { + this.id = id; + this.address = address; + this.identity_key = identity_key; + this.timestamp = timestamp; + this.first_use = first_use; + this.nonblocking_approval = nonblocking_approval; + this.verified = verified; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getIdentity_key() { + return identity_key; + } + + public void setIdentity_key(String identity_key) { + this.identity_key = identity_key; + } + + public String getTimestamp() { + return timestamp; + } + + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; + } + + public boolean getFirst_use() { + return first_use; + } + + public void setFirst_use(boolean first_use) { + this.first_use = first_use; + } + + public boolean getNonblocking_approval() { + return nonblocking_approval; + } + + public void setNonblocking_approval(boolean nonblocking_approval) { + this.nonblocking_approval = nonblocking_approval; + } + + public String getVerified() { + return verified; + } + + public void setVerified(String verified) { + this.verified = verified; + } + + @Override + public String toString() { + return "Identity{" + + "id='" + id + '\'' + + ", address='" + address + '\'' + + ", identity_key='" + identity_key + '\'' + + ", timestamp='" + timestamp + '\'' + + ", first_use='" + first_use + '\'' + + ", nonblocking_approval='" + nonblocking_approval + '\'' + + ", verified='" + verified + '\'' + + '}'; + } +} diff --git a/src/main/java/org/muzima/turkana/model/IdentityKey.java b/src/main/java/org/muzima/turkana/model/IdentityKey.java new file mode 100644 index 0000000..15f0d39 --- /dev/null +++ b/src/main/java/org/muzima/turkana/model/IdentityKey.java @@ -0,0 +1,29 @@ +package org.muzima.turkana.model; + +import org.whispersystems.libsignal.ecc.ECPublicKey; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name ="identity_key") +public class IdentityKey extends org.whispersystems.libsignal.IdentityKey { + + @Id + @GeneratedValue + private int id; + + public IdentityKey(ECPublicKey publicKey) { + super(publicKey); + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} diff --git a/src/main/java/org/muzima/turkana/model/OneTimePreKey.java b/src/main/java/org/muzima/turkana/model/OneTimePreKey.java new file mode 100644 index 0000000..7bf85de --- /dev/null +++ b/src/main/java/org/muzima/turkana/model/OneTimePreKey.java @@ -0,0 +1,73 @@ +package org.muzima.turkana.model; + +import javax.persistence.*; + +@Entity +@Table(name = "onetime_prekey") +public class OneTimePreKey { + + @Id + @GeneratedValue + private int id; + + @Column(name = "key_id") + private int key_id; + + @Column(name = "public_key") + private String public_key; + + @Column(name = "private_key") + private String private_key; + + public OneTimePreKey() { + } + + public OneTimePreKey(int id, int key_id, String public_key, String private_key) { + this.id = id; + this.key_id = key_id; + this.public_key = public_key; + this.private_key = private_key; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getKey_id() { + return key_id; + } + + public void setKey_id(int key_id) { + this.key_id = key_id; + } + + public String getPublic_key() { + return public_key; + } + + public void setPublic_key(String public_key) { + this.public_key = public_key; + } + + public String getPrivate_key() { + return private_key; + } + + public void setPrivate_key(String private_key) { + this.private_key = private_key; + } + + @Override + public String toString() { + return "OneTimePreKey{" + + "id='" + id + '\'' + + ", key_id='" + key_id + '\'' + + ", public_key='" + public_key + '\'' + + ", private_key='" + private_key + '\'' + + '}'; + } +} diff --git a/src/main/java/org/muzima/turkana/model/Registration.java b/src/main/java/org/muzima/turkana/model/Registration.java index 6c8ae1e..c905c1d 100644 --- a/src/main/java/org/muzima/turkana/model/Registration.java +++ b/src/main/java/org/muzima/turkana/model/Registration.java @@ -26,6 +26,9 @@ public class Registration { @Column(name = "date_registered", nullable = false) private LocalDateTime dateRegistered; + @Column(name = "status") + private String status; + @Column private Boolean retired; diff --git a/src/main/java/org/muzima/turkana/model/Session.java b/src/main/java/org/muzima/turkana/model/Session.java new file mode 100644 index 0000000..ad47f7c --- /dev/null +++ b/src/main/java/org/muzima/turkana/model/Session.java @@ -0,0 +1,58 @@ +package org.muzima.turkana.model; + +public class Session { + + private String id; + private String address; + private String device; + private String record; + + public Session(String id, String address, String device, String record) { + this.id = id; + this.address = address; + this.device = device; + this.record = record; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getDevice() { + return device; + } + + public void setDevice(String device) { + this.device = device; + } + + public String getRecord() { + return record; + } + + public void setRecord(String record) { + this.record = record; + } + + @Override + public String toString() { + return "Session{" + + "id='" + id + '\'' + + ", address='" + address + '\'' + + ", device='" + device + '\'' + + ", record='" + record + '\'' + + '}'; + } +} diff --git a/src/main/java/org/muzima/turkana/model/SignedPreKey.java b/src/main/java/org/muzima/turkana/model/SignedPreKey.java new file mode 100644 index 0000000..4bdd93c --- /dev/null +++ b/src/main/java/org/muzima/turkana/model/SignedPreKey.java @@ -0,0 +1,92 @@ +package org.muzima.turkana.model; + +import javax.persistence.*; + +@Table(name = "signed_prekey") +@Entity +public class SignedPreKey { + + @Id + @GeneratedValue + private int id; + + @Column(name = "key_id") + private int key_id; + + @Column(name = "public_key") + private String public_key; + + @Column(name = "private_key") + private String private_key; + + @Column(name = "signature") + private String signature; + + @Column(name = "timestamp") + private Long timestamp; + + public SignedPreKey() { + } + + public SignedPreKey(int id, int key_id, String public_key, String private_key, String signature, Long timestamp) { + this.id = id; + this.key_id = key_id; + this.public_key = public_key; + this.private_key = private_key; + this.signature = signature; + this.timestamp = timestamp; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getKey_id() { + return key_id; + } + + public void setKey_id(int key_id) { + this.key_id = key_id; + } + + public String getPublic_key() { + return public_key; + } + + public void setPublic_key(String public_key) { + this.public_key = public_key; + } + + public String getPrivate_key() { + return private_key; + } + + public void setPrivate_key(String private_key) { + this.private_key = private_key; + } + + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public Long getTimestamp() { + return timestamp; + } + + public void setTimestamp(Long timestamp) { + this.timestamp = timestamp; + } + + @Override + public String toString() { + return super.toString(); + } +} diff --git a/src/main/java/org/muzima/turkana/model/Sms.java b/src/main/java/org/muzima/turkana/model/Sms.java index dd20f46..16f2f10 100644 --- a/src/main/java/org/muzima/turkana/model/Sms.java +++ b/src/main/java/org/muzima/turkana/model/Sms.java @@ -39,6 +39,12 @@ public Sms() { this.transportType = "sms"; } + public Sms(String subject, String uuid, String type) { + this.subject = subject; + this.uuid = uuid; + this.type = type; + } + public String getSignalPerson() { return signalPerson; } diff --git a/src/main/java/org/muzima/turkana/service/OneTimePrekeyService.java b/src/main/java/org/muzima/turkana/service/OneTimePrekeyService.java new file mode 100644 index 0000000..4c44507 --- /dev/null +++ b/src/main/java/org/muzima/turkana/service/OneTimePrekeyService.java @@ -0,0 +1,16 @@ +package org.muzima.turkana.service; + +import org.springframework.stereotype.Service; +import org.whispersystems.libsignal.state.PreKeyRecord; + +@Service +public interface OneTimePrekeyService { + + public PreKeyRecord getPreKey(int keyId); + + public void insertPreKey(int keyId, PreKeyRecord record); + + public void removePreKey(int keyId); + + void deleteAll(); +} diff --git a/src/main/java/org/muzima/turkana/service/SignedPrekeyService.java b/src/main/java/org/muzima/turkana/service/SignedPrekeyService.java new file mode 100644 index 0000000..7f6c1d2 --- /dev/null +++ b/src/main/java/org/muzima/turkana/service/SignedPrekeyService.java @@ -0,0 +1,20 @@ +package org.muzima.turkana.service; + +import org.springframework.stereotype.Service; +import org.whispersystems.libsignal.state.SignedPreKeyRecord; + +import java.util.List; + +@Service +public interface SignedPrekeyService { + + public SignedPreKeyRecord getSignedPreKey(int keyId); + + public List getAllSignedPreKeys(); + + public void insertSignedPreKey(int keyId, SignedPreKeyRecord record); + + void removeSignedPreKey(int signedPreKeyId); + + void deleteAll(); +} diff --git a/src/main/java/org/muzima/turkana/service/impl/OneTimePrekeyServiceImpl.java b/src/main/java/org/muzima/turkana/service/impl/OneTimePrekeyServiceImpl.java new file mode 100644 index 0000000..c8c7ea6 --- /dev/null +++ b/src/main/java/org/muzima/turkana/service/impl/OneTimePrekeyServiceImpl.java @@ -0,0 +1,63 @@ +package org.muzima.turkana.service.impl; + +import org.muzima.turkana.data.OneTimePrekeyRepository; +import org.muzima.turkana.model.OneTimePreKey; +import org.muzima.turkana.service.OneTimePrekeyService; +import org.muzima.turkana.utils.Base64; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.whispersystems.libsignal.InvalidKeyException; +import org.whispersystems.libsignal.ecc.Curve; +import org.whispersystems.libsignal.ecc.ECKeyPair; +import org.whispersystems.libsignal.ecc.ECPrivateKey; +import org.whispersystems.libsignal.ecc.ECPublicKey; +import org.whispersystems.libsignal.state.PreKeyRecord; + +import java.io.IOException; + +@Service +public class OneTimePrekeyServiceImpl implements OneTimePrekeyService { + + @Autowired + OneTimePrekeyRepository prekeyRepository; + + @Override + public PreKeyRecord getPreKey(int keyId) { + try { + OneTimePreKey oneTimePreKey = prekeyRepository.getOne(keyId); + ECPublicKey publicKey = Curve.decodePoint(Base64.decode(oneTimePreKey.getPublic_key()), 0); + ECPrivateKey privateKey = Curve.decodePrivatePoint(Base64.decode(oneTimePreKey.getPrivate_key())); + + return new PreKeyRecord(keyId, new ECKeyPair(publicKey, privateKey)); + } catch (InvalidKeyException | IOException ex) { + throw new AssertionError(ex); + } + + } + + @Override + public void insertPreKey(int keyId, PreKeyRecord record) { + + System.out.println("Insert OneTimePreKey " + record.getKeyPair().getPublicKey().toString()); + + OneTimePreKey oneTimePreKey = new OneTimePreKey(); + oneTimePreKey.setKey_id(keyId); + oneTimePreKey.setPublic_key(Base64.encodeBytes(record.getKeyPair().getPublicKey().serialize())); + oneTimePreKey.setPrivate_key(Base64.encodeBytes(record.getKeyPair().getPrivateKey().serialize())); + + prekeyRepository.save(oneTimePreKey); + } + + @Override + public void removePreKey(int keyId) { + for (OneTimePreKey oneTimePreKey : prekeyRepository.findAll()) { + if (oneTimePreKey.getKey_id() == keyId) + prekeyRepository.delete(oneTimePreKey); + } + } + + @Override + public void deleteAll() { + prekeyRepository.deleteAll(); + } +} diff --git a/src/main/java/org/muzima/turkana/service/impl/SignedPrekeyServiceImpl.java b/src/main/java/org/muzima/turkana/service/impl/SignedPrekeyServiceImpl.java new file mode 100644 index 0000000..6cdc1e6 --- /dev/null +++ b/src/main/java/org/muzima/turkana/service/impl/SignedPrekeyServiceImpl.java @@ -0,0 +1,101 @@ +package org.muzima.turkana.service.impl; + +import org.muzima.turkana.data.SignedPrekeyRepository; +import org.muzima.turkana.model.SignedPreKey; +import org.muzima.turkana.service.SignedPrekeyService; +import org.muzima.turkana.utils.Base64; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.whispersystems.libsignal.InvalidKeyException; +import org.whispersystems.libsignal.ecc.Curve; +import org.whispersystems.libsignal.ecc.ECKeyPair; +import org.whispersystems.libsignal.ecc.ECPrivateKey; +import org.whispersystems.libsignal.ecc.ECPublicKey; +import org.whispersystems.libsignal.state.SignedPreKeyRecord; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +@Service +public class SignedPrekeyServiceImpl implements SignedPrekeyService { + + @Autowired + SignedPrekeyRepository signedPrekeyRepository; + + @Override + public SignedPreKeyRecord getSignedPreKey(int keyId) { + + try { + SignedPreKey signedPreKey = signedPrekeyRepository.getOne(keyId); + + if (signedPreKey == null) return null; + + ECPublicKey publicKey = Curve.decodePoint(Base64.decode(signedPreKey.getPublic_key()), 0); + ECPrivateKey privateKey = Curve.decodePrivatePoint(Base64.decode(signedPreKey.getPrivate_key())); + byte[] signature = Base64.decode(signedPreKey.getSignature()); + long timestamp = signedPreKey.getTimestamp(); + + return new SignedPreKeyRecord(keyId, timestamp, new ECKeyPair(publicKey, privateKey), signature); + } catch (IOException | InvalidKeyException ex) { + throw new AssertionError(ex); + } + + + } + + @Override + public List getAllSignedPreKeys() { + + try { + List results = new LinkedList<>(); + List signedPreKeyList = new ArrayList<>(); + + signedPreKeyList = signedPrekeyRepository.findAll(); + + if (signedPreKeyList.isEmpty()) return new ArrayList<>(); + + for (SignedPreKey signedPreKey : signedPreKeyList) { + int keyId = signedPreKey.getKey_id(); + ECPublicKey publicKey = Curve.decodePoint(Base64.decode(signedPreKey.getPublic_key()), 0); + ECPrivateKey privateKey = Curve.decodePrivatePoint(Base64.decode(signedPreKey.getPrivate_key())); + byte[] signature = Base64.decode(signedPreKey.getSignature()); + long timestamp = signedPreKey.getTimestamp(); + + results.add(new SignedPreKeyRecord(keyId, timestamp, new ECKeyPair(publicKey, privateKey), signature)); + + } + + return results; + } catch (InvalidKeyException | IOException e) { + throw new AssertionError(e); + } + + } + + @Override + public void insertSignedPreKey(int keyId, SignedPreKeyRecord record) { + SignedPreKey signedPreKey = new SignedPreKey(); + signedPreKey.setKey_id(keyId); + signedPreKey.setPublic_key(Base64.encodeBytes(record.getKeyPair().getPublicKey().serialize())); + signedPreKey.setPrivate_key(Base64.encodeBytes(record.getKeyPair().getPrivateKey().serialize())); + signedPreKey.setSignature(Base64.encodeBytes(record.getSignature())); + signedPreKey.setTimestamp(record.getTimestamp()); + + signedPrekeyRepository.save(signedPreKey); + } + + @Override + public void removeSignedPreKey(int keyId) { + for (SignedPreKey signedPreKey : signedPrekeyRepository.findAll()) { + if (signedPreKey.getKey_id() == keyId) + signedPrekeyRepository.delete(signedPreKey); + } + } + + @Override + public void deleteAll() { + signedPrekeyRepository.deleteAll(); + } +} diff --git a/src/main/java/org/muzima/turkana/utils/Base64.java b/src/main/java/org/muzima/turkana/utils/Base64.java new file mode 100644 index 0000000..0ace307 --- /dev/null +++ b/src/main/java/org/muzima/turkana/utils/Base64.java @@ -0,0 +1,2132 @@ +package org.muzima.turkana.utils; + +/** + *

Encodes and decodes to and from Base64 notation.

+ *

Homepage: http://iharder.net/base64.

+ * + *

Example:

+ * + * String encoded = Base64.encode( myByteArray ); + *
+ * byte[] myByteArray = Base64.decode( encoded ); + * + *

The options parameter, which appears in a few places, is used to pass + * several pieces of information to the encoder. In the "higher level" methods such as + * encodeBytes( bytes, options ) the options parameter can be used to indicate such + * things as first gzipping the bytes before encoding them, not inserting linefeeds, + * and encoding using the URL-safe and Ordered dialects.

+ * + *

Note, according to RFC3548, + * Section 2.1, implementations should not add line feeds unless explicitly told + * to do so. I've got Base64 set to this behavior now, although earlier versions + * broke lines by default.

+ * + *

The constants defined in Base64 can be OR-ed together to combine options, so you + * might make a call like this:

+ * + * String encoded = Base64.encodeBytes( mybytes, Base64.GZIP | Base64.DO_BREAK_LINES ); + *

to compress the data before encoding it and then making the output have newline characters.

+ *

Also...

+ * String encoded = Base64.encodeBytes( crazyString.getBytes() ); + * + * + * + *

+ * Change Log: + *

+ *
    + *
  • v2.3.4 - Fixed bug when working with gzipped streams whereby flushing + * the Base64.OutputStream closed the Base64 encoding (by padding with equals + * signs) too soon. Also added an option to suppress the automatic decoding + * of gzipped streams. Also added experimental support for specifying a + * class loader when using the + * {@link #decodeToObject(java.lang.String, int, java.lang.ClassLoader)} + * method.
  • + *
  • v2.3.3 - Changed default char encoding to US-ASCII which reduces the internal Java + * footprint with its CharEncoders and so forth. Fixed some javadocs that were + * inconsistent. Removed imports and specified things like java.io.IOException + * explicitly inline.
  • + *
  • v2.3.2 - Reduced memory footprint! Finally refined the "guessing" of how big the + * final encoded data will be so that the code doesn't have to create two output + * arrays: an oversized initial one and then a final, exact-sized one. Big win + * when using the {@link #encodeBytesToBytes(byte[])} family of methods (and not + * using the gzip options which uses a different mechanism with streams and stuff).
  • + *
  • v2.3.1 - Added {@link #encodeBytesToBytes(byte[], int, int, int)} and some + * similar helper methods to be more efficient with memory by not returning a + * String but just a byte array.
  • + *
  • v2.3 - This is not a drop-in replacement! This is two years of comments + * and bug fixes queued up and finally executed. Thanks to everyone who sent + * me stuff, and I'm sorry I wasn't able to distribute your fixes to everyone else. + * Much bad coding was cleaned up including throwing exceptions where necessary + * instead of returning null values or something similar. Here are some changes + * that may affect you: + *
      + *
    • Does not break lines, by default. This is to keep in compliance with + * RFC3548.
    • + *
    • Throws exceptions instead of returning null values. Because some operations + * (especially those that may permit the GZIP option) use IO streams, there + * is a possiblity of an java.io.IOException being thrown. After some discussion and + * thought, I've changed the behavior of the methods to throw java.io.IOExceptions + * rather than return null if ever there's an error. I think this is more + * appropriate, though it will require some changes to your code. Sorry, + * it should have been done this way to begin with.
    • + *
    • Removed all references to System.out, System.err, and the like. + * Shame on me. All I can say is sorry they were ever there.
    • + *
    • Throws NullPointerExceptions and IllegalArgumentExceptions as needed + * such as when passed arrays are null or offsets are invalid.
    • + *
    • Cleaned up as much javadoc as I could to avoid any javadoc warnings. + * This was especially annoying before for people who were thorough in their + * own projects and then had gobs of javadoc warnings on this file.
    • + *
    + *
  • v2.2.1 - Fixed bug using URL_SAFE and ORDERED encodings. Fixed bug + * when using very small files (~< 40 bytes).
  • + *
  • v2.2 - Added some helper methods for encoding/decoding directly from + * one file to the next. Also added a main() method to support command line + * encoding/decoding from one file to the next. Also added these Base64 dialects: + *
      + *
    1. The default is RFC3548 format.
    2. + *
    3. Calling Base64.setFormat(Base64.BASE64_FORMAT.URLSAFE_FORMAT) generates + * URL and file name friendly format as described in Section 4 of RFC3548. + * http://www.faqs.org/rfcs/rfc3548.html
    4. + *
    5. Calling Base64.setFormat(Base64.BASE64_FORMAT.ORDERED_FORMAT) generates + * URL and file name friendly format that preserves lexical ordering as described + * in http://www.faqs.org/qa/rfcc-1940.html
    6. + *
    + * Special thanks to Jim Kellerman at + * http://www.powerset.com/ + * for contributing the new Base64 dialects. + *
  • + * + *
  • v2.1 - Cleaned up javadoc comments and unused variables and methods. Added + * some convenience methods for reading and writing to and from files.
  • + *
  • v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems + * with other encodings (like EBCDIC).
  • + *
  • v2.0.1 - Fixed an error when decoding a single byte, that is, when the + * encoded data was a single byte.
  • + *
  • v2.0 - I got rid of methods that used booleans to set options. + * Now everything is more consolidated and cleaner. The code now detects + * when data that's being decoded is gzip-compressed and will decompress it + * automatically. Generally things are cleaner. You'll probably have to + * change some method calls that you were making to support the new + * options format (ints that you "OR" together).
  • + *
  • v1.5.1 - Fixed bug when decompressing and decoding to a + * byte[] using decode( String s, boolean gzipCompressed ). + * Added the ability to "suspend" encoding in the Output Stream so + * you can turn on and off the encoding if you need to embed base64 + * data in an otherwise "normal" stream (like an XML file).
  • + *
  • v1.5 - Output stream pases on flush() command but doesn't do anything itself. + * This helps when using GZIP streams. + * Added the ability to GZip-compress objects before encoding them.
  • + *
  • v1.4 - Added helper methods to read/write files.
  • + *
  • v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.
  • + *
  • v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream + * where last buffer being read, if not completely full, was not returned.
  • + *
  • v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.
  • + *
  • v1.3.3 - Fixed I/O streams which were totally messed up.
  • + *
+ * + *

+ * I am placing this code in the Public Domain. Do with it as you will. + * This software comes with no guarantees or warranties but with + * plenty of well-wishing instead! + * Please visit http://iharder.net/base64 + * periodically to check for updates or to contribute improvements. + *

+ * From Signal @version 2.3.3 + */ + +public class Base64 { + + /* ******** P U B L I C F I E L D S ******** */ + + + /** + * No options specified. Value is zero. + */ + public final static int NO_OPTIONS = 0; + + /** + * Specify encoding in first bit. Value is one. + */ + public final static int ENCODE = 1; + + + /** + * Specify decoding in first bit. Value is zero. + */ + public final static int DECODE = 0; + + + /** + * Specify that data should be gzip-compressed in second bit. Value is two. + */ + public final static int GZIP = 2; + + /** + * Specify that gzipped data should not be automatically gunzipped. + */ + public final static int DONT_GUNZIP = 4; + + + /** + * Do break lines when encoding. Value is 8. + */ + public final static int DO_BREAK_LINES = 8; + + /** + * Encode using Base64-like encoding that is URL- and Filename-safe as described + * in Section 4 of RFC3548: + * http://www.faqs.org/rfcs/rfc3548.html. + * It is important to note that data encoded this way is not officially valid Base64, + * or at the very least should not be called Base64 without also specifying that is + * was encoded using the URL- and Filename-safe dialect. + */ + public final static int URL_SAFE = 16; + + + /** + * Encode using the special "ordered" dialect of Base64 described here: + * http://www.faqs.org/qa/rfcc-1940.html. + */ + public final static int ORDERED = 32; + + + /* ******** P R I V A T E F I E L D S ******** */ + + + /** + * Maximum line length (76) of Base64 output. + */ + private final static int MAX_LINE_LENGTH = 76; + + + /** + * The equals sign (=) as a byte. + */ + private final static byte EQUALS_SIGN = (byte) '='; + + + /** + * The new line character (\n) as a byte. + */ + private final static byte NEW_LINE = (byte) '\n'; + + + /** + * Preferred encoding. + */ + private final static String PREFERRED_ENCODING = "US-ASCII"; + + + private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding + private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding + + + /* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */ + + /** + * The 64 valid Base64 values. + * + /* Host platform me be something funny like EBCDIC, so we hardcode these values. */ + private final static byte[] _STANDARD_ALPHABET = { + (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', + (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', + (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', + (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', + (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f', (byte) 'g', + (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', + (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', + (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', + (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', + (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '+', (byte) '/' + }; + + + /** + * Translates a Base64 value to either its 6-bit reconstruction value + * or a negative number indicating some other meaning. + **/ + private final static byte[] _STANDARD_DECODABET = { + -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 + -5, -5, // Whitespace: Tab and Linefeed + -9, -9, // Decimal 11 - 12 + -5, // Whitespace: Carriage Return + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26 + -9, -9, -9, -9, -9, // Decimal 27 - 31 + -5, // Whitespace: Space + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42 + 62, // Plus sign at decimal 43 + -9, -9, -9, // Decimal 44 - 46 + 63, // Slash at decimal 47 + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine + -9, -9, -9, // Decimal 58 - 60 + -1, // Equals sign at decimal 61 + -9, -9, -9, // Decimal 62 - 64 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N' + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z' + -9, -9, -9, -9, -9, -9, // Decimal 91 - 96 + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm' + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z' + -9, -9, -9, -9 // Decimal 123 - 126 + /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */ + }; + + + /* ******** U R L S A F E B A S E 6 4 A L P H A B E T ******** */ + + /** + * Used in the URL- and Filename-safe dialect described in Section 4 of RFC3548: + * http://www.faqs.org/rfcs/rfc3548.html. + * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus" and "slash." + */ + private final static byte[] _URL_SAFE_ALPHABET = { + (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', + (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', + (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', + (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', + (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f', (byte) 'g', + (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', + (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', + (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', + (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', + (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '-', (byte) '_' + }; + + /** + * Used in decoding URL- and Filename-safe dialects of Base64. + */ + private final static byte[] _URL_SAFE_DECODABET = { + -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 + -5, -5, // Whitespace: Tab and Linefeed + -9, -9, // Decimal 11 - 12 + -5, // Whitespace: Carriage Return + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26 + -9, -9, -9, -9, -9, // Decimal 27 - 31 + -5, // Whitespace: Space + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42 + -9, // Plus sign at decimal 43 + -9, // Decimal 44 + 62, // Minus sign at decimal 45 + -9, // Decimal 46 + -9, // Slash at decimal 47 + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine + -9, -9, -9, // Decimal 58 - 60 + -1, // Equals sign at decimal 61 + -9, -9, -9, // Decimal 62 - 64 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N' + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z' + -9, -9, -9, -9, // Decimal 91 - 94 + 63, // Underscore at decimal 95 + -9, // Decimal 96 + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm' + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z' + -9, -9, -9, -9 // Decimal 123 - 126 + /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */ + }; + + + + /* ******** O R D E R E D B A S E 6 4 A L P H A B E T ******** */ + + /** + * I don't get the point of this technique, but someone requested it, + * and it is described here: + * http://www.faqs.org/qa/rfcc-1940.html. + */ + private final static byte[] _ORDERED_ALPHABET = { + (byte) '-', + (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', + (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', + (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', + (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', + (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', + (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', + (byte) '_', + (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f', (byte) 'g', + (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', + (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', + (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z' + }; + + /** + * Used in decoding the "ordered" dialect of Base64. + */ + private final static byte[] _ORDERED_DECODABET = { + -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 + -5, -5, // Whitespace: Tab and Linefeed + -9, -9, // Decimal 11 - 12 + -5, // Whitespace: Carriage Return + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26 + -9, -9, -9, -9, -9, // Decimal 27 - 31 + -5, // Whitespace: Space + -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42 + -9, // Plus sign at decimal 43 + -9, // Decimal 44 + 0, // Minus sign at decimal 45 + -9, // Decimal 46 + -9, // Slash at decimal 47 + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // Numbers zero through nine + -9, -9, -9, // Decimal 58 - 60 + -1, // Equals sign at decimal 61 + -9, -9, -9, // Decimal 62 - 64 + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, // Letters 'A' through 'M' + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, // Letters 'N' through 'Z' + -9, -9, -9, -9, // Decimal 91 - 94 + 37, // Underscore at decimal 95 + -9, // Decimal 96 + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // Letters 'a' through 'm' + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, // Letters 'n' through 'z' + -9, -9, -9, -9 // Decimal 123 - 126 + /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243 + -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */ + }; + + + /* ******** D E T E R M I N E W H I C H A L H A B E T ******** */ + + + /** + * Returns one of the _SOMETHING_ALPHABET byte arrays depending on + * the options specified. + * It's possible, though silly, to specify ORDERED and URLSAFE + * in which case one of them will be picked, though there is + * no guarantee as to which one will be picked. + */ + private final static byte[] getAlphabet(int options) { + if ((options & URL_SAFE) == URL_SAFE) { + return _URL_SAFE_ALPHABET; + } else if ((options & ORDERED) == ORDERED) { + return _ORDERED_ALPHABET; + } else { + return _STANDARD_ALPHABET; + } + } // end getAlphabet + + + /** + * Returns one of the _SOMETHING_DECODABET byte arrays depending on + * the options specified. + * It's possible, though silly, to specify ORDERED and URL_SAFE + * in which case one of them will be picked, though there is + * no guarantee as to which one will be picked. + */ + private final static byte[] getDecodabet(int options) { + if ((options & URL_SAFE) == URL_SAFE) { + return _URL_SAFE_DECODABET; + } else if ((options & ORDERED) == ORDERED) { + return _ORDERED_DECODABET; + } else { + return _STANDARD_DECODABET; + } + } // end getAlphabet + + + /** + * Defeats instantiation. + */ + private Base64() { + } + + + public static int getEncodedLengthWithoutPadding(int unencodedLength) { + int remainderBytes = unencodedLength % 3; + int paddingBytes = 0; + + if (remainderBytes != 0) + paddingBytes = 3 - remainderBytes; + + return (((int) ((unencodedLength + 2) / 3)) * 4) - paddingBytes; + } + + public static int getEncodedBytesForTarget(int targetSize) { + return ((int) (targetSize * 3)) / 4; + } + + + /* ******** E N C O D I N G M E T H O D S ******** */ + + + /** + * Encodes up to the first three bytes of array threeBytes + * and returns a four-byte array in Base64 notation. + * The actual number of significant bytes in your array is + * given by numSigBytes. + * The array threeBytes needs only be as big as + * numSigBytes. + * Code can reuse a byte array by passing a four-byte array as b4. + * + * @param b4 A reusable byte array to reduce array instantiation + * @param threeBytes the array to convert + * @param numSigBytes the number of significant bytes in your array + * @return four byte array in Base64 notation. + * @since 1.5.1 + */ + private static byte[] encode3to4(byte[] b4, byte[] threeBytes, int numSigBytes, int options) { + encode3to4(threeBytes, 0, numSigBytes, b4, 0, options); + return b4; + } // end encode3to4 + + + /** + *

Encodes up to three bytes of the array source + * and writes the resulting four Base64 bytes to destination. + * The source and destination arrays can be manipulated + * anywhere along their length by specifying + * srcOffset and destOffset. + * This method does not check to make sure your arrays + * are large enough to accomodate srcOffset + 3 for + * the source array or destOffset + 4 for + * the destination array. + * The actual number of significant bytes in your array is + * given by numSigBytes.

+ *

This is the lowest level of the encoding methods with + * all possible parameters.

+ * + * @param source the array to convert + * @param srcOffset the index where conversion begins + * @param numSigBytes the number of significant bytes in your array + * @param destination the array to hold the conversion + * @param destOffset the index where output will be put + * @return the destination array + * @since 1.3 + */ + private static byte[] encode3to4( + byte[] source, int srcOffset, int numSigBytes, + byte[] destination, int destOffset, int options) { + + byte[] ALPHABET = getAlphabet(options); + + // 1 2 3 + // 01234567890123456789012345678901 Bit position + // --------000000001111111122222222 Array position from threeBytes + // --------| || || || | Six bit groups to index ALPHABET + // >>18 >>12 >> 6 >> 0 Right shift necessary + // 0x3f 0x3f 0x3f Additional AND + + // Create buffer with zero-padding if there are only one or two + // significant bytes passed in the array. + // We have to shift left 24 in order to flush out the 1's that appear + // when Java treats a value as negative that is cast from a byte to an int. + int inBuff = (numSigBytes > 0 ? ((source[srcOffset] << 24) >>> 8) : 0) + | (numSigBytes > 1 ? ((source[srcOffset + 1] << 24) >>> 16) : 0) + | (numSigBytes > 2 ? ((source[srcOffset + 2] << 24) >>> 24) : 0); + + switch (numSigBytes) { + case 3: + destination[destOffset] = ALPHABET[(inBuff >>> 18)]; + destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f]; + destination[destOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3f]; + destination[destOffset + 3] = ALPHABET[(inBuff) & 0x3f]; + return destination; + + case 2: + destination[destOffset] = ALPHABET[(inBuff >>> 18)]; + destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f]; + destination[destOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3f]; + destination[destOffset + 3] = EQUALS_SIGN; + return destination; + + case 1: + destination[destOffset] = ALPHABET[(inBuff >>> 18)]; + destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f]; + destination[destOffset + 2] = EQUALS_SIGN; + destination[destOffset + 3] = EQUALS_SIGN; + return destination; + + default: + return destination; + } // end switch + } // end encode3to4 + + + /** + * Performs Base64 encoding on the raw ByteBuffer, + * writing it to the encoded ByteBuffer. + * This is an experimental feature. Currently it does not + * pass along any options (such as {@link #DO_BREAK_LINES} + * or {@link #GZIP}. + * + * @param raw input buffer + * @param encoded output buffer + * @since 2.3 + */ + public static void encode(java.nio.ByteBuffer raw, java.nio.ByteBuffer encoded) { + byte[] raw3 = new byte[3]; + byte[] enc4 = new byte[4]; + + while (raw.hasRemaining()) { + int rem = Math.min(3, raw.remaining()); + raw.get(raw3, 0, rem); + Base64.encode3to4(enc4, raw3, rem, Base64.NO_OPTIONS); + encoded.put(enc4); + } // end input remaining + } + + + /** + * Performs Base64 encoding on the raw ByteBuffer, + * writing it to the encoded CharBuffer. + * This is an experimental feature. Currently it does not + * pass along any options (such as {@link #DO_BREAK_LINES} + * or {@link #GZIP}. + * + * @param raw input buffer + * @param encoded output buffer + * @since 2.3 + */ + public static void encode(java.nio.ByteBuffer raw, java.nio.CharBuffer encoded) { + byte[] raw3 = new byte[3]; + byte[] enc4 = new byte[4]; + + while (raw.hasRemaining()) { + int rem = Math.min(3, raw.remaining()); + raw.get(raw3, 0, rem); + Base64.encode3to4(enc4, raw3, rem, Base64.NO_OPTIONS); + for (int i = 0; i < 4; i++) { + encoded.put((char) (enc4[i] & 0xFF)); + } + } // end input remaining + } + + + /** + * Serializes an object and returns the Base64-encoded + * version of that serialized object. + * + *

As of v 2.3, if the object + * cannot be serialized or there is another error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned a null value, but + * in retrospect that's a pretty poor way to handle it.

+ *

+ * The object is not GZip-compressed before being encoded. + * + * @param serializableObject The object to encode + * @return The Base64-encoded object + * @throws java.io.IOException if there is an error + * @throws NullPointerException if serializedObject is null + * @since 1.4 + */ + public static String encodeObject(java.io.Serializable serializableObject) + throws java.io.IOException { + return encodeObject(serializableObject, NO_OPTIONS); + } // end encodeObject + + + /** + * Serializes an object and returns the Base64-encoded + * version of that serialized object. + * + *

As of v 2.3, if the object + * cannot be serialized or there is another error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned a null value, but + * in retrospect that's a pretty poor way to handle it.

+ *

+ * The object is not GZip-compressed before being encoded. + *

+ * Example options:

+     *   GZIP: gzip-compresses object before encoding it.
+     *   DO_BREAK_LINES: break lines at 76 characters
+     * 
+ *

+ * Example: encodeObject( myObj, Base64.GZIP ) or + *

+ * Example: encodeObject( myObj, Base64.GZIP | Base64.DO_BREAK_LINES ) + * + * @param serializableObject The object to encode + * @param options Specified options + * @return The Base64-encoded object + * @throws java.io.IOException if there is an error + * @see Base64#GZIP + * @see Base64#DO_BREAK_LINES + * @since 2.0 + */ + public static String encodeObject(java.io.Serializable serializableObject, int options) + throws java.io.IOException { + + if (serializableObject == null) { + throw new NullPointerException("Cannot serialize a null object."); + } // end if: null + + // Streams + java.io.ByteArrayOutputStream baos = null; + java.io.OutputStream b64os = null; + java.util.zip.GZIPOutputStream gzos = null; + java.io.ObjectOutputStream oos = null; + + + try { + // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream + baos = new java.io.ByteArrayOutputStream(); + b64os = new Base64.OutputStream(baos, ENCODE | options); + if ((options & GZIP) != 0) { + // Gzip + gzos = new java.util.zip.GZIPOutputStream(b64os); + oos = new java.io.ObjectOutputStream(gzos); + } else { + // Not gzipped + oos = new java.io.ObjectOutputStream(b64os); + } + oos.writeObject(serializableObject); + } // end try + catch (java.io.IOException e) { + // Catch it and then throw it immediately so that + // the finally{} block is called for cleanup. + throw e; + } // end catch + finally { + try { + oos.close(); + } catch (Exception e) { + } + try { + gzos.close(); + } catch (Exception e) { + } + try { + b64os.close(); + } catch (Exception e) { + } + try { + baos.close(); + } catch (Exception e) { + } + } // end finally + + // Return value according to relevant encoding. + try { + return new String(baos.toByteArray(), PREFERRED_ENCODING); + } // end try + catch (java.io.UnsupportedEncodingException uue) { + // Fall back to some Java default + return new String(baos.toByteArray()); + } // end catch + + } // end encode + + + /** + * Encodes a byte array into Base64 notation. + * Does not GZip-compress data. + * + * @param source The data to convert + * @return The data in Base64-encoded form + * @throws NullPointerException if source array is null + * @since 1.4 + */ + public static String encodeBytes(byte[] source) { + // Since we're not going to have the GZIP encoding turned on, + // we're not going to have an java.io.IOException thrown, so + // we should not force the user to have to catch it. + String encoded = null; + try { + encoded = encodeBytes(source, 0, source.length, NO_OPTIONS); + } catch (java.io.IOException ex) { + assert false : ex.getMessage(); + } // end catch + assert encoded != null; + return encoded; + } // end encodeBytes + + + public static String encodeBytesWithoutPadding(byte[] source, int offset, int length) { + String encoded = null; + + try { + encoded = encodeBytes(source, offset, length, NO_OPTIONS); + } catch (java.io.IOException ex) { + assert false : ex.getMessage(); + } + + assert encoded != null; + + if (encoded.charAt(encoded.length() - 2) == '=') return encoded.substring(0, encoded.length() - 2); + else if (encoded.charAt(encoded.length() - 1) == '=') return encoded.substring(0, encoded.length() - 1); + else return encoded; + + } + + public static String encodeBytesWithoutPadding(byte[] source) { + return encodeBytesWithoutPadding(source, 0, source.length); + } + + + /** + * Encodes a byte array into Base64 notation. + *

+ * Example options:

+     *   GZIP: gzip-compresses object before encoding it.
+     *   DO_BREAK_LINES: break lines at 76 characters
+     *     Note: Technically, this makes your encoding non-compliant.
+     * 
+ *

+ * Example: encodeBytes( myData, Base64.GZIP ) or + *

+ * Example: encodeBytes( myData, Base64.GZIP | Base64.DO_BREAK_LINES ) + * + * + *

As of v 2.3, if there is an error with the GZIP stream, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned a null value, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param source The data to convert + * @param options Specified options + * @return The Base64-encoded data as a String + * @throws java.io.IOException if there is an error + * @throws NullPointerException if source array is null + * @see Base64#GZIP + * @see Base64#DO_BREAK_LINES + * @since 2.0 + */ + public static String encodeBytes(byte[] source, int options) throws java.io.IOException { + return encodeBytes(source, 0, source.length, options); + } // end encodeBytes + + + /** + * Encodes a byte array into Base64 notation. + * Does not GZip-compress data. + * + *

As of v 2.3, if there is an error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned a null value, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param source The data to convert + * @param off Offset in array where conversion should begin + * @param len Length of data to convert + * @return The Base64-encoded data as a String + * @throws NullPointerException if source array is null + * @throws IllegalArgumentException if source array, offset, or length are invalid + * @since 1.4 + */ + public static String encodeBytes(byte[] source, int off, int len) { + // Since we're not going to have the GZIP encoding turned on, + // we're not going to have an java.io.IOException thrown, so + // we should not force the user to have to catch it. + String encoded = null; + try { + encoded = encodeBytes(source, off, len, NO_OPTIONS); + } catch (java.io.IOException ex) { + assert false : ex.getMessage(); + } // end catch + assert encoded != null; + return encoded; + } // end encodeBytes + + + /** + * Encodes a byte array into Base64 notation. + *

+ * Example options:

+     *   GZIP: gzip-compresses object before encoding it.
+     *   DO_BREAK_LINES: break lines at 76 characters
+     *     Note: Technically, this makes your encoding non-compliant.
+     * 
+ *

+ * Example: encodeBytes( myData, Base64.GZIP ) or + *

+ * Example: encodeBytes( myData, Base64.GZIP | Base64.DO_BREAK_LINES ) + * + * + *

As of v 2.3, if there is an error with the GZIP stream, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned a null value, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param source The data to convert + * @param off Offset in array where conversion should begin + * @param len Length of data to convert + * @param options Specified options + * @return The Base64-encoded data as a String + * @throws java.io.IOException if there is an error + * @throws NullPointerException if source array is null + * @throws IllegalArgumentException if source array, offset, or length are invalid + * @see Base64#GZIP + * @see Base64#DO_BREAK_LINES + * @since 2.0 + */ + public static String encodeBytes(byte[] source, int off, int len, int options) throws java.io.IOException { + byte[] encoded = encodeBytesToBytes(source, off, len, options); + + // Return value according to relevant encoding. + try { + return new String(encoded, PREFERRED_ENCODING); + } // end try + catch (java.io.UnsupportedEncodingException uue) { + return new String(encoded); + } // end catch + + } // end encodeBytes + + + /** + * Similar to {@link #encodeBytes(byte[])} but returns + * a byte array instead of instantiating a String. This is more efficient + * if you're working with I/O streams and have large data sets to encode. + * + * @param source The data to convert + * @return The Base64-encoded data as a byte[] (of ASCII characters) + * @throws NullPointerException if source array is null + * @since 2.3.1 + */ + public static byte[] encodeBytesToBytes(byte[] source) { + byte[] encoded = null; + try { + encoded = encodeBytesToBytes(source, 0, source.length, Base64.NO_OPTIONS); + } catch (java.io.IOException ex) { + assert false : "IOExceptions only come from GZipping, which is turned off: " + ex.getMessage(); + } + return encoded; + } + + + /** + * Similar to {@link #encodeBytes(byte[], int, int, int)} but returns + * a byte array instead of instantiating a String. This is more efficient + * if you're working with I/O streams and have large data sets to encode. + * + * @param source The data to convert + * @param off Offset in array where conversion should begin + * @param len Length of data to convert + * @param options Specified options + * @return The Base64-encoded data as a String + * @throws java.io.IOException if there is an error + * @throws NullPointerException if source array is null + * @throws IllegalArgumentException if source array, offset, or length are invalid + * @see Base64#GZIP + * @see Base64#DO_BREAK_LINES + * @since 2.3.1 + */ + public static byte[] encodeBytesToBytes(byte[] source, int off, int len, int options) throws java.io.IOException { + + if (source == null) { + throw new NullPointerException("Cannot serialize a null array."); + } // end if: null + + if (off < 0) { + throw new IllegalArgumentException("Cannot have negative offset: " + off); + } // end if: off < 0 + + if (len < 0) { + throw new IllegalArgumentException("Cannot have length offset: " + len); + } // end if: len < 0 + + if (off + len > source.length) { + throw new IllegalArgumentException( + String.format("Cannot have offset of %d and length of %d with array of length %d", off, len, source.length)); + } // end if: off < 0 + + + // Compress? + if ((options & GZIP) != 0) { + java.io.ByteArrayOutputStream baos = null; + java.util.zip.GZIPOutputStream gzos = null; + Base64.OutputStream b64os = null; + + try { + // GZip -> Base64 -> ByteArray + baos = new java.io.ByteArrayOutputStream(); + b64os = new Base64.OutputStream(baos, ENCODE | options); + gzos = new java.util.zip.GZIPOutputStream(b64os); + + gzos.write(source, off, len); + gzos.close(); + } // end try + catch (java.io.IOException e) { + // Catch it and then throw it immediately so that + // the finally{} block is called for cleanup. + throw e; + } // end catch + finally { + try { + gzos.close(); + } catch (Exception e) { + } + try { + b64os.close(); + } catch (Exception e) { + } + try { + baos.close(); + } catch (Exception e) { + } + } // end finally + + return baos.toByteArray(); + } // end if: compress + + // Else, don't compress. Better not to use streams at all then. + else { + boolean breakLines = (options & DO_BREAK_LINES) > 0; + + //int len43 = len * 4 / 3; + //byte[] outBuff = new byte[ ( len43 ) // Main 4:3 + // + ( (len % 3) > 0 ? 4 : 0 ) // Account for padding + // + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines + // Try to determine more precisely how big the array needs to be. + // If we get it right, we don't have to do an array copy, and + // we save a bunch of memory. + int encLen = (len / 3) * 4 + (len % 3 > 0 ? 4 : 0); // Bytes needed for actual encoding + if (breakLines) { + encLen += encLen / MAX_LINE_LENGTH; // Plus extra newline characters + } + byte[] outBuff = new byte[encLen]; + + + int d = 0; + int e = 0; + int len2 = len - 2; + int lineLength = 0; + for (; d < len2; d += 3, e += 4) { + encode3to4(source, d + off, 3, outBuff, e, options); + + lineLength += 4; + if (breakLines && lineLength >= MAX_LINE_LENGTH) { + outBuff[e + 4] = NEW_LINE; + e++; + lineLength = 0; + } // end if: end of line + } // en dfor: each piece of array + + if (d < len) { + encode3to4(source, d + off, len - d, outBuff, e, options); + e += 4; + } // end if: some padding needed + + + // Only resize array if we didn't guess it right. + if (e < outBuff.length - 1) { + byte[] finalOut = new byte[e]; + System.arraycopy(outBuff, 0, finalOut, 0, e); + //System.err.println("Having to resize array from " + outBuff.length + " to " + e ); + return finalOut; + } else { + //System.err.println("No need to resize array."); + return outBuff; + } + + } // end else: don't compress + + } // end encodeBytesToBytes + + + + + + /* ******** D E C O D I N G M E T H O D S ******** */ + + + /** + * Decodes four bytes from array source + * and writes the resulting bytes (up to three of them) + * to destination. + * The source and destination arrays can be manipulated + * anywhere along their length by specifying + * srcOffset and destOffset. + * This method does not check to make sure your arrays + * are large enough to accomodate srcOffset + 4 for + * the source array or destOffset + 3 for + * the destination array. + * This method returns the actual number of bytes that + * were converted from the Base64 encoding. + *

This is the lowest level of the decoding methods with + * all possible parameters.

+ * + * @param source the array to convert + * @param srcOffset the index where conversion begins + * @param destination the array to hold the conversion + * @param destOffset the index where output will be put + * @param options alphabet type is pulled from this (standard, url-safe, ordered) + * @return the number of decoded bytes converted + * @throws NullPointerException if source or destination arrays are null + * @throws IllegalArgumentException if srcOffset or destOffset are invalid + * or there is not enough room in the array. + * @since 1.3 + */ + private static int decode4to3( + byte[] source, int srcOffset, + byte[] destination, int destOffset, int options) { + + // Lots of error checking and exception throwing + if (source == null) { + throw new NullPointerException("Source array was null."); + } // end if + if (destination == null) { + throw new NullPointerException("Destination array was null."); + } // end if + if (srcOffset < 0 || srcOffset + 3 >= source.length) { + throw new IllegalArgumentException(String.format( + "Source array with length %d cannot have offset of %d and still process four bytes.", source.length, srcOffset)); + } // end if + if (destOffset < 0 || destOffset + 2 >= destination.length) { + throw new IllegalArgumentException(String.format( + "Destination array with length %d cannot have offset of %d and still store three bytes.", destination.length, destOffset)); + } // end if + + + byte[] DECODABET = getDecodabet(options); + + // Example: Dk== + if (source[srcOffset + 2] == EQUALS_SIGN) { + // Two ways to do the same thing. Don't know which way I like best. + //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 ) + // | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 ); + int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18) + | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12); + + destination[destOffset] = (byte) (outBuff >>> 16); + return 1; + } + + // Example: DkL= + else if (source[srcOffset + 3] == EQUALS_SIGN) { + // Two ways to do the same thing. Don't know which way I like best. + //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 ) + // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 ) + // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 ); + int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18) + | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12) + | ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6); + + destination[destOffset] = (byte) (outBuff >>> 16); + destination[destOffset + 1] = (byte) (outBuff >>> 8); + return 2; + } + + // Example: DkLE + else { + // Two ways to do the same thing. Don't know which way I like best. + //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 ) + // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 ) + // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 ) + // | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 ); + int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18) + | ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12) + | ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6) + | ((DECODABET[source[srcOffset + 3]] & 0xFF)); + + + destination[destOffset] = (byte) (outBuff >> 16); + destination[destOffset + 1] = (byte) (outBuff >> 8); + destination[destOffset + 2] = (byte) (outBuff); + + return 3; + } + } // end decodeToBytes + + + /** + * Low-level access to decoding ASCII characters in + * the form of a byte array. Ignores GUNZIP option, if + * it's set. This is not generally a recommended method, + * although it is used internally as part of the decoding process. + * Special case: if len = 0, an empty array is returned. Still, + * if you need more speed and reduced memory footprint (and aren't + * gzipping), consider this method. + * + * @param source The Base64 encoded data + * @return decoded data + * @since 2.3.1 + */ + public static byte[] decode(byte[] source) { + byte[] decoded = null; + try { + decoded = decode(source, 0, source.length, Base64.NO_OPTIONS); + } catch (java.io.IOException ex) { + assert false : "IOExceptions only come from GZipping, which is turned off: " + ex.getMessage(); + } + return decoded; + } + + + /** + * Low-level access to decoding ASCII characters in + * the form of a byte array. Ignores GUNZIP option, if + * it's set. This is not generally a recommended method, + * although it is used internally as part of the decoding process. + * Special case: if len = 0, an empty array is returned. Still, + * if you need more speed and reduced memory footprint (and aren't + * gzipping), consider this method. + * + * @param source The Base64 encoded data + * @param off The offset of where to begin decoding + * @param len The length of characters to decode + * @param options Can specify options such as alphabet type to use + * @return decoded data + * @throws java.io.IOException If bogus characters exist in source data + * @since 1.3 + */ + public static byte[] decode(byte[] source, int off, int len, int options) + throws java.io.IOException { + + // Lots of error checking and exception throwing + if (source == null) { + throw new NullPointerException("Cannot decode null source array."); + } // end if + if (off < 0 || off + len > source.length) { + throw new IllegalArgumentException(String.format( + "Source array with length %d cannot have offset of %d and process %d bytes.", source.length, off, len)); + } // end if + + if (len == 0) { + return new byte[0]; + } else if (len < 4) { + throw new IllegalArgumentException( + "Base64-encoded string must have at least four characters, but length specified was " + len); + } // end if + + byte[] DECODABET = getDecodabet(options); + + int len34 = len * 3 / 4; // Estimate on array size + byte[] outBuff = new byte[len34]; // Upper limit on size of output + int outBuffPosn = 0; // Keep track of where we're writing + + byte[] b4 = new byte[4]; // Four byte buffer from source, eliminating white space + int b4Posn = 0; // Keep track of four byte input buffer + int i = 0; // Source array counter + byte sbiCrop = 0; // Low seven bits (ASCII) of input + byte sbiDecode = 0; // Special value from DECODABET + + for (i = off; i < off + len; i++) { // Loop through source + + sbiCrop = (byte) (source[i] & 0x7f); // Only the low seven bits + sbiDecode = DECODABET[sbiCrop]; // Special value + + // White space, Equals sign, or legit Base64 character + // Note the values such as -5 and -9 in the + // DECODABETs at the top of the file. + if (sbiDecode >= WHITE_SPACE_ENC) { + if (sbiDecode >= EQUALS_SIGN_ENC) { + b4[b4Posn++] = sbiCrop; // Save non-whitespace + if (b4Posn > 3) { // Time to decode? + outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, options); + b4Posn = 0; + + // If that was the equals sign, break out of 'for' loop + if (sbiCrop == EQUALS_SIGN) { + break; + } // end if: equals sign + } // end if: quartet built + } // end if: equals sign or better + } // end if: white space, equals sign or better + else { + // There's a bad input character in the Base64 stream. + throw new java.io.IOException(String.format( + "Bad Base64 input character '%c' in array position %d", source[i], i)); + } // end else: + } // each input character + + byte[] out = new byte[outBuffPosn]; + System.arraycopy(outBuff, 0, out, 0, outBuffPosn); + return out; + } // end decode + + + /** + * Decodes data from Base64 notation, automatically + * detecting gzip-compressed data and decompressing it. + * + * @param s the string to decode + * @return the decoded data + * @throws java.io.IOException If there is a problem + * @since 1.4 + */ + public static byte[] decode(String s) throws java.io.IOException { + return decode(s, NO_OPTIONS); + } + + + public static byte[] decodeWithoutPadding(String source) throws java.io.IOException { + int padding = source.length() % 4; + + if (padding == 1) source = source + "="; + else if (padding == 2) source = source + "=="; + else if (padding == 3) source = source + "="; + + return decode(source); + } + + + /** + * Decodes data from Base64 notation, automatically + * detecting gzip-compressed data and decompressing it. + * + * @param s the string to decode + * @param options encode options such as URL_SAFE + * @return the decoded data + * @throws java.io.IOException if there is an error + * @throws NullPointerException if s is null + * @since 1.4 + */ + public static byte[] decode(String s, int options) throws java.io.IOException { + + if (s == null) { + throw new NullPointerException("Input string was null."); + } // end if + + byte[] bytes; + try { + bytes = s.getBytes(PREFERRED_ENCODING); + } // end try + catch (java.io.UnsupportedEncodingException uee) { + bytes = s.getBytes(); + } // end catch + // + + // Decode + bytes = decode(bytes, 0, bytes.length, options); + + // Check to see if it's gzip-compressed + // GZIP Magic Two-Byte Number: 0x8b1f (35615) + boolean dontGunzip = (options & DONT_GUNZIP) != 0; + if ((bytes != null) && (bytes.length >= 4) && (!dontGunzip)) { + + int head = ((int) bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00); + if (java.util.zip.GZIPInputStream.GZIP_MAGIC == head) { + java.io.ByteArrayInputStream bais = null; + java.util.zip.GZIPInputStream gzis = null; + java.io.ByteArrayOutputStream baos = null; + byte[] buffer = new byte[2048]; + int length = 0; + + try { + baos = new java.io.ByteArrayOutputStream(); + bais = new java.io.ByteArrayInputStream(bytes); + gzis = new java.util.zip.GZIPInputStream(bais); + + while ((length = gzis.read(buffer)) >= 0) { + baos.write(buffer, 0, length); + } // end while: reading input + + // No error? Get new bytes. + bytes = baos.toByteArray(); + + } // end try + catch (java.io.IOException e) { + e.printStackTrace(); + // Just return originally-decoded bytes + } // end catch + finally { + try { + baos.close(); + } catch (Exception e) { + } + try { + gzis.close(); + } catch (Exception e) { + } + try { + bais.close(); + } catch (Exception e) { + } + } // end finally + + } // end if: gzipped + } // end if: bytes.length >= 2 + + return bytes; + } // end decode + + + /** + * Attempts to decode Base64 data and deserialize a Java + * Object within. Returns null if there was an error. + * + * @param encodedObject The Base64 data to decode + * @return The decoded and deserialized object + * @throws NullPointerException if encodedObject is null + * @throws java.io.IOException if there is a general error + * @throws ClassNotFoundException if the decoded object is of a + * class that cannot be found by the JVM + * @since 1.5 + */ + public static Object decodeToObject(String encodedObject) + throws java.io.IOException, java.lang.ClassNotFoundException { + return decodeToObject(encodedObject, NO_OPTIONS, null); + } + + + /** + * Attempts to decode Base64 data and deserialize a Java + * Object within. Returns null if there was an error. + * If loader is not null, it will be the class loader + * used when deserializing. + * + * @param encodedObject The Base64 data to decode + * @param options Various parameters related to decoding + * @param loader Optional class loader to use in deserializing classes. + * @return The decoded and deserialized object + * @throws NullPointerException if encodedObject is null + * @throws java.io.IOException if there is a general error + * @throws ClassNotFoundException if the decoded object is of a + * class that cannot be found by the JVM + * @since 2.3.4 + */ + public static Object decodeToObject( + String encodedObject, int options, final ClassLoader loader) + throws java.io.IOException, java.lang.ClassNotFoundException { + + // Decode and gunzip if necessary + byte[] objBytes = decode(encodedObject, options); + + java.io.ByteArrayInputStream bais = null; + java.io.ObjectInputStream ois = null; + Object obj = null; + + try { + bais = new java.io.ByteArrayInputStream(objBytes); + + // If no custom class loader is provided, use Java's builtin OIS. + if (loader == null) { + ois = new java.io.ObjectInputStream(bais); + } // end if: no loader provided + + // Else make a customized object input stream that uses + // the provided class loader. + else { + ois = new java.io.ObjectInputStream(bais) { + @Override + public Class resolveClass(java.io.ObjectStreamClass streamClass) + throws java.io.IOException, ClassNotFoundException { + Class c = Class.forName(streamClass.getName(), false, loader); + if (c == null) { + return super.resolveClass(streamClass); + } else { + return c; // Class loader knows of this class. + } // end else: not null + } // end resolveClass + }; // end ois + } // end else: no custom class loader + + obj = ois.readObject(); + } // end try + catch (java.io.IOException e) { + throw e; // Catch and throw in order to execute finally{} + } // end catch + catch (java.lang.ClassNotFoundException e) { + throw e; // Catch and throw in order to execute finally{} + } // end catch + finally { + try { + bais.close(); + } catch (Exception e) { + } + try { + ois.close(); + } catch (Exception e) { + } + } // end finally + + return obj; + } // end decodeObject + + + /** + * Convenience method for encoding data to a file. + * + *

As of v 2.3, if there is a error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned false, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param dataToEncode byte array of data to encode in base64 form + * @param filename Filename for saving encoded data + * @throws java.io.IOException if there is an error + * @throws NullPointerException if dataToEncode is null + * @since 2.1 + */ + public static void encodeToFile(byte[] dataToEncode, String filename) + throws java.io.IOException { + + if (dataToEncode == null) { + throw new NullPointerException("Data to encode was null."); + } // end iff + + Base64.OutputStream bos = null; + try { + bos = new Base64.OutputStream( + new java.io.FileOutputStream(filename), Base64.ENCODE); + bos.write(dataToEncode); + } // end try + catch (java.io.IOException e) { + throw e; // Catch and throw to execute finally{} block + } // end catch: java.io.IOException + finally { + try { + bos.close(); + } catch (Exception e) { + } + } // end finally + + } // end encodeToFile + + + /** + * Convenience method for decoding data to a file. + * + *

As of v 2.3, if there is a error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned false, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param dataToDecode Base64-encoded data as a string + * @param filename Filename for saving decoded data + * @throws java.io.IOException if there is an error + * @since 2.1 + */ + public static void decodeToFile(String dataToDecode, String filename) + throws java.io.IOException { + + Base64.OutputStream bos = null; + try { + bos = new Base64.OutputStream( + new java.io.FileOutputStream(filename), Base64.DECODE); + bos.write(dataToDecode.getBytes(PREFERRED_ENCODING)); + } // end try + catch (java.io.IOException e) { + throw e; // Catch and throw to execute finally{} block + } // end catch: java.io.IOException + finally { + try { + bos.close(); + } catch (Exception e) { + } + } // end finally + + } // end decodeToFile + + + /** + * Convenience method for reading a base64-encoded + * file and decoding it. + * + *

As of v 2.3, if there is a error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned false, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param filename Filename for reading encoded data + * @return decoded byte array + * @throws java.io.IOException if there is an error + * @since 2.1 + */ + public static byte[] decodeFromFile(String filename) + throws java.io.IOException { + + byte[] decodedData = null; + Base64.InputStream bis = null; + try { + // Set up some useful variables + java.io.File file = new java.io.File(filename); + byte[] buffer = null; + int length = 0; + int numBytes = 0; + + // Check for size of file + if (file.length() > Integer.MAX_VALUE) { + throw new java.io.IOException("File is too big for this convenience method (" + file.length() + " bytes)."); + } // end if: file too big for int index + buffer = new byte[(int) file.length()]; + + // Open a stream + bis = new Base64.InputStream( + new java.io.BufferedInputStream( + new java.io.FileInputStream(file)), Base64.DECODE); + + // Read until done + while ((numBytes = bis.read(buffer, length, 4096)) >= 0) { + length += numBytes; + } // end while + + // Save in a variable to return + decodedData = new byte[length]; + System.arraycopy(buffer, 0, decodedData, 0, length); + + } // end try + catch (java.io.IOException e) { + throw e; // Catch and release to execute finally{} + } // end catch: java.io.IOException + finally { + try { + bis.close(); + } catch (Exception e) { + } + } // end finally + + return decodedData; + } // end decodeFromFile + + + /** + * Convenience method for reading a binary file + * and base64-encoding it. + * + *

As of v 2.3, if there is a error, + * the method will throw an java.io.IOException. This is new to v2.3! + * In earlier versions, it just returned false, but + * in retrospect that's a pretty poor way to handle it.

+ * + * @param filename Filename for reading binary data + * @return base64-encoded string + * @throws java.io.IOException if there is an error + * @since 2.1 + */ + public static String encodeFromFile(String filename) + throws java.io.IOException { + + String encodedData = null; + Base64.InputStream bis = null; + try { + // Set up some useful variables + java.io.File file = new java.io.File(filename); + byte[] buffer = new byte[Math.max((int) (file.length() * 1.4), 40)]; // Need max() for math on small files (v2.2.1) + int length = 0; + int numBytes = 0; + + // Open a stream + bis = new Base64.InputStream( + new java.io.BufferedInputStream( + new java.io.FileInputStream(file)), Base64.ENCODE); + + // Read until done + while ((numBytes = bis.read(buffer, length, 4096)) >= 0) { + length += numBytes; + } // end while + + // Save in a variable to return + encodedData = new String(buffer, 0, length, Base64.PREFERRED_ENCODING); + + } // end try + catch (java.io.IOException e) { + throw e; // Catch and release to execute finally{} + } // end catch: java.io.IOException + finally { + try { + bis.close(); + } catch (Exception e) { + } + } // end finally + + return encodedData; + } // end encodeFromFile + + /** + * Reads infile and encodes it to outfile. + * + * @param infile Input file + * @param outfile Output file + * @throws java.io.IOException if there is an error + * @since 2.2 + */ + public static void encodeFileToFile(String infile, String outfile) + throws java.io.IOException { + + String encoded = Base64.encodeFromFile(infile); + java.io.OutputStream out = null; + try { + out = new java.io.BufferedOutputStream( + new java.io.FileOutputStream(outfile)); + out.write(encoded.getBytes("US-ASCII")); // Strict, 7-bit output. + } // end try + catch (java.io.IOException e) { + throw e; // Catch and release to execute finally{} + } // end catch + finally { + try { + out.close(); + } catch (Exception ex) { + } + } // end finally + } // end encodeFileToFile + + + /** + * Reads infile and decodes it to outfile. + * + * @param infile Input file + * @param outfile Output file + * @throws java.io.IOException if there is an error + * @since 2.2 + */ + public static void decodeFileToFile(String infile, String outfile) + throws java.io.IOException { + + byte[] decoded = Base64.decodeFromFile(infile); + java.io.OutputStream out = null; + try { + out = new java.io.BufferedOutputStream( + new java.io.FileOutputStream(outfile)); + out.write(decoded); + } // end try + catch (java.io.IOException e) { + throw e; // Catch and release to execute finally{} + } // end catch + finally { + try { + out.close(); + } catch (Exception ex) { + } + } // end finally + } // end decodeFileToFile + + + /* ******** I N N E R C L A S S I N P U T S T R E A M ******** */ + + + /** + * A {@link Base64.InputStream} will read data from another + * java.io.InputStream, given in the constructor, + * and encode/decode to/from Base64 notation on the fly. + * + * @see Base64 + * @since 1.3 + */ + public static class InputStream extends java.io.FilterInputStream { + + private boolean encode; // Encoding or decoding + private int position; // Current position in the buffer + private byte[] buffer; // Small buffer holding converted data + private int bufferLength; // Length of buffer (3 or 4) + private int numSigBytes; // Number of meaningful bytes in the buffer + private int lineLength; + private boolean breakLines; // Break lines at less than 80 characters + private int options; // Record options used to create the stream. + private byte[] decodabet; // Local copies to avoid extra method calls + + + /** + * Constructs a {@link Base64.InputStream} in DECODE mode. + * + * @param in the java.io.InputStream from which to read data. + * @since 1.3 + */ + public InputStream(java.io.InputStream in) { + this(in, DECODE); + } // end constructor + + + /** + * Constructs a {@link Base64.InputStream} in + * either ENCODE or DECODE mode. + *

+ * Valid options:

+         *   ENCODE or DECODE: Encode or Decode as data is read.
+         *   DO_BREAK_LINES: break lines at 76 characters
+         *     (only meaningful when encoding)
+         * 
+ *

+ * Example: new Base64.InputStream( in, Base64.DECODE ) + * + * @param in the java.io.InputStream from which to read data. + * @param options Specified options + * @see Base64#ENCODE + * @see Base64#DECODE + * @see Base64#DO_BREAK_LINES + * @since 2.0 + */ + public InputStream(java.io.InputStream in, int options) { + + super(in); + this.options = options; // Record for later + this.breakLines = (options & DO_BREAK_LINES) > 0; + this.encode = (options & ENCODE) > 0; + this.bufferLength = encode ? 4 : 3; + this.buffer = new byte[bufferLength]; + this.position = -1; + this.lineLength = 0; + this.decodabet = getDecodabet(options); + } // end constructor + + /** + * Reads enough of the input stream to convert + * to/from Base64 and returns the next byte. + * + * @return next byte + * @since 1.3 + */ + @Override + public int read() throws java.io.IOException { + + // Do we need to get data? + if (position < 0) { + if (encode) { + byte[] b3 = new byte[3]; + int numBinaryBytes = 0; + for (int i = 0; i < 3; i++) { + int b = in.read(); + + // If end of stream, b is -1. + if (b >= 0) { + b3[i] = (byte) b; + numBinaryBytes++; + } else { + break; // out of for loop + } // end else: end of stream + + } // end for: each needed input byte + + if (numBinaryBytes > 0) { + encode3to4(b3, 0, numBinaryBytes, buffer, 0, options); + position = 0; + numSigBytes = 4; + } // end if: got data + else { + return -1; // Must be end of stream + } // end else + } // end if: encoding + + // Else decoding + else { + byte[] b4 = new byte[4]; + int i = 0; + for (i = 0; i < 4; i++) { + // Read four "meaningful" bytes: + int b = 0; + do { + b = in.read(); + } + while (b >= 0 && decodabet[b & 0x7f] <= WHITE_SPACE_ENC); + + if (b < 0) { + break; // Reads a -1 if end of stream + } // end if: end of stream + + b4[i] = (byte) b; + } // end for: each needed input byte + + if (i == 4) { + numSigBytes = decode4to3(b4, 0, buffer, 0, options); + position = 0; + } // end if: got four characters + else if (i == 0) { + return -1; + } // end else if: also padded correctly + else { + // Must have broken out from above. + throw new java.io.IOException("Improperly padded Base64 input."); + } // end + + } // end else: decode + } // end else: get data + + // Got data? + if (position >= 0) { + // End of relevant data? + if ( /*!encode &&*/ position >= numSigBytes) { + return -1; + } // end if: got data + + if (encode && breakLines && lineLength >= MAX_LINE_LENGTH) { + lineLength = 0; + return '\n'; + } // end if + else { + lineLength++; // This isn't important when decoding + // but throwing an extra "if" seems + // just as wasteful. + + int b = buffer[position++]; + + if (position >= bufferLength) { + position = -1; + } // end if: end + + return b & 0xFF; // This is how you "cast" a byte that's + // intended to be unsigned. + } // end else + } // end if: position >= 0 + + // Else error + else { + throw new java.io.IOException("Error in Base64 code reading stream."); + } // end else + } // end read + + + /** + * Calls {@link #read()} repeatedly until the end of stream + * is reached or len bytes are read. + * Returns number of bytes read into array or -1 if + * end of stream is encountered. + * + * @param dest array to hold values + * @param off offset for array + * @param len max number of bytes to read into array + * @return bytes read into array or -1 if end of stream is encountered. + * @since 1.3 + */ + @Override + public int read(byte[] dest, int off, int len) + throws java.io.IOException { + int i; + int b; + for (i = 0; i < len; i++) { + b = read(); + + if (b >= 0) { + dest[off + i] = (byte) b; + } else if (i == 0) { + return -1; + } else { + break; // Out of 'for' loop + } // Out of 'for' loop + } // end for: each byte read + return i; + } // end read + + } // end inner class InputStream + + + + + + + /* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */ + + + /** + * A {@link Base64.OutputStream} will write data to another + * java.io.OutputStream, given in the constructor, + * and encode/decode to/from Base64 notation on the fly. + * + * @see Base64 + * @since 1.3 + */ + public static class OutputStream extends java.io.FilterOutputStream { + + private boolean encode; + private int position; + private byte[] buffer; + private int bufferLength; + private int lineLength; + private boolean breakLines; + private byte[] b4; // Scratch used in a few places + private boolean suspendEncoding; + private int options; // Record for later + private byte[] decodabet; // Local copies to avoid extra method calls + + /** + * Constructs a {@link Base64.OutputStream} in ENCODE mode. + * + * @param out the java.io.OutputStream to which data will be written. + * @since 1.3 + */ + public OutputStream(java.io.OutputStream out) { + this(out, ENCODE); + } // end constructor + + + /** + * Constructs a {@link Base64.OutputStream} in + * either ENCODE or DECODE mode. + *

+ * Valid options:

+         *   ENCODE or DECODE: Encode or Decode as data is read.
+         *   DO_BREAK_LINES: don't break lines at 76 characters
+         *     (only meaningful when encoding)
+         * 
+ *

+ * Example: new Base64.OutputStream( out, Base64.ENCODE ) + * + * @param out the java.io.OutputStream to which data will be written. + * @param options Specified options. + * @see Base64#ENCODE + * @see Base64#DECODE + * @see Base64#DO_BREAK_LINES + * @since 1.3 + */ + public OutputStream(java.io.OutputStream out, int options) { + super(out); + this.breakLines = (options & DO_BREAK_LINES) != 0; + this.encode = (options & ENCODE) != 0; + this.bufferLength = encode ? 3 : 4; + this.buffer = new byte[bufferLength]; + this.position = 0; + this.lineLength = 0; + this.suspendEncoding = false; + this.b4 = new byte[4]; + this.options = options; + this.decodabet = getDecodabet(options); + } // end constructor + + + /** + * Writes the byte to the output stream after + * converting to/from Base64 notation. + * When encoding, bytes are buffered three + * at a time before the output stream actually + * gets a write() call. + * When decoding, bytes are buffered four + * at a time. + * + * @param theByte the byte to write + * @since 1.3 + */ + @Override + public void write(int theByte) + throws java.io.IOException { + // Encoding suspended? + if (suspendEncoding) { + this.out.write(theByte); + return; + } // end if: supsended + + // Encode? + if (encode) { + buffer[position++] = (byte) theByte; + if (position >= bufferLength) { // Enough to encode. + + this.out.write(encode3to4(b4, buffer, bufferLength, options)); + + lineLength += 4; + if (breakLines && lineLength >= MAX_LINE_LENGTH) { + this.out.write(NEW_LINE); + lineLength = 0; + } // end if: end of line + + position = 0; + } // end if: enough to output + } // end if: encoding + + // Else, Decoding + else { + // Meaningful Base64 character? + if (decodabet[theByte & 0x7f] > WHITE_SPACE_ENC) { + buffer[position++] = (byte) theByte; + if (position >= bufferLength) { // Enough to output. + + int len = Base64.decode4to3(buffer, 0, b4, 0, options); + out.write(b4, 0, len); + position = 0; + } // end if: enough to output + } // end if: meaningful base64 character + else if (decodabet[theByte & 0x7f] != WHITE_SPACE_ENC) { + throw new java.io.IOException("Invalid character in Base64 data."); + } // end else: not white space either + } // end else: decoding + } // end write + + + /** + * Calls {@link #write(int)} repeatedly until len + * bytes are written. + * + * @param theBytes array from which to read bytes + * @param off offset for array + * @param len max number of bytes to read into array + * @since 1.3 + */ + @Override + public void write(byte[] theBytes, int off, int len) + throws java.io.IOException { + // Encoding suspended? + if (suspendEncoding) { + this.out.write(theBytes, off, len); + return; + } // end if: supsended + + for (int i = 0; i < len; i++) { + write(theBytes[off + i]); + } // end for: each byte written + + } // end write + + + /** + * Method added by PHIL. [Thanks, PHIL. -Rob] + * This pads the buffer without closing the stream. + * + * @throws java.io.IOException if there's an error. + */ + public void flushBase64() throws java.io.IOException { + if (position > 0) { + if (encode) { + out.write(encode3to4(b4, buffer, position, options)); + position = 0; + } // end if: encoding + else { + throw new java.io.IOException("Base64 input not properly padded."); + } // end else: decoding + } // end if: buffer partially full + + } // end flush + + + /** + * Flushes and closes (I think, in the superclass) the stream. + * + * @since 1.3 + */ + @Override + public void close() throws java.io.IOException { + // 1. Ensure that pending characters are written + flushBase64(); + + // 2. Actually close the stream + // Base class both flushes and closes. + super.close(); + + buffer = null; + out = null; + } // end close + + + /** + * Suspends encoding of the stream. + * May be helpful if you need to embed a piece of + * base64-encoded data in a stream. + * + * @throws java.io.IOException if there's an error flushing + * @since 1.5.1 + */ + public void suspendEncoding() throws java.io.IOException { + flushBase64(); + this.suspendEncoding = true; + } // end suspendEncoding + + + /** + * Resumes encoding of the stream. + * May be helpful if you need to embed a piece of + * base64-encoded data in a stream. + * + * @since 1.5.1 + */ + public void resumeEncoding() { + this.suspendEncoding = false; + } // end resumeEncoding + + + } // end inner class OutputStream + + +} // end class Base64 diff --git a/src/main/java/org/muzima/turkana/utils/Constants.java b/src/main/java/org/muzima/turkana/utils/Constants.java index b062bf5..0fba471 100644 --- a/src/main/java/org/muzima/turkana/utils/Constants.java +++ b/src/main/java/org/muzima/turkana/utils/Constants.java @@ -6,5 +6,12 @@ public static final class REGISTRATION_CONSTANTS { public static final String REGISTERED_STATE_UNKNOWN = "UNKNOWN"; public static final String REGISTERED_STATE_REGISTERED = "REGISTERED"; public static final String REGISTERED_STATE_MULTIDEVICE = "MULTIDEVICE"; + + public static final class TWO_FACTOR_STATUS_CONSTANTS { + public static final String TWO_FACTOR_FAILED = "verification_failed"; + public static final String TWO_FACTOR_NUMBER_ERROR = "maformed_phone_number"; + public static final String TWO_FACTOR_PENDING_VERIFICATION = "pending_code_verification"; + public static final String TWO_FACTOR_VERIFICATION_SECCESSFUL = "two_factor_successful"; + } } } diff --git a/src/main/java/org/muzima/turkana/utils/Util.java b/src/main/java/org/muzima/turkana/utils/Util.java new file mode 100644 index 0000000..a2db6a2 --- /dev/null +++ b/src/main/java/org/muzima/turkana/utils/Util.java @@ -0,0 +1,72 @@ +package org.muzima.turkana.utils; + +import javax.annotation.Nullable; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.text.DecimalFormat; +import java.util.LinkedList; +import java.util.List; + +public class Util { + private static final String TAG = Util.class.getSimpleName(); + + + public static String join(long[] list, String delimeter) { + StringBuilder sb = new StringBuilder(); + + for (int j=0;j List> partition(List list, int partitionSize) { + List> results = new LinkedList<>(); + + for (int index=0;index oneTimePrekeys = KeyHelper.generatePreKeys(1,100); + List oneTimePrekeys = KeyHelper.generatePreKeys(1, 100); SignedPreKeyRecord signedPreKeyRecord = KeyHelper.generateSignedPreKey(identityKeyPair, SIGNED_PREKEY_ID); // Store this stuff. store.saveIdentity(sProtocolAddress, identityKeyPair.getPublicKey()); - for(int i=0; i < oneTimePrekeys.size() ; i++ ) { + for (int i = 0; i < oneTimePrekeys.size(); i++) { store.storePreKey(i + 1, oneTimePrekeys.get(i)); } -// store.storeSignedPreKey(SIGNED_PREKEY_ID, signedPreKeyRecord); + store.storeSignedPreKey(SIGNED_PREKEY_ID, signedPreKeyRecord); // Create account manager SignalServiceUrl url = new SignalServiceUrl(SIGNAL_SERVICE_URL, new TrustStore() { @Override public InputStream getKeyStoreInputStream() { - return null; + InputStream inputStream = null; + try { + inputStream = new FileInputStream( + new File(getClass().getClassLoader().getResource("whisper.store").getFile() + )); + + return inputStream; + + } catch (FileNotFoundException e) { + throw new AssertionError("Keystore file not found."); + } + } @Override @@ -69,17 +97,26 @@ public String getKeyStorePassword() { } }); - SignalServiceConfiguration configuration = new SignalServiceConfiguration(new SignalServiceUrl[] { url },new SignalCdnUrl[0]); + SignalServiceConfiguration configuration = new SignalServiceConfiguration( + new SignalServiceUrl[]{url}, + new SignalCdnUrl[0]); + accountManager = new SignalServiceAccountManager(configuration, USERNAME, PASSWORD, "java-app"); } @PostMapping(path = "/register") public void register() throws IOException { + logger.info("Register MBS server on signal : Phone Number : " + USERNAME); + + store.purgeKeyStore(); + accountManager.requestSmsVerificationCode(); } @PostMapping(path = "/verify", consumes = "application/json") public void verify(@RequestParam String code) throws IOException { - accountManager.verifyAccountWithCode(code, UUID.randomUUID().toString(), store.getLocalRegistrationId(), false, "willa"); + logger.info("Verify Signal phone number | Code " + code); + + accountManager.verifyAccountWithCode(code, UUID.randomUUID().toString(), store.getLocalRegistrationId(), false, "mbspin"); } } diff --git a/src/main/java/org/muzima/turkana/web/signalclients/MasterCipher.java b/src/main/java/org/muzima/turkana/web/signalclients/MasterCipher.java new file mode 100644 index 0000000..723bd11 --- /dev/null +++ b/src/main/java/org/muzima/turkana/web/signalclients/MasterCipher.java @@ -0,0 +1,191 @@ +package org.muzima.turkana.web.signalclients; + +import org.springframework.lang.NonNull; +import org.whispersystems.libsignal.InvalidMessageException; +import org.whispersystems.libsignal.ecc.Curve; +import org.whispersystems.libsignal.ecc.ECPrivateKey; +import org.whispersystems.libsignal.util.Hex; +import org.whispersystems.signalservice.internal.util.Base64; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.Mac; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; + +public class MasterCipher { + private static final String TAG = MasterCipher.class.getSimpleName(); + + private final MasterSecret masterSecret; + private final Cipher encryptingCipher; + private final Cipher decryptingCipher; + private final Mac hmac; + + public MasterCipher(MasterSecret masterSecret) { + try { + this.masterSecret = masterSecret; + this.encryptingCipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + this.decryptingCipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + this.hmac = Mac.getInstance("HmacSHA1"); + } catch (NoSuchPaddingException | NoSuchAlgorithmException nspe) { + throw new AssertionError(nspe); + } + } + + public byte[] encryptKey(ECPrivateKey privateKey) { + return encryptBytes(privateKey.serialize()); + } + + public String encryptBody(@NonNull String body) { + return encryptAndEncodeBytes(body.getBytes()); + } + + public String decryptBody(String body) throws InvalidMessageException { + return new String(decodeAndDecryptBytes(body)); + } + + public ECPrivateKey decryptKey(byte[] key) + throws org.whispersystems.libsignal.InvalidKeyException { + try { + return Curve.decodePrivatePoint(decryptBytes(key)); + } catch (InvalidMessageException ime) { + throw new org.whispersystems.libsignal.InvalidKeyException(ime); + } + } + + public byte[] decryptBytes(@NonNull byte[] decodedBody) throws InvalidMessageException { + try { + Mac mac = getMac(masterSecret.getMacKey()); + byte[] encryptedBody = verifyMacBody(mac, decodedBody); + + Cipher cipher = getDecryptingCipher(masterSecret.getEncryptionKey(), encryptedBody); + byte[] encrypted = getDecryptedBody(cipher, encryptedBody); + + return encrypted; + } catch (GeneralSecurityException ge) { + throw new InvalidMessageException(ge); + } + } + + public byte[] encryptBytes(byte[] body) { + try { + Cipher cipher = getEncryptingCipher(masterSecret.getEncryptionKey()); + Mac mac = getMac(masterSecret.getMacKey()); + + byte[] encryptedBody = getEncryptedBody(cipher, body); + byte[] encryptedAndMacBody = getMacBody(mac, encryptedBody); + + return encryptedAndMacBody; + } catch (GeneralSecurityException ge) { + System.err.println("bodycipher" + ge); + return null; + } + + } + + public boolean verifyMacFor(String content, byte[] theirMac) { + byte[] ourMac = getMacFor(content); + System.err.println("Our Mac: " + Hex.toString(ourMac)); + System.err.println("Thr Mac: " + Hex.toString(theirMac)); + return Arrays.equals(ourMac, theirMac); + } + + public byte[] getMacFor(String content) { + System.err.println("Macing: " + content); + try { + Mac mac = getMac(masterSecret.getMacKey()); + return mac.doFinal(content.getBytes()); + } catch (GeneralSecurityException ike) { + throw new AssertionError(ike); + } + } + + private byte[] decodeAndDecryptBytes(String body) throws InvalidMessageException { + try { + byte[] decodedBody = Base64.decode(body); + return decryptBytes(decodedBody); + } catch (IOException e) { + throw new InvalidMessageException("Bad Base64 Encoding...", e); + } + } + + private String encryptAndEncodeBytes(@NonNull byte[] bytes) { + byte[] encryptedAndMacBody = encryptBytes(bytes); + return Base64.encodeBytes(encryptedAndMacBody); + } + + private byte[] verifyMacBody(@NonNull Mac hmac, @NonNull byte[] encryptedAndMac) throws InvalidMessageException { + if (encryptedAndMac.length < hmac.getMacLength()) { + throw new InvalidMessageException("length(encrypted body + MAC) < length(MAC)"); + } + + byte[] encrypted = new byte[encryptedAndMac.length - hmac.getMacLength()]; + System.arraycopy(encryptedAndMac, 0, encrypted, 0, encrypted.length); + + byte[] remoteMac = new byte[hmac.getMacLength()]; + System.arraycopy(encryptedAndMac, encryptedAndMac.length - remoteMac.length, remoteMac, 0, remoteMac.length); + + byte[] localMac = hmac.doFinal(encrypted); + + if (!Arrays.equals(remoteMac, localMac)) + throw new InvalidMessageException("MAC doesen't match."); + + return encrypted; + } + + private byte[] getDecryptedBody(Cipher cipher, byte[] encryptedBody) throws IllegalBlockSizeException, BadPaddingException { + return cipher.doFinal(encryptedBody, cipher.getBlockSize(), encryptedBody.length - cipher.getBlockSize()); + } + + private byte[] getEncryptedBody(Cipher cipher, byte[] body) throws IllegalBlockSizeException, BadPaddingException { + byte[] encrypted = cipher.doFinal(body); + byte[] iv = cipher.getIV(); + + byte[] ivAndBody = new byte[iv.length + encrypted.length]; + System.arraycopy(iv, 0, ivAndBody, 0, iv.length); + System.arraycopy(encrypted, 0, ivAndBody, iv.length, encrypted.length); + + return ivAndBody; + } + + private Mac getMac(SecretKeySpec key) throws NoSuchAlgorithmException, InvalidKeyException { + // Mac hmac = Mac.getInstance("HmacSHA1"); + hmac.init(key); + + return hmac; + } + + private byte[] getMacBody(Mac hmac, byte[] encryptedBody) { + byte[] mac = hmac.doFinal(encryptedBody); + byte[] encryptedAndMac = new byte[encryptedBody.length + mac.length]; + + System.arraycopy(encryptedBody, 0, encryptedAndMac, 0, encryptedBody.length); + System.arraycopy(mac, 0, encryptedAndMac, encryptedBody.length, mac.length); + + return encryptedAndMac; + } + + private Cipher getDecryptingCipher(SecretKeySpec key, byte[] encryptedBody) throws InvalidKeyException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchPaddingException { + // Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + IvParameterSpec iv = new IvParameterSpec(encryptedBody, 0, decryptingCipher.getBlockSize()); + decryptingCipher.init(Cipher.DECRYPT_MODE, key, iv); + + return decryptingCipher; + } + + private Cipher getEncryptingCipher(SecretKeySpec key) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException { + // Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + encryptingCipher.init(Cipher.ENCRYPT_MODE, key); + + return encryptingCipher; + } + +} diff --git a/src/main/java/org/muzima/turkana/web/signalclients/MasterSecret.java b/src/main/java/org/muzima/turkana/web/signalclients/MasterSecret.java new file mode 100644 index 0000000..0f1b88a --- /dev/null +++ b/src/main/java/org/muzima/turkana/web/signalclients/MasterSecret.java @@ -0,0 +1,42 @@ +package org.muzima.turkana.web.signalclients; + +import java.util.Arrays; + +import javax.crypto.spec.SecretKeySpec; + +/** + * When a user first initializes TextSecure, a few secrets + * are generated. These are: + *

+ * 1) A 128bit symmetric encryption key. + * 2) A 160bit symmetric MAC key. + * 3) An ECC keypair. + *

+ * The first two, along with the ECC keypair's private key, are + * then encrypted on disk using PBE. + *

+ * This class represents 1 and 2. + * + * @author Samuel Owino + */ + +public class MasterSecret { + + private SecretKeySpec encryptionKey; + private SecretKeySpec macKey; + + public MasterSecret(SecretKeySpec encryptionKey, SecretKeySpec macKey) { + this.encryptionKey = encryptionKey; + this.macKey = macKey; + } + + public SecretKeySpec getEncryptionKey() { + return this.encryptionKey; + } + + public SecretKeySpec getMacKey() { + return this.macKey; + } + +} + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8699de2..1394a3c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,6 +2,9 @@ spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect spring.jpa.hibernate.ddl-auto=update spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/turkana -spring.datasource.username=root -spring.datasource.password=1234 -media.directory=/Users/mhawilamhawila/turkana_media +spring.datasource.username=dev +spring.datasource.password=S705431007s +media.directory=/home/muzima/Desktop/nasa +turkana.phonenumber=+254706906138 +server.contextPath=turkana + diff --git a/src/main/resources/signal_keystore.jks b/src/main/resources/signal_keystore.jks new file mode 100644 index 0000000..7426b79 Binary files /dev/null and b/src/main/resources/signal_keystore.jks differ diff --git a/src/main/resources/whisper.store b/src/main/resources/whisper.store new file mode 100644 index 0000000..664ca95 Binary files /dev/null and b/src/main/resources/whisper.store differ diff --git a/src/test/java/org/muzima/TurkanaApplicationTests.java b/src/test/java/org/muzima/TurkanaApplicationTests.java index c5851ce..d9195ff 100644 --- a/src/test/java/org/muzima/TurkanaApplicationTests.java +++ b/src/test/java/org/muzima/TurkanaApplicationTests.java @@ -16,7 +16,7 @@ public class TurkanaApplicationTests { @Test - public void contextLoads() { + public void Loads() { } diff --git a/src/test/java/org/muzima/turkana/AbstractIntegrationTest.java b/src/test/java/org/muzima/turkana/AbstractIntegrationTest.java index 548cfec..65efa7f 100644 --- a/src/test/java/org/muzima/turkana/AbstractIntegrationTest.java +++ b/src/test/java/org/muzima/turkana/AbstractIntegrationTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** - * Provides Spring context and database initialization for integration tests. + * Provides Spring and database initialization for integration tests. * @author Willa aka Baba Imu on 6/20/19. */ diff --git a/src/test/java/org/muzima/turkana/data/SignedPrekeyRepositoryTest.java b/src/test/java/org/muzima/turkana/data/SignedPrekeyRepositoryTest.java new file mode 100644 index 0000000..4557db3 --- /dev/null +++ b/src/test/java/org/muzima/turkana/data/SignedPrekeyRepositoryTest.java @@ -0,0 +1,36 @@ +package org.muzima.turkana.data; + +import org.assertj.core.api.Assertions; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.muzima.turkana.model.SignedPreKey; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.net.ssl.KeyManagerFactory; + +import static org.junit.Assert.*; + +@DataJpaTest +@RunWith(SpringRunner.class) +public class SignedPrekeyRepositoryTest { + + @Autowired + private TestEntityManager testEntityManager; + + private SignedPreKey sampleSignedPreKey; + + @Before + public void setUp() throws Exception { + sampleSignedPreKey = new SignedPreKey(1,1,"public_key","private_key","signature",1L); + } + + @Test + public void mappingTest(){ + SignedPreKey signedPreKey = this.testEntityManager.persistAndFlush(sampleSignedPreKey); + Assertions.assertThat(signedPreKey).isEqualTo(sampleSignedPreKey); + } +} \ No newline at end of file diff --git a/src/test/java/org/muzima/turkana/data/SmsRepositoryTest.java b/src/test/java/org/muzima/turkana/data/SmsRepositoryTest.java new file mode 100644 index 0000000..65dcc59 --- /dev/null +++ b/src/test/java/org/muzima/turkana/data/SmsRepositoryTest.java @@ -0,0 +1,60 @@ +package org.muzima.turkana.data; + +import org.assertj.core.api.Assertions; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.muzima.turkana.model.Sms; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collections; +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.*; + +@DataJpaTest +@RunWith(SpringRunner.class) +public class SmsRepositoryTest { + + private Logger logger = LoggerFactory.getLogger(SmsRepositoryTest.class); + + @Autowired + private TestEntityManager testEntityManager; + + @Autowired + private SmsRepository smsRepository; + + private Sms sampleSmsMessage; + + private List sampleSmsMessages; + + @Before + public void setUp() throws Exception { + logger.info("SmsRepositoryTest set up"); + + sampleSmsMessage = new Sms("DIABETES ENCOUNTER APPLICATION", UUID.randomUUID().toString(),"text-message_type"); + sampleSmsMessages = Collections.singletonList(sampleSmsMessage); + } + + @Test + public void mappingTest(){ + + logger.info("Testing Sms Repository jpa mapping"); + + Sms sms = this.testEntityManager.persistAndFlush(sampleSmsMessage); + Assertions.assertThat(sms.getUuid()).isEqualTo(sampleSmsMessage.getUuid()); + Assertions.assertThat(sms.getType()).isEqualTo(sampleSmsMessage.getType()); + Assertions.assertThat(sms.getSubject()).isEqualTo("DIABETES ENCOUNTER APPLICATION"); + } + + + public void tearDown() throws Exception { + } +} \ No newline at end of file diff --git a/src/test/java/org/muzima/turkana/data/UsageLogsRepositoryTest.java b/src/test/java/org/muzima/turkana/data/UsageLogsRepositoryTest.java new file mode 100644 index 0000000..a2615c8 --- /dev/null +++ b/src/test/java/org/muzima/turkana/data/UsageLogsRepositoryTest.java @@ -0,0 +1,55 @@ +package org.muzima.turkana.data; + +import org.assertj.core.api.Assertions; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.muzima.turkana.model.UsageLogs; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.*; + +@DataJpaTest +@RunWith(SpringRunner.class) +public class UsageLogsRepositoryTest { + + private Logger logger = LoggerFactory.getLogger(UsageLogsRepositoryTest.class); + + @Autowired + private TestEntityManager testEntityManager; + + + private UsageLogs sampleUsageLogs; + private List sampleUsageLogsList; + + @Before + public void setUp(){ + + logger.info("Running UsageLogsRepositoryTest : setUp()"); + + sampleUsageLogs = new UsageLogs(); + sampleUsageLogsList = Collections.singletonList(sampleUsageLogs); + } + + @Test + public void mappingTest(){ + + logger.info("Running: UsageLogsRepositoryTest : mappingTest"); + + UsageLogs usageLogs = this.testEntityManager.persistAndFlush(sampleUsageLogs); + List usageLogsList = this.testEntityManager.persistAndFlush(sampleUsageLogsList); + + Assertions.assertThat(usageLogs).isEqualTo(sampleUsageLogs); + Assertions.assertThat(usageLogsList).isEqualTo(sampleUsageLogsList); + } + +} \ No newline at end of file diff --git a/src/test/java/org/muzima/turkana/service/MediaServiceIntegrationTest.java b/src/test/java/org/muzima/turkana/service/MediaServiceIntegrationTest.java index 088506b..f64ae17 100644 --- a/src/test/java/org/muzima/turkana/service/MediaServiceIntegrationTest.java +++ b/src/test/java/org/muzima/turkana/service/MediaServiceIntegrationTest.java @@ -41,7 +41,6 @@ public void saveMedia_shouldSaveMediaFileAndMetadata() throws IOException { MediaMetadata metadata = new MediaMetadata(); Registration registration = new Registration(); - // Get the directory String randomFilename = UUID.randomUUID().toString(); String mediaPath = testMediaFileResource.getFile().getParentFile().getAbsolutePath() + "/" + randomFilename + ".jpg";