witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

https support

Browse source
This commit is contained in:
Joerg Platte 2012-10-29 17:29:25 +01:00
parent 3f3164954d
commit 25e4f48b14
6 changed files with 168 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/BuschJaegerConfiguration.h
View file

@ -45,7 +45,7 @@ typedef enum _BuschJaegerConfigurationRequestType{
@property (readonly) NSMutableSet *outdoorStations;
@property (readonly) Network *network;
@property (readonly) LevelPushButton *levelPushButton;
@property (readonly) CFArrayRef certificates;
@property (readonly) SecCertificateRef certificate;
- (void)reset;
@ -62,6 +62,10 @@ typedef enum _BuschJaegerConfigurationRequestType{
- (NSString*)getGateway:(BuschJaegerConfigurationRequestType)type;
- (BOOL)canHandleAuthChallenge : (NSURLConnection*)connection : (NSURLProtectionSpace*)protectionSpace;
- (void)handleAuthChallenge:(NSURLConnection*)conn : (NSURLAuthenticationChallenge*)challenge;
+ (NSString*)getRegexValue:(NSString*)regexString data:(NSString*)data;
@end

144
Classes/BuschJaegerConfiguration.m
View file

@ -29,7 +29,7 @@
@synthesize network;
@synthesize history;
@synthesize levelPushButton;
@synthesize certificates;
@synthesize certificate;
/********
[outdoorstation_0]
@ -96,7 +96,7 @@
history = [[NSMutableSet alloc] init];
network = [[Network alloc] init];
levelPushButton = [[LevelPushButton alloc] init];
certificates = NULL;
certificate = NULL;
[self reloadCertificates];
}
return self;
@ -108,8 +108,8 @@
[history release];
[network release];
[levelPushButton release];
if(certificates != NULL) {
CFRelease(certificates);
if(certificate != NULL) {
CFRelease(certificate);
}
[super dealloc];
}
@ -201,7 +201,7 @@
NSURL *derUrl = [NSURL URLWithString:network.derCertificate];
if(pemUrl != nil && derUrl != nil) {
NSURLRequest *pemRequest = [NSURLRequest requestWithURL:pemUrl cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
NSURLRequest *derRequest = [NSURLRequest requestWithURL:pemUrl cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
NSURLRequest *derRequest = [NSURLRequest requestWithURL:derUrl cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
if(pemRequest != nil && derRequest != nil) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) {
NSURLResponse *response = nil;
@ -286,16 +286,14 @@
- (void)loadCertificates {
if(certificates != NULL) {
CFRelease(certificates);
certificates = NULL;
if(certificate != NULL) {
CFRelease(certificate);
certificate = NULL;
}
NSData *data = [NSData dataWithContentsOfFile:[LinphoneManager documentFile:kLinphoneDERPath]];
if(data != NULL) {
SecCertificateRef rootcert = SecCertificateCreateWithData(kCFAllocatorDefault, (CFDataRef)data);
if(rootcert) {
const void *certs[] = { rootcert };
certificates = CFArrayCreate(NULL, (const void**)certs, sizeof(certs) / sizeof(certs[0]), &kCFTypeArrayCallBacks);
certificate = SecCertificateCreateWithData(kCFAllocatorDefault, (CFDataRef)data);
if(certificate) {
[LinphoneLogger log:LinphoneLoggerLog format:@"Certificates loaded"];
} else {
[LinphoneLogger log:LinphoneLoggerError format:@"Can't load certificates"];
@ -406,9 +404,14 @@
- (BOOL)loadHistory:(BuschJaegerConfigurationRequestType)type delegate:(id<BuschJaegerConfigurationDelegate>)delegate {
[history removeAllObjects];
NSString *url = (type == BuschJaegerConfigurationRequestType_Local)? network.localHistory: network.globalHistory;
NSString *domain = (type == BuschJaegerConfigurationRequestType_Local)? network.localHistory: network.globalHistory;
domain = [self addUserNameAndPasswordToUrl:domain];
NSString* url = [NSString stringWithFormat:@"%@", domain];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
if(request != nil) {
//[NSURLConnection connectionWithRequest:request delegate:self];
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) {
NSURLResponse *response = nil;
NSError *error = nil;
@ -440,6 +443,89 @@
return FALSE;
}
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
{
return [self canHandleAuthChallenge:connection:protectionSpace];
}
- (void)connection:(NSURLConnection *)conn didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
[self handleAuthChallenge:conn:challenge];
}
- (BOOL)canHandleAuthChallenge:(NSURLConnection*)connection : (NSURLProtectionSpace*)protectionSpace
{
return [protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust];
}
- (void)handleAuthChallenge:(NSURLConnection*)conn : (NSURLAuthenticationChallenge*)challenge
{
OSStatus err;
SecCertificateRef cert = [self certificate];
NSURLProtectionSpace* protectionSpace = [challenge protectionSpace];
SecTrustRef trust = [protectionSpace serverTrust];
// recreate trust since our hostname does not match the hostname in the certifcate
SecTrustRef newTrust;
SecPolicyRef newSecPolicy = SecPolicyCreateSSL(false, nil);
if (!newSecPolicy)
{
[[challenge sender] cancelAuthenticationChallenge:challenge];
return;
}
NSMutableArray* certificates = [NSMutableArray array];
CFIndex certCount = SecTrustGetCertificateCount(trust);
CFIndex certIndex;
for (certIndex = 0; certIndex < certCount; certIndex++)
{
SecCertificateRef thisCertificate;
thisCertificate = SecTrustGetCertificateAtIndex(trust, certIndex);
[certificates addObject:(id)thisCertificate];
}
err = SecTrustCreateWithCertificates((CFArrayRef) certificates,
newSecPolicy,
&newTrust
);
if (err != errSecSuccess)
{
[[challenge sender] cancelAuthenticationChallenge:challenge];
return;
}
// setup our .der certificate as anchor certificate
NSArray * arr = [NSArray arrayWithObject:(id)cert];
err = SecTrustSetAnchorCertificates(newTrust, (CFArrayRef)arr);
if (err != errSecSuccess)
{
[[challenge sender] cancelAuthenticationChallenge:challenge];
return;
}
SecTrustSetAnchorCertificatesOnly(newTrust, YES);
// FINALLY: check the certificates!
SecTrustResultType trustResult;
err = SecTrustEvaluate(newTrust, &trustResult);
BOOL trusted = (err == noErr) && ((trustResult == kSecTrustResultProceed) || (trustResult == kSecTrustResultUnspecified));
NSURLCredential* credential = nil;
if (trusted)
{
credential = [NSURLCredential credentialForTrust:trust];
}
if (credential == nil)
{
[[challenge sender] cancelAuthenticationChallenge:challenge];
}
else
{
[[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
}
}
- (BOOL)removeHistory:(BuschJaegerConfigurationRequestType)type history:(History*)ahistory delegate:(id<BuschJaegerConfigurationDelegate>)delegate {
NSString *url = [NSString stringWithFormat:@"%@/adduser.cgi?type=delhistory&id=%d", [self getGateway:type], ahistory.ID];
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
@ -471,18 +557,44 @@
return FALSE;
}
- (NSString*)addUserNameAndPasswordToUrl:(NSString*)url
{
NSString *username = [[NSUserDefaults standardUserDefaults] stringForKey:@"username_preference"];
NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"];
// add username and password
NSString* domain;
NSString* proto;
NSRange range = [url rangeOfString:@"https"];
if (range.location == 0)
{
proto = @"https://";
domain = [url substringFromIndex:8];
}
else
{
proto = @"http://";
domain = [url substringFromIndex:7];
}
return [NSString stringWithFormat:@"%@%@:%@@%@", proto, username, password, domain];
}
- (NSString*)getGateway:(BuschJaegerConfigurationRequestType)type {
NSString *gateway = nil;
NSString *urlString = (type == BuschJaegerConfigurationRequestType_Local)? network.localHistory: network.globalHistory;
NSURL *url = [NSURL URLWithString:urlString];
NSRange range = [urlString rangeOfString:[url relativePath]];
if(range.location != NSNotFound) {
gateway = [urlString substringToIndex:range.location];
}
gateway= [self addUserNameAndPasswordToUrl:gateway];
return gateway;
}
- (NSString*)getImageUrl:(BuschJaegerConfigurationRequestType)type image:(NSString *)image {
return [NSString stringWithFormat:@"%@/%@", [self getGateway:type], image];
}
@ -502,7 +614,7 @@
#pragma mark - NSURLConnectionDelegate Function
/*
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace {
return [protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust];
}
@ -510,7 +622,7 @@
- (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
SecTrustRef trust = [challenge.protectionSpace serverTrust];
NSArray *anchors = (NSArray*)certificates;
SecCertificateRef cert = (NSArray*)certificate;
if(anchors == nil) {
anchors = [NSArray array];
}
@ -530,6 +642,6 @@
} else {
[challenge.sender continueWithoutCredentialForAuthenticationChallenge:challenge];
}
}
}*/
@end

22
Classes/BuschJaegerHistoryDetailsView.xib
View file

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">2843</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1498</string>
<string key="NS.object.0">1929</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
@ -400,7 +400,7 @@
<reference key="source" ref="322407382"/>
<reference key="destination" ref="504152559"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">NO</bool>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">31</int>
</object>
@ -410,7 +410,7 @@
<reference key="source" ref="322407382"/>
<reference key="destination" ref="309092053"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">NO</bool>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">25</int>
</object>
@ -420,7 +420,7 @@
<reference key="source" ref="322407382"/>
<reference key="destination" ref="217364971"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">NO</bool>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">30</int>
</object>
@ -716,7 +716,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
<real value="1536" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
@ -724,6 +724,6 @@
<string key="bj_save.png">{34, 35}</string>
<string key="trash.png">{26, 26}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1498</string>
<string key="IBCocoaTouchPluginVersion">1929</string>
</data>
</archive>

7
Classes/BuschJaegerSettingsView.m
View file

@ -105,6 +105,13 @@
#pragma mark -
- (void)setConfiguration:(NSString*)address username:(NSString*)username password:(NSString*)password {
NSRange range = [address rangeOfString:@"http://"];
if (range.location == NSNotFound)
{
address = [@"http://" stringByAppendingString:address];
}
NSString *dataString = [NSString stringWithFormat:@"URL=%@/config.ini USER=%@ PW=%@", address, username, password];
if([[[LinphoneManager instance] configuration] parseQRCode:dataString delegate:self]) {
[waitView setHidden:FALSE];

2
Classes/LinphoneUI/UIRemoteImageView.h
View file

@ -20,7 +20,7 @@
#import <UIKit/UIKit.h>
@interface UIRemoteImageView : UIImageView
@interface UIRemoteImageView : UIImageView <NSURLConnectionDelegate>
@property (retain) UIActivityIndicatorView *waitIndicatorView;

18
Classes/LinphoneUI/UIRemoteImageView.m
View file

@ -18,6 +18,9 @@
*/
#import "UIRemoteImageView.h"
#import "BuschJaegerConfiguration.h"
#import "LinphoneManager.h"
#import "NSURLConnection+SynchronousDelegate.h"
@implementation UIRemoteImageView
@ -90,7 +93,9 @@
NSURLResponse *response = nil;
NSError *error = nil;
NSData *data = nil;
data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error delegate:self];
if(data != nil) {
UIImage *image = [UIImage imageWithData:data];
dispatch_async(dispatch_get_main_queue(), ^{
@ -106,5 +111,14 @@
}
}
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
{
BuschJaegerConfiguration* conf = [[LinphoneManager instance] configuration];
return [conf canHandleAuthChallenge:connection:protectionSpace];
}
- (void)connection:(NSURLConnection *)conn didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
BuschJaegerConfiguration* conf = [[LinphoneManager instance] configuration];
[conf handleAuthChallenge:conn:challenge];
}
@end