diff --git a/cve-agency-manager/Dockerfile b/cve-agency-manager/Dockerfile index a922a3e3d7f6642de7dee125db301fe2f6256cc6..d73ef1d52388421fdcd5657b1f46c2891698254f 100644 --- a/cve-agency-manager/Dockerfile +++ b/cve-agency-manager/Dockerfile @@ -9,12 +9,14 @@ RUN cd /go/src/gitee.com/openeuler/cve-agency-manager && CGO_ENABLED=1 go build # copy binary config and utils FROM golang:latest +RUN apt-get update && apt-get install -y python3 && apt-get install -y python3-pip RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ COPY ./conf/product.conf /opt/app/conf/app.conf # overwrite config yaml COPY ./cve_tracking /opt/app/cve_tracking RUN chmod 755 -R /opt/app/cve_tracking +RUN pip3 install --no-cache-dir -r /opt/app/cve_tracking/requirements.txt COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-agency-manager/cve-agency-manager /opt/app/cve-agency-manager WORKDIR /opt/app/ -ENTRYPOINT ["/opt/app/cve-agency-manager"] \ No newline at end of file +ENTRYPOINT ["/opt/app/cve-agency-manager"] diff --git a/cve-agency-manager/controllers/live.go b/cve-agency-manager/controllers/live.go index 7af428ae44a1a6cc497215f4283e5b0c6be75d83..9bb773ef3070b5c913cc59033de020c9ec8079d8 100644 --- a/cve-agency-manager/controllers/live.go +++ b/cve-agency-manager/controllers/live.go @@ -2,7 +2,6 @@ package controllers import ( "github.com/astaxie/beego" - "github.com/astaxie/beego/logs" ) type TriggerHeartbeatreadController struct { @@ -21,10 +20,10 @@ func (c *TriggerHeartbeatreadController) RetCveData(resp map[string]interface{}) // @Failure 403 body is empty // @router / [get] func (u *TriggerHeartbeatreadController) Get() { - req := u.Ctx.Request - addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "Client request ip address: ", addr, - ", Header: ", req.Header, ", body: ", req.Body) + //req := u.Ctx.Request + //addr := req.RemoteAddr + //logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + // ", Header: ", req.Header, ", body: ", req.Body) resp := make(map[string]interface{}) resp["code"] = "200" resp["errmsg"] = "success" @@ -48,10 +47,10 @@ func (c *TriggerHeartbeatLiveController) RetCveData(resp map[string]interface{}) // @Failure 403 :status is err // @router / [get] func (u *TriggerHeartbeatLiveController) Get() { - req := u.Ctx.Request - addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "Client request ip address: ", addr, - ", Header: ", req.Header, ", body: ", req.Body) + //req := u.Ctx.Request + //addr := req.RemoteAddr + //logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + // ", Header: ", req.Header, ", body: ", req.Body) resp := make(map[string]interface{}) resp["code"] = "200" resp["errmsg"] = "success" diff --git a/cve-agency-manager/controllers/track.go b/cve-agency-manager/controllers/track.go index ed4184137fe69c42400e56919ac127bf3dc5c1a4..cf073488d32522aeae7c1f665545c442359d49c7 100644 --- a/cve-agency-manager/controllers/track.go +++ b/cve-agency-manager/controllers/track.go @@ -47,7 +47,7 @@ func (c *TriggerTrackController) Post() { args := []string{pythonFile, "-cve", cvePram.CveNum, "-name", cvePram.PackName, "-v", cvePram.PackVersion, "-branch", cvePram.AffectBranch, "-cmd", "-issue", cvePram.IssueNumber} //args := []string{pythonFile} - out, err := exec.Command("python", args...).Output() + out, err := exec.Command("python3", args...).Output() if err != nil { logs.Error("cmd python3 ==> python ", args, ",err: ", err) resp["errno"] = common.RecodeCmdFailed diff --git a/cve-vulner-manager/conf/app.conf b/cve-vulner-manager/conf/app.conf index a6d2578692bdd52c85e4c28fdf2f1c5dc3194ffb..84f0250658bef5db347f87f8e483505cef6a948b 100644 --- a/cve-vulner-manager/conf/app.conf +++ b/cve-vulner-manager/conf/app.conf @@ -19,7 +19,7 @@ rejectCmd = "/reject" approveCmd = "/approve" closeCmd = "/close" errorCmd = "/error" -autoPrCmd = "/auto-pr" +autoPrCmd = "/auto-patch" labelFixed = "CVE/FIXED" labelUnFix = "CVE/UNFIXED" labeUnaffected = "CVE/UNAFFECTED" diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index 430579e136eb8d65af52f948043f4a56273e7b8b..b5c0bf4ecf58526bfbbacdc7171f1267068c6d25 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -19,7 +19,7 @@ rejectCmd = "/reject" approveCmd = "/approve" closeCmd = "/close" errorCmd = "/error" -autoPrCmd = "/auto-pr" +autoPrCmd = "/auto-patch" labelFixed = "CVE/FIXED" labelUnFix = "CVE/UNFIXED" labeUnaffected = "CVE/UNAFFECTED"