root
/
telebit
mirror of https://github.com/therootcompany/telebit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix nil pointer due to misnamed variable

This commit is contained in:
AJ ONeal 2020-05-25 10:51:59 -06:00
parent 4a156f50ca
commit 2813ffcbd3
6 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -2,7 +2,9 @@
.env.* .env.*
certs certs
acme.d acme.d
xversion.go
/mplexer/cmd/telebit/telebit
/telebit /telebit
/cmd/telebit/telebit /cmd/telebit/telebit
/telebitd /telebitd
@ -14,3 +16,5 @@ acme.d
.*.sw* .*.sw*
log.txt log.txt
*.log *.log
.DS_Store
*.exe

1
go.mod
View File

@ -3,6 +3,7 @@ module git.coolaj86.com/coolaj86/go-telebitd
go 1.14 go 1.14
require ( require (
git.rootprojects.org/root/go-gitver v1.1.3
github.com/caddyserver/certmagic v0.10.12 github.com/caddyserver/certmagic v0.10.12
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-acme/lego/v3 v3.7.0 github.com/go-acme/lego/v3 v3.7.0

2
go.sum
View File

@ -22,6 +22,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
git.rootprojects.org/root/go-gitver v1.1.3 h1:/qR9z53vY+IFhWRxLkF9cjaiWh8xRJIm6gyuW+MG81A=
git.rootprojects.org/root/go-gitver v1.1.3/go.mod h1:Rj1v3TBhvdaSphFEqMynUYwAz/4f+wY/+syBTvRrmlI=
github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg= github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw= github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw=

2
mplexer/telebit.go
View File

@ -188,7 +188,7 @@ func TerminateTLS(client net.Conn, acme *ACME) net.Conn {
tlsConfig := &tls.Config{ tlsConfig := &tls.Config{
GetCertificate: func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) { GetCertificate: func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) {
return magic.GetCertificate(hello) return acmecert.GetCertificate(hello)
/* /*
if false { if false {
_, _ = magic.GetCertificate(hello) _, _ = magic.GetCertificate(hello)

2
tools/tools.go
View File

@ -2,3 +2,5 @@
// tools is a faux package for tracking dependencies that don't make it into the code // tools is a faux package for tracking dependencies that don't make it into the code
package tools package tools
import _ "git.rootprojects.org/root/go-gitver"

4
vendor/modules.txt vendored
View File

@ -1,3 +1,7 @@
# git.rootprojects.org/root/go-gitver v1.1.3
## explicit
git.rootprojects.org/root/go-gitver
git.rootprojects.org/root/go-gitver/gitver
# github.com/caddyserver/certmagic v0.10.12 # github.com/caddyserver/certmagic v0.10.12
## explicit ## explicit
github.com/caddyserver/certmagic github.com/caddyserver/certmagic