aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.drone.yml26
-rw-r--r--.golangci.yml6
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.rootless2
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--docs/config.yaml2
-rw-r--r--go.mod214
-rw-r--r--modules/util/net.go8
-rw-r--r--modules/util/net_test.go56
10 files changed, 259 insertions, 63 deletions
diff --git a/.drone.yml b/.drone.yml
index 6e5b3da55e..d99b8b6bc7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,7 +25,7 @@ steps:
- make deps-frontend
- name: deps-backend
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- make deps-backend
@@ -88,7 +88,7 @@ steps:
depends_on: [deps-frontend]
- name: checks-backend
- image: golang:1.17
+ image: golang:1.18
commands:
- make checks-backend
depends_on: [deps-backend]
@@ -122,7 +122,7 @@ steps:
path: /go
- name: build-backend-arm64
- image: golang:1.17
+ image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
@@ -138,7 +138,7 @@ steps:
path: /go
- name: build-backend-windows
- image: golang:1.17
+ image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
@@ -153,7 +153,7 @@ steps:
path: /go
- name: build-backend-386
- image: golang:1.17
+ image: golang:1.18
environment:
GO111MODULE: on
GOPROXY: https://goproxy.cn
@@ -242,7 +242,7 @@ steps:
- pull_request
- name: deps-backend
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- make deps-backend
@@ -359,7 +359,7 @@ steps:
path: /go
- name: generate-coverage
- image: golang:1.17
+ image: golang:1.18
commands:
- make coverage
environment:
@@ -434,7 +434,7 @@ steps:
- pull_request
- name: deps-backend
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- make deps-backend
@@ -576,7 +576,7 @@ trigger:
steps:
- name: download
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- timeout -s ABRT 40m make generate-license generate-gitignore
@@ -637,7 +637,7 @@ steps:
- make deps-frontend
- name: deps-backend
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- make deps-backend
@@ -646,7 +646,7 @@ steps:
path: /go
- name: static
- image: techknowlogick/xgo:go-1.17.x
+ image: techknowlogick/xgo:go-1.18.x
pull: always
commands:
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
@@ -755,7 +755,7 @@ steps:
- make deps-frontend
- name: deps-backend
- image: golang:1.17
+ image: golang:1.18
pull: always
commands:
- make deps-backend
@@ -764,7 +764,7 @@ steps:
path: /go
- name: static
- image: techknowlogick/xgo:go-1.17.x
+ image: techknowlogick/xgo:go-1.18.x
pull: always
commands:
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
diff --git a/.golangci.yml b/.golangci.yml
index f06c9cc480..143359bcf0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -13,7 +13,7 @@ linters:
#- gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
- gofmt
- misspell
- - gocritic
+ #- gocritic # TODO: disabled until fixed with go 1.18
- bidichk
- ineffassign
- revive
@@ -64,7 +64,7 @@ linters-settings:
- name: modifies-value-receiver
gofumpt:
extra-rules: true
- lang-version: 1.17
+ lang-version: 1.18
issues:
exclude-rules:
@@ -152,3 +152,5 @@ issues:
- path: models/user/openid.go
linters:
- golint
+ - linters: staticcheck
+ text: "strings.Title is deprecated: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead."
diff --git a/Dockerfile b/Dockerfile
index 8cb88ae83e..973d93b784 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
#Build stage
-FROM golang:1.17-alpine3.15 AS build-env
+FROM golang:1.18-alpine3.15 AS build-env
ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index 78a6c3cb03..27e898c58e 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -1,5 +1,5 @@
#Build stage
-FROM golang:1.17-alpine3.15 AS build-env
+FROM golang:1.18-alpine3.15 AS build-env
ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
diff --git a/Makefile b/Makefile
index 873ad60832..12d85ceec1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ SHASUM ?= shasum -a 256
HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
COMMA := ,
-XGO_VERSION := go-1.17.x
+XGO_VERSION := go-1.18.x
MIN_GO_VERSION := 001017000
MIN_NODE_VERSION := 012017000
@@ -32,7 +32,7 @@ AIR_PACKAGE ?= github.com/cosmtrek/air@bedc18201271882c2be66d216d0e1a275b526ec4
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@50adf46752da119dfef66e57be3ce2693ea4aa9c
ERRCHECK_PACKAGE ?= github.com/kisielk/errcheck@8ddee489636a8311a376fc92e27a6a13c6658344
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.3.0
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.0
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.27.0
diff --git a/README.md b/README.md
index 305931b1b8..84c0524ed4 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ or if SQLite support is required:
The `build` target is split into two sub-targets:
-- `make backend` which requires [Go 1.17](https://golang.org/dl/) or greater.
+- `make backend` which requires [Go 1.17](https://go.dev/dl/) or greater.
- `make frontend` which requires [Node.js LTS](https://nodejs.org/en/download/) or greater and Internet connectivity to download npm dependencies.
When building from the official source tarballs which include pre-built frontend files, the `frontend` target will not be triggered, making it possible to build without Node.js and Internet connectivity.
diff --git a/docs/config.yaml b/docs/config.yaml
index 333870028c..c3614e4bc8 100644
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -20,7 +20,7 @@ params:
website: https://docs.gitea.io
version: 1.16.4
minGoVersion: 1.17
- goVersion: 1.17
+ goVersion: 1.18
minNodeVersion: 12.17
outputs:
diff --git a/go.mod b/go.mod
index a545dacca7..e3e2029d68 100644
--- a/go.mod
+++ b/go.mod
@@ -11,22 +11,12 @@ require (
gitea.com/go-chi/session v0.0.0-20211218221615-e3605d8b28b8
gitea.com/lunny/levelqueue v0.4.1
github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
- github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
- github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/NYTimes/gziphandler v1.1.1
- github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
github.com/PuerkitoBio/goquery v1.8.0
github.com/alecthomas/chroma v0.10.0
- github.com/andybalholm/brotli v1.0.4 // indirect
- github.com/bits-and-blooms/bitset v1.2.1 // indirect
github.com/blevesearch/bleve/v2 v2.3.1
- github.com/boombuler/barcode v1.0.1 // indirect
- github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
github.com/caddyserver/certmagic v0.15.4
github.com/chi-middleware/proxy v1.1.1
- github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
- github.com/couchbase/gomemcached v0.1.2 // indirect
- github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
github.com/denisenkom/go-mssqldb v0.12.0
github.com/djherbis/buffer v1.2.0
github.com/djherbis/nio/v3 v3.0.1
@@ -36,7 +26,6 @@ require (
github.com/emirpasic/gods v1.12.0
github.com/ethantkoenig/rupture v1.0.1
github.com/gliderlabs/ssh v0.3.3
- github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/cors v1.2.0
github.com/go-enry/go-enry/v2 v2.8.0
@@ -52,21 +41,16 @@ require (
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
github.com/golang-jwt/jwt/v4 v4.3.0
- github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
- github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-github/v39 v39.2.0
github.com/google/uuid v1.3.0
github.com/gorilla/feeds v1.1.1
- github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/sessions v1.2.1
- github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/go-version v1.4.0
github.com/hashicorp/golang-lru v0.5.4
github.com/huandu/xstrings v1.3.2
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
github.com/json-iterator/go v1.1.12
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
- github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
github.com/klauspost/compress v1.15.0
github.com/klauspost/cpuid/v2 v2.0.11
@@ -74,62 +58,43 @@ require (
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
github.com/markbates/goth v1.69.0
github.com/mattn/go-isatty v0.0.14
- github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mattn/go-sqlite3 v1.14.12
- github.com/mholt/acmez v1.0.2 // indirect
github.com/mholt/archiver/v3 v3.5.1
github.com/microcosm-cc/bluemonday v1.0.18
- github.com/miekg/dns v1.1.46 // indirect
- github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.23
- github.com/minio/sha256-simd v1.0.0 // indirect
- github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
github.com/msteinert/pam v1.0.0
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/niklasfasching/go-org v1.6.2
- github.com/nwaples/rardecode v1.1.3 // indirect
github.com/oliamb/cutter v0.2.2
github.com/olivere/elastic/v7 v7.0.31
- github.com/pierrec/lz4/v4 v4.1.14 // indirect
github.com/pkg/errors v0.9.1
github.com/pquerna/otp v1.3.0
github.com/prometheus/client_golang v1.12.1
github.com/quasoft/websspi v1.1.2
- github.com/rs/xid v1.3.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
github.com/sergi/go-diff v1.2.0
- github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
- github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
github.com/stretchr/testify v1.7.0
github.com/syndtr/goleveldb v1.0.0
github.com/tstranex/u2f v1.0.0
- github.com/ulikunitz/xz v0.5.10 // indirect
github.com/unknwon/com v1.0.1
github.com/unknwon/i18n v0.0.0-20210904045753-ff3a8617e361
github.com/unknwon/paginater v0.0.0-20200328080006-042474bd0eae
github.com/unrolled/render v1.4.1
github.com/urfave/cli v1.22.5
github.com/xanzy/go-gitlab v0.58.0
- github.com/xanzy/ssh-agent v0.3.1 // indirect
github.com/yohcop/openid-go v1.0.0
github.com/yuin/goldmark v1.4.8
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
github.com/yuin/goldmark-meta v1.1.0
- go.etcd.io/bbolt v1.3.6 // indirect
go.jolheiser.com/hcaptcha v0.0.4
go.jolheiser.com/pwn v0.0.3
- go.uber.org/atomic v1.9.0 // indirect
- go.uber.org/multierr v1.8.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
golang.org/x/text v0.3.7
- golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
golang.org/x/tools v0.1.9
- gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gopkg.in/ini.v1 v1.66.4
gopkg.in/yaml.v2 v2.4.0
@@ -139,6 +104,185 @@ require (
xorm.io/xorm v1.2.5
)
+require (
+ cloud.google.com/go v0.99.0 // indirect
+ github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
+ github.com/Microsoft/go-winio v0.5.2 // indirect
+ github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
+ github.com/PuerkitoBio/purell v1.1.1 // indirect
+ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/RoaringBitmap/roaring v0.9.4 // indirect
+ github.com/acomagu/bufpipe v1.0.3 // indirect
+ github.com/andybalholm/brotli v1.0.4 // indirect
+ github.com/andybalholm/cascadia v1.3.1 // indirect
+ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
+ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
+ github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/bgentry/speakeasy v0.1.0 // indirect
+ github.com/bits-and-blooms/bitset v1.2.1 // indirect
+ github.com/blevesearch/bleve_index_api v1.0.1 // indirect
+ github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
+ github.com/blevesearch/mmap-go v1.0.3 // indirect
+ github.com/blevesearch/scorch_segment_api/v2 v2.1.0 // indirect
+ github.com/blevesearch/segment v0.9.0 // indirect
+ github.com/blevesearch/snowballstem v0.9.0 // indirect
+ github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect
+ github.com/blevesearch/vellum v1.0.7 // indirect
+ github.com/blevesearch/zapx/v11 v11.3.3 // indirect
+ github.com/blevesearch/zapx/v12 v12.3.3 // indirect
+ github.com/blevesearch/zapx/v13 v13.3.3 // indirect
+ github.com/blevesearch/zapx/v14 v14.3.3 // indirect
+ github.com/blevesearch/zapx/v15 v15.3.3 // indirect
+ github.com/boombuler/barcode v1.0.1 // indirect
+ github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
+ github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cloudflare/cfssl v1.6.1 // indirect
+ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
+ github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
+ github.com/coreos/go-semver v0.3.0 // indirect
+ github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+ github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
+ github.com/couchbase/gomemcached v0.1.2 // indirect
+ github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+ github.com/dlclark/regexp2 v1.4.0 // indirect
+ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
+ github.com/envoyproxy/go-control-plane v0.10.1 // indirect
+ github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
+ github.com/felixge/httpsnoop v1.0.2 // indirect
+ github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
+ github.com/fsnotify/fsnotify v1.5.1 // indirect
+ github.com/fullstorydev/grpcurl v1.8.1 // indirect
+ github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+ github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
+ github.com/go-enry/go-oniguruma v1.2.1 // indirect
+ github.com/go-git/gcfg v1.5.0 // indirect
+ github.com/go-openapi/analysis v0.21.2 // indirect
+ github.com/go-openapi/errors v0.20.2 // indirect
+ github.com/go-openapi/inflect v0.19.0 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.19.6 // indirect
+ github.com/go-openapi/loads v0.21.0 // indirect
+ github.com/go-openapi/runtime v0.21.1 // indirect
+ github.com/go-openapi/spec v0.20.4 // indirect
+ github.com/go-openapi/strfmt v0.21.1 // indirect
+ github.com/go-openapi/swag v0.19.15 // indirect
+ github.com/go-openapi/validate v0.20.3 // indirect
+ github.com/go-stack/stack v1.8.1 // indirect
+ github.com/goccy/go-json v0.9.5 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+ github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/mock v1.6.0 // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/golang/snappy v0.0.4 // indirect
+ github.com/google/btree v1.0.1 // indirect
+ github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect
+ github.com/google/go-querystring v1.1.0 // indirect
+ github.com/gorilla/css v1.0.0 // indirect
+ github.com/gorilla/handlers v1.5.1 // indirect
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/gorilla/securecookie v1.1.1 // indirect
+ github.com/gorilla/websocket v1.4.2 // indirect
+ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+ github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+ github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+ github.com/jessevdk/go-flags v1.5.0 // indirect
+ github.com/jhump/protoreflect v1.8.2 // indirect
+ github.com/jonboulle/clockwork v0.2.2 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/kevinburke/ssh_config v1.1.0 // indirect
+ github.com/klauspost/pgzip v1.2.5 // indirect
+ github.com/kr/pretty v0.3.0 // indirect
+ github.com/kr/text v0.2.0 // indirect
+ github.com/libdns/libdns v0.2.1 // indirect
+ github.com/magiconair/properties v1.8.5 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/markbates/going v1.0.0 // indirect
+ github.com/mattn/go-runewidth v0.0.13 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/mholt/acmez v1.0.2 // indirect
+ github.com/miekg/dns v1.1.46 // indirect
+ github.com/minio/md5-simd v1.1.2 // indirect
+ github.com/minio/sha256-simd v1.0.0 // indirect
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/mapstructure v1.4.3 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
+ github.com/mschoch/smat v0.2.0 // indirect
+ github.com/nwaples/rardecode v1.1.3 // indirect
+ github.com/oklog/ulid v1.3.1 // indirect
+ github.com/olekukonko/tablewriter v0.0.5 // indirect
+ github.com/pelletier/go-toml v1.9.4 // indirect
+ github.com/pierrec/lz4/v4 v4.1.14 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/prometheus/common v0.32.1 // indirect
+ github.com/prometheus/procfs v0.7.3 // indirect
+ github.com/rivo/uniseg v0.2.0 // indirect
+ github.com/rogpeppe/go-internal v1.8.1 // indirect
+ github.com/rs/xid v1.3.0 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
+ github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/soheilhy/cmux v0.1.5 // indirect
+ github.com/spf13/afero v1.8.0 // indirect
+ github.com/spf13/cast v1.4.1 // indirect
+ github.com/spf13/cobra v1.3.0 // indirect
+ github.com/spf13/jwalterweatherman v1.1.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/spf13/viper v1.10.1 // indirect
+ github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
+ github.com/steveyen/gtreap v0.1.0 // indirect
+ github.com/subosito/gotenv v1.2.0 // indirect
+ github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
+ github.com/toqueteos/webbrowser v1.2.0 // indirect
+ github.com/ulikunitz/xz v0.5.10 // indirect
+ github.com/x448/float16 v0.8.4 // indirect
+ github.com/xanzy/ssh-agent v0.3.1 // indirect
+ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+ go.etcd.io/bbolt v1.3.6 // indirect
+ go.etcd.io/etcd/api/v3 v3.5.1 // indirect
+ go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
+ go.etcd.io/etcd/client/v2 v2.305.1 // indirect
+ go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect
+ go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect
+ go.mongodb.org/mongo-driver v1.8.2 // indirect
+ go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/multierr v1.8.0 // indirect
+ go.uber.org/zap v1.21.0 // indirect
+ golang.org/x/mod v0.5.1 // indirect
+ golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
+ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+ google.golang.org/grpc v1.43.0 // indirect
+ google.golang.org/protobuf v1.27.1 // indirect
+ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+ gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
+ gopkg.in/warnings.v0 v0.1.2 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ sigs.k8s.io/yaml v1.2.0 // indirect
+)
+
replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
replace github.com/markbates/goth v1.68.0 => github.com/zeripath/goth v1.68.1-0.20220109111530-754359885dce
diff --git a/modules/util/net.go b/modules/util/net.go
index 54c0a2ca39..0339325dc3 100644
--- a/modules/util/net.go
+++ b/modules/util/net.go
@@ -8,12 +8,6 @@ import (
"net"
)
-// IsIPPrivate for net.IP.IsPrivate. TODO: replace with `ip.IsPrivate()` if min go version is bumped to 1.17
func IsIPPrivate(ip net.IP) bool {
- if ip4 := ip.To4(); ip4 != nil {
- return ip4[0] == 10 ||
- (ip4[0] == 172 && ip4[1]&0xf0 == 16) ||
- (ip4[0] == 192 && ip4[1] == 168)
- }
- return len(ip) == net.IPv6len && ip[0]&0xfe == 0xfc
+ return ip.IsPrivate()
}
diff --git a/modules/util/net_test.go b/modules/util/net_test.go
new file mode 100644
index 0000000000..93a95ab123
--- /dev/null
+++ b/modules/util/net_test.go
@@ -0,0 +1,56 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+ "net"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestIsIPPPrivate(t *testing.T) {
+ cases := []struct {
+ ip string
+ isPrivate bool
+ }{
+ // case 0
+ {
+ ip: "127.0.0.1",
+ isPrivate: false, // TODO: according to go, this isn't private?
+ },
+ // case 1
+ {
+ ip: "127.1.2.3",
+ isPrivate: false, // TODO: according to go, this isn't private?
+ },
+ // case 2
+ {
+ ip: "10.255.255.0",
+ isPrivate: true,
+ },
+ // case 3
+ {
+ ip: "8.8.8.8",
+ isPrivate: false,
+ },
+ // case 4
+ {
+ ip: "::1",
+ isPrivate: false, // TODO: according to go, this isn't private?
+ },
+ // case 4
+ {
+ ip: "2a12:7c40::f00d",
+ isPrivate: false,
+ },
+ }
+
+ for n, c := range cases {
+ i := net.ParseIP(c.ip)
+ p := IsIPPrivate(i)
+ assert.Equal(t, c.isPrivate, p, "case %d: should be equal", n)
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 19:46:11 +0000