TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Fixed rate limit test (#16258)

Browse Source 
closes https://github.com/TryGhost/Team/issues/2547

Changed the configuration for testing to be a bit more strict, by slowing down the amount of requests it can handle to give CI enough time to kick in the rate limiter. Before this, CI simply wasn't hitting the API fast enough to trigger the rate limiter.

Co-authored-by: Ronald Langeveld <hi@ronaldlangeveld.com>
This commit is contained in:
Fabien 'egg' O'Carroll 2023-02-13 14:16:56 +07:00 committed by GitHub
parent 2c9fb2ad5e
commit 57695d03df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 103 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/core/core/shared/config/env/config.testing-browser.json vendored
View File

@ -43,6 +43,12 @@
"maxWait": 3600000, "maxWait": 3600000,
"lifetime": 3600, "lifetime": 3600,
"freeRetries":99 "freeRetries":99
},
"webmentions_block": {
"minWait": 100000,
"maxWait": 100000,
"lifetime": 3600,
"freeRetries": 3
} }
}, },
"privacy": { "privacy": {

7
ghost/core/core/shared/config/env/config.testing-mysql.json vendored
View File

@ -44,7 +44,14 @@
"maxWait": 3600000, "maxWait": 3600000,
"lifetime": 3600, "lifetime": 3600,
"freeRetries":99 "freeRetries":99
},
"webmentions_block": {
"minWait": 100000,
"maxWait": 100000,
"lifetime": 3600,
"freeRetries": 3
} }
}, },
"privacy": { "privacy": {
"useTinfoil": true, "useTinfoil": true,

8
ghost/core/core/shared/config/env/config.testing.json vendored
View File

@ -45,10 +45,10 @@
"freeRetries":99 "freeRetries":99
}, },
"webmentions_block": { "webmentions_block": {
"minWait": 10, "minWait": 100000,
"maxWait": 100, "maxWait": 100000,
"lifetime": 1000, "lifetime": 3600,
"freeRetries": 100 "freeRetries": 3
} }
}, },
"privacy": { "privacy": {

72
ghost/core/test/e2e-api/webmentions/webmentions.test.js
View File

@ -34,6 +34,7 @@ describe('Webmentions (receiving)', function () {
afterEach(async function () { afterEach(async function () {
await DomainEvents.allSettled(); await DomainEvents.allSettled();
mockManager.restore(); mockManager.restore();
await dbUtils.truncate('brute');
}); });
it('can receive a webmention', async function () { it('can receive a webmention', async function () {
@ -175,43 +176,44 @@ describe('Webmentions (receiving)', function () {
emailMockReceiver.sentEmailCount(0); emailMockReceiver.sentEmailCount(0);
}); });
// @TODO this test is flaky, needs to find a better way to test rate limiting.
// No issues locally, and sometimes passes on CI, but is not reliable.
// it('is rate limited against spamming mention requests', async function () { it('is rate limited against spamming mention requests', async function () {
// await dbUtils.truncate('brute'); await dbUtils.truncate('brute');
// const webmentionBlock = configUtils.config.get('spam').webmentions_block; const webmentionBlock = configUtils.config.get('spam').webmentions_block;
// const targetUrl = new URL(urlUtils.getSiteUrl()); const targetUrl = new URL(urlUtils.getSiteUrl());
// const sourceUrl = new URL('http://testpage.com/external-article-2/'); const sourceUrl = new URL('http://testpage.com/external-article-2/');
// const html = ` const html = `
// <html><head><title>Test Page</title><meta name="description" content="Test description"><meta name="author" content="John Doe"></head><body></body></html> <html><head><title>Test Page</title><meta name="description" content="Test description"><meta name="author" content="John Doe"></head><body></body></html>
// `; `;
// nock(targetUrl.origin) nock(targetUrl.origin)
// .head(targetUrl.pathname) .head(targetUrl.pathname)
// .reply(200); .reply(200);
// nock(sourceUrl.origin) nock(sourceUrl.origin)
// .get(sourceUrl.pathname) .get(sourceUrl.pathname)
// .reply(200, html, {'Content-Type': 'text/html'}); .reply(200, html, {'Content-Type': 'text/html'});
// // +1 because this is a retry count, so we have one request + the retries, then blocked const requests = [];
// for (let i = 0; i < webmentionBlock.freeRetries + 1; i++) { for (let i = 0; i < webmentionBlock.freeRetries + 1; i++) {
// await agent.post('/receive/') const req = await agent.post('/receive/')
// .body({ .body({
// source: sourceUrl.href, source: sourceUrl.href,
// target: targetUrl.href, target: targetUrl.href,
// payload: {} payload: {}
// }) })
// .expectStatus(202); .expectStatus(202);
// }
// await agent requests.push(req);
// .post('/receive/') }
// .body({ await Promise.all(requests);
// source: sourceUrl.href,
// target: targetUrl.href, await agent
// payload: {} .post('/receive/')
// }) .body({
// .expectStatus(429); source: sourceUrl.href,
// }); target: targetUrl.href,
payload: {}
})
.expectStatus(429);
});
}); });

49
ghost/core/test/utils/fixtures/config/defaults.json
View File

@ -5,5 +5,54 @@
"filename": "/test.db" "filename": "/test.db"
}, },
"debug": false "debug": false
},
"spam": {
"user_login": {
"minWait": 600000,
"maxWait": 604800000,
"freeRetries": 4
},
"user_reset": {
"minWait": 3600000,
"maxWait": 3600000,
"lifetime": 3600,
"freeRetries": 4
},
"global_reset": {
"minWait": 3600000,
"maxWait": 3600000,
"lifetime": 3600,
"freeRetries": 4
},
"global_block": {
"minWait": 3600000,
"maxWait": 3600000,
"lifetime": 3600,
"freeRetries": 99
},
"private_block": {
"minWait": 3600000,
"maxWait": 3600000,
"lifetime": 3600,
"freeRetries": 99
},
"content_api_key": {
"minWait": 3600000,
"maxWait": 86400000,
"lifetime": 3600,
"freeRetries": 99
},
"member_login": {
"minWait": 600000,
"maxWait": 43200000,
"lifetime": 43200,
"freeRetries": 8
},
"webmentions_block": {
"minWait": 3600000,
"maxWait": 3600000,
"lifetime": 3600,
"freeRetries": 4
}
} }
} }