skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Java improvements.

Browse Source 
UI threading improvements.
Save user/site changes to file.
Ordering of user / site fixes.
Add questions to JSON output.
Bring JSON output format in line with C.
This commit is contained in:
Maarten Billemont
2018-07-09 01:13:25 -04:00
parent 529f1feace
commit 954c4f8d63
20 changed files with 446 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java
View File

@@ -21,6 +21,7 @@ package com.lyndir.masterpassword.model;
import com.google.common.primitives.UnsignedInteger;
import com.lyndir.masterpassword.*;
import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -31,41 +32,50 @@ public interface MPSite<Q extends MPQuestion> extends Comparable<MPSite<?>> {
// - Meta
@Nonnull
String getName();
void setName(String name);
// - Algorithm
@Nonnull
MPAlgorithm getAlgorithm();
void setAlgorithm(MPAlgorithm algorithm);
@Nonnull
UnsignedInteger getCounter();
void setCounter(UnsignedInteger counter);
@Nonnull
MPResultType getResultType();
void setResultType(MPResultType resultType);
@Nonnull
MPResultType getLoginType();
void setLoginType(@Nullable MPResultType loginType);
@Nonnull
String getResult(MPKeyPurpose keyPurpose, @Nullable String keyContext, @Nullable String state)
throws MPKeyUnavailableException, MPAlgorithmException;
@Nonnull
String getLogin(@Nullable String state)
throws MPKeyUnavailableException, MPAlgorithmException;
// - Relations
MPUser<? extends MPSite<?>> getUser();
@Nonnull
MPUser<?> getUser();
void addQuestion(Q question);
void deleteQuestion(Q question);
@Nonnull
Collection<Q> getQuestions();
}

5
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java
View File

@@ -18,8 +18,7 @@
package com.lyndir.masterpassword.model;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.collect.*;
import java.util.Collection;
import java.util.Map;
@@ -37,7 +36,7 @@ public abstract class MPUserManager<U extends MPUser<?>> {
}
public Collection<U> getUsers() {
return ImmutableList.copyOf( usersByName.values() );
return ImmutableSortedSet.copyOf( usersByName.values() );
}
public U getUserNamed(final String fullName) {

59
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/Changeable.java Normal file
View File

@@ -0,0 +1,59 @@
package com.lyndir.masterpassword.model.impl;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* @author lhunath, 2018-07-08
*/
public class Changeable {
private static final ExecutorService changeExecutor = Executors.newSingleThreadExecutor();
private boolean changed;
private boolean batchingChanges;
void setChanged() {
synchronized (changeExecutor) {
if (changed)
return;
changed = true;
if (batchingChanges)
return;
changeExecutor.submit( () -> {
synchronized (changeExecutor) {
if (batchingChanges)
return;
changed = false;
}
onChanged();
} );
}
}
protected void onChanged() {
}
public void beginChanges() {
synchronized (changeExecutor) {
batchingChanges = true;
}
}
public boolean endChanges() {
synchronized (changeExecutor) {
batchingChanges = false;
if (changed) {
this.changed = false;
setChanged();
return true;
} else
return false;
}
}
}

11
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java
View File

@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author lhunath, 2018-05-14
*/
public abstract class MPBasicQuestion implements MPQuestion {
public abstract class MPBasicQuestion extends Changeable implements MPQuestion {
private final String keyword;
private MPResultType type;
@@ -56,6 +56,8 @@ public abstract class MPBasicQuestion implements MPQuestion {
@Override
public void setType(final MPResultType type) {
this.type = type;
setChanged();
}
@Nonnull
@@ -70,6 +72,13 @@ public abstract class MPBasicQuestion implements MPQuestion {
@Override
public abstract MPBasicSite<?> getSite();
@Override
protected void onChanged() {
super.onChanged();
getSite().setChanged();
}
@Override
public int hashCode() {
return Objects.hashCode( getKeyword() );

36
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java
View File

@@ -26,6 +26,7 @@ import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPQuestion;
import com.lyndir.masterpassword.model.MPSite;
import java.util.*;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
/**
* @author lhunath, 14-12-16
*/
public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
public abstract class MPBasicSite<Q extends MPQuestion> extends Changeable implements MPSite<Q> {
private String name;
private MPAlgorithm algorithm;
@@ -56,6 +57,7 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
this.loginType = (loginType == null)? algorithm.mpw_default_login_type(): loginType;
}
@Nonnull
@Override
public String getName() {
return name;
@@ -64,8 +66,11 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void setName(final String name) {
this.name = name;
setChanged();
}
@Nonnull
@Override
public MPAlgorithm getAlgorithm() {
return algorithm;
@@ -74,8 +79,11 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void setAlgorithm(final MPAlgorithm algorithm) {
this.algorithm = algorithm;
setChanged();
}
@Nonnull
@Override
public UnsignedInteger getCounter() {
return counter;
@@ -84,8 +92,11 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void setCounter(final UnsignedInteger counter) {
this.counter = counter;
setChanged();
}
@Nonnull
@Override
public MPResultType getResultType() {
return resultType;
@@ -94,8 +105,11 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void setResultType(final MPResultType resultType) {
this.resultType = resultType;
setChanged();
}
@Nonnull
@Override
public MPResultType getLoginType() {
return loginType;
@@ -104,8 +118,11 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void setLoginType(@Nullable final MPResultType loginType) {
this.loginType = ifNotNullElse( loginType, getAlgorithm().mpw_default_login_type() );
setChanged();
}
@Nonnull
@Override
public String getResult(final MPKeyPurpose keyPurpose, @Nullable final String keyContext, @Nullable final String state)
throws MPKeyUnavailableException, MPAlgorithmException {
@@ -131,6 +148,7 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
keyPurpose, keyContext, type, state );
}
@Nonnull
@Override
public String getLogin(@Nullable final String state)
throws MPKeyUnavailableException, MPAlgorithmException {
@@ -141,18 +159,34 @@ public abstract class MPBasicSite<Q extends MPQuestion> implements MPSite<Q> {
@Override
public void addQuestion(final Q question) {
questions.add( question );
setChanged();
}
@Override
public void deleteQuestion(final Q question) {
questions.remove( question );
setChanged();
}
@Nonnull
@Override
public Collection<Q> getQuestions() {
return Collections.unmodifiableCollection( questions );
}
@Nonnull
@Override
public abstract MPBasicUser<?> getUser();
@Override
protected void onChanged() {
super.onChanged();
getUser().setChanged();
}
@Override
public int hashCode() {
return Objects.hashCode( getName() );

16
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java
View File

@@ -20,7 +20,7 @@ package com.lyndir.masterpassword.model.impl;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSortedSet;
import com.lyndir.lhunath.opal.system.CodeUtils;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.masterpassword.*;
@@ -34,7 +34,7 @@ import javax.annotation.Nullable;
/**
* @author lhunath, 2014-06-08
*/
public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S> {
public abstract class MPBasicUser<S extends MPBasicSite<?>> extends Changeable implements MPUser<S> {
protected final Logger logger = Logger.get( getClass() );
@@ -64,6 +64,8 @@ public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S>
@Override
public void setAvatar(final int avatar) {
this.avatar = avatar;
setChanged();
}
@Nonnull
@@ -81,6 +83,8 @@ public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S>
@Override
public void setAlgorithm(final MPAlgorithm algorithm) {
this.algorithm = algorithm;
setChanged();
}
@Nullable
@@ -136,7 +140,7 @@ public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S>
public MPMasterKey getMasterKey()
throws MPKeyUnavailableException {
if (masterKey == null)
throw new MPKeyUnavailableException( "Master key was not yet set." );
throw new MPKeyUnavailableException( "Master key was not yet set for: " + this );
return masterKey;
}
@@ -144,11 +148,15 @@ public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S>
@Override
public void addSite(final S site) {
sites.add( site );
setChanged();
}
@Override
public void deleteSite(final S site) {
sites.remove( site );
setChanged();
}
@Nonnull
@@ -160,7 +168,7 @@ public abstract class MPBasicUser<S extends MPBasicSite<?>> implements MPUser<S>
@Nonnull
@Override
public Collection<S> findSites(final String query) {
ImmutableList.Builder<S> results = ImmutableList.builder();
ImmutableSortedSet.Builder<S> results = ImmutableSortedSet.naturalOrder();
for (final S site : getSites())
if (site.getName().startsWith( query ))
results.add( site );

19
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java
View File

@@ -33,19 +33,24 @@ public class MPFileQuestion extends MPBasicQuestion {
private final MPFileSite site;
@Nullable
private String state;
private String answerState;
public MPFileQuestion(final MPFileSite site, final String keyword,
@Nullable final MPResultType type, @Nullable final String state) {
@Nullable final MPResultType type, @Nullable final String answerState) {
super( keyword, ifNotNullElse( type, site.getAlgorithm().mpw_default_answer_type() ) );
this.site = site;
this.state = state;
this.answerState = answerState;
}
@Nullable
public String getAnswerState() {
return answerState;
}
public String getAnswer()
throws MPKeyUnavailableException, MPAlgorithmException {
return getAnswer( state );
return getAnswer( answerState );
}
public void setAnswer(final MPResultType type, @Nullable final String answer)
@@ -53,10 +58,12 @@ public class MPFileQuestion extends MPBasicQuestion {
setType( type );
if (answer == null)
this.state = null;
this.answerState = null;
else
this.state = getSite().getState(
this.answerState = getSite().getState(
MPKeyPurpose.Recovery, getKeyword(), null, getType(), answer );
setChanged();
}
@Nonnull

18
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java
View File

@@ -20,6 +20,7 @@ package com.lyndir.masterpassword.model.impl;
import com.google.common.primitives.UnsignedInteger;
import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPSite;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.joda.time.Instant;
@@ -29,6 +30,7 @@ import org.joda.time.ReadableInstant;
/**
* @author lhunath, 14-12-05
*/
@SuppressWarnings("ComparableImplementedButEqualsNotOverridden")
public class MPFileSite extends MPBasicSite<MPFileQuestion> {
private final MPFileUser user;
@@ -77,6 +79,8 @@ public class MPFileSite extends MPBasicSite<MPFileQuestion> {
public void setUrl(@Nullable final String url) {
this.url = url;
setChanged();
}
public int getUses() {
@@ -125,6 +129,8 @@ public class MPFileSite extends MPBasicSite<MPFileQuestion> {
else
this.resultState = getState(
MPKeyPurpose.Authentication, null, getCounter(), getResultType(), password );
setChanged();
}
@Nullable
@@ -141,10 +147,22 @@ public class MPFileSite extends MPBasicSite<MPFileQuestion> {
else
this.loginState = getState(
MPKeyPurpose.Identification, null, null, getLoginType(), loginName );
setChanged();
}
@Nonnull
@Override
public MPFileUser getUser() {
return user;
}
@Override
public int compareTo(final MPSite<?> o) {
int comparison = (o instanceof MPFileSite)? -getLastUsed().compareTo( ((MPFileSite) o).getLastUsed() ): 0;
if (comparison != 0)
return comparison;
return super.compareTo( o );
}
}

31
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
View File

@@ -18,7 +18,6 @@
package com.lyndir.masterpassword.model.impl;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
import com.lyndir.masterpassword.model.MPUser;
@@ -34,9 +33,6 @@ import org.joda.time.ReadableInstant;
@SuppressWarnings("ComparableImplementedButEqualsNotOverridden")
public class MPFileUser extends MPBasicUser<MPFileSite> {
@SuppressWarnings("UnusedDeclaration")
private static final Logger logger = Logger.get( MPFileUser.class );
@Nullable
private byte[] keyID;
private MPMarshalFormat format;
@@ -101,6 +97,8 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
public void setFormat(final MPMarshalFormat format) {
this.format = format;
setChanged();
}
public MPMarshaller.ContentMode getContentMode() {
@@ -109,6 +107,8 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
public void setContentMode(final MPMarshaller.ContentMode contentMode) {
this.contentMode = contentMode;
setChanged();
}
public MPResultType getDefaultType() {
@@ -117,6 +117,8 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
public void setDefaultType(final MPResultType defaultType) {
this.defaultType = defaultType;
setChanged();
}
public ReadableInstant getLastUsed() {
@@ -125,6 +127,8 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
public void use() {
lastUsed = new Instant();
setChanged();
}
public void setJSON(final MPJSONFile json) {
@@ -141,8 +145,23 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
throws MPIncorrectMasterPasswordException, MPKeyUnavailableException, MPAlgorithmException {
super.authenticate( masterKey );
if (keyID == null)
if (keyID == null) {
keyID = masterKey.getKeyID( getAlgorithm() );
setChanged();
}
}
@Override
protected void onChanged() {
super.onChanged();
try {
save();
}
catch (final MPKeyUnavailableException | MPAlgorithmException e) {
logger.wrn( e, "Couldn't save change." );
}
}
void save()
@@ -152,7 +171,7 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
@Override
public int compareTo(final MPUser<?> o) {
int comparison = (o instanceof MPFileUser)? getLastUsed().compareTo( ((MPFileUser) o).getLastUsed() ): 0;
int comparison = (o instanceof MPFileUser)? -getLastUsed().compareTo( ((MPFileUser) o).getLastUsed() ): 0;
if (comparison != 0)
return comparison;

21
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java
View File

@@ -18,14 +18,14 @@
package com.lyndir.masterpassword.model.impl;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.*;
import java.util.*;
/**
* @author lhunath, 2018-05-14
*/
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = MPJSONAnyObject.MPJSONEmptyValue.class)
class MPJSONAnyObject {
@JsonAnySetter
@@ -35,4 +35,21 @@ class MPJSONAnyObject {
public Map<String, Object> getAny() {
return Collections.unmodifiableMap( any );
}
@SuppressWarnings("EqualsAndHashcode")
public static class MPJSONEmptyValue {
@Override
@SuppressWarnings({ "ChainOfInstanceofChecks", "Contract" })
public boolean equals(final Object obj) {
if (obj instanceof Collection<?>)
return ((Collection<?>) obj).isEmpty();
if (obj instanceof Map<?, ?>)
return ((Map<?, ?>) obj).isEmpty();
if (obj instanceof MPJSONFile.Site.Ext)
return ((MPJSONAnyObject) obj).any.isEmpty();
return obj == null;
}
}
}

80
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
View File

@@ -20,7 +20,10 @@ package com.lyndir.masterpassword.model.impl;
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.core.util.Separators;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.primitives.UnsignedInteger;
import com.lyndir.lhunath.opal.system.CodeUtils;
@@ -37,18 +40,28 @@ import org.joda.time.Instant;
/**
* @author lhunath, 2018-04-27
*/
@SuppressFBWarnings( "URF_UNREAD_FIELD" )
@SuppressFBWarnings("URF_UNREAD_FIELD")
public class MPJSONFile extends MPJSONAnyObject {
protected static final ObjectMapper objectMapper = new ObjectMapper();
static {
objectMapper.setSerializationInclusion( JsonInclude.Include.NON_EMPTY );
objectMapper.setDefaultPrettyPrinter( new DefaultPrettyPrinter() {
private static final long serialVersionUID = 1;
@Override
public DefaultPrettyPrinter withSeparators(final Separators separators) {
super.withSeparators( separators );
_objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator() + " ";
return this;
}
} );
objectMapper.setVisibility( PropertyAccessor.FIELD, JsonAutoDetect.Visibility.NON_PRIVATE );
}
public MPJSONFile write(final MPFileUser modelUser)
throws MPKeyUnavailableException, MPAlgorithmException {
// Section: "export"
if (export == null)
export = new Export();
@@ -98,38 +111,27 @@ public class MPJSONFile extends MPJSONAnyObject {
site.uses = modelSite.getUses();
site.last_used = MPConstants.dateTimeFormatter.print( modelSite.getLastUsed() );
if (site.questions == null)
site.questions = new LinkedHashMap<>();
for (final MPFileQuestion question : modelSite.getQuestions())
site.questions.put( question.getKeyword(), new Site.Question() {
{
type = question.getType();
if (!export.redacted) {
// Clear Text
answer = question.getAnswer();
} else {
// Redacted
if (question.getType().supportsTypeFeature( MPSiteFeature.ExportContent ))
answer = question.getAnswerState();
}
}
} );
if (site._ext_mpw == null)
site._ext_mpw = new Site.Ext();
site._ext_mpw.url = modelSite.getUrl();
if (site.questions == null)
site.questions = new LinkedHashMap<>();
// for (size_t q = 0; q < site.questions_count; ++q) {
// MPMarshalledQuestion *question = &site.questions[q];
// if (!question.keyword)
// continue;
//
// json_object *json_site_question = json_object_new_object();
// json_object_object_add( json_site_questions, question.keyword, json_site_question );
// json_object_object_add( json_site_question, "type = question.type;
//
// if (!user.redacted) {
// // Clear Text
// const char *answerContent = mpw_siteResult( masterKey, site.name, MPCounterValueInitial,
// MPKeyPurposeRecovery, question.keyword, question.type, question.content, site.algorithm );
// json_object_object_add( json_site_question, "answer = answerContent;
// }
// else {
// // Redacted
// if (site.type & MPSiteFeatureExportContent && question.content && strlen( question.content ))
// json_object_object_add( json_site_question, "answer = question.content;
// }
// }
// json_object *json_site_mpw = json_object_new_object();
// fileSite._ext_mpw = json_site_mpw;
// if (site.url)
// json_object_object_add( json_site_mpw, "url", site.url );
}
return this;
@@ -143,6 +145,7 @@ public class MPJSONFile extends MPJSONAnyObject {
(user.default_type != null)? user.default_type: algorithm.mpw_default_result_type(),
(user.last_used != null)? MPConstants.dateTimeFormatter.parseDateTime( user.last_used ): new Instant(),
MPMarshalFormat.JSON, export.redacted? MPMarshaller.ContentMode.PROTECTED: MPMarshaller.ContentMode.VISIBLE );
model.beginChanges();
model.setJSON( this );
if (masterPassword != null)
model.authenticate( masterPassword );
@@ -167,6 +170,7 @@ public class MPJSONFile extends MPJSONAnyObject {
model.addSite( site );
}
model.endChanges();
return model;
}
@@ -193,26 +197,26 @@ public class MPJSONFile extends MPJSONAnyObject {
String full_name;
String last_used;
@Nullable
MPAlgorithm.Version algorithm;
@Nullable
String key_id;
@Nullable
MPAlgorithm.Version algorithm;
@Nullable
MPResultType default_type;
}
public static class Site extends MPJSONAnyObject {
@Nullable
MPResultType type;
long counter;
MPAlgorithm.Version algorithm;
@Nullable
MPResultType type;
@Nullable
String password;
@Nullable
MPResultType login_type;
@Nullable
String login_name;
@Nullable
MPResultType login_type;
int uses;
@Nullable

2
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java
View File

@@ -37,7 +37,7 @@ public class MPJSONMarshaller implements MPMarshaller {
throws MPKeyUnavailableException, MPMarshalException, MPAlgorithmException {
try {
return objectMapper.writeValueAsString( user.getJSON().write( user ) );
return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( user.getJSON().write( user ) );
}
catch (final JsonProcessingException e) {
throw new MPMarshalException( "Couldn't compose JSON for: " + user, e );