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

Rate limit processor #22883

Merged
merged 53 commits into from
Dec 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
b4c068c
Implement basic scaffolding for rate_limit processor
ycombinator Dec 3, 2020
2400b67
Fixing import cycle
ycombinator Dec 3, 2020
b9028cd
Adding skeleton for token bucket algo
ycombinator Dec 3, 2020
dce6dae
Set default algorithm in default config
ycombinator Dec 7, 2020
ca41a82
Using an algo constructor
ycombinator Dec 7, 2020
fb960e5
Implement token bucket rate limiting algorithm
ycombinator Dec 7, 2020
80a37f8
Resolving some TODOs
ycombinator Dec 7, 2020
8b550d3
Adding license header
ycombinator Dec 7, 2020
bff5ee7
Removing old TODO comment
ycombinator Dec 7, 2020
752ff9c
Adding tests
ycombinator Dec 7, 2020
028b67a
Reverting to previous logic
ycombinator Dec 7, 2020
d08d9a6
Adding CHANGELOG entry
ycombinator Dec 7, 2020
0a6b0cd
Adding TODOs for more tests
ycombinator Dec 7, 2020
c9852c9
Fixing comment
ycombinator Dec 7, 2020
1fb20e3
Fixing error messages
ycombinator Dec 7, 2020
8e8a204
Fixing comment
ycombinator Dec 7, 2020
dfc5907
Fleshing out godoc comments
ycombinator Dec 7, 2020
fa63dbb
Fixing logger location
ycombinator Dec 7, 2020
189a170
Fixing up docs a bit
ycombinator Dec 7, 2020
1e0c6ec
Adding test for "fields" config
ycombinator Dec 7, 2020
8639e3b
WIP: adding test for burst multiplier
ycombinator Dec 7, 2020
a9faa7e
Return pointer to bucket from getBucket
ycombinator Dec 8, 2020
193cb1f
Keep pointers to buckets in map to avoid map reassignment
ycombinator Dec 8, 2020
7597c67
Fix test
ycombinator Dec 8, 2020
f918076
Fix logic as we cannot allow withdrawal of fractional (<1) tokens
ycombinator Dec 8, 2020
ae35015
Move burst multiplier default to token_bucket algo
ycombinator Dec 8, 2020
1a17229
Implementing GC
ycombinator Dec 8, 2020
44c31e4
Making the factory take the algo config and return the algo
ycombinator Dec 8, 2020
c3be265
Reduce nesting level
ycombinator Dec 8, 2020
56e4731
Use mitchellh/hashstructure
ycombinator Dec 8, 2020
ae8874b
Using sync.Map
ycombinator Dec 8, 2020
900019c
Removing algorithm and algorithm options from documentation
ycombinator Dec 8, 2020
58124f5
Mocking clock
ycombinator Dec 8, 2020
eb81d13
Adding license headers
ycombinator Dec 8, 2020
742ed41
Using atomic.Uints for metrics counters
ycombinator Dec 8, 2020
b4990a0
Fixing logic
ycombinator Dec 8, 2020
40e1382
Use github.com/jonboulle/clockwork
ycombinator Dec 8, 2020
a220fbf
Running make update
ycombinator Dec 8, 2020
4b53054
Add mutex to prevent only one GC thread from running at any time
ycombinator Dec 9, 2020
c36b186
Adding logging
ycombinator Dec 10, 2020
c89ecca
Remove NumBuckets GC threshold
ycombinator Dec 10, 2020
425b03a
Use non-blocking mutex
ycombinator Dec 10, 2020
e10a73d
Perform actual GC in own goroutine
ycombinator Dec 10, 2020
91493ba
Running mage fmt
ycombinator Dec 10, 2020
c957161
Fixing processor name
ycombinator Dec 10, 2020
3f4b800
Importing rate limit processor
ycombinator Dec 10, 2020
84c4f74
Initialize mutex
ycombinator Dec 10, 2020
ac6343b
Do not register as a JS processor
ycombinator Dec 10, 2020
00251a8
Remove unused field
ycombinator Dec 10, 2020
a3ce476
Mark processor as beta
ycombinator Dec 10, 2020
5125748
Renaming package
ycombinator Dec 10, 2020
0ffcd7d
Flatenning package hierarchy
ycombinator Dec 10, 2020
2b92955
Remove SetClock from algorithm interface
ycombinator Dec 10, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Improve event normalization performance {pull}22974[22974]
- Add tini as init system in docker images {pull}22137[22137]
- Added "add_network_direction" processor for determining perimeter-based network direction. {pull}23076[23076]
- Added new `rate_limit` processor for enforcing rate limits on event throughput. {pull}22883[22883]

*Auditbeat*

Expand Down
211 changes: 211 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11032,6 +11032,217 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/jonboulle/clockwork
Version: v0.2.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/jonboulle/clockwork@v0.2.2/LICENSE:

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.


--------------------------------------------------------------------------------
Dependency : github.com/josephspurrier/goversioninfo
Version: v0.0.0-20190209210621-63e6d1acd3dd
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ require (
github.com/insomniacslk/dhcp v0.0.0-20180716145214-633285ba52b2
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
github.com/jonboulle/clockwork v0.2.2
github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd
github.com/jpillora/backoff v1.0.0 // indirect
github.com/jstemmer/go-junit-report v0.9.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd h1:KikNiFwUO3QLyeKyN4k9yBH9Pcu/gU/yficWi61cJIw=
github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
Expand Down
1 change: 1 addition & 0 deletions libbeat/cmd/instance/imports_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
_ "github.com/elastic/beats/v7/libbeat/processors/dns"
_ "github.com/elastic/beats/v7/libbeat/processors/extract_array"
_ "github.com/elastic/beats/v7/libbeat/processors/fingerprint"
_ "github.com/elastic/beats/v7/libbeat/processors/ratelimit"
_ "github.com/elastic/beats/v7/libbeat/processors/registered_domain"
_ "github.com/elastic/beats/v7/libbeat/processors/translate_sid"
_ "github.com/elastic/beats/v7/libbeat/processors/urldecode"
Expand Down
70 changes: 70 additions & 0 deletions libbeat/processors/ratelimit/algorithm.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// Licensed to Elasticsearch B.V. under one or more contributor
// license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright
// ownership. Elasticsearch B.V. licenses this file to you under
// the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package ratelimit

import (
"fmt"

"github.com/pkg/errors"

"github.com/elastic/beats/v7/libbeat/common"
)

var registry = make(map[string]constructor, 0)

// algoConfig for rate limit algorithm.
type algoConfig struct {
// limit is the rate limit to be enforced by the algorithm.
limit rate

// config is any algorithm-specific additional configuration.
config common.Config
}

// algorithm is the interface that all rate limiting algorithms must
// conform to.
type algorithm interface {
// IsAllowed accepts a key and returns whether that key is allowed
// (true) or not (false). If a key is allowed, it means it is NOT
// rate limited. If a key is not allowed, it means it is being rate
// limited.
IsAllowed(uint64) bool
}

type constructor func(algoConfig) (algorithm, error)

func register(id string, ctor constructor) {
registry[id] = ctor
}

// factory returns the requested rate limiting algorithm, if one is found. If not found,
// an error is returned.
func factory(id string, config algoConfig) (algorithm, error) {
var ctor constructor
var found bool
if ctor, found = registry[id]; !found {
return nil, fmt.Errorf("rate limiting algorithm '%v' not implemented", id)
}

algorithm, err := ctor(config)
if err != nil {
return nil, errors.Wrap(err, "could not construct algorithm")
}

return algorithm, nil
}
47 changes: 47 additions & 0 deletions libbeat/processors/ratelimit/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Licensed to Elasticsearch B.V. under one or more contributor
// license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright
// ownership. Elasticsearch B.V. licenses this file to you under
// the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package ratelimit

import (
"github.com/pkg/errors"

"github.com/elastic/beats/v7/libbeat/common"
)

// config for rate limit processor.
type config struct {
Limit rate `config:"limit" validate:"required"`
Fields []string `config:"fields"`
Algorithm common.ConfigNamespace `config:"algorithm"`
}

func (c *config) setDefaults() error {
if c.Algorithm.Name() == "" {
cfg, err := common.NewConfigFrom(map[string]interface{}{
"token_bucket": map[string]interface{}{},
})

if err != nil {
return errors.Wrap(err, "could not parse default configuration")
}

c.Algorithm.Unpack(cfg)
}

return nil
}
Loading