Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial implementation of key-value rate limits #6947

Merged
merged 42 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8e41eea
WIP
beautifulentropy Jun 14, 2023
67ed1e9
Flesh out the RateLimit methods
beautifulentropy Jun 15, 2023
759479f
Store limit prefixes as integers
beautifulentropy Jun 16, 2023
30e9b01
Improve errors.
beautifulentropy Jun 16, 2023
e834925
Add and test YAML loading
beautifulentropy Jun 16, 2023
5593b49
Refunds, Resets, and Initialization
beautifulentropy Jun 16, 2023
2d148b9
Moar coverage and some small refactors.
beautifulentropy Jun 17, 2023
32741c8
Refunds should return full decisions
beautifulentropy Jun 20, 2023
d44d42c
Initialization is hard.
beautifulentropy Jun 20, 2023
529bfba
Another round of coverage improvements.
beautifulentropy Jun 20, 2023
8178cf1
Avoid shadowing and fix lints.
beautifulentropy Jun 20, 2023
a5a0d15
Addressing comments and adding better checks for limit overrides
beautifulentropy Jun 21, 2023
fb78d4d
Typos
beautifulentropy Jun 21, 2023
5c8d04c
Add some cautionary panics inside of gcra
beautifulentropy Jun 21, 2023
a2844b8
Typos
beautifulentropy Jun 21, 2023
24673e4
Document enums to set stage for the last three id validators
beautifulentropy Jun 22, 2023
b1c2f35
Typo
beautifulentropy Jun 22, 2023
de93969
Addressing comments (WIP)
beautifulentropy Jun 23, 2023
b2f9081
Addressing comments.
beautifulentropy Jun 26, 2023
3b1b762
Lints.
beautifulentropy Jun 26, 2023
1a09f68
We cannot support certain overrides
beautifulentropy Jun 26, 2023
94ec876
Typo.
beautifulentropy Jun 26, 2023
95730f0
Revert changes to policy.
beautifulentropy Jun 26, 2023
47622b3
Address limit.go comments.
beautifulentropy Jun 27, 2023
c413abf
Changes to limit Names, validations, and tests.
beautifulentropy Jun 28, 2023
07699d4
More test cases and a README
beautifulentropy Jun 28, 2023
1ac9b0e
Indent bullets
beautifulentropy Jun 28, 2023
1e7a1ce
Small typos, etc.
beautifulentropy Jun 28, 2023
1c0301e
Informated????
beautifulentropy Jun 28, 2023
6ac0e5e
:woman_facepalming:
beautifulentropy Jun 28, 2023
ea75b65
Addressing comments, two still outstanding.
beautifulentropy Jul 13, 2023
2f69601
Addressed final comment.
beautifulentropy Jul 13, 2023
7442f18
Merge branch 'main' into rate-limits-v2
beautifulentropy Jul 13, 2023
603f187
Update ratelimits/README.md
beautifulentropy Jul 17, 2023
c0289c5
Update ratelimits/README.md
beautifulentropy Jul 17, 2023
897f754
Update ratelimits/README.md
beautifulentropy Jul 17, 2023
5ef087a
Update ratelimits/README.md
beautifulentropy Jul 17, 2023
ca04728
Address comemnts.
beautifulentropy Jul 19, 2023
d052e0c
Merge branch 'main' into rate-limits-v2
beautifulentropy Jul 19, 2023
9ec09f0
unnecessary conversion
beautifulentropy Jul 19, 2023
bb77c0b
Add fractional refund test.
beautifulentropy Jul 20, 2023
861161f
:woman_facepalming:
beautifulentropy Jul 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions policy/pa.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ var (
errWildcardNotSupported = berrors.MalformedError("Wildcard domain names are not supported")
)

// validDomain checks that a domain isn't:
// ValidDomain checks that a domain isn't:
//
// * empty
// * prefixed with the wildcard label `*.`
Expand All @@ -210,7 +210,7 @@ var (
// * exactly equal to an IANA registered TLD
//
// It does _not_ check that the domain isn't on any PA blocked lists.
func validDomain(domain string) error {
func ValidDomain(domain string) error {
if domain == "" {
return errEmptyName
}
Expand Down Expand Up @@ -323,7 +323,7 @@ func ValidEmail(address string) error {
}
splitEmail := strings.SplitN(email.Address, "@", -1)
domain := strings.ToLower(splitEmail[len(splitEmail)-1])
err = validDomain(domain)
err = ValidDomain(domain)
if err != nil {
return berrors.InvalidEmailError(
"contact email %q has invalid domain : %s",
Expand Down Expand Up @@ -363,7 +363,7 @@ func (pa *AuthorityImpl) willingToIssue(id identifier.ACMEIdentifier) error {
}
domain := id.Value

err := validDomain(domain)
err := ValidDomain(domain)
if err != nil {
return err
}
Expand Down
151 changes: 151 additions & 0 deletions ratelimits/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# Configuring and Storing Key-Value Rate Limits

beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
## Default Limit Settings

Each root key directly corresponds to a `Name` enumeration as detailed in
`name.go`. The `Name` enum is used to identify the particular limit. The `count`
value is used to determine the maximum number of requests allowed, within the
given `period` of time. The `burst` value is used to determine the maximum
number of requests allowed, at any given time.
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

```yaml
NewRegistrationsPerIPAddress:
burst: 20
count: 20
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
period: 1s
NewOrdersPerAccount:
burst: 300
count: 300
period: 180m
```

## Override Limit Settings
aarongable marked this conversation as resolved.
Show resolved Hide resolved

Each root key represents a specific bucket, consisting of two elements: `name`
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
and `id`. The `name` here refers to the `Name` of the particular limit, while
the `id` is the client's identifier. The format of the `id` is dependent on the
limit. For example, the `id` for 'NewRegistrationsPerIPAddress' is a subscriber
IP address, while the `id` for 'NewOrdersPerAccount' is the subscriber's
registration ID.

```yaml
NewRegistrationsPerIPAddress:10.0.0.2:
burst: 40
count: 40
period: 1s
NewOrdersPerAccount:12345678
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
burst: 600
count: 600
period: 180m
```

### Id Formats in Limit Override Settings

Id formats vary based on the 'Name' enumeration. Below are examples for each
format:

#### ipAddress

A valid IPv4 or IPv6 address.

Example: `NewRegistrationsPerIPAddress:10.0.0.1`
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

#### ipv6RangeCIDR

A valid IPv6 range in CIDR notation with a /48 mask.
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

Example: `NewRegistrationsPerIPv6Range:2001:0db8:0000::/48`

#### regId

The registration ID of the account.

Example: `NewOrdersPerAccount:12345678`

#### regId:domain

A combination of registration ID and domain, formatted 'regId:domain'.

Example: `CertificatesPerDomainPerAccount:12345678:example.com`

#### regId:fqdnSet

A combination of registration ID and a comma-separated list of domain names,
formatted 'regId:fqdnSet'.

Example: `CertificatesPerFQDNSetPerAccount:12345678:example.com,example.org`
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

## Bucket Key Definitions
pgporada marked this conversation as resolved.
Show resolved Hide resolved

Bucket keys are the key used to lookup the bucket for a given limit and
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
subscriber. Bucket keys are formatted similarly to the overrides but with a
slight difference: the limit `Names` do not carry the string form of each limit.
Instead, they apply the Name enum equivalent for every limit.
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

So, instead of:

```
NewOrdersPerAccount:12345678
```

The corresponding bucket key for regId 12345678 would look like this:

```
6:12345678
```

When loaded from a file, the keys for the default/override limits undergo the
same interning process as the aforementioned subscriber bucket keys. This
eliminates the need for redundant conversions when fetching each
default/override limit.

## How Limits are Applied

beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
For the purposes of this example, subscribers originating from a specific IPv4
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
address are allowed 20 requests to the newFoo endpoint per second, with a
maximum burst of 20 requests at any point-in-time.

A subscriber calls the newFoo endpoint for the first time with an IP address of
172.23.45.22. Here's what happens:

1. The subscriber's IP address is used to generate a bucket key in the form of
`NewFoosPerIPAddress:172.23.45.22`. The Theoretical Arrival Time (TAT) for
this bucket is set to the current time.

2. The subscriber's bucket is initialized with 19 tokens, as 1 token is removed
to account for the current request. The request is approved, and the TAT is
updated. The TAT is set to the current time, plus the inter-request time
(which would be 1/20th of a second if we are limiting to 20 requests per
second).
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

3. The subscriber is informed that their request was successful. Their bucket:
- will reset to full in 50ms (1/20th of a second),
- they can make another newFoo request immediately,
- they can make 19 more requests in the next 50ms,
- they do not need to wait between requests,
- if they make 19 requests in the next 50ms they will need to wait 50ms before
making another request and 1s to make 20 more requests,
- thus if they make 1 request every 50ms, they will never be denied.

Now, the subscriber makes another request immediately:

4. The TAT at bucket key `NewFoosPerIPAddress:172.23.45.22` is compared against
the current time and the burst offset. If the current time is less than the
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
TAT minus the burst offset, this implies the request would surpass the rate
limit and thus, it's rejected. If the current time is equal to or greater
than the TAT minus the burst offset, the request is allowed.
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved

5. A token is deducted from the subscriber's bucket and the TAT is updated
similarly to the first request.

If the subscriber makes requests rapidly, causing the token count to hit 0
before 50ms has passed, here's what would happen during their next request:

6. The rate limiter checks the TAT. If the current time is less than (TAT -
burst offset), the request is rejected. Since the subscriber has already
exhausted their 20 requests in <50ms, the current time is indeed less than
(TAT - burst offset). Therefore, the request is rejected to maintain the rate
limit.

beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
This mechanism allows for bursts of traffic but also ensures that the average
rate of requests stays within the prescribed limits over time.
121 changes: 121 additions & 0 deletions ratelimits/gcra.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package ratelimits

import (
"math"
"time"

"github.com/jmhodges/clock"
)

// divThenRound divides two int64s and rounds the result to the nearest integer.
// This is used to calculate request intervals and costs in nanoseconds.
func divThenRound(x, y int64) int64 {
return int64(math.Round(float64(x) / float64(y)))
}

// maybeSpend uses the GCRA algorithm to decide whether to allow a request. It
// returns a Decision struct with the result of the decision and the updated
// TAT. The cost must be 0 or greater and <= the burst capacity of the limit.
func maybeSpend(clk clock.Clock, rl limit, tat time.Time, cost int64) *Decision {
if cost < 0 || cost > rl.Burst {
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
panic("invalid cost for maybeSpend")
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
}
nowUnix := clk.Now().UnixNano()
tatUnix := tat.UnixNano()

// If the TAT is in the future, use it as the starting point for the
// calculation. Otherwise, use the current time. This is to prevent the
// bucket from being filled with capacity from the past.
if nowUnix > tatUnix {
tatUnix = nowUnix
}

// Compute the cost increment.
emissionInterval := divThenRound(rl.Period.Nanoseconds(), rl.Count)
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
costIncrement := emissionInterval * cost

// Deduct the cost to find the new TAT and residual capacity.
newTAT := tatUnix + costIncrement
burstOffset := emissionInterval * rl.Burst
difference := nowUnix - (newTAT - burstOffset)
residual := divThenRound(difference, emissionInterval)

if costIncrement <= 0 && residual == 0 {
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
// Edge case: no cost to consume and no capacity to consume it from.
return &Decision{
Allowed: false,
Remaining: 0,
RetryIn: time.Duration(emissionInterval),
ResetIn: time.Duration(tatUnix - nowUnix),
newTAT: time.Unix(0, tatUnix).UTC(),
}
}

if residual < 0 {
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
// Too little capacity to satisfy the cost, deny the request.
remaining := divThenRound(nowUnix-(tatUnix-burstOffset), emissionInterval)
return &Decision{
Allowed: false,
Remaining: int(remaining),
RetryIn: -time.Duration(difference),
ResetIn: time.Duration(tatUnix - nowUnix),
newTAT: time.Unix(0, tatUnix).UTC(),
}
}

// There is enough capacity to satisfy the cost, allow the request.
var retryIn time.Duration
if residual == 0 {
// This request will empty the bucket.
retryIn = time.Duration(emissionInterval)
}
return &Decision{
Allowed: true,
Remaining: int(residual),
RetryIn: retryIn,
ResetIn: time.Duration(newTAT - nowUnix),
newTAT: time.Unix(0, newTAT).UTC(),
}
}

// maybeRefund uses the Generic Cell Rate Algorithm (GCRA) to attempt to refund
// the cost of a request which was previously spent. The refund cost must be 0
// or greater. A cost will only be refunded up to the burst capacity of the
// limit. A partial refund is still considered successful.
func maybeRefund(clk clock.Clock, rl limit, tat time.Time, cost int64) *Decision {
if cost <= 0 || cost > rl.Burst {
panic("invalid cost for maybeRefund")
}
nowUnix := clk.Now().UnixNano()
tatUnix := tat.UnixNano()

// If the TAT is in the past, use the current time as the starting point.
beautifulentropy marked this conversation as resolved.
Show resolved Hide resolved
if nowUnix > tatUnix {
tatUnix = nowUnix
}

// Compute the refund increment.
emissionInterval := divThenRound(rl.Period.Nanoseconds(), rl.Count)
refundIncrement := emissionInterval * cost

// Subtract the refund increment from the TAT to find the new TAT.
newTAT := tatUnix - refundIncrement

// Ensure the new TAT is not earlier than now.
if newTAT < nowUnix {
newTAT = nowUnix
}

// Calculate the new capacity.
burstOffset := emissionInterval * rl.Burst
difference := nowUnix - (newTAT - burstOffset)
residual := divThenRound(difference, emissionInterval)

return &Decision{
Allowed: (newTAT != tatUnix),
Remaining: int(residual),
RetryIn: time.Duration(0),
ResetIn: time.Duration(newTAT - nowUnix),
newTAT: time.Unix(0, newTAT).UTC(),
}
}
Loading