aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-29 11:22:27 +0200
committerChocobozzz <me@florianbigard.com>2018-03-29 11:39:53 +0200
commit09becad8e85cc4007ff862b26fa4195f3d0e7c8d (patch)
tree4abea8adbff0487a57bce1397f99bfc02949d65a
parent09e10ac0c99c66049a9ba07da59067baadf5112e (diff)
downloadPeerTube-09becad8e85cc4007ff862b26fa4195f3d0e7c8d.tar.gz
PeerTube-09becad8e85cc4007ff862b26fa4195f3d0e7c8d.tar.zst
PeerTube-09becad8e85cc4007ff862b26fa4195f3d0e7c8d.zip
Add reverse proxy test in travis
-rw-r--r--client/src/app/core/auth/auth.service.ts3
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/tests/api/index-fast.ts1
-rw-r--r--server/tests/api/server/reverse-proxy.ts2
4 files changed, 5 insertions, 3 deletions
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index d31c61496..69ae3e5e1 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -70,7 +70,8 @@ export class AuthService {
70 70
71 if (error.status === 403) { 71 if (error.status === 403) {
72 errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n` 72 errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`
73 errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.' 73 errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), ' +
74 'in particular the "webserver" section.'
74 } 75 }
75 76
76 // We put a bigger timeout 77 // We put a bigger timeout
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 986fed099..5152095b3 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -238,7 +238,7 @@ const CONSTRAINTS_FIELDS = {
238const RATES_LIMIT = { 238const RATES_LIMIT = {
239 LOGIN: { 239 LOGIN: {
240 WINDOW_MS: 5 * 60 * 1000, // 5 minutes 240 WINDOW_MS: 5 * 60 * 1000, // 5 minutes
241 MAX: 10 // 10 attempts 241 MAX: 15 // 15 attempts
242 } 242 }
243} 243}
244 244
diff --git a/server/tests/api/index-fast.ts b/server/tests/api/index-fast.ts
index 464dcb5e0..aa063b97a 100644
--- a/server/tests/api/index-fast.ts
+++ b/server/tests/api/index-fast.ts
@@ -11,3 +11,4 @@ import './videos/video-privacy'
11import './videos/services' 11import './videos/services'
12import './server/email' 12import './server/email'
13import './server/config' 13import './server/config'
14import './server/reverse-proxy'
diff --git a/server/tests/api/server/reverse-proxy.ts b/server/tests/api/server/reverse-proxy.ts
index aa4b3ae81..4c2655f64 100644
--- a/server/tests/api/server/reverse-proxy.ts
+++ b/server/tests/api/server/reverse-proxy.ts
@@ -64,7 +64,7 @@ describe('Test application behind a reverse proxy', function () {
64 it('Should rate limit logins', async function () { 64 it('Should rate limit logins', async function () {
65 const user = { username: 'root', password: 'fail' } 65 const user = { username: 'root', password: 'fail' }
66 66
67 for (let i = 0; i < 9; i++) { 67 for (let i = 0; i < 14; i++) {
68 await userLogin(server, user, 400) 68 await userLogin(server, user, 400)
69 } 69 }
70 70