-
Notifications
You must be signed in to change notification settings - Fork 212
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Self-signed homeserver: When creating a new MXRestClient, trust alrea…
…dy trusted certificate. This fixes e2e on self-signed hs. (element-hq/element-ios#816)
- Loading branch information
Showing
5 changed files
with
302 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| Copyright 2017 Vector Creations Ltd | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
|
|
||
| #import "MatrixSDKTestsData.h" | ||
|
|
||
| #import "MXSession.h" | ||
|
|
||
| @interface MXSelfSignedHomeserverTests : XCTestCase | ||
| { | ||
| MatrixSDKTestsData *matrixSDKTestsData; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation MXSelfSignedHomeserverTests | ||
|
|
||
| - (void)setUp | ||
| { | ||
| [super setUp]; | ||
|
|
||
| matrixSDKTestsData = [[MatrixSDKTestsData alloc] init]; | ||
| } | ||
|
|
||
| - (void)tearDown | ||
| { | ||
| [super tearDown]; | ||
| } | ||
|
|
||
| - (void)testRegiter | ||
| { | ||
| XCTestExpectation *expectation = [self expectationWithDescription:@"asyncTest"]; | ||
|
|
||
| __block BOOL certificateCheckAsked = NO; | ||
| [matrixSDKTestsData getHttpsBobCredentials:^{ | ||
|
|
||
| XCTAssert(certificateCheckAsked, @"We must have been asked to check the certificate"); | ||
| XCTAssertNotNil(matrixSDKTestsData.bobCredentials); | ||
|
|
||
| XCTAssertNotNil(matrixSDKTestsData.bobCredentials.accessToken); | ||
| XCTAssertNotNil(matrixSDKTestsData.bobCredentials.allowedCertificate); | ||
| XCTAssertNil(matrixSDKTestsData.bobCredentials.ignoredCertificate); | ||
|
|
||
| [expectation fulfill]; | ||
|
|
||
| } onUnrecognizedCertificateBlock:^BOOL(NSData *certificate) { | ||
| certificateCheckAsked = YES; | ||
| return YES; | ||
| }]; | ||
|
|
||
| [self waitForExpectationsWithTimeout:10 handler:nil]; | ||
| } | ||
|
|
||
| - (void)testTrustedCertificate | ||
| { | ||
| XCTestExpectation *expectation = [self expectationWithDescription:@"asyncTest"]; | ||
|
|
||
| [matrixSDKTestsData getHttpsBobCredentials:^{ | ||
|
|
||
| MXRestClient *mxRestClient = [[MXRestClient alloc] initWithCredentials:matrixSDKTestsData.bobCredentials andOnUnrecognizedCertificateBlock:^BOOL(NSData *certificate) { | ||
|
|
||
| XCTFail(@"We have already accepted the certificate. We should not be asked again"); | ||
| return NO; | ||
| }]; | ||
|
|
||
| // Check the instance is usable | ||
| XCTAssert(mxRestClient); | ||
| [mxRestClient createRoom:nil visibility:0 roomAlias:nil topic:nil success:^(MXCreateRoomResponse *response) { | ||
|
|
||
| [expectation fulfill]; | ||
|
|
||
| } failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| } onUnrecognizedCertificateBlock:^BOOL(NSData *certificate) { | ||
| return YES; | ||
| }]; | ||
|
|
||
| [self waitForExpectationsWithTimeout:10 handler:nil]; | ||
| } | ||
|
|
||
| // Create a room and post a message to it | ||
| - (void)testRoomAndMessages | ||
| { | ||
| [matrixSDKTestsData doHttpsMXSessionTestWithBob:self readyToTest:^(MXSession *mxSession, XCTestExpectation *expectation) { | ||
|
|
||
| [mxSession createRoom:@"A room" visibility:0 roomAlias:nil topic:nil success:^(MXRoom *room) { | ||
|
|
||
| XCTAssertNotNil(room); | ||
|
|
||
| [room.liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomMessage] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) { | ||
|
|
||
| XCTAssertEqual(direction, MXTimelineDirectionForwards); | ||
| XCTAssert([event.description containsString:@"Hello"]); | ||
|
|
||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| [room sendTextMessage:@"Hello" success:nil failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| } failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
| }]; | ||
| } | ||
|
|
||
| // Create an e2e encrypted room and post a message to it | ||
| - (void)testE2ERoomAndMessages | ||
| { | ||
| [MXSDKOptions sharedInstance].enableCryptoWhenStartingMXSession = YES; | ||
|
|
||
| [matrixSDKTestsData doHttpsMXSessionTestWithBob:self readyToTest:^(MXSession *mxSession, XCTestExpectation *expectation) { | ||
|
|
||
| [MXSDKOptions sharedInstance].enableCryptoWhenStartingMXSession = NO; | ||
|
|
||
| [mxSession createRoom:@"A room" visibility:0 roomAlias:nil topic:nil success:^(MXRoom *room) { | ||
|
|
||
| XCTAssertNotNil(room); | ||
|
|
||
| [room enableEncryptionWithAlgorithm:kMXCryptoMegolmAlgorithm success:^{ | ||
|
|
||
| [room.liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomMessage] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) { | ||
|
|
||
| XCTAssertEqual(direction, MXTimelineDirectionForwards); | ||
| XCTAssert(event.clearEvent); | ||
| XCTAssert([event.clearEvent.description containsString:@"Hello"]); | ||
|
|
||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| [room sendTextMessage:@"Hello" success:nil failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| } failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
|
|
||
| } failure:^(NSError *error) { | ||
| XCTFail(@"Cannot set up intial test conditions - error: %@", error); | ||
| [expectation fulfill]; | ||
| }]; | ||
| }]; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters