giuseppenuc/PNObject
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update Pod

Browse Source
This commit is contained in:
giuseppenuc committed 2016-03-15 22:17:08 +01:00
1 parent ef4deb51f6
commit 6a5119dbe3
108 files changed
+13081 -7351
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Pod/Classes/PNClasses/PNUser.m
+1 -3
View File
@@ -135,8 +135,6 @@ static bool isFirstAccess = YES;
- (void) reloadFormServer {
///api/v1/user/profile
[self autoLoginWithBlockSuccess:^(BOOL loginSuccess) {
[[self class] GETWithEndpointAction:@"user/profile"
progress:nil
@@ -168,7 +166,7 @@ static bool isFirstAccess = YES;
[self saveLocally];
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
NSLogDebug(@"error : %ld",[error code]);
NSLogDebug(@"error : %ld",(long)[error code]);
if (failure) {
failure(error);
}
Pod/Classes/PNObjectConfig.h
+3 -1
View File
@@ -212,6 +212,8 @@ extern NSString* _Nonnull const Client_Secret;
/**
* <#Description#>
*/
@property (nonatomic, strong, nonnull , readonly) NSString *encrypKey;
@property (nonatomic, strong, nonnull, readonly) NSString *encrypKey;
@property (nonatomic, strong, nonnull, readonly) NSString *nonce;
@end
Pod/Classes/PNObjectConfig.m
+10 -3
View File
@@ -12,7 +12,9 @@
#import "AFJSONResponseSerializerWithData.h"
#import "NSString+Helper.h"
#import "PNObject+Protected.h"
#import "NSUserDefaults+AESEncryptor.h"
NSString * const PNObjectNSUserDefaultsAESKey = @"feiGuP5iYZB8cSwHnmCtAWomLcarVoxDe3L8jVSxv6f6dOUtSF";
NSString * const PNObjectLocalNotificationRefreshTokenClientCredentialSuccess = @"PNObjectLocalNotificationRefreshTokenClientCredentialSuccess";
NSString * const PNObjectLocalNotificationRefreshTokenClientCredentialFail = @"PNObjectLocalNotificationRefreshTokenClientCredentialFail";
@@ -27,6 +29,7 @@ NSString * const PNObjectLocalNotificationUserReloadFromServerSuccess = @"PNObje
NSInteger const minPassLenght = 4;
NSString * const PNObjectEncryptionKey = @"PNObjectConfigEncryptionKey";
NSString * const PNObjectEncryptionNonce = @"PNObjectConfigEncryptionNonce";
NSString * const PNObjectServiceCredentialIdentifier = @"PNObjectServiceCredentialIdentifier";
@@ -162,14 +165,18 @@ static bool isFirstAccess = YES;
_headerFields = [[NSMutableDictionary alloc] init];
[[NSUserDefaults standardUserDefaults] setAESKey:PNObjectNSUserDefaultsAESKey];
if ([[NSUserDefaults standardUserDefaults] objectForKey:PNObjectEncryptionKey]) {
_encrypKey = [[NSUserDefaults standardUserDefaults] objectForKey:PNObjectEncryptionKey];
_encrypKey = [[NSUserDefaults standardUserDefaults] decryptedValueForKey:PNObjectEncryptionKey];
_nonce = [[NSUserDefaults standardUserDefaults] decryptedValueForKey:PNObjectEncryptionNonce];
}
else {
_encrypKey = [[NSProcessInfo processInfo] globallyUniqueString];
_nonce = [[NSProcessInfo processInfo] globallyUniqueString];
[[NSUserDefaults standardUserDefaults] setObject:_encrypKey forKey:PNObjectEncryptionKey];
[[NSUserDefaults standardUserDefaults] synchronize];
[[NSUserDefaults standardUserDefaults] encryptValue:_encrypKey withKey:PNObjectEncryptionKey];
[[NSUserDefaults standardUserDefaults] encryptValue:_nonce withKey:PNObjectEncryptionNonce];
}
}
Pod/Classes/PNObjectModel.m
+15 -9
View File
@@ -10,13 +10,12 @@
#import "PNObject+Protected.h"
#import "PEARFileManager.h"
#import "PNObjectConstants.h"
@import RNCryptor;
#import <NACrypto/NACrypto.h>
@interface PNObjectModel()
@property (nonatomic, strong) PEARFileManager *fileManager;
@property (nonatomic, strong) NAAES *AES;
@end
@implementation PNObjectModel
@@ -121,6 +120,7 @@ static bool isFirstAccess = YES;
[_fileManager setRootDirectory:k_ROOT_DIR_DOCUMENTS];
NSLogDebug(@"%@",[_fileManager getRootDirectoryPath]);
_AES = [[NAAES alloc] initWithAlgorithm:NAAESAlgorithm256CTR];
}
return self;
}
@@ -148,7 +148,7 @@ static bool isFirstAccess = YES;
NSError *error = nil;
NSData *data = [RNCryptor decryptData:[_fileManager fetchFileDataWithPath:className] password:[[PNObjectConfig sharedInstance] encrypKey] error:&error];
NSData *data = [_AES decrypt:[_fileManager fetchFileDataWithPath:className] nonce:[[[PNObjectConfig sharedInstance] nonce] dataUsingEncoding:NSUTF8StringEncoding] key:[[[PNObjectConfig sharedInstance] encrypKey] dataUsingEncoding:NSUTF8StringEncoding] error:&error]; // password:[[PNObjectConfig sharedInstance] encrypKey] error:&error];
return [NSKeyedUnarchiver unarchiveObjectWithData:data];
}
@@ -162,15 +162,18 @@ static bool isFirstAccess = YES;
BOOL isPNObjectSubclass = [[object class] isSubclassOfClass:[PNObject class]];
NSError *error = nil;
if(isPNObjectSubclass) {
if ([[object class] conformsToProtocol:@protocol(PNObjectSubclassing)]) {
if ([(PNObject*) object singleInstance]) {
NSDictionary *objectDict = [(PNObject*) object reverseMapping];
NSData *objectData = [RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objectDict] password:[[PNObjectConfig sharedInstance] encrypKey]];
NSData *objectData = [_AES encrypt:[NSKeyedArchiver archivedDataWithRootObject:objectDict] nonce:[[[PNObjectConfig sharedInstance] nonce] dataUsingEncoding:NSUTF8StringEncoding] key:[[[PNObjectConfig sharedInstance] encrypKey] dataUsingEncoding:NSUTF8StringEncoding] error:&error];//[RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objectDict] password:[[PNObjectConfig sharedInstance] encrypKey]];
if ([self issetPNObjectModelForObject:object]) {
if ([_fileManager updateFileWithData:objectData filePath:[self objectName:object] permisson:@(0755)]) {
@@ -194,9 +197,10 @@ static bool isFirstAccess = YES;
//NSData * data = [_fileManager fetchFileDataWithPath:[self objectName:object]];
NSError *error = nil;
NSData *data = [RNCryptor decryptData:[_fileManager fetchFileDataWithPath:[self objectName:object]] password:[[PNObjectConfig sharedInstance] encrypKey] error:&error];
NSData *data = [_AES decrypt:[_fileManager fetchFileDataWithPath:[self objectName:object]] nonce:[[[PNObjectConfig sharedInstance] nonce] dataUsingEncoding:NSUTF8StringEncoding] key:[[[PNObjectConfig sharedInstance] encrypKey] dataUsingEncoding:NSUTF8StringEncoding] error:&error];
//[RNCryptor decryptData:[_fileManager fetchFileDataWithPath:[self objectName:object]] password:[[PNObjectConfig sharedInstance] encrypKey] error:&error];
NSMutableArray *objects = [[NSMutableArray alloc] initWithArray:[NSKeyedUnarchiver unarchiveObjectWithData:data]];
@@ -204,7 +208,8 @@ static bool isFirstAccess = YES;
[objects addObject:objectDict];
NSData *objectData = [RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objects] password:[[PNObjectConfig sharedInstance] encrypKey]];
NSData *objectData = [_AES encrypt:[NSKeyedArchiver archivedDataWithRootObject:objects] nonce:[[[PNObjectConfig sharedInstance] nonce] dataUsingEncoding:NSUTF8StringEncoding] key:[[[PNObjectConfig sharedInstance] encrypKey] dataUsingEncoding:NSUTF8StringEncoding] error:&error];
//[RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objects] password:[[PNObjectConfig sharedInstance] encrypKey]];
if ([_fileManager updateFileWithData:objectData filePath:[self objectName:object] permisson:@(0755)]) {
@@ -222,7 +227,8 @@ static bool isFirstAccess = YES;
[objects addObject:objectDict];
NSData *objectData = [RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objects] password:[[PNObjectConfig sharedInstance] encrypKey]];
NSData *objectData = [_AES encrypt:[NSKeyedArchiver archivedDataWithRootObject:objects] nonce:[[[PNObjectConfig sharedInstance] nonce] dataUsingEncoding:NSUTF8StringEncoding] key:[[[PNObjectConfig sharedInstance] encrypKey] dataUsingEncoding:NSUTF8StringEncoding] error:&error];
//[RNCryptor encryptData:[NSKeyedArchiver archivedDataWithRootObject:objects] password:[[PNObjectConfig sharedInstance] encrypKey]];
if ([_fileManager createFileWithData:objectData filePath:[self objectName:object] permisson:@(0755)]) {
return object;