r0n1n7an/apiserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refuse empty usn and mac

Browse Source
This commit is contained in:
r0n1n7an 2023-12-19 14:44:37 +08:00
parent 1aa921fa8c
commit f5310b8930
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
APIServer.exe
View File

Binary file not shown.

13
ews/ews.go
View File

@ -48,6 +48,12 @@ type DefectInfo struct {
func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr string, uri string, params map[string]string) map[string]string { func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr string, uri string, params map[string]string) map[string]string {
rst := map[string]string{"RESULT": ""} rst := map[string]string{"RESULT": ""}
if params["USN"] == "" || params["MAC"] == "" {
logger.Printf("[ERR] %s; %s; %#v; %s\r\n", addr, uri, params, "Missing Parameter USN/MAC.")
rst["RESULT"] = "NG"
rst["ErrMsg"] = e.SimpleMsgHTML("red", "Invalid Parameters !")
return rst
}
dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s", dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s",
cfg.MySQL.User, cfg.MySQL.User,
@ -240,6 +246,11 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
return rst return rst
} }
mac := params["MAC"]
if mac == "" {
mac = ui.MAC
}
stmt, err = tx.Prepare("INSERT INTO uutinfo (usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,NOW(),NOW());") stmt, err = tx.Prepare("INSERT INTO uutinfo (usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,NOW(),NOW());")
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
@ -250,7 +261,7 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
} }
_, err = stmt.Exec( _, err = stmt.Exec(
params["USN"], params["USN"],
params["MAC"], mac,
addr, addr,
host, host,
params["ITEM"], params["ITEM"],