skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

site.name -> siteName, add identicon marshalling to iOS, missing resultState

Browse Source
This commit is contained in:
Maarten Billemont
2020-01-23 15:58:32 -05:00
parent 2637e9ba99
commit a37b095a66
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform-darwin/Source/MPAppDelegate_Store.m
View File

@@ -641,10 +641,10 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
// Find an existing site to update. // Find an existing site to update.
NSFetchRequest *siteFetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )]; NSFetchRequest *siteFetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )];
siteFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@ AND user == %@", @(importSite->name), user]; siteFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@ AND user == %@", @(importSite->siteName), user];
NSArray *existingSites = [context executeFetchRequest:siteFetchRequest error:&error]; NSArray *existingSites = [context executeFetchRequest:siteFetchRequest error:&error];
if (!existingSites) if (!existingSites)
return MPError( error, @"Lookup of existing sites failed for site: %@, user: %@", @(importSite->name), user.userID ); return MPError( error, @"Lookup of existing sites failed for site: %@, user: %@", @(importSite->siteName), user.userID );
if ([existingSites count]) if ([existingSites count])
// Update existing site. // Update existing site.
for (MPSiteEntity *site in existingSites) { for (MPSiteEntity *site in existingSites) {
@@ -656,7 +656,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
id<MPAlgorithm> algorithm = MPAlgorithmForVersion( importSite->algorithm ); id<MPAlgorithm> algorithm = MPAlgorithmForVersion( importSite->algorithm );
Class entityType = [algorithm classOfType:importSite->type]; Class entityType = [algorithm classOfType:importSite->type];
if (!entityType) if (!entityType)
return MPMakeError( @"Invalid site type in import file: %@ has type %lu", @(importSite->name), (long)importSite->type ); return MPMakeError( @"Invalid site type in import file: %@ has type %lu", @(importSite->siteName), (long)importSite->type );
MPSiteEntity *site = (MPSiteEntity *)[entityType insertNewObjectInContext:context]; MPSiteEntity *site = (MPSiteEntity *)[entityType insertNewObjectInContext:context];
site.user = user; site.user = user;
@@ -683,7 +683,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
- (void)importSite:(const MPMarshalledSite *)importSite protectedByKey:(MPKey *)importKey intoSite:(MPSiteEntity *)site - (void)importSite:(const MPMarshalledSite *)importSite protectedByKey:(MPKey *)importKey intoSite:(MPSiteEntity *)site
usingKey:(MPKey *)userKey { usingKey:(MPKey *)userKey {
site.name = @(importSite->name); site.name = @(importSite->siteName);
if (importSite->content) if (importSite->content)
[site.algorithm importPassword:@(importSite->content) protectedByKey:importKey intoSite:site usingKey:userKey]; [site.algorithm importPassword:@(importSite->content) protectedByKey:importKey intoSite:site usingKey:userKey];
site.type = importSite->type; site.type = importSite->type;

10
platform-independent/c/cli/src/mpw-cli.c
View File

@@ -240,7 +240,7 @@ int main(const int argc, char *const argv[]) {
dbg( "sitesPath : %s", operation.sitesPath ); dbg( "sitesPath : %s", operation.sitesPath );
} }
if (operation.site) { if (operation.site) {
dbg( "siteName : %s", operation.site->name ); dbg( "siteName : %s", operation.site->siteName );
dbg( "siteCounter : %u", operation.siteCounter ); dbg( "siteCounter : %u", operation.siteCounter );
dbg( "resultType : %s (%u)", mpw_type_short_name( operation.resultType ), operation.resultType ); dbg( "resultType : %s (%u)", mpw_type_short_name( operation.resultType ), operation.resultType );
dbg( "resultParam : %s", operation.resultParam ); dbg( "resultParam : %s", operation.resultParam );
@@ -552,7 +552,7 @@ void cli_site(Arguments *args, Operation *operation) {
// Load the site object from mpsites. // Load the site object from mpsites.
for (size_t s = 0; !operation->site && s < operation->user->sites_count; ++s) for (size_t s = 0; !operation->site && s < operation->user->sites_count; ++s)
if (strcmp( operation->siteName, (&operation->user->sites[s])->name ) == 0) if (strcmp( operation->siteName, (&operation->user->sites[s])->siteName ) == 0)
operation->site = &operation->user->sites[s]; operation->site = &operation->user->sites[s];
// If no site from mpsites, create a new one. // If no site from mpsites, create a new one.
@@ -715,7 +715,7 @@ void cli_mpw(Arguments *args, Operation *operation) {
if (mpw_verbosity >= inf_level) if (mpw_verbosity >= inf_level)
fprintf( stderr, "%s's %s for %s:\n[ %s ]: ", fprintf( stderr, "%s's %s for %s:\n[ %s ]: ",
operation->user->fullName, operation->purposeResult, operation->site->name, operation->identicon ); operation->user->fullName, operation->purposeResult, operation->site->siteName, operation->identicon );
// Determine master key. // Determine master key.
MPMasterKey masterKey = operation->user->masterKeyProvider( operation->site->algorithm, operation->user->fullName ); MPMasterKey masterKey = operation->user->masterKeyProvider( operation->site->algorithm, operation->user->fullName );
@@ -728,7 +728,7 @@ void cli_mpw(Arguments *args, Operation *operation) {
// Update state from resultParam if stateful. // Update state from resultParam if stateful.
if (operation->resultParam && operation->resultType & MPResultTypeClassStateful) { if (operation->resultParam && operation->resultType & MPResultTypeClassStateful) {
mpw_free_string( &operation->resultState ); mpw_free_string( &operation->resultState );
if (!(operation->resultState = mpw_site_state( masterKey, operation->site->name, operation->siteCounter, if (!(operation->resultState = mpw_site_state( masterKey, operation->site->siteName, operation->siteCounter,
operation->keyPurpose, operation->keyContext, operation->resultType, operation->resultParam, operation->keyPurpose, operation->keyContext, operation->resultType, operation->resultParam,
operation->site->algorithm ))) { operation->site->algorithm ))) {
ftl( "Couldn't encrypt site result." ); ftl( "Couldn't encrypt site result." );
@@ -766,7 +766,7 @@ void cli_mpw(Arguments *args, Operation *operation) {
operation->resultParam = mpw_strdup( operation->resultState ); operation->resultParam = mpw_strdup( operation->resultState );
// Generate result. // Generate result.
const char *result = mpw_site_result( masterKey, operation->site->name, operation->siteCounter, const char *result = mpw_site_result( masterKey, operation->site->siteName, operation->siteCounter,
operation->keyPurpose, operation->keyContext, operation->resultType, operation->resultParam, operation->site->algorithm ); operation->keyPurpose, operation->keyContext, operation->resultType, operation->resultParam, operation->site->algorithm );
mpw_free( &masterKey, MPMasterKeySize ); mpw_free( &masterKey, MPMasterKeySize );
if (!result) { if (!result) {

16
platform-independent/c/core/src/mpw-marshal.c
View File

@@ -58,7 +58,7 @@ MPMarshalledSite *mpw_marshal_site(
MPMarshalledSite *site = &user->sites[user->sites_count - 1]; MPMarshalledSite *site = &user->sites[user->sites_count - 1];
*site = (MPMarshalledSite){ *site = (MPMarshalledSite){
.name = mpw_strdup( siteName ), .siteName = mpw_strdup( siteName ),
.algorithm = algorithmVersion, .algorithm = algorithmVersion,
.counter = siteCounter, .counter = siteCounter,
@@ -119,7 +119,7 @@ bool mpw_marshal_free(
for (size_t s = 0; s < (*user)->sites_count; ++s) { for (size_t s = 0; s < (*user)->sites_count; ++s) {
MPMarshalledSite *site = &(*user)->sites[s]; MPMarshalledSite *site = &(*user)->sites[s];
success &= mpw_free_strings( &site->name, &site->resultState, &site->loginState, &site->url, NULL ); success &= mpw_free_strings( &site->siteName, &site->resultState, &site->loginState, &site->url, NULL );
for (size_t q = 0; q < site->questions_count; ++q) { for (size_t q = 0; q < site->questions_count; ++q) {
MPMarshalledQuestion *question = &site->questions[q]; MPMarshalledQuestion *question = &site->questions[q];
@@ -177,7 +177,7 @@ static bool mpw_marshal_write_flat(
// Sites. // Sites.
for (size_t s = 0; s < user->sites_count; ++s) { for (size_t s = 0; s < user->sites_count; ++s) {
MPMarshalledSite *site = &user->sites[s]; MPMarshalledSite *site = &user->sites[s];
if (!site->name || !strlen( site->name )) if (!site->siteName || !strlen( site->siteName ))
continue; continue;
const char *resultState = NULL, *loginState = NULL; const char *resultState = NULL, *loginState = NULL;
@@ -189,9 +189,9 @@ static bool mpw_marshal_write_flat(
return false; return false;
} }
resultState = mpw_site_result( masterKey, site->name, site->counter, resultState = mpw_site_result( masterKey, site->siteName, site->counter,
MPKeyPurposeAuthentication, NULL, site->resultType, site->resultState, site->algorithm ); MPKeyPurposeAuthentication, NULL, site->resultType, site->resultState, site->algorithm );
loginState = mpw_site_result( masterKey, site->name, MPCounterValueInitial, loginState = mpw_site_result( masterKey, site->siteName, MPCounterValueInitial,
MPKeyPurposeIdentification, NULL, site->loginType, site->loginState, site->algorithm ); MPKeyPurposeIdentification, NULL, site->loginType, site->loginState, site->algorithm );
} }
else { else {
@@ -205,7 +205,7 @@ static bool mpw_marshal_write_flat(
if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &site->lastUsed ) )) if (strftime( dateString, sizeof( dateString ), "%FT%TZ", gmtime( &site->lastUsed ) ))
mpw_string_pushf( out, "%s %8ld %lu:%lu:%lu %25s\t%25s\t%s\n", mpw_string_pushf( out, "%s %8ld %lu:%lu:%lu %25s\t%25s\t%s\n",
dateString, (long)site->uses, (long)site->resultType, (long)site->algorithm, (long)site->counter, dateString, (long)site->uses, (long)site->resultType, (long)site->algorithm, (long)site->counter,
loginState? loginState: "", site->name, resultState? resultState: "" ); loginState? loginState: "", site->siteName, resultState? resultState: "" );
mpw_free_strings( &resultState, &loginState, NULL ); mpw_free_strings( &resultState, &loginState, NULL );
} }
mpw_free( &masterKey, MPMasterKeySize ); mpw_free( &masterKey, MPMasterKeySize );
@@ -668,10 +668,10 @@ static MPMarshalledUser *mpw_marshal_read_flat(
} }
if (siteResultState && strlen( siteResultState )) if (siteResultState && strlen( siteResultState ))
site->resultState = mpw_site_state( masterKey, site->name, site->counter, site->resultState = mpw_site_state( masterKey, site->siteName, site->counter,
MPKeyPurposeAuthentication, NULL, site->resultType, siteResultState, site->algorithm ); MPKeyPurposeAuthentication, NULL, site->resultType, siteResultState, site->algorithm );
if (siteLoginState && strlen( siteLoginState )) if (siteLoginState && strlen( siteLoginState ))
site->loginState = mpw_site_state( masterKey, site->name, MPCounterValueInitial, site->loginState = mpw_site_state( masterKey, site->siteName, MPCounterValueInitial,
MPKeyPurposeIdentification, NULL, site->loginType, siteLoginState, site->algorithm ); MPKeyPurposeIdentification, NULL, site->loginType, siteLoginState, site->algorithm );
} }
else { else {

2
platform-independent/c/core/src/mpw-marshal.h
View File

@@ -73,7 +73,7 @@ typedef struct MPMarshalledQuestion {
} MPMarshalledQuestion; } MPMarshalledQuestion;
typedef struct MPMarshalledSite { typedef struct MPMarshalledSite {
const char *name; const char *siteName;
MPAlgorithmVersion algorithm; MPAlgorithmVersion algorithm;
MPCounterValue counter; MPCounterValue counter;