go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update CI

Browse Source
This commit is contained in:
ginuerzh 2022-01-10 11:42:51 +08:00
parent 37e77bdce5
commit 0dd604a1f8
6 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
.github/workflows/buildx.yaml vendored
View File

@ -1,33 +1,41 @@
# ref: https://github.com/crazy-max/diun/blob/master/.github/workflows/build.yml # ref: https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/
name: Docker name: Docker
on: [push]
on:
push:
branches:
- master
tags:
- 'v*'
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Prepare - name: Prepare
id: prepare id: prepare
run: | run: |
DOCKER_IMAGE=${{ secrets.DOCKER_IMAGE }}
VERSION=latest
SHORTREF=${GITHUB_SHA::8}
# If this is git tag, use the tag name as a docker tag
if [[ $GITHUB_REF == refs/tags/* ]]; then if [[ $GITHUB_REF == refs/tags/* ]]; then
echo ::set-output name=version::${GITHUB_REF#refs/tags/v} VERSION=${GITHUB_REF#refs/tags/v}
elif [[ $GITHUB_REF == refs/heads/master ]]; then fi
echo ::set-output name=version::latest TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
elif [[ $GITHUB_REF == refs/heads/* ]]; then
echo ::set-output name=version::${GITHUB_REF#refs/heads/} # If the VERSION looks like a version number, assume that
else # this is the most recent version of the image and also
echo ::set-output name=version::snapshot # tag it 'latest'.
if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
TAGS="$TAGS,${DOCKER_IMAGE}:latest"
fi fi
echo ::set-output name=docker_platforms::linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386 # Set output parameters.
echo ::set-output name=docker_image::${{ secrets.DOCKER_IMAGE }} echo ::set-output name=tags::${TAGS}
echo ::set-output name=docker_image::${DOCKER_IMAGE}
# https://github.com/crazy-max/ghaction-docker-buildx
- name: Set up Docker Buildx
id: buildx
uses: crazy-max/ghaction-docker-buildx@v1
with:
version: latest
- name: Environment - name: Environment
run: | run: |
@ -43,32 +51,23 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Docker Buildx (no push)
run: |
docker buildx bake \
--set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \
--set ${{ github.event.repository.name }}.output=type=image,push=false \
--set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
--file docker-compose.yaml
- name: Docker Login - name: Docker Login
if: success() if: github.event_name != 'pull_request'
env: uses: docker/login-action@v1
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} with:
run: | username: ${{ secrets.DOCKER_USERNAME }}
echo "${DOCKER_PASSWORD}" | docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin password: ${{ secrets.DOCKER_PASSWORD }}
- name: Docker Buildx (push) - name: Set up Docker Buildx
if: success() id: buildx
run: | uses: docker/setup-buildx-action@v1
docker buildx bake \
--set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \ - name: Build and push
--set ${{ github.event.repository.name }}.output=type=image,push=true \ uses: docker/build-push-action@v2
--set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ with:
--file docker-compose.yaml builder: ${{ steps.buildx.outputs.name }}
context: .
- name: Clear file: ./Dockerfile
if: always() platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
run: | push: true
rm -f ${HOME}/.docker/config.json tags: ${{ steps.prepare.outputs.tags }}

12
Dockerfile
View File

@ -1,19 +1,11 @@
FROM --platform=$BUILDPLATFORM golang:1-alpine as builder FROM golang:1-alpine as builder
# Convert TARGETPLATFORM to GOARCH format RUN apk add --no-cache musl-dev gcc
# https://github.com/tonistiigi/xx
COPY --from=tonistiigi/xx:golang / /
ARG TARGETPLATFORM
RUN apk add --no-cache musl-dev git gcc
ADD . /src ADD . /src
WORKDIR /src WORKDIR /src
ENV GO111MODULE=on
RUN cd cmd/gost && go env && go build -v RUN cd cmd/gost && go env && go build -v
FROM alpine:latest FROM alpine:latest

4
docker-compose.yaml
View File

@ -1,4 +0,0 @@
version: "3.4"
services:
gost:
build: .

2
pkg/handler/http/handler.go
View File

@ -274,7 +274,7 @@ func (h *httpHandler) authenticate(conn net.Conn, req *http.Request, resp *http.
return true return true
} }
pr := h.md.probeResist pr := h.md.probeResistance
// probing resistance is enabled, and knocking host is mismatch. // probing resistance is enabled, and knocking host is mismatch.
if pr != nil && (pr.Knock == "" || !strings.EqualFold(req.URL.Hostname(), pr.Knock)) { if pr != nil && (pr.Knock == "" || !strings.EqualFold(req.URL.Hostname(), pr.Knock)) {
resp.StatusCode = http.StatusServiceUnavailable // default status code resp.StatusCode = http.StatusServiceUnavailable // default status code

14
pkg/handler/http/metadata.go
View File

@ -8,16 +8,16 @@ import (
) )
type metadata struct { type metadata struct {
probeResist *probeResist probeResistance *probeResistance
sni bool sni bool
enableUDP bool enableUDP bool
header http.Header header http.Header
} }
func (h *httpHandler) parseMetadata(md mdata.Metadata) error { func (h *httpHandler) parseMetadata(md mdata.Metadata) error {
const ( const (
header = "header" header = "header"
probeResistKey = "probeResist" probeResistKey = "probeResistance"
knock = "knock" knock = "knock"
sni = "sni" sni = "sni"
enableUDP = "udp" enableUDP = "udp"
@ -33,7 +33,7 @@ func (h *httpHandler) parseMetadata(md mdata.Metadata) error {
if v := mdata.GetString(md, probeResistKey); v != "" { if v := mdata.GetString(md, probeResistKey); v != "" {
if ss := strings.SplitN(v, ":", 2); len(ss) == 2 { if ss := strings.SplitN(v, ":", 2); len(ss) == 2 {
h.md.probeResist = &probeResist{ h.md.probeResistance = &probeResistance{
Type: ss[0], Type: ss[0],
Value: ss[1], Value: ss[1],
Knock: mdata.GetString(md, knock), Knock: mdata.GetString(md, knock),
@ -46,7 +46,7 @@ func (h *httpHandler) parseMetadata(md mdata.Metadata) error {
return nil return nil
} }
type probeResist struct { type probeResistance struct {
Type string Type string
Value string Value string
Knock string Knock string

3
pkg/handler/socks/v5/metadata.go
View File

@ -8,7 +8,6 @@ import (
) )
type metadata struct { type metadata struct {
timeout time.Duration
readTimeout time.Duration readTimeout time.Duration
noTLS bool noTLS bool
enableBind bool enableBind bool
@ -20,7 +19,6 @@ type metadata struct {
func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) { func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) {
const ( const (
readTimeout = "readTimeout" readTimeout = "readTimeout"
timeout = "timeout"
noTLS = "notls" noTLS = "notls"
enableBind = "bind" enableBind = "bind"
enableUDP = "udp" enableUDP = "udp"
@ -29,7 +27,6 @@ func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) {
) )
h.md.readTimeout = mdata.GetDuration(md, readTimeout) h.md.readTimeout = mdata.GetDuration(md, readTimeout)
h.md.timeout = mdata.GetDuration(md, timeout)
h.md.noTLS = mdata.GetBool(md, noTLS) h.md.noTLS = mdata.GetBool(md, noTLS)
h.md.enableBind = mdata.GetBool(md, enableBind) h.md.enableBind = mdata.GetBool(md, enableBind)
h.md.enableUDP = mdata.GetBool(md, enableUDP) h.md.enableUDP = mdata.GetBool(md, enableUDP)