diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index a2ee5442..f9bc1e7b 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Ask a question - url: https://github.com/kitabisa/teler-waf/discussions + url: https://github.com/teler-sh/teler-waf/discussions about: Ask questions and discuss with other community members - name: Announcement Bulletin url: https://groups.google.com/g/teler-announce diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md index 4b47e178..a174551c 100644 --- a/.github/ISSUE_TEMPLATE/documentation.md +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -8,7 +8,7 @@ labels: 'documentation' ## Summary diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 3c9bc7ff..fc6d1563 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -4,4 +4,4 @@ If you discover a security issue, please bring it to their attention right away, ### Reporting a Vulnerability -If you have information about a security issue, or vulnerability in this teler-waf package, and/or you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert in [our demo site](https://waf.teler.app), please do **NOT** file a public issue — instead, kindly send your report privately via the [vulnerability report form](https://github.com/kitabisa/teler-waf/security/advisories/new) to our [official channels](https://security.kitabisa.com/#official-channels) as per our [security policy](https://security.kitabisa.com/). \ No newline at end of file +If you have information about a security issue, or vulnerability in this teler-waf package, and/or you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert in [our demo site](https://waf.teler.app), please do **NOT** file a public issue — instead, kindly send your report privately via the [vulnerability report form](https://github.com/teler-sh/teler-waf/security/advisories/new). \ No newline at end of file diff --git a/.github/workflows/regression.yaml b/.github/workflows/regression.yaml index b312e46f..36b8ae6c 100644 --- a/.github/workflows/regression.yaml +++ b/.github/workflows/regression.yaml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: teler-sh/actions/setup-go@v1 - - uses: kitabisa/teler-resources/cache@master + - uses: teler-sh/teler-resources/cache@master - run: make bench-${{ matrix.phase }} | tee ${{ env.out }} - uses: actions/cache@v4 with: diff --git a/README.md b/README.md index 4cac1857..c74d458a 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ # teler-waf -[![Kitabisa Security](https://img.shields.io/badge/kitabisa-security%20project-blue)](#) -[![GoDoc](https://pkg.go.dev/static/frontend/badge/badge.svg)](http://pkg.go.dev/github.com/kitabisa/teler-waf) -[![codecov](https://codecov.io/gh/kitabisa/teler-waf/branch/master/graph/badge.svg?token=RTIZW58NWK)](https://codecov.io/gh/kitabisa/teler-waf) -[![tests](https://github.com/kitabisa/teler-waf/actions/workflows/tests.yaml/badge.svg)](https://github.com/kitabisa/teler-waf/actions/workflows/tests.yaml) -[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/kitabisa/teler-waf/badge)](https://securityscorecards.dev/viewer/?uri=github.com/kitabisa/teler-waf) +[![GoDoc](https://pkg.go.dev/static/frontend/badge/badge.svg)](http://pkg.go.dev/github.com/teler-sh/teler-waf) +[![codecov](https://codecov.io/gh/teler-sh/teler-waf/graph/badge.svg?token=RTIZW58NWK)](https://codecov.io/gh/teler-sh/teler-waf) +[![tests](https://github.com/teler-sh/teler-waf/actions/workflows/tests.yaml/badge.svg)](https://github.com/teler-sh/teler-waf/actions/workflows/tests.yaml) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/teler-sh/teler-waf/badge)](https://securityscorecards.dev/viewer/?uri=github.com/teler-sh/teler-waf) [![Mentioned in Awesome Go](https://awesome.re/mentioned-badge.svg)](https://github.com/avelino/awesome-go) -**teler-waf** is a comprehensive security solution for Go-based web applications. It acts as an HTTP middleware, providing an easy-to-use interface for integrating IDS functionality with [teler IDS](https://github.com/kitabisa/teler-waf) into existing Go applications. By using teler-waf, you can help protect against a variety of web-based attacks, such as cross-site scripting (XSS) and SQL injection. +**teler-waf** is a comprehensive security solution for Go-based web applications. It acts as an HTTP middleware, providing an easy-to-use interface for integrating IDS functionality with [teler IDS](https://github.com/teler-sh/teler-waf) into existing Go applications. By using teler-waf, you can help protect against a variety of web-based attacks, such as cross-site scripting (XSS) and SQL injection. The package comes with a standard [`net/http.Handler`](https://pkg.go.dev/net/http#Handler), making it easy to integrate into your application's routing. When a client makes a request to a route protected by teler-waf, the request is first checked against the teler IDS to detect known malicious patterns. If no malicious patterns are detected, the request is then passed through for further processing. @@ -17,8 +16,8 @@ In addition to providing protection against web-based attacks, teler-waf can als **See also:** -- [kitabisa/teler](https://github.com/kitabisa/teler): Real-time HTTP intrusion detection. -- [kitabisa/teler-proxy](https://github.com/kitabisa/teler-proxy): teler Proxy enabling seamless integration with teler WAF. +- [teler-sh/teler](https://github.com/teler-sh/teler): Real-time HTTP intrusion detection. +- [teler-sh/teler-proxy](https://github.com/teler-sh/teler-proxy): teler Proxy enabling seamless integration with teler WAF. ## Features @@ -49,20 +48,20 @@ Overall, teler-waf provides a comprehensive security solution for Go-based web a To install teler-waf in your Go application, run the following command to download and install the teler-waf package: ```console -go get github.com/kitabisa/teler-waf +go get github.com/teler-sh/teler-waf ``` ## Usage > [!WARNING] -> **Deprecation notice**: Threat exclusions (`Excludes`) will be deprecated in the upcoming release (**v2**). See [#73](https://github.com/kitabisa/teler-waf/discussions/73) & [#64](https://github.com/kitabisa/teler-waf/issues/64). +> **Deprecation notice**: Threat exclusions (`Excludes`) will be deprecated in the upcoming release (**v2**). See [#73](https://github.com/teler-sh/teler-waf/discussions/73) & [#64](https://github.com/teler-sh/teler-waf/issues/64). Here is an example of how to use teler-waf in a Go application: 1. Import the teler-waf package in your Go code: ```go -import "github.com/kitabisa/teler-waf" +import "github.com/teler-sh/teler-waf" ``` 2. Use the `New` function to create a new instance of the `Teler` type. This function takes a variety of optional parameters that can be used to configure teler-waf to suit the specific needs of your application. @@ -87,7 +86,7 @@ That's it! You have configured teler-waf in your Go application. **Options:** -For a list of the options available to customize teler-waf, see the [`teler.Options`](https://pkg.go.dev/github.com/kitabisa/teler-waf#Options) struct. +For a list of the options available to customize teler-waf, see the [`teler.Options`](https://pkg.go.dev/github.com/teler-sh/teler-waf#Options) struct. ### Examples @@ -100,9 +99,9 @@ package main import ( "net/http" - "github.com/kitabisa/teler-waf" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" ) var myHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -185,7 +184,7 @@ func main() { } ``` -For more examples of how to use teler-waf or integrate it with any framework, take a look at [examples/](https://github.com/kitabisa/teler-waf/tree/master/examples) directory. +For more examples of how to use teler-waf or integrate it with any framework, take a look at [examples/](https://github.com/teler-sh/teler-waf/tree/master/examples) directory. ### Custom Rules @@ -196,9 +195,9 @@ To integrate custom rules into the teler-waf middleware, you have two choices: ` - **`Customs` option** -You can define custom rules directly using the `Customs` option, as shown in the [example](https://github.com/kitabisa/teler-waf#examples) above. +You can define custom rules directly using the `Customs` option, as shown in the [example](https://github.com/teler-sh/teler-waf#examples) above. -In the `Customs` option, you provide an array of `teler.Rule` structures. Each `teler.Rule` represents a custom rule with a unique name and a condition that specifies how the individual conditions within the rule are evaluated (`or` or `and`). The rule consists of one or more `teler.Condition` structures, each defining a specific condition to check. Conditions can be based on the [HTTP method](https://pkg.go.dev/github.com/kitabisa/teler-waf/request#pkg-constants), [element](https://pkg.go.dev/github.com/kitabisa/teler-waf/request#Element) (headers, body, URI, or any), and a regex pattern or a [DSL expression](https://pkg.go.dev/github.com/kitabisa/teler-waf/dsl) to match against. +In the `Customs` option, you provide an array of `teler.Rule` structures. Each `teler.Rule` represents a custom rule with a unique name and a condition that specifies how the individual conditions within the rule are evaluated (`or` or `and`). The rule consists of one or more `teler.Condition` structures, each defining a specific condition to check. Conditions can be based on the [HTTP method](https://pkg.go.dev/github.com/teler-sh/teler-waf/request#pkg-constants), [element](https://pkg.go.dev/github.com/teler-sh/teler-waf/request#Element) (headers, body, URI, or any), and a regex pattern or a [DSL expression](https://pkg.go.dev/github.com/teler-sh/teler-waf/dsl) to match against. - **`CustomsFromFile` option** @@ -208,14 +207,14 @@ Alternatively, the `CustomsFromFile` option allows you to load custom rules from - name: condition: # Valid values are: "or" or "and", in lowercase or uppercase. rules: - - method: # Valid methods are: "ALL", "CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", and "TRACE". Please refer to https://pkg.go.dev/github.com/kitabisa/teler-waf/request for further details. + - method: # Valid methods are: "ALL", "CONNECT", "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT", and "TRACE". Please refer to https://pkg.go.dev/github.com/teler-sh/teler-waf/request for further details. element: # Valid elements are: "headers", "body", "uri", and "any", in lowercase, uppercase, or title case (except for "uri"). pattern: "" # Regular expression pattern - dsl: "" # DSL expression ``` > [!IMPORTANT] -> Please note that the `condition`, `method`, and `element` are optional parameters. The default values assigned to them are as follows: `condition` is set to **or**, `method` is set to **ALL**, and `element` is set to **ANY**. Therefore, if desired, you can leave those parameters empty. The `pattern` parameter is mandatory, unless you specify a `dsl` expression. In such cases, when a `dsl` expression is provided, teler-waf will disregard any values assigned to `method` and `element`, even if they are defined. To see some examples, you can refer to the [`tests/rules/`](https://github.com/kitabisa/teler-waf/tree/master/tests/rules/valid) directory. +> Please note that the `condition`, `method`, and `element` are optional parameters. The default values assigned to them are as follows: `condition` is set to **or**, `method` is set to **ALL**, and `element` is set to **ANY**. Therefore, if desired, you can leave those parameters empty. The `pattern` parameter is mandatory, unless you specify a `dsl` expression. In such cases, when a `dsl` expression is provided, teler-waf will disregard any values assigned to `method` and `element`, even if they are defined. To see some examples, you can refer to the [`tests/rules/`](https://github.com/teler-sh/teler-waf/tree/master/tests/rules/valid) directory. You can specify the `CustomsFromFile` option with the actual file path or glob pattern pointing to the location of your custom rule files. For example: @@ -338,7 +337,7 @@ For more comprehensive details on operators and built-in functions, please refer ### Streamlined Configuration Management -For effective configuration, it's essential to define a range of settings, including whitelists, custom rule definitions, logging preferences, and other parameters. The [`option`](https://pkg.go.dev/github.com/kitabisa/teler-waf/option) package streamlines this configuration workflow by enabling you to efficiently unmarshal or load configuration data from JSON and YAML formats into a format that teler-waf can readily comprehend and implement. +For effective configuration, it's essential to define a range of settings, including whitelists, custom rule definitions, logging preferences, and other parameters. The [`option`](https://pkg.go.dev/github.com/teler-sh/teler-waf/option) package streamlines this configuration workflow by enabling you to efficiently unmarshal or load configuration data from JSON and YAML formats into a format that teler-waf can readily comprehend and implement. ```go // Load configuration from a YAML file. @@ -382,7 +381,7 @@ Teler request IDs are used by teler-waf to track requests made to its web applic ### Custom Response -By default, teler-waf employs the [`DefaultHTMLResponse`](https://pkg.go.dev/github.com/kitabisa/teler-waf#DefaultHTMLResponse) as the standard response when a request is rejected or blocked. However, teler-waf offers a high degree of customization, empowering you to tailor the response to your specific requirements. The customization can be achieved using the `Status`, `HTML`, or `HTMLFile` options, all of which are part of the [`Response`](https://pkg.go.dev/github.com/kitabisa/teler-waf#Response) interface. +By default, teler-waf employs the [`DefaultHTMLResponse`](https://pkg.go.dev/github.com/teler-sh/teler-waf#DefaultHTMLResponse) as the standard response when a request is rejected or blocked. However, teler-waf offers a high degree of customization, empowering you to tailor the response to your specific requirements. The customization can be achieved using the `Status`, `HTML`, or `HTMLFile` options, all of which are part of the [`Response`](https://pkg.go.dev/github.com/teler-sh/teler-waf#Response) interface. Here's how you can make use of these options in your code: @@ -465,7 +464,7 @@ Add the `localfile` element block below inside `ossec_config` element in the [lo ``` > [!NOTE] -> The value of `location` should be the teler WAF log file path you specified in [`Options.LogFile`](https://pkg.go.dev/github.com/kitabisa/teler-waf#Options.LogFile). +> The value of `location` should be the teler WAF log file path you specified in [`Options.LogFile`](https://pkg.go.dev/github.com/teler-sh/teler-waf#Options.LogFile). By doing this, Wazuh will be able to read and analyze the teler WAF logs, enhancing your network protection and providing better insights. @@ -475,7 +474,7 @@ The teler-waf package utilizes a dataset of threats to identify and analyze each ](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) if non-empty, else `$HOME/.cache/teler-waf`. On Darwin, it returns `$HOME/Library/Caches/teler-waf`. On Windows, it returns `%LocalAppData%/teler-waf`. On Plan 9, it returns `$home/lib/cache/teler-waf`)_ on your first launch. Subsequent launch will utilize the cached dataset, rather than downloading it again. > [!NOTE] -> The threat datasets are obtained from the [kitabisa/teler-resources](https://github.com/kitabisa/teler-resources) repository. +> The threat datasets are obtained from the [teler-sh/teler-resources](https://github.com/teler-sh/teler-resources) repository. However, there may be situations where you want to disable automatic updates to the threat dataset. For example, you may have a slow or limited internet connection, or you may be using a machine with restricted file access. In these cases, you can set an option called **NoUpdateCheck** to `true`, which will prevent the teler-waf from automatically updating the dataset. @@ -514,7 +513,7 @@ If you discover a security issue, please bring it to their attention right away, ### Reporting a Vulnerability -If you have information about a security issue, or vulnerability in this teler-waf package, and/or you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert in our [demo site](https://waf.teler.app) (see [resources](#resources)), please do **NOT** file a public issue — instead, kindly send your report privately via the [vulnerability report form](https://github.com/kitabisa/teler-waf/security/advisories/new) or to our [official channels](https://security.kitabisa.com/#official-channels) as per our [security policy](https://security.kitabisa.com/). +If you have information about a security issue, or vulnerability in this teler-waf package, and/or you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert in our [demo site](https://waf.teler.app) (see [resources](#resources)), please do **NOT** file a public issue — instead, kindly send your report privately via the [vulnerability report form](https://github.com/teler-sh/teler-waf/security/advisories/new). ## Limitations @@ -526,7 +525,7 @@ Here are some limitations of using teler-waf: $ go test -bench "^BenchmarkAnalyze" -cpu=4 goos: linux goarch: amd64 -pkg: github.com/kitabisa/teler-waf +pkg: github.com/teler-sh/teler-waf cpu: 11th Gen Intel(R) Core(TM) i9-11900H @ 2.50GHz BenchmarkAnalyzeDefault-4 266018 4018 ns/op 2682 B/op 74 allocs/op BenchmarkAnalyzeCommonWebAttack-4 374410 3126 ns/op 2090 B/op 68 allocs/op @@ -543,24 +542,24 @@ BenchmarkAnalyzeWithoutBadReferrer-4 298168 3667 ns/op 25 BenchmarkAnalyzeWithoutBadCrawler-4 276108 4023 ns/op 2682 B/op 74 allocs/op BenchmarkAnalyzeWithoutDirectoryBruteforce-4 276699 3627 ns/op 2682 B/op 74 allocs/op PASS -ok github.com/kitabisa/teler-waf 32.093s +ok github.com/teler-sh/teler-waf 32.093s ``` > [!NOTE] -> Benchmarking results may vary and may not be consistent. The [teler-resources](https://github.com/kitabisa/teler-resources) dataset may have increased since then, which may impact the results. +> Benchmarking results may vary and may not be consistent. The [teler-resources](https://github.com/teler-sh/teler-resources) dataset may have increased since then, which may impact the results. - **Configuration complexity**: Configuring teler-waf to suit the specific needs of your application can be complex, and may require a certain level of expertise in web security. This can make it difficult for those who are not familiar with application firewalls and IDS systems to properly set up and use teler-waf. - **Limited protection**: teler-waf is not a perfect security solution, and it may not be able to protect against all possible types of attacks. As with any security system, it is important to regularly monitor and maintain teler-waf to ensure that it is providing the desired level of protection. #### Known Issues -To view a list of known issues with teler-waf, please filter the issues by the ["known-issue" label](https://github.com/kitabisa/teler-waf/issues?q=is%3Aopen+is%3Aissue+label%3Aknown-issue). +To view a list of known issues with teler-waf, please filter the issues by the ["known-issue" label](https://github.com/teler-sh/teler-waf/issues?q=is%3Aopen+is%3Aissue+label%3Aknown-issue). ## Community -We use the Google Groups as our dedicated mailing list. Subscribe to [teler-announce](https://groups.google.com/g/teler-announce) via [teler-announce+subscribe@googlegroups.com](mailto:teler-announce+subscribe@googlegroups.com) for important announcements, such as the availability of new releases. This subscription will keep you informed about significant developments related to [teler IDS](https://github.com/kitabisa/teler), [teler WAF](https://github.com/kitabisa/teler-waf), [teler Proxy](https://github.com/kitabisa/teler-proxy), and [teler Resources](https://github.com/kitabisa/teler-resources). +We use the Google Groups as our dedicated mailing list. Subscribe to [teler-announce](https://groups.google.com/g/teler-announce) via [teler-announce+subscribe@googlegroups.com](mailto:teler-announce+subscribe@googlegroups.com) for important announcements, such as the availability of new releases. This subscription will keep you informed about significant developments related to [teler IDS](https://github.com/teler-sh/teler), [teler WAF](https://github.com/teler-sh/teler-waf), [teler Proxy](https://github.com/teler-sh/teler-proxy), and [teler Resources](https://github.com/teler-sh/teler-resources). -For any [inquiries](https://github.com/kitabisa/teler-waf/discussions/categories/q-a), [discussions](https://github.com/kitabisa/teler-waf/discussions), or [issues](https://github.com/kitabisa/teler-waf/issues) are being tracked here on GitHub. This is where we actively manage and address these aspects of our community engagement. +For any [inquiries](https://github.com/teler-sh/teler-waf/discussions/categories/q-a), [discussions](https://github.com/teler-sh/teler-waf/discussions), or [issues](https://github.com/teler-sh/teler-waf/issues) are being tracked here on GitHub. This is where we actively manage and address these aspects of our community engagement. ## License diff --git a/analyze.go b/analyze.go index 379796aa..38cd834a 100644 --- a/analyze.go +++ b/analyze.go @@ -11,8 +11,8 @@ import ( "net/http" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" "go.uber.org/zap/zapcore" "golang.org/x/net/publicsuffix" ) diff --git a/condition.go b/condition.go index 845366bf..de1429fa 100644 --- a/condition.go +++ b/condition.go @@ -9,7 +9,7 @@ import ( "regexp" "github.com/expr-lang/expr/vm" - "github.com/kitabisa/teler-waf/request" + "github.com/teler-sh/teler-waf/request" ) // Condition specifies a request element to match and diff --git a/examples/custom/main.go b/examples/custom/main.go index cdc72f8b..dab19453 100644 --- a/examples/custom/main.go +++ b/examples/custom/main.go @@ -3,9 +3,9 @@ package main import ( "net/http" - "github.com/kitabisa/teler-waf" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" ) var myHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/examples/demo/index.html b/examples/demo/index.html index 1bec8e4e..f57e3466 100644 --- a/examples/demo/index.html +++ b/examples/demo/index.html @@ -34,8 +34,8 @@

teler-waf tester

diff --git a/examples/demo/main.go b/examples/demo/main.go index 2b30ad16..a08b364a 100644 --- a/examples/demo/main.go +++ b/examples/demo/main.go @@ -6,7 +6,7 @@ import ( "net/http" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "gitlab.com/golang-commonmark/mdurl" ) diff --git a/examples/go.mod b/examples/go.mod index b9ec53a0..61cbf1af 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-chi/chi v1.5.4 github.com/gorilla/mux v1.8.0 github.com/kataras/iris/v12 v12.2.0 - github.com/kitabisa/teler-waf v1.1.7 + github.com/teler-sh/teler-waf v1.1.7 github.com/labstack/echo v3.3.10+incompatible github.com/urfave/negroni v1.0.0 github.com/zenazn/goji v1.0.1 diff --git a/examples/go.sum b/examples/go.sum index cd28d6c5..b5d9898b 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -433,8 +433,8 @@ github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIR github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kitabisa/teler-waf v1.1.7 h1:eYCfrmIv53NlDDUhrdMjWXqmS8dBc8IlI10iT5x6ud4= -github.com/kitabisa/teler-waf v1.1.7/go.mod h1:QVyhPUFwI5sFC1YM2OS7/90izNw9nVGHSacvyYrq9rI= +github.com/teler-sh/teler-waf v1.1.7 h1:eYCfrmIv53NlDDUhrdMjWXqmS8dBc8IlI10iT5x6ud4= +github.com/teler-sh/teler-waf v1.1.7/go.mod h1:QVyhPUFwI5sFC1YM2OS7/90izNw9nVGHSacvyYrq9rI= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= diff --git a/examples/integrations/chi/main.go b/examples/integrations/chi/main.go index df871a3d..517cb28f 100644 --- a/examples/integrations/chi/main.go +++ b/examples/integrations/chi/main.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/go-chi/chi" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" ) func main() { diff --git a/examples/integrations/echo/main.go b/examples/integrations/echo/main.go index ffbe36e7..83dfe987 100644 --- a/examples/integrations/echo/main.go +++ b/examples/integrations/echo/main.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "github.com/labstack/echo" ) diff --git a/examples/integrations/gin/main.go b/examples/integrations/gin/main.go index 762969fa..d8cdd715 100644 --- a/examples/integrations/gin/main.go +++ b/examples/integrations/gin/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/gin-gonic/gin" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" ) func main() { diff --git a/examples/integrations/goji/main.go b/examples/integrations/goji/main.go index 2dbf925f..f2049d28 100644 --- a/examples/integrations/goji/main.go +++ b/examples/integrations/goji/main.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "github.com/zenazn/goji" "github.com/zenazn/goji/web" ) diff --git a/examples/integrations/iris/main.go b/examples/integrations/iris/main.go index af7095c9..07be27a9 100644 --- a/examples/integrations/iris/main.go +++ b/examples/integrations/iris/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/kataras/iris/v12" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" ) func main() { diff --git a/examples/integrations/mux/main.go b/examples/integrations/mux/main.go index d838fb3b..fea2eeea 100644 --- a/examples/integrations/mux/main.go +++ b/examples/integrations/mux/main.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" ) func main() { diff --git a/examples/integrations/negroni/main.go b/examples/integrations/negroni/main.go index 90b97d06..b8223f95 100644 --- a/examples/integrations/negroni/main.go +++ b/examples/integrations/negroni/main.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "github.com/urfave/negroni" ) diff --git a/examples/simple/main.go b/examples/simple/main.go index d22e28dc..b0d3a9f6 100644 --- a/examples/simple/main.go +++ b/examples/simple/main.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/arl/statsviz" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" ) func helloHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go.mod b/go.mod index d419bbef..a24bc34d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kitabisa/teler-waf +module github.com/teler-sh/teler-waf go 1.19 @@ -16,7 +16,7 @@ require ( github.com/scorpionknifes/go-pcre v0.0.0-20210805092536-77486363b797 github.com/sourcegraph/conc v0.3.0 github.com/stretchr/testify v1.9.0 - github.com/teler-sh/dsl v1.0.1 + github.com/teler-sh/dsl v1.0.2 github.com/twharmon/gouid v0.6.0 github.com/valyala/fastjson v1.6.3 github.com/valyala/fasttemplate v1.2.2 diff --git a/go.sum b/go.sum index 38e254e1..e70e91dc 100644 --- a/go.sum +++ b/go.sum @@ -447,6 +447,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/teler-sh/dsl v1.0.1 h1:PDrQeIKEdC+NYEvSY0EZszPbzrwWis1jhZ1WwQLo/OY= github.com/teler-sh/dsl v1.0.1/go.mod h1:mxNMl2sxUjjReAUemhkeX0cwaFrHAu2Wcf0u2zoRdGE= +github.com/teler-sh/dsl v1.0.2 h1:TZLxLvCL1q8M7IOE0A+2zWuAcp6niJ+56My0iBvl+3o= +github.com/teler-sh/dsl v1.0.2/go.mod h1:dCDAO75SGg1pC1qsX5Y0mNsfswmfRcEJTK86ldi7DP0= github.com/twharmon/gouid v0.6.0 h1:l5Tcn8zXwVtFlbQWPfh6BrltSjcOXXsbT3Tm4NdYgj8= github.com/twharmon/gouid v0.6.0/go.mod h1:m1SyQo0sYYbukI1yNZ1WRk980fV2XWBuYGAtMo/AmQ8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= diff --git a/option/loader.go b/option/loader.go index 7b3dc83d..2a8cafd7 100644 --- a/option/loader.go +++ b/option/loader.go @@ -12,7 +12,7 @@ Options struct for further processing. */ package option -import "github.com/kitabisa/teler-waf" +import "github.com/teler-sh/teler-waf" // LoadFromJSONBytes to unmarshal the teler-waf JSON // bytes configuration into the [teler.Options] struct. diff --git a/option/loader_test.go b/option/loader_test.go index 0c1b17ad..1525dd2d 100644 --- a/option/loader_test.go +++ b/option/loader_test.go @@ -9,7 +9,7 @@ import ( "syscall" "testing" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "github.com/stretchr/testify/assert" ) diff --git a/option/utils.go b/option/utils.go index 1acb3a66..c1796d18 100644 --- a/option/utils.go +++ b/option/utils.go @@ -10,7 +10,7 @@ import ( "encoding/json" - "github.com/kitabisa/teler-waf" + "github.com/teler-sh/teler-waf" "gopkg.in/yaml.v3" ) diff --git a/options.go b/options.go index 7512120b..4b40a7af 100644 --- a/options.go +++ b/options.go @@ -8,7 +8,7 @@ package teler import ( "io" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf/threat" ) // Options is a struct for specifying configuration options for the teler.Teler middleware. diff --git a/teler.go b/teler.go index b300c9f5..825eb567 100644 --- a/teler.go +++ b/teler.go @@ -36,8 +36,8 @@ import ( "path/filepath" "github.com/expr-lang/expr/vm" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" "github.com/klauspost/compress/zstd" "github.com/patrickmn/go-cache" "github.com/scorpionknifes/go-pcre" diff --git a/teler_test.go b/teler_test.go index 5cce57cf..f799af04 100644 --- a/teler_test.go +++ b/teler_test.go @@ -17,8 +17,8 @@ import ( "net/http/httptest" "path/filepath" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" "github.com/stretchr/testify/assert" ) diff --git a/threat/const.go b/threat/const.go index f6ad9432..ad4a766c 100644 --- a/threat/const.go +++ b/threat/const.go @@ -6,7 +6,7 @@ package threat const ( telerRes = "teler-resources" - repoURL = "https://github.com/kitabisa/" + telerRes + repoURL = "https://github.com/teler-sh/" + telerRes cachePath = "/teler-waf" tmpDirSuffix = "." + telerRes + "-%s" ) diff --git a/utils.go b/utils.go index d3b7ee79..9646b2fa 100644 --- a/utils.go +++ b/utils.go @@ -19,8 +19,8 @@ import ( "github.com/dwisiswant0/clientip" "github.com/expr-lang/expr/vm" - "github.com/kitabisa/teler-waf/request" - "github.com/kitabisa/teler-waf/threat" + "github.com/teler-sh/teler-waf/request" + "github.com/teler-sh/teler-waf/threat" "github.com/patrickmn/go-cache" "github.com/twharmon/gouid" "go.uber.org/zap" diff --git a/yaml.go b/yaml.go index bb6ef649..1330986c 100644 --- a/yaml.go +++ b/yaml.go @@ -11,7 +11,7 @@ import ( "os" "github.com/go-playground/validator/v10" - "github.com/kitabisa/teler-waf/request" + "github.com/teler-sh/teler-waf/request" "gopkg.in/yaml.v3" )