From f9198064f716ad11c62c0018c3cd3ff56991e22c Mon Sep 17 00:00:00 2001 From: gentee Date: Fri, 25 Sep 2020 09:29:36 +0500 Subject: [PATCH 1/5] Added http.host in config --- api.go | 5 +- assets.go | 141 +++++++++++++++++++++++++++---------------------- config.go | 9 +++- console.go | 2 +- const.go | 1 + lib/lib.go | 1 + server.go | 10 ++-- task.go | 2 +- taskmanager.go | 2 +- 9 files changed, 97 insertions(+), 76 deletions(-) diff --git a/api.go b/api.go index 667dd53..e8650dc 100644 --- a/api.go +++ b/api.go @@ -98,7 +98,7 @@ func runHandle(c echo.Context) error { ) open := true name := c.QueryParam(`name`) - if len(c.QueryParam(`silent`)) > 0 { + if len(c.QueryParam(`silent`)) > 0 || cfg.HTTP.Host != Localhost { open = false } if len(c.QueryParam(`console`)) > 0 { @@ -138,6 +138,7 @@ func runHandle(c echo.Context) error { TaskID: lib.RndNum(), ServerPort: cfg.HTTP.Port, HTTP: &lib.HTTPConfig{ + Host: cfg.HTTP.Host, Port: port, Open: open, Theme: cfg.HTTP.Theme, @@ -220,7 +221,7 @@ func sysTaskHandle(c echo.Context) error { for _, item := range tasks { if item.ID == uint32(taskid) { - url := fmt.Sprintf("http://localhost:%d/sys?cmd=%s&taskid=%d", item.Port, cmd, taskid) + url := fmt.Sprintf("http://%s:%d/sys?cmd=%s&taskid=%d", Localhost, item.Port, cmd, taskid) go func() { resp, err := http.Get(url) if err == nil { diff --git a/assets.go b/assets.go index 8348574..fa42ef5 100644 --- a/assets.go +++ b/assets.go @@ -540,6 +540,21 @@ jahcjXneR3FDH/8LAAD//+6Br31kBAAA `, }, + "/eonza-assets/scripts/get-webpage.yaml": { + name: "get-webpage.yaml", + local: "../eonza-assets/scripts/get-webpage.yaml", + size: 534, + modtime: 1600689005, + compressed: ` +H4sIAAAAAAAC/5SQP04zMRTEe59ipBRJpC9fQUHhC0AZiQjKyEkem5Uc7+K1E9HljwQF3IErACIoErBn +eL4R8u4iJUBD9zxj/2aeC3IuNUkhBWDUjCQScr0FjXKVkABc6jRJtFvD6LbaAphQMa6UOFSKzhJNc9IS +xwLwxnoj4ayPgCnp/Ds0alqZRMJ6kSurZoUUvSbfW72f+99bXYW465wkjgSQ5S7NTFUZsHTlU0uTJvCL +Mlc2DgekRvsDLZasHDK1P6yXPyEHNyWMM+PIOGSX1XFBIzQrAsO6SLx6QSP0a936AxA/cMlvYRNueRfW +4R5hxSW/8DYs+ZV3/M4lb8HPvOWnXliFdVjyI3/wLtyEu/2YH6Df32zEOJuQxBm5c2U7zY/8w+lg0I8N +O97qbld8BgAA//+0NbTvFgIAAA== +`, + }, + "/eonza-assets/scripts/httprequest.yaml": { name: "httprequest.yaml", local: "../eonza-assets/scripts/httprequest.yaml", @@ -5300,69 +5315,70 @@ h+TsfwEAAP//D3J6AGEOAAA= "/eonza-assets/themes/default/templates/script.tpl": { name: "script.tpl", local: "../eonza-assets/themes/default/templates/script.tpl", - size: 12494, - modtime: 1599219419, + size: 12890, + modtime: 1600684392, compressed: ` -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 -Fv43AAD//wK/zznOMAAA +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 `, }, @@ -10127,6 +10143,7 @@ var _escDirs = map[string][]os.FileInfo{ _escData["/eonza-assets/scripts/for.eonza.yaml"], _escData["/eonza-assets/scripts/foreach-file.yaml"], _escData["/eonza-assets/scripts/form.yaml"], + _escData["/eonza-assets/scripts/get-webpage.yaml"], _escData["/eonza-assets/scripts/httprequest.yaml"], _escData["/eonza-assets/scripts/if.eonza.yaml"], _escData["/eonza-assets/scripts/log-output.yaml"], diff --git a/config.go b/config.go index 864801b..389a025 100644 --- a/config.go +++ b/config.go @@ -40,7 +40,7 @@ type Config struct { } const ( - AccessLocalhost = `localhost` + AccessLocalhost = Localhost AccessPrivate = `private` ) @@ -52,6 +52,7 @@ var ( Level: logLevelInfo, }, HTTP: lib.HTTPConfig{ + Host: Localhost, Port: DefPort, Open: true, Theme: `default`, @@ -106,7 +107,11 @@ func LoadConfig() { cfg.Log.Dir = defDir(cfg.Log.Dir, DefLog) cfg.Users.Dir = defDir(cfg.Users.Dir, DefUsers) // dataFile := defDir(cfg.DataDir) - + if len(cfg.HTTP.Host) == 0 { + cfg.HTTP.Host = Localhost + } else if cfg.HTTP.Host != Localhost { + cfg.HTTP.Open = false + } if cfg.HTTP.Port == 0 { cfg.HTTP.Port = DefPort } diff --git a/console.go b/console.go index a3458b6..a5fbcd9 100644 --- a/console.go +++ b/console.go @@ -22,7 +22,7 @@ func request(url string) ([]byte, error) { err error ) buf := core.NewBuffer() - res, err = http.Get(`http://localhost:` + url) + res, err = http.Get(fmt.Sprintf(`http://%s:%s`, Localhost, url)) if err == nil { buf.Data, err = ioutil.ReadAll(res.Body) res.Body.Close() diff --git a/const.go b/const.go index 8566bf3..d09a63d 100644 --- a/const.go +++ b/const.go @@ -32,6 +32,7 @@ const ( DefLang = 0 // ConsolePrefix is the prefix of eonza console version ConsolePrefix = `ez` + Localhost = `localhost` ) // AppInfo contains information about the application diff --git a/lib/lib.go b/lib/lib.go index aa37ab8..38208df 100644 --- a/lib/lib.go +++ b/lib/lib.go @@ -23,6 +23,7 @@ import ( // HTTPConfig stores web-server settings type HTTPConfig struct { + Host string `yaml:"host"` // if empty, then localhost Port int `yaml:"port"` // if empty, then DefPort Open bool `yaml:"open"` // if true then host is opened Theme string `yaml:"theme"` // theme of web interface. if it is empty - DefTheme diff --git a/server.go b/server.go index cf95d20..59605cd 100644 --- a/server.go +++ b/server.go @@ -27,9 +27,8 @@ const ( // WebSettings contains web-server parameters type WebSettings struct { - Domain string // Domain, localhost if it sempty - Port int - Open bool // if true then webpage is opened + Port int + Open bool // if true then webpage is opened } type Response struct { @@ -200,9 +199,6 @@ func reloadHandle(c echo.Context) error { func RunServer(options WebSettings) *echo.Echo { InitLang() InitTemplates() - if len(options.Domain) == 0 { - options.Domain = `localhost` - } e := echo.New() e.HideBanner = true @@ -270,7 +266,7 @@ func RunServer(options WebSettings) *echo.Echo { var ( body []byte ) - url := fmt.Sprintf("http://%s:%d", options.Domain, options.Port) + url := fmt.Sprintf("http://%s:%d", Localhost, options.Port) for string(body) != Success { time.Sleep(100 * time.Millisecond) resp, err := http.Get(url + `/ping`) diff --git a/task.go b/task.go index de4f68c..b0e15a9 100644 --- a/task.go +++ b/task.go @@ -388,7 +388,7 @@ func sendCmdStatus(status int, timeStamp int64, message string) { Time: timeStamp, }) if err == nil { - resp, err := http.Post(fmt.Sprintf("http://localhost:%d/api/taskstatus", + resp, err := http.Post(fmt.Sprintf("http://%s:%d/api/taskstatus", Localhost, scriptTask.Header.ServerPort), "application/json", bytes.NewBuffer(jsonValue)) if err != nil { golog.Error(err) diff --git a/taskmanager.go b/taskmanager.go index 52481a9..597c9d5 100644 --- a/taskmanager.go +++ b/taskmanager.go @@ -213,7 +213,7 @@ func InitTaskManager() (err error) { } for key, item := range tasks { if item.Status < TaskFinished { - url := fmt.Sprintf("http://localhost:%d", item.Port) + url := fmt.Sprintf("http://%s:%d", Localhost, item.Port) resp, err := http.Get(url + `/info`) active := false if err == nil { From 7dbbb6d047c551a370496c6b84a43b0322a4ecd5 Mon Sep 17 00:00:00 2001 From: gentee Date: Fri, 25 Sep 2020 14:53:09 +0500 Subject: [PATCH 2/5] Added run for host defined --- api.go | 21 +++++++- assets.go | 140 ++++++++++++++++++++++++++++-------------------------- main.go | 2 +- render.go | 14 +++--- task.go | 2 +- 5 files changed, 102 insertions(+), 77 deletions(-) diff --git a/api.go b/api.go index e8650dc..e1a5160 100644 --- a/api.go +++ b/api.go @@ -24,6 +24,12 @@ type CompileResponse struct { Error string `json:"error,omitempty"` } +type RunResponse struct { + Success bool `json:"success"` + ID uint32 `json:"id"` + Error string `json:"error,omitempty"` +} + type TaskStatus struct { TaskID uint32 `json:"taskid"` Status int `json:"status"` @@ -163,7 +169,7 @@ func runHandle(c echo.Context) error { if console { return c.Blob(http.StatusOK, ``, data.Bytes()) } - return c.JSON(http.StatusOK, Response{Success: true}) + return c.JSON(http.StatusOK, RunResponse{Success: true, ID: header.TaskID}) } func pingHandle(c echo.Context) error { @@ -189,6 +195,19 @@ func taskStatusHandle(c echo.Context) error { Message: taskStatus.Message, Time: finish, } + if taskStatus.Status == TaskActive { + task := tasks[taskStatus.TaskID] + cmd.Task = &Task{ + ID: task.ID, + Status: task.Status, + Name: task.Name, + StartTime: task.StartTime, + FinishTime: task.FinishTime, + UserID: task.UserID, + Port: task.Port, + } + } + for id, client := range clients { err := client.Conn.WriteJSON(cmd) if err != nil { diff --git a/assets.go b/assets.go index fa42ef5..f90570b 100644 --- a/assets.go +++ b/assets.go @@ -5206,75 +5206,79 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 14593, - modtime: 1600433091, + size: 15586, + modtime: 1601018167, compressed: ` -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 -OQAA +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 `, }, diff --git a/main.go b/main.go index 0c36509..c9e7e3e 100644 --- a/main.go +++ b/main.go @@ -80,7 +80,7 @@ func main() { setStatus(TaskFailed, err) } <-chFinish - if scriptTask.Header.HTTP.Open { + if scriptTask.Header.HTTP.Open || scriptTask.Header.HTTP.Host != Localhost { if duration := time.Since(start).Milliseconds(); duration < TimeoutOpen { time.Sleep(time.Duration(TimeoutOpen-duration) * time.Millisecond) } diff --git a/render.go b/render.go index 43e6c4d..44a03a2 100644 --- a/render.go +++ b/render.go @@ -17,12 +17,13 @@ import ( ) type Render struct { - App AppInfo - Version string - Develop bool - Langs map[string]string - Lang string - Login bool + App AppInfo + Version string + Develop bool + Langs map[string]string + Lang string + Login bool + Localhost bool // Port int /* Params map[string]string Url string @@ -122,6 +123,7 @@ func RenderPage(c echo.Context, url string) (string, error) { render.Langs[lang] = Lang(i, `native`) } render.Login = len(storage.Settings.PasswordHash) > 0 + render.Localhost = cfg.HTTP.Host == Localhost data = render } diff --git a/task.go b/task.go index b0e15a9..18f3be9 100644 --- a/task.go +++ b/task.go @@ -57,6 +57,7 @@ type WsCmd struct { Status int `json:"status,omitempty"` Message string `json:"message,omitempty"` Time string `json:"finish,omitempty"` + Task *Task `json:"task,omitempty"` } type StdinForm struct { @@ -434,7 +435,6 @@ func sysHandle(c echo.Context) error { func setStatus(status int, pars ...interface{}) { var message string - // cmd := WsCmd{TaskID: task.ID, Cmd: WcStatus, Status: status} if len(pars) > 0 { message = fmt.Sprint(pars...) task.Message = message From 8f8ed84e31d9a07de6ff54eb33771b3a9af91b74 Mon Sep 17 00:00:00 2001 From: gentee Date: Sat, 26 Sep 2020 15:04:36 +0500 Subject: [PATCH 3/5] hide start console output --- assets.go | 199 +++++++++++++++++++++++++++--------------------------- server.go | 6 +- 2 files changed, 103 insertions(+), 102 deletions(-) diff --git a/assets.go b/assets.go index f90570b..8673157 100644 --- a/assets.go +++ b/assets.go @@ -212,16 +212,16 @@ var _escData = map[string]*_escFile{ "/eonza-assets/init/demo.url.yaml": { name: "demo.url.yaml", local: "../eonza-assets/init/demo.url.yaml", - size: 816, - modtime: 1599320129, + size: 818, + modtime: 1601113639, compressed: ` -H4sIAAAAAAAC/2yTQWvcMBCF7/oVjw10T7sJPfSgc2gJhC6k5BwUe2wLZEmVRuumv75Iso238R6F5n3f -vJUjMWvbRykAq0aSaGl05xSMAFizIYlHGh1eX54F0FJsJC6eLHggRE+N7jS1SMFA18P34KZIQQDG9Yau -ZCS+CQ5EUpxmSCQ+XVXQ6t1QFMBVmURFAnirkEfqtCXo6DLtC8aPzNgOAUZHrkOnGiFx4JDoUM5ybJBz -wu2tgdlHeX8/TdOZnP2rzi7026FCW3U7F8Z9y1+Dm8rWry+5AJ8YnSbTftJj+sNybjH/+MNn26+Hz9Tt -wBMmZRns4GrpOmK5s4Q87Gy7mOuu7idQAiRyPf+tstVsRi9Bv5NaELZoHB4WT+t4DanQWvt+5c2gTRvI -5vhFybj+5BL7xGINmE2A+b08X368Pf38fln2LBLH8u7uSkl3x03i+v/eZnnFg8RxHdgVuCliB17R6yfw -LwAA//9cNDmYMAMAAA== +H4sIAAAAAAAC/2yTQW/cIBCF7/yKp43UPe2m6qEHzlGrSFFXSpVzROyxjYSBwrBu+usrwHa9jfeImPd9 +8xZHYta2j1IAVo0k0dLozikYAbBmQxIPNDq8PD8JoKXYSFw8WfBAiJ4a3WlqkYKBrodvwU2RggCM6w1d +yUh8FRyIpDjNkEh8uqqg1ZuhKICrMomKBPBaIQ/UaUvQ0WXaJ4zvmbEdAoyOXIdONULiwCHRoZzl2CDn +hNtbA7OP8v5+mqYzOftHnV3ot0OFtup2Loz7lj8HN5WtX55zAT4xOk2m/aDH9Jvl3GL+8bvPtl8OH6nb +gUdMyjLYwdXSdcRyZw35vLfv4q67uqFAiZDIBf23zFa0Gb0E/Upqgdgi8g9iHa8hFVqL3y+9GbRpA9kc +vygZ159cYp9YrAGzCTC/mKfL99fHH98uy6ZF4lhe3l2p6e64SVz/4dssr3iQOK4DuwI3RezAK3r9CP4G +AAD//y7N4OYyAwAA `, }, @@ -5014,8 +5014,8 @@ DxaiBOSCZ7UTvTBQBC+MjkJDcRozySbm2FUjzH8DAAD//44sea6IJAAA "/eonza-assets/themes/default/templates/dyncomp.tpl": { name: "dyncomp.tpl", local: "../eonza-assets/themes/default/templates/dyncomp.tpl", - size: 12548, - modtime: 1599219434, + size: 12550, + modtime: 1601113554, compressed: ` H4sIAAAAAAAC/+xa3W/juBF/918xUZuTfGvJzu59QbZ817sWaIHrdYFbFCiMPNASbbMrUSpFO0mz/t+L IfVliXTi7O6hQJuH2CY5w/n4zXCG0qKMBSskyIeCRo6k93J670uaFSmR1AGWRE7sxzsav1/n985yBACw @@ -5048,22 +5048,22 @@ Wcgbw2O17WOTorQ0FSYKkRdl2JnFkhj+tv4njeWk7ZJVddwdPU5GR/TvQPYqfMyS15Mvkhv/qi49BL5P Dck4KyAC1zUuUHs9FDTfnNlChTZEUQTunid0g0W5a9tSWUlt+YTMRuoj0LSkH8FayWpmbRxVnNR9VcNT XVpBhFuNzjM5/aV9pgDijc2IUrlxL2nSxZSSHeEEo77vBMWjdXU7MuKjYwAbjq6uhqbSZQl88cWp641G OPU5fPhwoREReDC2YeWM8W1iDz1SfQ4mPlk81s44kPSFqBZUBsW+3HkHko6fCFTcZTT90hasJoeeYH/8 -eYLny+nH5o+rT5c/Lg3yJmIsGMX9PnwAFkUzOCfXaVZGV1mX9g3zvOgC+z3UE2E2G+SP/t90CqQs2ZZD -nQHsZnxhdjzvheNF2bQ6tQWVv1G90TQI5oqjnX5RzVFhOITHYyudepYRQnW+LnvIM+X5QNB/7ZmgCabv -K2vAV9u71/Xya/dpU0vRQUMj5Wcu8treylLodRb83/CfzvCqBTSbXE+NbOVK9Xh4UP82Adttz2wJZPwb -BXXVt5oVrSdtxX79OHigalUNIHZOnWdDD4LGekxW2bh3PhoPombT51RHhur09zRj0nNrxdAu6I4QTrzT -NPPq4whV8/n5vVXdfpi9VU/+D2eBHkY/lxvUlZLZCXrqRS5oHtWGsCFpSVvRqodlPKH3Ifg3gwnVpz+a -TXK2oRr488pa0Hz4AFd/EII8BKxUn/bUZfL4mUKp172ZfW8hH+IB2ifsfQ0rXqsgCAa4Rb8FGSk8j6tb -uMY9+iaP6+alCXyutofjcTw5KSqbi7/qgVrn4s914WiS9/SxsO3UUAJ3cKBqY/8Gvge3uTp3AXfGRfpn -fzP7rU3zoAvUgy5Do617O1yzOsFE79oEMaQe+D8UFKvu5uLd3n93vZDvZee20pDcIYLh+lVPLH1fOru9 -qJweSK5v/E2ymBpna88M7NUra89Ub2q9UUKdzzVcQ5M8o9tWR7eg5P0n6EJQgwNJK21hCW9eW85l3Q8G -5X5dSuHNJrjwFbhBEDwj93c7yeNp/tOxDtWDtd7ew7DRj4yti3Tjqk+BQLeD3uNxYk1AK8Xudjxk2KTz -fg3Ukb9+ZcVYQKX6YZIxVT15sary2VMQRJqEbiBSyxE0/ZprGOFN4CZ0Y0ZmecdkvAOv5okRZcNwTEra -JonQAlctozoUR5fCWe+gg/k8/9mFvJ8KFAO0VrVN6rMvoRsL+Dso6bzVMTwfBlgbmskQBP7NExHwaJSk -+yTbEnHqoi5v7qfmhhpb5LkM4pxvmMj+QUsP3OuEptUAnpin6K6ea3njIYTU+0YqKtW3JiqDskhZTNv3 -BMyUg7to1HY87y01GaJ9FwHqTRImDOeFfpQr2/s6aw55pRncmixWUmktt6qXYCrypzPVC/lPUAkT8fBC -vzVT++YTGMvNATKX4N9Yy8cnxOwzm9jSeAv08SkwrA9XbJvqS+s+0/nFz0DamTbUhxatPu6IjHdt9dbG -vtcrFg46gVsZn7K9pEt6VM16CKoRmED13msIq9u2+VCtU/NSxn8CAAD//1q/evsEMQAA +eYLny+nH5o+rT5c/Lg3yJmIsGMX9PnwAFkUzOCfXaVZGV1mX9g3zvOgC+z3UM8Ksn0H6f9MpkLJkWw51 +DrAb8oX58bwfjhfl0+rcFlT+RhVH0yKYa452+kVVR4XiEB6PrXTqaUYI1Qm77GHPlOkDQf+1Z4ImmMCv +rCFfbe9e18uv3adNLUUHDY2Un7nMa7srS6nXWfB/w386w6sm0GxyPTWyFSzVA+JBBdwEbLdBsyWQ8W8U +1FXnala0nrSV+/UD4YGqVT2A2Dl1ng09CBrrQVll494JaTyKmk2fUx8Z6tPf04xJz60VQ7ugO0I48U7T +zquPI1Tt5+f3VnX/YfZWPfk/nAV6GP1cblCXSmYn6KkXuaB5WBvChqQlbUWrHpfxhN6H4N8MJlSn/mg2 +ydmWauDPK2tB8+EDXP1BCPIQsFJ92lOXyeNnCqVe/2b2vYV8iAdon7H3Nax4rYIgGOAW/RZkpPA8ru7h +Gvfouzyu25cm8LnaHo7H8eSkqGyu/qpHap2rP9eFo0ne0wfDtlNDCdzBgaqO/Rv4Htzm8twF3BkX6Z/9 +zez3Ns2jLlCPugyttu7ucM3qBBO9ixPEkHrk/1BQrLubq3d7B971Qr6XnftKQ3KHCIbrVz2x9I3p7Pai +cnogub7zN8liap2tXTOwV6+sXVO9qfVOCXU+13INTfKMflsd3YKS95+gC0ENDiSttIUlvHltOZd1RxiU ++3UphTeb4MJX4AZB8Izc3+0lj6f5T8c6VI/WensPw0Y/NLYu0q2rPgUC3Q56j8eJNQGtFLvb8ZBhk877 +NVBH/vqlFWMBlerHScZU9eTVqspnT0EQaRK6gUgtR9D0a65hhDeBm9CNGZnlHZPxDryaJ0aUDcMxKWmb +JEILXLWM6lAcXQpnvYMO5vP8ZxfyfipQDNBa1Tapz76Ebizg76Ck817H8HwYYG1oJkMQ+DdPRMCjUZLu +s2xLxKmrury5oZobamyR5zKIc75hIvsHLT1wrxOaVgN4Yp6iu3qy5Y2HEFJvHKmoVN+aqAzKImUxbd8U +MFMObqNR2/G8t9RkiPZtBKg3SZgwnBf6Ya5sb+ysOeSVZnBrslhJpbXcql6DqcifzlQv5D9BJUzEwyv9 +1kztu09gLDcHyFyCf2MtH58Qs89sYkvjLdDHp8CwPl6xbaqvrftM5xc/BWln2lAfWrT6uCMy3rXVWxv7 +Xq9YOOgEbmV8yvaSLulRNeshqEZgAtWbryGsbtvmQ7VOzWsZ/wkAAP//8CzwcgYxAAA= `, }, @@ -5206,79 +5206,80 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 15586, - modtime: 1601018167, + size: 15596, + modtime: 1601027417, compressed: ` -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 +AAD//5KPjizsPAAA `, }, diff --git a/server.go b/server.go index 59605cd..dbe8d50 100644 --- a/server.go +++ b/server.go @@ -251,9 +251,9 @@ func RunServer(options WebSettings) *echo.Echo { e.POST("/api/setpsw", setPasswordHandle) } go func() { - if IsScript { - e.Logger.SetOutput(ioutil.Discard) - } + // if IsScript { + e.Logger.SetOutput(ioutil.Discard) + // } if err := e.Start(fmt.Sprintf(":%d", options.Port)); err != nil { if IsScript { setStatus(TaskFailed, err) From 832e1e08b7ae320f81434b7db0390696f10ff95d Mon Sep 17 00:00:00 2001 From: gentee Date: Mon, 28 Sep 2020 08:42:10 +0500 Subject: [PATCH 4/5] Added playground mode --- api.go | 24 ++++++++++++++---------- config.go | 28 ++++++++++++++++++++-------- const.go | 2 +- go.mod | 2 +- go.sum | 2 ++ lib/lib.go | 8 ++++++++ render.go | 18 ++++++++++-------- script/encoding.go | 28 +++++++++++++++------------- script/script.go | 8 +++++++- server.go | 6 +++--- 10 files changed, 81 insertions(+), 45 deletions(-) diff --git a/api.go b/api.go index e1a5160..6bc99db 100644 --- a/api.go +++ b/api.go @@ -133,16 +133,17 @@ func runHandle(c echo.Context) error { } } header := script.Header{ - Name: name, - Title: title, - AssetsDir: cfg.AssetsDir, - LogDir: cfg.Log.Dir, - Console: console, - UserID: c.(*Auth).User.ID, - Constants: storage.Settings.Constants, - Lang: langCode, - TaskID: lib.RndNum(), - ServerPort: cfg.HTTP.Port, + Name: name, + Title: title, + AssetsDir: cfg.AssetsDir, + LogDir: cfg.Log.Dir, + Console: console, + IsPlayground: cfg.playground, + UserID: c.(*Auth).User.ID, + Constants: storage.Settings.Constants, + Lang: langCode, + TaskID: lib.RndNum(), + ServerPort: cfg.HTTP.Port, HTTP: &lib.HTTPConfig{ Host: cfg.HTTP.Host, Port: port, @@ -151,6 +152,9 @@ func runHandle(c echo.Context) error { Access: cfg.HTTP.Access, }, } + if header.IsPlayground { + header.Playground = &cfg.Playground + } if src, err = GenSource(item, &header); err != nil { return jsonError(c, err) } diff --git a/config.go b/config.go index 389a025..b2f443e 100644 --- a/config.go +++ b/config.go @@ -15,6 +15,12 @@ import ( "gopkg.in/yaml.v2" ) +const ( + ModeDefault = `default` + ModeDevelop = `develop` + ModePlayground = `playground` +) + // LogConfig stores config settings type LogConfig struct { Dir string `yaml:"dir"` // Directory for log files. If it is empty - dir of cfg file @@ -29,14 +35,17 @@ type UsersConfig struct { // Config stores application's settings type Config struct { - Version string `yaml:"version"` // Version of the application - Develop bool `yaml:"develop"` // Developer's mode - AssetsDir string `yaml:"assetsdir"` // Directory for assets file. empty - dir of cfg file - Log LogConfig `yaml:"log"` // Log settings - Users UsersConfig `yaml:"users"` // Users settings - HTTP lib.HTTPConfig `yaml:"http"` // Web-server settings - - path string // path to cfg file + Version string `yaml:"version"` // Version of the application + Mode string `yaml:"mode"` // Mode: default, develop, playground + AssetsDir string `yaml:"assetsdir"` // Directory for assets file. empty - dir of cfg file + Log LogConfig `yaml:"log"` // Log settings + Users UsersConfig `yaml:"users"` // Users settings + HTTP lib.HTTPConfig `yaml:"http"` // Web-server settings + Playground lib.PlaygroundConfig `yaml:"playground"` // Playground settings + + path string // path to cfg file + develop bool + playground bool } const ( @@ -47,6 +56,7 @@ const ( var ( cfg = Config{ Version: Version, + Mode: ModeDefault, Log: LogConfig{ Mode: logModeFile, Level: logLevelInfo, @@ -123,6 +133,8 @@ func LoadConfig() { default: cfg.HTTP.Access = AccessLocalhost } + cfg.develop = cfg.Mode == ModeDevelop + cfg.playground = cfg.Mode == ModePlayground SetLogging(basename) if err = InitTaskManager(); err != nil { golog.Fatal(err) diff --git a/const.go b/const.go index d09a63d..e7fe0d3 100644 --- a/const.go +++ b/const.go @@ -6,7 +6,7 @@ package main const ( // Version of the application - Version = "1.0.0+1" + Version = "1.0.1+1" // DefPort is the default web-server port DefPort = 3234 // DefTheme is the default web-server theme diff --git a/go.mod b/go.mod index 92ac518..b6fd66e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/alecthomas/chroma v0.7.3 github.com/dgrijalva/jwt-go v3.2.0+incompatible - github.com/gentee/gentee v1.13.0 + github.com/gentee/gentee v1.14.0 github.com/gorilla/websocket v1.4.2 github.com/kataras/golog v0.1.2 github.com/labstack/echo/v4 v4.1.16 diff --git a/go.sum b/go.sum index 21a5b43..6d81aba 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,8 @@ github.com/gentee/gentee v1.12.0 h1:QUlXUb9o9lLqpbg76DP0pALA545dd27UVe+2IWZtGRM= github.com/gentee/gentee v1.12.0/go.mod h1:XeyqrgfEuwpfJM/YO2A1uUKbnqUFKnc0qcq6NOX1ggk= github.com/gentee/gentee v1.13.0 h1:i51xgicLVPVGNsgiY3r06ZDOJc3wRrAGq8P5wE/rDuw= github.com/gentee/gentee v1.13.0/go.mod h1:XeyqrgfEuwpfJM/YO2A1uUKbnqUFKnc0qcq6NOX1ggk= +github.com/gentee/gentee v1.14.0 h1:zbVoUamorzitXjdmLVbqHXBiOn7030Ki1qJ6ISaiyUs= +github.com/gentee/gentee v1.14.0/go.mod h1:XeyqrgfEuwpfJM/YO2A1uUKbnqUFKnc0qcq6NOX1ggk= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI= diff --git a/lib/lib.go b/lib/lib.go index 38208df..36b3786 100644 --- a/lib/lib.go +++ b/lib/lib.go @@ -31,6 +31,14 @@ type HTTPConfig struct { JWTKey string `yaml:"jwtkey"` // Secret key for JWT token } +// PlaygroundConfig stores the config of playgroundmode +type PlaygroundConfig struct { + Dir string `yaml:"dir"` // path to the temporary folder if it's empty then TempDir is used. + Summary int64 `yaml:"summary"` // all files size limit. By default, 10MB + Files int64 `yaml:"files"` // count of files limit. By default, 100 + Size int64 `yaml:"size"` // file size limit. By default, 5MB +} + var ( privateIPBlocks []*net.IPNet ipPrivateList = []string{ diff --git a/render.go b/render.go index 44a03a2..1930729 100644 --- a/render.go +++ b/render.go @@ -17,13 +17,14 @@ import ( ) type Render struct { - App AppInfo - Version string - Develop bool - Langs map[string]string - Lang string - Login bool - Localhost bool + App AppInfo + Version string + Develop bool + Playground bool + Langs map[string]string + Lang string + Login bool + Localhost bool // Port int /* Params map[string]string Url string @@ -116,7 +117,8 @@ func RenderPage(c echo.Context, url string) (string, error) { } else { render.App = appInfo render.Version = Version - render.Develop = cfg.Develop + render.Develop = cfg.develop + render.Playground = cfg.playground render.Lang = GetLangCode(c.(*Auth).User) render.Langs = make(map[string]string) for i, lang := range langs { diff --git a/script/encoding.go b/script/encoding.go index e9f1cfe..a5bc835 100644 --- a/script/encoding.go +++ b/script/encoding.go @@ -16,19 +16,21 @@ import ( ) type Header struct { - Name string - Title string - AssetsDir string - LogDir string - Theme string - Console bool - SourceCode []byte - Constants map[string]string - Lang string - UserID uint32 - TaskID uint32 - ServerPort int - HTTP *lib.HTTPConfig + Name string + Title string + AssetsDir string + LogDir string + Theme string + Console bool + IsPlayground bool + SourceCode []byte + Constants map[string]string + Lang string + UserID uint32 + TaskID uint32 + ServerPort int + HTTP *lib.HTTPConfig + Playground *lib.PlaygroundConfig } func Encode(header Header, source string) (*bytes.Buffer, error) { diff --git a/script/script.go b/script/script.go index 727748f..f967624 100644 --- a/script/script.go +++ b/script/script.go @@ -68,6 +68,12 @@ func (script *Script) Run(options Settings) (interface{}, error) { options.ChStdout <- buf } }(script.Header.Console) - + if script.Header.IsPlayground { + settings.IsPlayground = true + settings.Playground.Path = script.Header.Playground.Dir + settings.Playground.AllSizeLimit = script.Header.Playground.Summary + settings.Playground.FilesLimit = int(script.Header.Playground.Files) + settings.Playground.SizeLimit = script.Header.Playground.Size + } return script.Exec.Run(settings) } diff --git a/server.go b/server.go index dbe8d50..59605cd 100644 --- a/server.go +++ b/server.go @@ -251,9 +251,9 @@ func RunServer(options WebSettings) *echo.Echo { e.POST("/api/setpsw", setPasswordHandle) } go func() { - // if IsScript { - e.Logger.SetOutput(ioutil.Discard) - // } + if IsScript { + e.Logger.SetOutput(ioutil.Discard) + } if err := e.Start(fmt.Sprintf(":%d", options.Port)); err != nil { if IsScript { setStatus(TaskFailed, err) From 9c4563350d3528711ac0370f4ecf0a43dbbe7d82 Mon Sep 17 00:00:00 2001 From: gentee Date: Mon, 28 Sep 2020 08:44:16 +0500 Subject: [PATCH 5/5] version 1.1.0 --- const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/const.go b/const.go index e7fe0d3..af12302 100644 --- a/const.go +++ b/const.go @@ -6,7 +6,7 @@ package main const ( // Version of the application - Version = "1.0.1+1" + Version = "1.1.0+1" // DefPort is the default web-server port DefPort = 3234 // DefTheme is the default web-server theme