teach/adlin
Archived
0
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

Compare commits

base: teach:f6bbdcf0963fdaf5ed4f5522023cf602c6bfac6b
Branches Tags
teach:master
teach:renovate/github.com-gdamore-tcell-v2-2.x
teach:renovate/linuxkit-kernel-6.x
teach:renovate/golang-1.x
teach:renovate/postgres-16.x
teach:srs2024-tutorial2-v2
teach:srs2024-tutorial2-v1
teach:srs2023-tutorial3-1
teach:srs2023-tutorial3-0
teach:srs2023-tutorial2-0
teach:challenge-srs2023
teach:srs2023-tutorial2-test
...
compare: teach:ab909d12e7b53ae4f6a7c0c629095674b21d6b65
Branches Tags
teach:renovate/github.com-gdamore-tcell-v2-2.x
teach:master
teach:renovate/linuxkit-kernel-6.x
teach:renovate/golang-1.x
teach:renovate/postgres-16.x
teach:srs2024-tutorial2-v2
teach:srs2024-tutorial2-v1
teach:srs2023-tutorial3-1
teach:srs2023-tutorial3-0
teach:srs2023-tutorial2-0
teach:challenge-srs2023
teach:srs2023-tutorial2-test

2 Commits
f6bbdcf096 ... ab909d12e7

Author SHA1 Message Date
Pierre-Olivier Mercier
ab909d12e7 Don't include KeySign on tunnel v2
Some checks are pending
continuous-integration/drone/push Build is running
Details
2023-03-15 21:22:34 +01:00
Pierre-Olivier Mercier
be98438120 Generate for ARMv7 2023-03-15 21:20:15 +01:00
2 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
.drone.yml
View File

@ -61,7 +61,7 @@ steps:
- cd ./pkg/login-app/cmd && go build -buildvcs=false -v -ldflags="-s -w" -o ../../../dist/login-app . && cd - - cd ./pkg/login-app/cmd && go build -buildvcs=false -v -ldflags="-s -w" -o ../../../dist/login-app . && cd -
environment: environment:
CGO_ENABLED: 0 CGO_ENABLED: 0
GOARM: 5 GOARM: 7
- name: deploy binaries - name: deploy binaries
image: appleboy/drone-scp:linux-arm image: appleboy/drone-scp:linux-arm

7
token-validator/wg.go
View File

@ -152,8 +152,11 @@ PersistentKeepalive = 5
# MyNetwork=%s/%d # MyNetwork=%s/%d
# GWIPv6=%s # GWIPv6=%s
# MyLogin=%s # MyLogin=%s
# KeySign=%s `, base64.StdEncoding.EncodeToString(tinfo.SrvPubKey), "82.64.31.248", tinfo.SrvPort, tinfo.CltIPv6, token.SuffixIP, 64, tinfo.CltIPv6, tinfo.CltRange, tinfo.SrvGW6, student.Login)))
`, base64.StdEncoding.EncodeToString(tinfo.SrvPubKey), "82.64.31.248", tinfo.SrvPort, tinfo.CltIPv6, token.SuffixIP, 64, tinfo.CltIPv6, tinfo.CltRange, tinfo.SrvGW6, student.Login, base64.StdEncoding.EncodeToString(token.GenKeySign())))) if version > 2 {
w.Write([]byte(fmt.Sprintf(`# KeySign=%s`, base64.StdEncoding.EncodeToString(token.GenKeySign()))))
}
} }
func updateWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) { func updateWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {