Skip to content

Commit b290410

Browse files
pk910pk910
authored
Merge pull request #31 from ethpandaops/pk910/public-ui
Add public security trimmed UI
2 parents 0e03cb7 + 8bc28cd commit b290410

18 files changed

Lines changed: 509 additions & 485 deletions

File tree

‎pkg/coordinator/coordinator.go‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,23 @@ import (
1919
"github.com/ethpandaops/assertoor/pkg/coordinator/types"
2020
"github.com/ethpandaops/assertoor/pkg/coordinator/vars"
2121
"github.com/ethpandaops/assertoor/pkg/coordinator/wallet"
22-
"github.com/ethpandaops/assertoor/pkg/coordinator/web/server"
22+
"github.com/ethpandaops/assertoor/pkg/coordinator/web"
2323
"github.com/gorhill/cronexpr"
2424
"github.com/prometheus/client_golang/prometheus/promhttp"
2525
"github.com/sirupsen/logrus"
2626
)
2727

2828
type Coordinator struct {
2929
// Config is the coordinator configuration.
30-
Config *Config
31-
log *logger.LogScope
32-
clientPool *clients.ClientPool
33-
walletManager *wallet.Manager
34-
webserver *server.WebServer
35-
validatorNames *names.ValidatorNames
36-
globalVars types.Variables
37-
metricsPort int
30+
Config *Config
31+
log *logger.LogScope
32+
clientPool *clients.ClientPool
33+
walletManager *wallet.Manager
34+
webserver *web.Server
35+
publicWebserver *web.Server
36+
validatorNames *names.ValidatorNames
37+
globalVars types.Variables
38+
metricsPort int
3839

3940
runIDCounter uint64
4041
lastExecutedRunID uint64
@@ -110,14 +111,26 @@ func (c *Coordinator) Run(ctx context.Context) error {
110111
}
111112

112113
// init webserver
113-
if c.Config.Web != nil && c.Config.Web.Server != nil {
114-
c.webserver, err = server.NewWebServer(c.Config.Web.Server, c.log.GetLogger())
115-
if err != nil {
116-
return err
114+
if c.Config.Web != nil {
115+
if c.Config.Web.Server != nil {
116+
c.webserver, err = web.NewWebServer(c.Config.Web.Server, c.log.GetLogger())
117+
if err != nil {
118+
return err
119+
}
120+
121+
err = c.webserver.ConfigureRoutes(c.Config.Web.Frontend, c.Config.Web.API, c, false)
122+
if err != nil {
123+
return err
124+
}
117125
}
118126

119-
if c.Config.Web.API != nil {
120-
err = c.webserver.ConfigureRoutes(c.Config.Web, c.log.GetLogger(), c)
127+
if c.Config.Web.PublicServer != nil {
128+
c.publicWebserver, err = web.NewWebServer(c.Config.Web.PublicServer, c.log.GetLogger().WithField("module", "public_web"))
129+
if err != nil {
130+
return err
131+
}
132+
133+
err = c.publicWebserver.ConfigureRoutes(c.Config.Web.Frontend, nil, c, true)
121134
if err != nil {
122135
return err
123136
}

‎pkg/coordinator/web/frontend.go‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎pkg/coordinator/web/handlers/clients.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/ethpandaops/assertoor/pkg/coordinator/clients"
88
"github.com/ethpandaops/assertoor/pkg/coordinator/clients/consensus"
99
"github.com/ethpandaops/assertoor/pkg/coordinator/clients/execution"
10-
"github.com/ethpandaops/assertoor/pkg/coordinator/web"
1110
)
1211

1312
type ClientsPage struct {
@@ -38,25 +37,25 @@ type ClientsPageClient struct {
3837

3938
// Clients will return the "clients" page using a go template
4039
func (fh *FrontendHandler) Clients(w http.ResponseWriter, r *http.Request) {
41-
templateFiles := web.LayoutTemplateFiles
40+
templateFiles := LayoutTemplateFiles
4241
templateFiles = append(templateFiles,
4342
"clients/clients.html",
4443
)
4544

46-
pageTemplate := web.GetTemplate(templateFiles...)
47-
data := web.InitPageData(r, "clients", "/clients", "Clients", templateFiles)
45+
pageTemplate := fh.templates.GetTemplate(templateFiles...)
46+
data := fh.initPageData(r, "clients", "/clients", "Clients", templateFiles)
4847

4948
var pageError error
5049
data.Data, pageError = fh.getClientsPageData()
5150

5251
if pageError != nil {
53-
web.HandlePageError(w, r, pageError)
52+
fh.HandlePageError(w, r, pageError)
5453
return
5554
}
5655

5756
w.Header().Set("Content-Type", "text/html")
5857

59-
if web.HandleTemplateError(w, r, "clients.go", "Clients", "", pageTemplate.ExecuteTemplate(w, "layout", data)) != nil {
58+
if fh.handleTemplateError(w, r, "clients.go", "Clients", pageTemplate.ExecuteTemplate(w, "layout", data)) != nil {
6059
return // an error has occurred and was processed
6160
}
6261
}

0 commit comments

Comments
 (0)