wip
This commit is contained in:
Michael Hohn
committed by
=Michael Hohn
=Michael Hohn
parent
1fdf5064b7
commit
12b9bd9858
@@ -1,179 +0,0 @@
|
||||
/*
|
||||
Copyright © 2024 github
|
||||
*/
|
||||
package ccmem
|
||||
|
||||
import (
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/advanced-security/mrvacommander/lib/commander/lcmem"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/hohn/ghes-mirva-server/analyze"
|
||||
co "github.com/hohn/ghes-mirva-server/common"
|
||||
"github.com/hohn/ghes-mirva-server/store"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
// XX: no subcommands here
|
||||
// StartCmd represents the Start command
|
||||
var StartCmd = &cobra.Command{
|
||||
Use: "Start",
|
||||
Short: "A brief description of your command",
|
||||
Long: `A longer description that spans multiple lines and likely contains examples
|
||||
and usage of using your command. For example:
|
||||
|
||||
Cobra is a CLI library for Go that empowers applications.
|
||||
This application is a tool to generate the needed files
|
||||
to quickly create a Cobra application.`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
slog.Info("Starting server")
|
||||
serve()
|
||||
},
|
||||
}
|
||||
|
||||
func serve() {
|
||||
r := mux.NewRouter()
|
||||
|
||||
//
|
||||
// First are the API endpoints that mirror those used in the github API
|
||||
//
|
||||
r.HandleFunc("/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses", MirvaRequest)
|
||||
// /repos/hohn /mirva-controller/code-scanning/codeql/variant-analyses
|
||||
// Or via
|
||||
r.HandleFunc("/{repository_id}/code-scanning/codeql/variant-analyses", MirvaRequestID)
|
||||
|
||||
r.HandleFunc("/", RootHandler)
|
||||
|
||||
// This is the standalone status request.
|
||||
// It's also the first request made when downloading; the difference is on the
|
||||
// client side's handling.
|
||||
r.HandleFunc("/repos/{owner}/{repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}", MirvaStatus)
|
||||
|
||||
r.HandleFunc("/repos/{controller_owner}/{controller_repo}/code-scanning/codeql/variant-analyses/{codeql_variant_analysis_id}/repos/{repo_owner}/{repo_name}", MirvaDownloadArtifact)
|
||||
|
||||
// Not implemented:
|
||||
// r.HandleFunc("/codeql-query-console/codeql-variant-analysis-repo-tasks/{codeql_variant_analysis_id}/{repo_id}/{owner_id}/{controller_repo_id}", MirvaDownLoad3)
|
||||
// r.HandleFunc("/github-codeql-query-console-prod/codeql-variant-analysis-repo-tasks/{codeql_variant_analysis_id}/{repo_id}", MirvaDownLoad4)
|
||||
|
||||
//
|
||||
// Now some support API endpoints
|
||||
//
|
||||
r.HandleFunc("/download-server/{local_path:.*}", MirvaDownloadServe)
|
||||
|
||||
//
|
||||
// Bind to a port and pass our router in
|
||||
//
|
||||
log.Fatal(http.ListenAndServe(":8080", r))
|
||||
}
|
||||
|
||||
func RootHandler(w http.ResponseWriter, r *http.Request) {
|
||||
slog.Info("Request on /")
|
||||
}
|
||||
|
||||
func MirvaStatus(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
slog.Info("mrva status request for ",
|
||||
"owner", vars["owner"],
|
||||
"repo", vars["repo"],
|
||||
"codeql_variant_analysis_id", vars["codeql_variant_analysis_id"])
|
||||
id, err := strconv.Atoi(vars["codeql_variant_analysis_id"])
|
||||
if err != nil {
|
||||
slog.Error("Variant analysis is is not integer", "id",
|
||||
vars["codeql_variant_analysis_id"])
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
// The status reports one status for all jobs belonging to an id.
|
||||
// So we simply report the status of a job as the status of all.
|
||||
spec := store.GetJobList(id)
|
||||
if spec == nil {
|
||||
slog.Error("No jobs found for given job id",
|
||||
"id", vars["codeql_variant_analysis_id"])
|
||||
http.Error(w, err.Error(), http.StatusUnprocessableEntity)
|
||||
return
|
||||
}
|
||||
|
||||
job := spec[0]
|
||||
|
||||
js := co.JobSpec{
|
||||
ID: job.QueryPackId,
|
||||
OwnerRepo: job.ORL,
|
||||
}
|
||||
|
||||
ji := store.GetJobInfo(js)
|
||||
|
||||
analyze.StatusResponse(w, js, ji, id)
|
||||
lcmem.StatusResponse(w, js, ji, id)
|
||||
}
|
||||
|
||||
// Download artifacts
|
||||
func MirvaDownloadArtifact(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
slog.Info("MRVA artifact download",
|
||||
"controller_owner", vars["controller_owner"],
|
||||
"controller_repo", vars["controller_repo"],
|
||||
"codeql_variant_analysis_id", vars["codeql_variant_analysis_id"],
|
||||
"repo_owner", vars["repo_owner"],
|
||||
"repo_name", vars["repo_name"],
|
||||
)
|
||||
vaid, err := strconv.Atoi(vars["codeql_variant_analysis_id"])
|
||||
if err != nil {
|
||||
slog.Error("Variant analysis is is not integer", "id",
|
||||
vars["codeql_variant_analysis_id"])
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
js := co.JobSpec{
|
||||
ID: vaid,
|
||||
OwnerRepo: co.OwnerRepo{
|
||||
Owner: vars["repo_owner"],
|
||||
Repo: vars["repo_name"],
|
||||
},
|
||||
}
|
||||
analyze.DownloadResponse(w, js, vaid)
|
||||
|
||||
}
|
||||
|
||||
func MirvaDownloadServe(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
slog.Info("File download request", "local_path", vars["local_path"])
|
||||
|
||||
analyze.FileDownload(w, vars["local_path"])
|
||||
}
|
||||
|
||||
func MirvaRequestID(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
slog.Info("New mrva using repository_id=%v\n", vars["repository_id"])
|
||||
}
|
||||
|
||||
func MirvaRequest(w http.ResponseWriter, r *http.Request) {
|
||||
vars := mux.Vars(r)
|
||||
slog.Info("New mrva run ", "owner", vars["owner"], "repo", vars["repo"])
|
||||
// TODO Change this to functional style?
|
||||
// session := new(MirvaSession)
|
||||
// session.id = next_id()
|
||||
// session.owner = vars["owner"]
|
||||
// session.controller_repo = vars["repo"]
|
||||
// session.collect_info(w, r)
|
||||
// session.find_available_DBs()
|
||||
// session.start_analyses()
|
||||
// session.submit_response(w)
|
||||
// session.save()
|
||||
}
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(StartCmd)
|
||||
|
||||
// Here you will define your flags and configuration settings.
|
||||
|
||||
// Cobra supports Persistent Flags which will work for this command
|
||||
// and all subcommands, e.g.:
|
||||
// startCmd.PersistentFlags().String("foo", "", "A help for foo")
|
||||
|
||||
// Cobra supports local flags which will only run when this command
|
||||
// is called directly, e.g.:
|
||||
// startCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
|
||||
}
|
||||
5
cmd/commander/cconfig.toml
Normal file
5
cmd/commander/cconfig.toml
Normal file
@@ -0,0 +1,5 @@
|
||||
[commander]
|
||||
[logger]
|
||||
[queue]
|
||||
[storage]
|
||||
[runner]
|
||||
@@ -8,6 +8,8 @@ import (
|
||||
"log"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/BurntSushi/toml"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -48,11 +50,17 @@ func main() {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Read configuration
|
||||
config := loadConfig("cconfig.toml")
|
||||
|
||||
// Apply 'mode' flag
|
||||
switch *mode {
|
||||
case "standalone":
|
||||
// Assemble ccmem
|
||||
case "container":
|
||||
// Assemble cccontainer
|
||||
case "cluster":
|
||||
// Assemble cccluster
|
||||
default:
|
||||
slog.Error("Invalid value for --mode. Allowed values are: standalone, container, cluster\n")
|
||||
os.Exit(1)
|
||||
@@ -62,4 +70,40 @@ func main() {
|
||||
log.Printf("Help: %t\n", *helpFlag)
|
||||
log.Printf("Log Level: %s\n", *logLevel)
|
||||
log.Printf("Mode: %s\n", *mode)
|
||||
|
||||
// Run in the chosen mode
|
||||
|
||||
}
|
||||
|
||||
type CommanderParts struct {
|
||||
commander MCCommander
|
||||
logger MCLogger
|
||||
queue MCQueue
|
||||
storage MCStorage
|
||||
runner MCRunner
|
||||
}
|
||||
|
||||
type MCConfig struct {
|
||||
commander MCCConf
|
||||
logger MCLConf
|
||||
queue MCQConf
|
||||
storage MCSConf
|
||||
runner MCRConf
|
||||
}
|
||||
|
||||
func loadConfig(fname string) *MCConfig {
|
||||
if _, err := os.Stat(fname); err != nil {
|
||||
slog.Error("Configuration file %s not found", f)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
var config MCConfig
|
||||
|
||||
_, err := toml.DecodeFile(fname, &config)
|
||||
if err != nil {
|
||||
slog.Error("", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
return &config
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user