Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/bugs #101

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Hotfix/bugs #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08d8290
chore: make public tunnel with cloudflare
akakou Sep 9, 2024
b62c1ee
fix: deploy non-tls server (because of using cloudflare tunnel)
akakou Sep 9, 2024
13102d3
feat: add error handing of tls listening
akakou Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions compose.test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@ services:
- ./test:/test
- /dev:/dev
working_dir: /ta/example
command: bash -c 'mount -o remount,exec /dev && ego-go build -buildvcs=false -trimpath=true && ego sign example && source /test/issue_service.sh && sleep 10 && ego run example'
command: bash -c 'mount -o remount,exec /dev && ego-go build -buildvcs=false -trimpath=true && ego sign example && source /test/issue_service.sh && ego run example'
privileged: true
environment:
- OE_SIMULATION=0
env_file:
- test/env/ta.env
- test/env/common.env
restart: unless-stopped
profiles:
- ta

verifier:
build: ./docker
ports:
- "10.0.0.5:443:443"
volumes:
- ./verifier:/verifier
- ./core:/core
Expand All @@ -34,3 +33,14 @@ services:
- test/env/common.env
privileged: true
tty: true
profiles:
- verifier

tunnel:
restart: unless-stopped
image: cloudflare/cloudflared
command: tunnel --url http://verifier:8080
env_file:
- test/env/tunnel.env
profiles:
- verifier
4 changes: 3 additions & 1 deletion ta/example/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,7 @@ func main() {
}

http.HandleFunc("/", handler)
server.ListenAndServeTLS("", "")

err = server.ListenAndServeTLS("", "")
panic(err)
}
26 changes: 2 additions & 24 deletions verifier/serv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
package main

import (
"crypto/tls"
"embed"
"fmt"
"html/template"
"io"
"net/http"
"os"

"github.com/akakou/ra_webs/verifier"
"github.com/akakou/ra_webs/verifier/api"
"github.com/akakou/ra_webs/verifier/notifier"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
)

//go:embed views/*/*.html
Expand All @@ -42,13 +37,6 @@ func InjectSWHeader(next echo.HandlerFunc) echo.HandlerFunc {
}

func main() {
verifierHost := os.Getenv("RA_WEBS_VERIFIER_HOST")

autoTLSManager := autocert.Manager{
Prompt: autocert.AcceptTOS,
Cache: autocert.DirCache("/var/www/.cache"),
}

e := echo.New()
verifier, err := verifier.DefaultVerifier()
if err != nil {
Expand All @@ -74,19 +62,9 @@ func main() {

fmt.Printf("public: %v\nprivate: %v", verifier.Notifier.(*notifier.BrowserNotifier).VapidPublicKey, verifier.Notifier.(*notifier.BrowserNotifier).VapidPrivateKey)

s := http.Server{
Addr: verifierHost + ":443",
Handler: e,
TLSConfig: &tls.Config{
GetCertificate: autoTLSManager.GetCertificate,
NextProtos: []string{acme.ALPNProto},
},
}

go verifier.Monitor.Run(verifier)
// fmt.Printf("public: %v\nprivate: %v", verifier.Notifier.(*notifier.BrowserNotifier).VapidPublicKey, verifier.Notifier.(*notifier.BrowserNotifier).VapidPrivateKey)

if err := s.ListenAndServeTLS("", ""); err != http.ErrServerClosed {
e.Logger.Fatal(err)
}
e.Logger.Fatal(e.Start(":8080"))
}

Loading