mirror of
https://github.com/amir20/dozzle.git
synced 2025-12-21 13:23:07 +01:00
fix: allows dots inside URLs (not at end) (#4035)
This commit is contained in:
2
.github/workflows/deploy.yml
vendored
2
.github/workflows/deploy.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
|||||||
- name: Install Go
|
- name: Install Go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: 1.24.4
|
go-version: 1.24.5
|
||||||
check-latest: true
|
check-latest: true
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|||||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -54,7 +54,7 @@ jobs:
|
|||||||
- name: Install Go
|
- name: Install Go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: "1.24.4"
|
go-version: "1.24.5"
|
||||||
check-latest: true
|
check-latest: true
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -77,7 +77,7 @@ jobs:
|
|||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: "1.24.4"
|
go-version: "1.24.5"
|
||||||
check-latest: true
|
check-latest: true
|
||||||
- name: Generate dependencies
|
- name: Generate dependencies
|
||||||
run: make fake_assets shared_key.pem shared_cert.pem
|
run: make fake_assets shared_key.pem shared_cert.pem
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// Standard URL regex pattern to match http/https URLs
|
// Standard URL regex pattern to match http/https URLs
|
||||||
var urlRegex = regexp.MustCompile(`(https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+~#?&//=]*[^.]))`)
|
var urlRegex = regexp.MustCompile(`(https?://[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}[-a-zA-Z0-9()@:%_+.~#?&/=]*/?(?:[-a-zA-Z0-9@%_+~#?&/=]|\b))`)
|
||||||
|
|
||||||
// MarkURLs marks URLs in the logEvent message with special markers
|
// MarkURLs marks URLs in the logEvent message with special markers
|
||||||
func MarkURLs(logEvent *container.LogEvent) bool {
|
func MarkURLs(logEvent *container.LogEvent) bool {
|
||||||
|
|||||||
Reference in New Issue
Block a user