skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Apply 'Lhunath' code inspection fixes and improvements.

Browse Source
This commit is contained in:
Maarten Billemont
2017-04-04 20:39:18 -04:00
parent 86f956571d
commit b478691980
59 changed files with 452 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/model/build.gradle
View File

@@ -6,7 +6,7 @@ plugins {
description = 'Master Password Site Model'
dependencies {
compile project(':masterpassword:algorithm')
compile project(':masterpassword-algorithm')
compile group: 'joda-time', name: 'joda-time', version:'2.4'
compileOnly group: 'com.google.auto.value', name: 'auto-value', version: '1.2'

2
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java
View File

@@ -128,7 +128,7 @@ public class MPSite {
@Override
public boolean equals(final Object obj) {
return this == obj || obj instanceof MPSite && Objects.equals( siteName, ((MPSite) obj).siteName );
return (this == obj) || ((obj instanceof MPSite) && Objects.equals( siteName, ((MPSite) obj).siteName ));
}
@Override

8
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java
View File

@@ -26,7 +26,7 @@ public class MPSiteMarshaller {
public static MPSiteMarshaller marshallSafe(final MPUser user) {
MPSiteMarshaller marshaller = new MPSiteMarshaller();
marshaller.marshallHeaderForSafeContent( user );
for (MPSite site : user.getSites())
for (final MPSite site : user.getSites())
marshaller.marshallSite( site );
return marshaller;
@@ -35,7 +35,7 @@ public class MPSiteMarshaller {
public static MPSiteMarshaller marshallVisible(final MPUser user, final MasterKey masterKey) {
MPSiteMarshaller marshaller = new MPSiteMarshaller();
marshaller.marshallHeaderForVisibleContentWithKey( user, masterKey );
for (MPSite site : user.getSites())
for (final MPSite site : user.getSites())
marshaller.marshallSite( site );
return marshaller;
@@ -77,7 +77,7 @@ public class MPSiteMarshaller {
return header.toString();
}
public String marshallSite(MPSite site) {
public String marshallSite(final MPSite site) {
String exportLine = strf( "%s %8d %8s %25s\t%25s\t%s", //
rfc3339.print( site.getLastUsed() ), // lastUsed
site.getUses(), // uses
@@ -126,6 +126,6 @@ public class MPSiteMarshaller {
return description;
}
public abstract String contentForSite(final MPSite site, final MasterKey masterKey);
public abstract String contentForSite(MPSite site, MasterKey masterKey);
}
}

2
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java
View File

@@ -22,7 +22,7 @@ public class MPSiteResult {
@Override
public boolean equals(final Object obj) {
return this == obj || obj instanceof MPSiteResult && Objects.equals( site, ((MPSiteResult) obj).site );
return (this == obj) || ((obj instanceof MPSiteResult) && Objects.equals( site, ((MPSiteResult) obj).site ));
}
@Override

19
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java
View File

@@ -2,6 +2,7 @@ package com.lyndir.masterpassword.model;
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.io.CharStreams;
@@ -31,26 +32,28 @@ public class MPSiteUnmarshaller {
@SuppressWarnings("UnusedDeclaration")
private static final Logger logger = Logger.get( MPSite.class );
private static final DateTimeFormatter rfc3339 = ISODateTimeFormat.dateTimeNoMillis();
private static final Pattern[] unmarshallFormats = new Pattern[]{
private static final Pattern[] unmarshallFormats = {
Pattern.compile( "^([^ ]+) +(\\d+) +(\\d+)(:\\d+)? +([^\t]+)\t(.*)" ),
Pattern.compile( "^([^ ]+) +(\\d+) +(\\d+)(:\\d+)?(:\\d+)? +([^\t]*)\t *([^\t]+)\t(.*)" ) };
private static final Pattern headerFormat = Pattern.compile( "^#\\s*([^:]+): (.*)" );
private final int importFormat;
@SuppressWarnings({ "FieldCanBeLocal", "unused" })
private final int mpVersion;
@SuppressWarnings({ "FieldCanBeLocal", "unused" })
private final boolean clearContent;
private final MPUser user;
@Nonnull
public static MPSiteUnmarshaller unmarshall(@Nonnull File file)
public static MPSiteUnmarshaller unmarshall(@Nonnull final File file)
throws IOException {
try (Reader reader = new FileReader( file )) {
try (Reader reader = new InputStreamReader( new FileInputStream( file ), Charsets.UTF_8 )) {
return unmarshall( CharStreams.readLines( reader ) );
}
}
@Nonnull
public static MPSiteUnmarshaller unmarshall(@Nonnull List<String> lines) {
public static MPSiteUnmarshaller unmarshall(@Nonnull final List<String> lines) {
byte[] keyID = null;
String fullName = null;
int mpVersion = 0, importFormat = 0, avatar = 0;
@@ -59,7 +62,7 @@ public class MPSiteUnmarshaller {
MPSiteUnmarshaller marshaller = null;
final ImmutableList.Builder<MPSite> sites = ImmutableList.builder();
for (String line : lines)
for (final String line : lines)
// Header delimitor.
if (line.startsWith( "##" ))
if (!headerStarted)
@@ -71,7 +74,7 @@ public class MPSiteUnmarshaller {
// Comment.
else if (line.startsWith( "#" )) {
if (headerStarted && marshaller == null) {
if (headerStarted && (marshaller == null)) {
// In header.
Matcher headerMatcher = headerFormat.matcher( line );
if (headerMatcher.matches()) {
@@ -87,7 +90,7 @@ public class MPSiteUnmarshaller {
else if ("Avatar".equalsIgnoreCase( name ))
avatar = ConversionUtils.toIntegerNN( value );
else if ("Passwords".equalsIgnoreCase( name ))
clearContent = value.equalsIgnoreCase( "visible" );
clearContent = "visible".equalsIgnoreCase( value );
else if ("Default Type".equalsIgnoreCase( name ))
defaultType = MPSiteType.forType( ConversionUtils.toIntegerNN( value ) );
}
@@ -116,7 +119,7 @@ public class MPSiteUnmarshaller {
}
@Nullable
public MPSite unmarshallSite(@Nonnull String siteLine) {
public MPSite unmarshallSite(@Nonnull final String siteLine) {
Matcher siteMatcher = unmarshallFormats[importFormat].matcher( siteLine );
if (!siteMatcher.matches())
return null;

13
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java
View File

@@ -39,16 +39,16 @@ public class MPUser implements Comparable<MPUser> {
public MPUser(final String fullName, @Nullable final byte[] keyID, final MasterKey.Version algorithmVersion, final int avatar,
final MPSiteType defaultType, final ReadableInstant lastUsed) {
this.fullName = fullName;
this.keyID = keyID;
this.keyID = (keyID == null)? null: keyID.clone();
this.algorithmVersion = algorithmVersion;
this.avatar = avatar;
this.defaultType = defaultType;
this.lastUsed = lastUsed;
}
public Collection<MPSiteResult> findSitesByName(String query) {
public Collection<MPSiteResult> findSitesByName(final String query) {
ImmutableList.Builder<MPSiteResult> results = ImmutableList.builder();
for (MPSite site : getSites())
for (final MPSite site : getSites())
if (site.getSiteName().startsWith( query ))
results.add( new MPSiteResult( site ) );
@@ -87,10 +87,11 @@ public class MPUser implements Comparable<MPUser> {
* @throws IncorrectMasterPasswordException If authentication fails due to the given master password not matching the user's keyID.
*/
@Nonnull
@SuppressWarnings("MethodCanBeVariableArityMethod")
public MasterKey authenticate(final char[] masterPassword)
throws IncorrectMasterPasswordException {
MasterKey masterKey = MasterKey.create( algorithmVersion, getFullName(), masterPassword );
if (keyID == null || keyID.length == 0)
if ((keyID == null) || (keyID.length == 0))
keyID = masterKey.getKeyID();
else if (!Arrays.equals( masterKey.getKeyID(), keyID ))
throw new IncorrectMasterPasswordException( this );
@@ -119,7 +120,7 @@ public class MPUser implements Comparable<MPUser> {
}
public void updateLastUsed() {
this.lastUsed = new Instant();
lastUsed = new Instant();
}
public Iterable<MPSite> getSites() {
@@ -128,7 +129,7 @@ public class MPUser implements Comparable<MPUser> {
@Override
public boolean equals(final Object obj) {
return this == obj || obj instanceof MPUser && Objects.equals( fullName, ((MPUser) obj).fullName );
return (this == obj) || ((obj instanceof MPUser) && Objects.equals( fullName, ((MPUser) obj).fullName ));
}
@Override

9
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java
View File

@@ -59,7 +59,7 @@ public class MPUserFileManager extends MPUserManager {
try {
return MPSiteUnmarshaller.unmarshall( Preconditions.checkNotNull( file ) ).getUser();
}
catch (IOException e) {
catch (final IOException e) {
logger.err( e, "Couldn't read user from: %s", file );
return null;
}
@@ -99,16 +99,17 @@ public class MPUserFileManager extends MPUserManager {
@Override
public Writer openStream()
throws IOException {
return new FileWriter( new File( userFilesDirectory, user.getFullName() + ".mpsites" ) );
File mpsitesFile = new File( userFilesDirectory, user.getFullName() + ".mpsites" );
return new OutputStreamWriter( new FileOutputStream( mpsitesFile ), Charsets.UTF_8 );
}
}.write( MPSiteMarshaller.marshallSafe( user ).getExport() );
}
catch (IOException e) {
catch (final IOException e) {
logger.err( e, "Unable to save sites for user: %s", user );
}
// Remove deleted users.
for (File userFile : listUserFiles( userFilesDirectory ))
for (final File userFile : listUserFiles( userFilesDirectory ))
if (getUserNamed( userFile.getName().replaceFirst( "\\.mpsites$", "" ) ) == null)
if (!userFile.delete())
logger.err( "Couldn't delete file: %s", userFile );

4
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java
View File

@@ -17,7 +17,7 @@ public abstract class MPUserManager {
}
protected MPUserManager(final Iterable<MPUser> users) {
for (MPUser user : users)
for (final MPUser user : users)
usersByName.put( user.getFullName(), user );
}
@@ -25,7 +25,7 @@ public abstract class MPUserManager {
return FluentIterable.from( usersByName.values() ).toSortedSet( Ordering.natural() );
}
public MPUser getUserNamed(String fullName) {
public MPUser getUserNamed(final String fullName) {
return usersByName.get( fullName );
}