kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes for new API

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-03 17:28:28 -08:00
parent be03d7b459
commit 6cbaa29fbd
29 changed files with 154 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/app/warewulfd/response/ipxe.go
View File

@@ -2,8 +2,8 @@ package response
import (
"fmt"
"github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"log"
"net/http"
@@ -13,16 +13,15 @@ import (
)
type iPxeTemplate struct {
Hostname string
Fqdn string
Vnfs string
Hwaddr string
Ipaddr string
Port string
Kernelargs string
Hostname string
Fqdn string
Vnfs string
Hwaddr string
Ipaddr string
Port string
Kernelargs string
}
func IpxeSend(w http.ResponseWriter, req *http.Request) {
url := strings.Split(req.URL.Path, "/")
@@ -47,9 +46,13 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
}
if node.Id.Defined() == true {
conf := config.New()
conf, err := warewulfconf.New()
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
return
}
log.Printf("IPXE: %15s: %s\n", node.Fqdn.Get(), req.URL.Path)
log.Printf("IPXE: %15s: %s\n", node.Id.Get(), req.URL.Path)
// TODO: Fix template path to use config package
ipxeTemplate := fmt.Sprintf("/etc/warewulf/ipxe/%s.ipxe", node.Ipxe.Get())
@@ -62,10 +65,10 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
var replace iPxeTemplate
replace.Fqdn = node.Fqdn.Get()
replace.Fqdn = node.Id.Get()
replace.Ipaddr = conf.Ipaddr
replace.Port = strconv.Itoa(conf.Port)
replace.Hostname = node.HostName.Get()
replace.Port = strconv.Itoa(conf.Warewulf.Port)
replace.Hostname = node.Id.Get()
replace.Hwaddr = url[2]
replace.Vnfs = node.Vnfs.Get()
replace.Kernelargs = node.KernelArgs.Get()
@@ -76,7 +79,7 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
return
}
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), ipxeTemplate)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), ipxeTemplate)
} else {
log.Printf("ERROR: iPXE request from unknown Node (hwaddr=%s)\n", url[2])

7
internal/app/warewulfd/response/kernel.go
View File

@@ -7,7 +7,6 @@ import (
)
func KernelSend(w http.ResponseWriter, req *http.Request) {
config := config.New()
node, err := getSanity(req)
if err != nil {
@@ -19,16 +18,16 @@ func KernelSend(w http.ResponseWriter, req *http.Request) {
if node.KernelVersion.Defined() == true {
fileName := config.KernelImage(node.KernelVersion.Get())
err := sendFile(w, fileName, node.Fqdn.Get())
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
log.Printf("ERROR: %s\n", err)
} else {
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), fileName)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), fileName)
}
} else {
w.WriteHeader(503)
log.Printf("ERROR: No 'kernel version' set for node %s\n", node.Fqdn.Get())
log.Printf("ERROR: No 'kernel version' set for node %s\n", node.Id.Get())
}
return

7
internal/app/warewulfd/response/kmods.go
View File

@@ -7,7 +7,6 @@ import (
)
func KmodsSend(w http.ResponseWriter, req *http.Request) {
config := config.New()
node, err := getSanity(req)
if err != nil {
@@ -19,16 +18,16 @@ func KmodsSend(w http.ResponseWriter, req *http.Request) {
if node.KernelVersion.Defined() == true {
fileName := config.KmodsImage(node.KernelVersion.Get())
err := sendFile(w, fileName, node.Fqdn.Get())
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
log.Printf("ERROR: %s\n", err)
} else {
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), fileName)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), fileName)
}
} else {
w.WriteHeader(503)
log.Printf("ERROR: No 'kernel version' set for node %s\n", node.Fqdn.Get())
log.Printf("ERROR: No 'kernel version' set for node %s\n", node.Id.Get())
}
return

21
internal/app/warewulfd/response/runtime.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
"github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"log"
"net/http"
"strconv"
@@ -11,7 +12,13 @@ import (
)
func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
config := config.New()
conf, err := warewulfconf.New()
if err != nil {
log.Printf("Could not read Warewulf configuration file: %s\n", err)
w.WriteHeader(503)
return
}
nodes, err := node.New()
if err != nil {
log.Printf("Could not read node configuration file: %s\n", err)
@@ -32,7 +39,7 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
return
}
if config.InsecureRuntime == false {
if conf.Warewulf.Secure == true {
if port >= 1024 {
log.Panicf("DENIED: Connection coming from non-privledged port: %s\n", req.RemoteAddr)
w.WriteHeader(401)
@@ -52,21 +59,21 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(404)
return
} else {
log.Printf("REQ: %15s: %s\n", node.Fqdn.Get(), req.URL.Path)
log.Printf("REQ: %15s: %s\n", node.Id.Get(), req.URL.Path)
}
if node.RuntimeOverlay.Defined() == true {
fileName := config.RuntimeOverlayImage(node.Fqdn.Get())
fileName := config.RuntimeOverlayImage(node.Id.Get())
err := sendFile(w, fileName, node.Fqdn.Get())
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
log.Printf("ERROR: %s\n", err)
} else {
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), fileName)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), fileName)
}
} else {
w.WriteHeader(503)
log.Printf("ERROR: No 'runtime system-overlay' set for node %s\n", node.Fqdn.Get())
log.Printf("ERROR: No 'runtime system-overlay' set for node %s\n", node.Id.Get())
}
return

10
internal/app/warewulfd/response/system.go
View File

@@ -7,8 +7,6 @@ import (
)
func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
config := config.New()
node, err := getSanity(req)
if err != nil {
w.WriteHeader(404)
@@ -17,17 +15,17 @@ func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
}
if node.SystemOverlay.Defined() == true {
fileName := config.SystemOverlayImage(node.Fqdn.Get())
fileName := config.SystemOverlayImage(node.Id.Get())
err := sendFile(w, fileName, node.Fqdn.Get())
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
log.Printf("ERROR: %s\n", err)
} else {
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), fileName)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), fileName)
}
} else {
w.WriteHeader(503)
log.Printf("ERROR: No 'system system-overlay' set for node %s\n", node.Fqdn.Get())
log.Printf("ERROR: No 'system system-overlay' set for node %s\n", node.Id.Get())
}
return

7
internal/app/warewulfd/response/util.go
View File

@@ -27,12 +27,7 @@ func getSanity(req *http.Request) (node.NodeInfo, error) {
return ret, errors.New("Could not find node by HW address")
}
if ret.Fqdn.Defined() == false {
log.Printf("UNKNOWN: %15s: %s\n", hwaddr, req.URL.Path)
return ret, errors.New("Unknown node HW address: " + hwaddr)
} else {
log.Printf("REQ: %15s: %s\n", ret.Fqdn.Get(), req.URL.Path)
}
log.Printf("REQ: %15s: %s\n", ret.Id.Get(), req.URL.Path)
return ret, nil
}

8
internal/app/warewulfd/response/vnfs.go
View File

@@ -20,19 +20,19 @@ func VnfsSend(w http.ResponseWriter, req *http.Request) {
v, err := vnfs.Load(node.Vnfs.Get())
if err != nil {
w.WriteHeader(503)
log.Printf("ERROR: Could not load VNFS: %s\n", node.Fqdn.Get())
log.Printf("ERROR: Could not load VNFS: %s\n", node.Id.Get())
return
}
err = sendFile(w, v.Image, node.Fqdn.Get())
err = sendFile(w, v.Image, node.Id.Get())
if err != nil {
log.Printf("ERROR1: %s\n", err)
} else {
log.Printf("SEND: %15s: %s\n", node.Fqdn.Get(), v.Image)
log.Printf("SEND: %15s: %s\n", node.Id.Get(), v.Image)
}
} else {
w.WriteHeader(503)
log.Printf("ERROR: No VNFS set for node %s\n", node.Fqdn.Get())
log.Printf("ERROR: No VNFS set for node %s\n", node.Id.Get())
}
return