mirror of https://git.tuxpa.in/a/code-server.git
refactor: change limiter.Try() to .removeToken()
This commit is contained in:
parent
7928dc2bff
commit
a3f18d6158
|
@ -21,11 +21,8 @@ export class RateLimiter {
|
||||||
return this.minuteLimiter.getTokensRemaining() > 0 || this.hourLimiter.getTokensRemaining() > 0
|
return this.minuteLimiter.getTokensRemaining() > 0 || this.hourLimiter.getTokensRemaining() > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
public try(): boolean {
|
public removeToken(): boolean {
|
||||||
if (this.canTry()) {
|
return this.minuteLimiter.tryRemoveTokens(1) || this.hourLimiter.tryRemoveTokens(1)
|
||||||
return this.minuteLimiter.tryRemoveTokens(1) || this.hourLimiter.tryRemoveTokens(1)
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +88,7 @@ router.post("/", async (req, res) => {
|
||||||
|
|
||||||
// Note: successful logins should not count against the RateLimiter
|
// Note: successful logins should not count against the RateLimiter
|
||||||
// which is why this logic must come after the successful login logic
|
// which is why this logic must come after the successful login logic
|
||||||
if (!limiter.try()) {
|
if (!limiter.removeToken()) {
|
||||||
throw new Error("Login rate limited!")
|
throw new Error("Login rate limited!")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,20 +4,20 @@ describe("login", () => {
|
||||||
describe("RateLimiter", () => {
|
describe("RateLimiter", () => {
|
||||||
it("should allow one try ", () => {
|
it("should allow one try ", () => {
|
||||||
const limiter = new RateLimiter()
|
const limiter = new RateLimiter()
|
||||||
expect(limiter.try()).toBe(true)
|
expect(limiter.removeToken()).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should pull tokens from both limiters (minute & hour)", () => {
|
it("should pull tokens from both limiters (minute & hour)", () => {
|
||||||
const limiter = new RateLimiter()
|
const limiter = new RateLimiter()
|
||||||
|
|
||||||
// Try twice, which pulls two from the minute bucket
|
// Try twice, which pulls two from the minute bucket
|
||||||
limiter.try()
|
limiter.removeToken()
|
||||||
limiter.try()
|
limiter.removeToken()
|
||||||
|
|
||||||
// Check that we can still try
|
// Check that we can still try
|
||||||
// which should be true since there are 12 remaining in the hour bucket
|
// which should be true since there are 12 remaining in the hour bucket
|
||||||
expect(limiter.canTry()).toBe(true)
|
expect(limiter.canTry()).toBe(true)
|
||||||
expect(limiter.try()).toBe(true)
|
expect(limiter.removeToken()).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should not allow more than 14 tries in less than an hour", () => {
|
it("should not allow more than 14 tries in less than an hour", () => {
|
||||||
|
@ -27,10 +27,11 @@ describe("login", () => {
|
||||||
// so if we run it 15 times, 14 should return true and the last
|
// so if we run it 15 times, 14 should return true and the last
|
||||||
// should return false
|
// should return false
|
||||||
for (let i = 1; i <= 14; i++) {
|
for (let i = 1; i <= 14; i++) {
|
||||||
expect(limiter.try()).toBe(true)
|
expect(limiter.removeToken()).toBe(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(limiter.try()).toBe(false)
|
expect(limiter.canTry()).toBe(false)
|
||||||
|
expect(limiter.removeToken()).toBe(false)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue