Added wip vendor-res

desktop.go

@@ -104,7 +104,6 @@ func desktop_hostdetailHandler(w http.ResponseWriter, r *http.Request) {
 		InternalVersion string
 		DeviceVendor    string
 		DeviceModel     string
-		VendorIcon      string
 	}
 
 	jsonString, _ := json.Marshal(returnStruct{
@@ -114,7 +113,6 @@ func desktop_hostdetailHandler(w http.ResponseWriter, r *http.Request) {
 		InternalVersion: internal_version,
 		DeviceVendor:    deviceVendor,
 		DeviceModel:     deviceModel,
-		VendorIcon:      iconVendor,
 	})
 
 	utils.SendJSONResponse(w, string(jsonString))

ldap.go

@@ -2,14 +2,20 @@ package main
 
 import (
 	"net/http"
+	"path/filepath"
 
 	ldap "imuslab.com/arozos/mod/auth/ldap"
+	fs "imuslab.com/arozos/mod/filesystem"
 	prout "imuslab.com/arozos/mod/prouter"
 )
 
 func ldapInit() {
 	//ldap
-	ldapHandler := ldap.NewLdapHandler(authAgent, registerHandler, sysdb, permissionHandler, userHandler, nightlyManager, iconSystem)
+	authIcon := filepath.Join(vendorResRoot, "auth_icon.png")
+	if !fs.FileExists(authIcon) {
+		authIcon = "./web/img/public/auth_icon.png"
+	}
+	ldapHandler := ldap.NewLdapHandler(authAgent, registerHandler, sysdb, permissionHandler, userHandler, nightlyManager, authIcon)
 
 	//add a entry to the system settings
 	adminRouter := prout.NewModuleRouter(prout.RouterOption{

main.flags.go

@@ -35,8 +35,10 @@ var deviceVendor = "IMUSLAB.INC"                       //Vendor of the system
 var deviceVendorURL = "http://imuslab.com"             //Vendor contact information
 var deviceModel = "AR100"                              //Hardware Model of the system
 var deviceModelDesc = "General Purpose Cloud Platform" //Device Model Description
-var iconVendor = "img/vendor/vendor_icon.png"          //Vendor icon location
-var iconSystem = "img/vendor/system_icon.png"          //System icon location
+var vendorResRoot = "./vendor-res/"                    //Root folder for vendor overwrite resources
+
+//var iconVendor = "vendor/vendor_icon.png"              //Vendor icon location
+//var iconSystem = "vendor/system_icon.png"              //System icon location
 
 // =========== RUNTTIME RELATED ================
 var max_upload_size int64 = 8192 << 20                         //Maxmium upload size, default 8GB

main.router.go

@@ -33,7 +33,7 @@ func mrouter(h http.Handler) http.Handler {
 			red, _ := utils.GetPara(r, "redirect")
 
 			//Append the redirection addr into the template
-			imgsrc := "./web/" + iconSystem
+			imgsrc := filepath.Join(vendorResRoot, "auth_icon.png")
 			if !fs.FileExists(imgsrc) {
 				imgsrc = "./web/img/public/auth_icon.png"
 			}

register.go

@@ -4,8 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"path/filepath"
 
 	reg "imuslab.com/arozos/mod/auth/register"
+	fs "imuslab.com/arozos/mod/filesystem"
 	prout "imuslab.com/arozos/mod/prouter"
 	"imuslab.com/arozos/mod/utils"
 )
@@ -16,9 +18,14 @@ var (
 
 func RegisterSystemInit() {
 	//Register the endpoints for public registration
+	imgsrc := filepath.Join(vendorResRoot, "vendor_icon.png")
+	if !fs.FileExists(imgsrc) {
+		imgsrc = "./web/img/public/vendor_icon.png"
+	}
+
 	rh := reg.NewRegisterHandler(sysdb, authAgent, permissionHandler, reg.RegisterOptions{
 		Hostname:   *host_name,
-		VendorIcon: "web/" + iconVendor,
+		VendorIcon: imgsrc,
 	})
 
 	registerHandler = rh

system.go

@@ -156,7 +156,6 @@ func systemIdHandleRequest(w http.ResponseWriter, r *http.Request) {
 		Build      string
 		Version    string
 		Model      string
-		VendorIcon string
 	}
 
 	//thisDevIP := network_info_GetOutboundIP().String()
@@ -169,7 +168,6 @@ func systemIdHandleRequest(w http.ResponseWriter, r *http.Request) {
 		Build:      build_version,
 		Version:    internal_version,
 		Model:      deviceModel,
-		VendorIcon: iconVendor,
 	})
 
 	utils.SendJSONResponse(w, string(jsonString))

system.info.go

@@ -64,11 +64,12 @@ func SystemInfoInit() {
 			BuildVersion: build_version + "." + internal_version,
 			DeviceVendor: deviceVendor,
 			DeviceModel:  deviceModel,
-			VendorIcon:   "../../" + iconVendor,
-			SN:           deviceUUID,
-			HostOS:       runtime.GOOS,
-			CPUArch:      runtime.GOARCH,
-			HostName:     *host_name,
+			//TODO: FIX THIS
+			//VendorIcon:   "../../" + iconVendor,
+			SN:       deviceUUID,
+			HostOS:   runtime.GOOS,
+			CPUArch:  runtime.GOARCH,
+			HostName: *host_name,
 		})
 
 		router.HandleFunc("/system/info/getCPUinfo", info.GetCPUInfo)
@@ -109,11 +110,12 @@ func SystemInfoInit() {
 			BuildVersion: build_version + "." + internal_version,
 			DeviceVendor: deviceVendor,
 			DeviceModel:  deviceModel,
-			VendorIcon:   "../../" + iconVendor,
-			SN:           deviceUUID,
-			HostOS:       "virtualized",
-			CPUArch:      "generic",
-			HostName:     *host_name,
+			//TODO: FIX THIS
+			//VendorIcon:   "../../" + iconVendor,
+			SN:       deviceUUID,
+			HostOS:   "virtualized",
+			CPUArch:  "generic",
+			HostName: *host_name,
 		})
 	}
 

system.resetpw.go

@@ -4,8 +4,10 @@ import (
 	"errors"
 	"log"
 	"net/http"
+	"path/filepath"
 
 	auth "imuslab.com/arozos/mod/auth"
+	fs "imuslab.com/arozos/mod/filesystem"
 	"imuslab.com/arozos/mod/utils"
 )
 
@@ -20,7 +22,7 @@ func system_resetpw_init() {
 	http.HandleFunc("/system/reset/confirmPasswordReset", system_resetpw_confirmReset)
 }
 
-//Validate if the ysername and rkey is valid
+// Validate if the ysername and rkey is valid
 func system_resetpw_validateResetKeyHandler(w http.ResponseWriter, r *http.Request) {
 	username, err := utils.PostPara(r, "username")
 	if err != nil {
@@ -122,7 +124,11 @@ func system_resetpw_handlePasswordReset(w http.ResponseWriter, r *http.Request)
 	}
 
 	//OK. Create the New Password Entering UI
-	imageBase64, _ := utils.LoadImageAsBase64("./web/" + iconVendor)
+	vendorIconSrc := filepath.Join(vendorResRoot, "vendor_icon.png")
+	if !fs.FileExists(vendorIconSrc) {
+		vendorIconSrc = "./web/img/public/vendor_icon.png"
+	}
+	imageBase64, _ := utils.LoadImageAsBase64(vendorIconSrc)
 	template, err := utils.Templateload("system/reset/resetPasswordTemplate.html", map[string]interface{}{
 		"vendor_logo": imageBase64,
 		"host_name":   *host_name,
@@ -138,7 +144,11 @@ func system_resetpw_handlePasswordReset(w http.ResponseWriter, r *http.Request)
 
 func system_resetpw_serveIdEnterInterface(w http.ResponseWriter, r *http.Request) {
 	//Reset Key or Username not found, Serve entering interface
-	imageBase64, _ := utils.LoadImageAsBase64("./web/" + iconVendor)
+	imgsrc := filepath.Join(vendorResRoot, "vendor_icon.png")
+	if !fs.FileExists(imgsrc) {
+		imgsrc = "./web/img/public/vendor_icon.png"
+	}
+	imageBase64, _ := utils.LoadImageAsBase64(imgsrc)
 	template, err := utils.Templateload("system/reset/resetCodeTemplate.html", map[string]interface{}{
 		"vendor_logo": imageBase64,
 		"host_name":   *host_name,