From 6d6e2f243699e62c760cf85164fcd7cba0f8881b Mon Sep 17 00:00:00 2001 From: "Brett R. Toomey" Date: Tue, 3 Oct 2017 12:47:08 +0200 Subject: [PATCH 1/4] Updated CI --- .circleci/config.yml | 19 +++++++++++++++++++ .travis.yml | 4 +++- circle.yml | 10 ---------- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..57131ae --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,19 @@ +jobs: + build: + docker: + - image: buildpack-deps:trusty + steps: + - checkout + - run: + name: Install Swift + command: 'eval "$(curl -sL https://apt.vapor.sh)"' + - run: + name: Install Vapor toolbox + command: | + sudo apt-get install --yes vapor + sudo apt-get install --yes cmysql + sudo chmod -R a+rx /usr/ + - run: + name: Run Tests + command: | + swift test -Xswiftc -DNOJSON diff --git a/.travis.yml b/.travis.yml index 13c1b8b..3169d29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,14 @@ before_install: brew tap vapor/tap; brew update; brew install vapor; + brew install cmysql; + gem install xcpretty; script: - swift build - swift build -c release - swift package generate-xcodeproj --enable-code-coverage - - xcodebuild -scheme Gatekeeper -enableCodeCoverage YES test + - xcodebuild -scheme Gatekeeper -enableCodeCoverage YES test | xcpretty && exit ${PIPESTATUS[0]} after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/circle.yml b/circle.yml deleted file mode 100644 index c15e3fb..0000000 --- a/circle.yml +++ /dev/null @@ -1,10 +0,0 @@ -dependencies: - override: - - eval "$(curl -sL https://apt.vapor.sh)" - - sudo apt-get install vapor - - sudo chmod -R a+rx /usr/ -test: - override: - - swift build - - swift build -c release - - swift test From 1a51b994f6a1d96f8347f39e18d08bb1e5159523 Mon Sep 17 00:00:00 2001 From: "Steffen D. Sommer" Date: Wed, 4 Oct 2017 12:54:55 +0200 Subject: [PATCH 2/4] Update to recent version of Vapor --- Sources/RateLimiter.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/RateLimiter.swift b/Sources/RateLimiter.swift index 79501ff..f9a16ed 100644 --- a/Sources/RateLimiter.swift +++ b/Sources/RateLimiter.swift @@ -46,7 +46,7 @@ public struct RateLimiter: Middleware { } public func respond(to request: Request, chainingTo next: Responder) throws -> Response { - guard let peer = request.peerAddress?.address() else { + guard let peer = request.peerHostname else { throw Abort( .forbidden, metadata: nil, From 8a66c39be292925b0b8dd6c88cd513fc46b30606 Mon Sep 17 00:00:00 2001 From: "Steffen D. Sommer" Date: Wed, 4 Oct 2017 12:55:20 +0200 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3169d29..228ec4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,11 @@ before_install: gem install xcpretty; script: + - set -o pipefail - swift build - swift build -c release - swift package generate-xcodeproj --enable-code-coverage - - xcodebuild -scheme Gatekeeper -enableCodeCoverage YES test | xcpretty && exit ${PIPESTATUS[0]} + - xcodebuild -scheme Gatekeeper -enableCodeCoverage YES test | xcpretty after_success: - bash <(curl -s https://codecov.io/bash) From d230b45dab07c0d8a875eaff30de10424bcf6775 Mon Sep 17 00:00:00 2001 From: Mauran Muthiah Date: Mon, 23 Oct 2017 15:29:19 +0200 Subject: [PATCH 4/4] Fixed issue that caused test to fail --- Tests/GatekeeperTests/GatekeeperTests.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Tests/GatekeeperTests/GatekeeperTests.swift b/Tests/GatekeeperTests/GatekeeperTests.swift index b8d895e..72462b8 100644 --- a/Tests/GatekeeperTests/GatekeeperTests.swift +++ b/Tests/GatekeeperTests/GatekeeperTests.swift @@ -158,14 +158,18 @@ extension GatekeeperTests { } func getHTTPRequest() -> Request { - return try! Request(method: .get, uri: "http://localhost:8080/") + return Request(method: .get, uri: "http://localhost:8080/") } func getHTTPSRequest() -> Request { + + var headers = [HeaderKey: String]() + headers["X-Forwarded-For"] = "192.168.1.2" + return try! Request( method: .get, uri: URI("https://localhost:8080/"), - peerAddress: PeerAddress(stream: "192.168.1.2") + headers: headers ) } }