From f5310b89301031005d9aac68e9a46877d0ffd86a Mon Sep 17 00:00:00 2001
From: r0n1n7an <weasly.tan@outlook.com>
Date: Tue, 19 Dec 2023 14:44:37 +0800
Subject: [PATCH] refuse empty usn and mac

---
 APIServer.exe | Bin 8058880 -> 8058880 bytes
 ews/ews.go    |  13 ++++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/APIServer.exe b/APIServer.exe
index b1b56bf9454223f1d6a11c0140c8c785ce0fe363..8f2ab33d1f9ba603878f24ab2c6b657926972b5f 100644
GIT binary patch
delta 808
zcmb`?OH)z-0LAe{1EUu`Bs2@O7d;H&a^XTR6b(T@<rZNtxI8Ts;~B7GY9?m-0!%Y8
ze1$g6-L&jOv~1<34b!ew{hg_A(Bii^=d4a=_+zw#PX=v#PA*4Q3W2rNq!<yhje0fS
zD%rN8nTo$rEN-p}^>CtGY$k&xTU!XoiCn1AXvacJ#abwy^Mq_+IaG;fqszO&Rx~UX
z#9AQcp4D4=GhZjC-gdOzj&=kZjA9H2vES=3jziGnFpl6Tj^Q{AIDwNmh0~aT5och+
zB&Ki{(>RCoFvEfw%;Ewr;u0?73aq$_Yq*XZn8QujFb_K%5a5Ie7u=BGffu)M8+ULQ
z_u#_<7U9PdmT?~etRRRGRuM)7QLJGd8)`=zYkt?+6~*JQ=hfePvBKwnskie{{$l+*
zDN;rh<`t(RIo$5FGn2_nlHyFevsstuQL=*6+vv;FI+xcWctx>i9@Zy}d1bqr)Bke#
z?e9#M%7HhFh6UrdpWQ)U#sfS=9FLH|CLZGnp5hsvBZ(9gq>(`uIpk5m7GB^birB^u
zO4!9Klu<zyHFeOhzmIAL<7(%Fyr=nJugCUZ_uRv}wVN8&(ZFjpHEf#JN6g)pucfwp
H?XLO<&|4<3

delta 807
zcmb`?Idc*L0LAeH6e3=D1VfAoi5DJ`8+P&HNPwWmz#1f82)hd=F&GF$pxV(HnehuS
z&WQO6HqJJdeh5peG&YQ#mHwU4Z(#8&-h0*42H%YuK3YvVA<<Svp%yE+D{J{wHXhwv
zuDbl0peLIOHuBYZ?~1&Tbj!0jSI3u>@@l%W-N~ls)*I=ZDyChlrCLl)CK6j^sU?-0
za!HQKGZsg0`ip)1wPxySrePRh#2)O$pWciS?1KgSaR3K#2!~<C5gf%a9LFeZIDs+P
zF^-d%z$r{(3Jy$T2B&cbXK@ba;lu@8#3fwDEUv%>H$3pd2R{M`A_M^<!nlfSxQ-jR
zi3p;IA&xoBBY`ARSU?)La2t29h`U%qM%PT));F`Ph&~}$(tqt{E1&+Q-o|_Bv-9ud
zDfyIQNGyqdL6t>8@dyF0TM-3WP(q4dD3*JfzBFMDgad)FC)k@BG)HZXdQ-Lh^u|4J
z#vJvbS21hU_Vve5cc(Am9+r{AedMu%2Y84_c#J0~;3<kIL52bqWmNDCt60N2o?`=5
zyuc=EsACHaeW%}iyJ+|@qHFJ@UBmx+ZRB-N7&M*T!k~$5ywnSWmVIe>vfGZd^>(Dw
G)qexR1|;wR

diff --git a/ews/ews.go b/ews/ews.go
index 9bd0c93..5fe0c69 100644
--- a/ews/ews.go
+++ b/ews/ews.go
@@ -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 {
 	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",
 		cfg.MySQL.User,
@@ -240,6 +246,11 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
 			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());")
 		if err != nil {
 			tx.Rollback()
@@ -250,7 +261,7 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
 		}
 		_, err = stmt.Exec(
 			params["USN"],
-			params["MAC"],
+			mac,
 			addr,
 			host,
 			params["ITEM"],