mirror of
https://github.com/davidallendj/configurator.git
synced 2025-12-20 03:27:02 -07:00
Rewrote generators to use plugin system with default plugins
This commit is contained in:
parent
8036a5a8c0
commit
d77a31c7fe
15 changed files with 712 additions and 179 deletions
|
|
@ -9,7 +9,6 @@ import (
|
|||
"time"
|
||||
|
||||
configurator "github.com/OpenCHAMI/configurator/internal"
|
||||
"github.com/OpenCHAMI/configurator/internal/generator"
|
||||
"github.com/OpenCHAMI/jwtauth/v5"
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/chi/v5/middleware"
|
||||
|
|
@ -22,29 +21,33 @@ var (
|
|||
|
||||
type Server struct {
|
||||
*http.Server
|
||||
JwksUri string `yaml:"jwks-uri"`
|
||||
}
|
||||
|
||||
func New() *Server {
|
||||
return &Server{
|
||||
Server: &http.Server{},
|
||||
Server: &http.Server{
|
||||
Addr: "localhost:3334",
|
||||
},
|
||||
JwksUri: "",
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) Start(config *configurator.Config) error {
|
||||
// create client just for the server to use to fetch data from SMD
|
||||
client := &configurator.SmdClient{
|
||||
Host: config.SmdHost,
|
||||
Port: config.SmdPort,
|
||||
_ = &configurator.SmdClient{
|
||||
Host: config.SmdClient.Host,
|
||||
Port: config.SmdClient.Port,
|
||||
}
|
||||
|
||||
// set the server address with config values
|
||||
s.Server.Addr = fmt.Sprintf("%s:%d", config.Server.Host, config.Server.Port)
|
||||
|
||||
// fetch JWKS public key from authorization server
|
||||
if config.Options.JwksUri != "" && tokenAuth == nil {
|
||||
for i := 0; i < config.Options.JwksRetries; i++ {
|
||||
if config.Server.Jwks.Uri != "" && tokenAuth == nil {
|
||||
for i := 0; i < config.Server.Jwks.Retries; i++ {
|
||||
var err error
|
||||
tokenAuth, err = configurator.FetchPublicKeyFromURL(config.Options.JwksUri)
|
||||
tokenAuth, err = configurator.FetchPublicKeyFromURL(config.Server.Jwks.Uri)
|
||||
if err != nil {
|
||||
logrus.Errorf("failed to fetch JWKS: %w", err)
|
||||
continue
|
||||
|
|
@ -58,42 +61,42 @@ func (s *Server) Start(config *configurator.Config) error {
|
|||
router.Use(middleware.RedirectSlashes)
|
||||
router.Use(middleware.Timeout(60 * time.Second))
|
||||
router.Group(func(r chi.Router) {
|
||||
if config.Options.JwksUri != "" {
|
||||
if config.Server.Jwks.Uri != "" {
|
||||
r.Use(
|
||||
jwtauth.Verifier(tokenAuth),
|
||||
jwtauth.Authenticator(tokenAuth),
|
||||
)
|
||||
}
|
||||
r.HandleFunc("/target", func(w http.ResponseWriter, r *http.Request) {
|
||||
g := generator.Generator{
|
||||
Type: r.URL.Query().Get("type"),
|
||||
Template: r.URL.Query().Get("template"),
|
||||
}
|
||||
// g := generator.Generator{
|
||||
// Type: r.URL.Query().Get("type"),
|
||||
// Template: r.URL.Query().Get("template"),
|
||||
// }
|
||||
|
||||
// NOTE: we probably don't want to hardcode the types, but should do for now
|
||||
if g.Type == "dhcp" {
|
||||
// fetch eths from SMD
|
||||
eths, err := client.FetchEthernetInterfaces()
|
||||
if err != nil {
|
||||
logrus.Errorf("failed to fetch DHCP metadata: %v\n", err)
|
||||
w.Write([]byte("An error has occurred"))
|
||||
return
|
||||
}
|
||||
if len(eths) <= 0 {
|
||||
logrus.Warnf("no ethernet interfaces found")
|
||||
w.Write([]byte("no ethernet interfaces found"))
|
||||
return
|
||||
}
|
||||
// generate a new config from that data
|
||||
// if _type == "dhcp" {
|
||||
// // fetch eths from SMD
|
||||
// eths, err := client.FetchEthernetInterfaces()
|
||||
// if err != nil {
|
||||
// logrus.Errorf("failed to fetch DHCP metadata: %v\n", err)
|
||||
// w.Write([]byte("An error has occurred"))
|
||||
// return
|
||||
// }
|
||||
// if len(eths) <= 0 {
|
||||
// logrus.Warnf("no ethernet interfaces found")
|
||||
// w.Write([]byte("no ethernet interfaces found"))
|
||||
// return
|
||||
// }
|
||||
// // generate a new config from that data
|
||||
|
||||
b, err := g.GenerateDHCP(config, eths)
|
||||
if err != nil {
|
||||
logrus.Errorf("failed to generate DHCP: %v", err)
|
||||
w.Write([]byte("An error has occurred."))
|
||||
return
|
||||
}
|
||||
w.Write(b)
|
||||
}
|
||||
// // b, err := g.GenerateDHCP(config, eths)
|
||||
// if err != nil {
|
||||
// logrus.Errorf("failed to generate DHCP: %v", err)
|
||||
// w.Write([]byte("An error has occurred."))
|
||||
// return
|
||||
// }
|
||||
// w.Write(b)
|
||||
// }
|
||||
})
|
||||
r.HandleFunc("/templates", func(w http.ResponseWriter, r *http.Request) {
|
||||
// TODO: handle GET request
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue