Skip to content

Commit

Permalink
refactor(*): mod rename (#197)
Browse files Browse the repository at this point in the history
* refactor(*): mod rename

Signed-off-by: Dwi Siswanto <git@dw1.io>

* build(module): bump github.com/teler-sh/dsl to v1.0.2

Signed-off-by: Dwi Siswanto <git@dw1.io>

---------

Signed-off-by: Dwi Siswanto <git@dw1.io>
  • Loading branch information
dwisiswant0 committed Jun 10, 2024
1 parent 20a54b7 commit 14b1a7f
Show file tree
Hide file tree
Showing 31 changed files with 70 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ labels: 'documentation'
<!--
To make it easier for us to help you, please include as much useful information as possible.
Before opening a new issue, please search existing issues https://github.com/kitabisa/teler-waf/issues
Before opening a new issue, please search existing issues https://github.com/teler-sh/teler-waf/issues
-->

## Summary
Expand Down
2 changes: 1 addition & 1 deletion .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
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).
2 changes: 1 addition & 1 deletion .github/workflows/regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
61 changes: 30 additions & 31 deletions README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/custom/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions examples/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ <h1>teler-waf tester</h1>
<div class="popup-inner" id="popup-inner">
<div class="popup__text">
<h1>What is this?</h1>
<p>This page serves as a demonstration of the <a href="https://github.com/kitabisa/teler-waf" target="_blank">teler-waf</a> package implementation, which is configured with default settings to test the resilience of web applications against common web attack threats.</p>
<p>If you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert, kindly report it to us via the <a href="https://github.com/kitabisa/teler-waf/security/advisories/new" target="_blank">vulnerability report form</a> under its GitHub repository or reach us through the <a href="https://security.kitabisa.com/#official-channels" target="_blank">official channels</a> specified on our <a href="https://security.kitabisa.com/" target="_blank">security policy page</a>.</p>
<p>This page serves as a demonstration of the <a href="https://github.com/teler-sh/teler-waf" target="_blank">teler-waf</a> package implementation, which is configured with default settings to test the resilience of web applications against common web attack threats.</p>
<p>If you are able to successfully execute such as cross-site scripting (XSS) and pop-up an alert, kindly report it to us via the <a href="https://github.com/teler-sh/teler-waf/security/advisories/new" target="_blank">vulnerability report form</a> under its GitHub repository.</p>
</div>
<a class="popup__close" href="#">X</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"net/http"

"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
"gitlab.com/golang-commonmark/mdurl"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/chi/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/echo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"net/http"

"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
"github.com/labstack/echo"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/gin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/goji/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/iris/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/mux/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"

"github.com/gorilla/mux"
"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/integrations/negroni/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"net/http"

"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
"github.com/urfave/negroni"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/simple/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kitabisa/teler-waf
module github.com/teler-sh/teler-waf

go 1.19

Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion option/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion option/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"
"testing"

"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion option/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"encoding/json"

"github.com/kitabisa/teler-waf"
"github.com/teler-sh/teler-waf"
"gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions teler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions teler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion threat/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
4 changes: 2 additions & 2 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down

0 comments on commit 14b1a7f

Please sign in to comment.