From 704947d1e9a0d671b8ee0df52581fddb8f71fad8 Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 30 Sep 2020 08:48:49 +0500 Subject: [PATCH 01/18] Added install flag --- assets.go | 151 +++++++++++++++++++++++++++--------------------------- main.go | 11 ++-- 2 files changed, 84 insertions(+), 78 deletions(-) diff --git a/assets.go b/assets.go index 8673157..9c77123 100644 --- a/assets.go +++ b/assets.go @@ -213,7 +213,7 @@ var _escData = map[string]*_escFile{ name: "demo.url.yaml", local: "../eonza-assets/init/demo.url.yaml", size: 818, - modtime: 1601113639, + modtime: 1601286051, compressed: ` H4sIAAAAAAAC/2yTQW/cIBCF7/yKp43UPe2m6qEHzlGrSFFXSpVzROyxjYSBwrBu+usrwHa9jfeImPd9 8xZHYta2j1IAVo0k0dLozikYAbBmQxIPNDq8PD8JoKXYSFw8WfBAiJ4a3WlqkYKBrodvwU2RggCM6w1d @@ -5015,7 +5015,7 @@ DxaiBOSCZ7UTvTBQBC+MjkJDcRozySbm2FUjzH8DAAD//44sea6IJAAA name: "dyncomp.tpl", local: "../eonza-assets/themes/default/templates/dyncomp.tpl", size: 12550, - modtime: 1601113554, + modtime: 1601286051, compressed: ` H4sIAAAAAAAC/+xa3W/juBF/918xUZuTfGvJzu59QbZ817sWaIHrdYFbFCiMPNASbbMrUSpFO0mz/t+L IfVliXTi7O6hQJuH2CY5w/n4zXCG0qKMBSskyIeCRo6k93J670uaFSmR1AGWRE7sxzsav1/n985yBACw @@ -5206,80 +5206,81 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 15596, - modtime: 1601027417, + size: 15868, + modtime: 1601286051, compressed: ` -H4sIAAAAAAAC/9xb747jNpL/7qeo1u3EMsaSuycTIHC3OhdM9nC4y10WN7MbBEYjoCXK5jRF6kjKbm/H -734okpL1z+5ONou72/nQI5LFH6uKxWJVSb67+u6HD59++tMfYWsKfj+5q/+jJLuHCcBdQQ2BdEuUpiYJ -KpNHXwf3zYAgBU2CHaP7UioTQCqFocIkwZ5lZptkdMdSGtnGnAlmGOGRTgmnyU187XAMM5zer1YQf1uW -8SdswcPD3cL1IwVn4hEU5UnAUikC2CqaJ8EiJztsxyyVAZhDSZOAFWRDF0+RpXP8nybrrVQmrQz8OpQe -iDlwqreUmgYh1Xqxq6hh+SEumIhTrV85K5fCkD3VsqC/ciaV4q/kRH8VRXaKo9gaU+rlYlFpGreXSGWx -UJRToqle7L6Kr+ObLy0a4dxiDZaMovvJ3cIaw+RuLbPD/eQuYztgGSQQkLJ0y+8iUpYAdmISbCnbbM3y -5vr6za0dx3+OJloTBUibSi5VEqx5RSEj6pGK6CaAjArt2rCLWJ4Ee6keGwgLsjYC/jnlLH1MgkyRPVWQ -wJV7CuzO3t/t7M7d50RDTnBJfbfwffiwNqIDaaTka6IiZ3DPz9pIRWNtiKGx7TsecVqXrA2gS5JSZbH9 -Y59jL26pWEHUIQAjk2BBM2ak+kanipXGHiRB9wGknGidBPstMxQA9y/aW41Ga8mzAGRlOBM08yr6g5KV -oTHOh6sEblrq8gyg4KALwjlwmpv7nEQlr046+UKsdXn7RtC9Y+XNifsRbY2Js3R2N60Nb7/fx85CpdpM -4S20VbqlvAzAELVBh/Kza14WGoqn6P1J8tdI+N8V1YZJ0ZcSl7ss4IXdtOMFFRWspTGysKvBUpZURFJE -W7mz5mhURaHHpKFFyYmhsIs0l2ZJUsN2xKAan0EKOPb2rdZ1rxPs6Rh0ooSDzl0kRRJIEfRG7geUpxMT -Uc5ZqZmOdo3m+nz1deY6awHvJ/3d4UybEeGwO2KGFiOM56iXEAfnwGbABFh9UdR9OAsGM5aP9JAEbDjg -XQUixVLYxmu14Q3KW2aponfB/fMzWCg77tzCmIq68jWOxc21LT+5TzOi6oakr/ChYrEPNdT43EXjdJtd -udtFguzYhuDhiJzfbCBIWZ6e11ryytDJqOHtokJmeFl4zzvpKtNeEl5zWZRz+gT4J0olrwoBnyuNt6U7 -X9Gamj2lIujdH9C7QDK265xTlL4lvCC7VqvetUN0fTKK3kFuNAtmL/H+pP7+XK1sKPKvsqAl2dCHh5a7 -WnMiHgOw25UENcnQ6Z52luyIIWqwtazYgFZpEixsuKEXXG5k9P7ruBSbYHyvu3jnV/RB2GBJ1KCXzYZZ -GGV1tDqCpau1M83dahX/hSrNpMB5ozQXuB7hqWfd3c3J2I5l3g3Xz5Nz+7fE+9QeLnsZdt2A9yaWkAm0 -E3zUXSLvQJrz2YfAm9ad/Azu4MvuMIZek3MexR4Fb9k2Dl7C+6/Lp9sxf+/cDvsrTYIv35VPr/Q3fhN/ -vT0M/E99bAZBx693Xn+H3f8/sfn38O4fdfP/F3f/8q3W+KjTHYAZz84CEyaoqlk39MlEKRWGKrCxZBRh -F2Dqgvf35FUm1r69ShPdBLXX/CDLg0K9dDwnIjScYMbU57rtZJF4cAF7ul2tKZsinc+m7qyhqwjT7vu7 -RbvVYajR+V3GN1FVckkyWOqt3CeBawWw9DeZazvzt5Hjcm1EEqRFFtzfLU7zW4B1iF1D1u0TKNGPlxDr -CS1MqpRUNaBtnNCoUh5tmRLO1wRzwPopwFBPaupnQQI54ZrWS9nO1jqpLAoiMl0vJegeGXN8pkXm6hqu -Nxc1Sj3LJr0uuML82G7vnUue/J3+2ZYEbFL/WeN0NzpOFrkdfCV1U2d4gZQ8Malfifk0QjdZrZqkJdjK -ggYQPzx0eo2iI73ZQaSyKIcDKVHZsNelwSPgRD/qYbemxjCxGRlxmeSAfluZTO5F0OeSES43OhjhET2Q -A6qVdT+ZpFJoA3anNCSwerbGVBL06dPFdD5xQWhBl3DtGqgEKagwS8A4cQJwxIHuRCd9Z/rNYPofLdE4 -gFVTZ/67wfxPSDM+vVZnB+HLAcJHTzYfR0HVdxDeD1VAeXlmdr1FHYSvhjx4Mo/ycNvZFDzygu7hLxX9 -L9sOn+vdOs4aUluIOFE+xR+xI0R+bHVi6VkDF+EvYeqZAkAZW1sNkG6J2NBs6TxN3YtOctDpstcliIrz -hpBp0+2xW7mE1UOzAmflWhKVdemcTZ5YtX1+g7q9x3mrgae1O4wyMJ4pKtqr2omTFoD9U1TGXlnNClWZ -EUNdvTa0yps7pc2aNVo1NEjc4O2kxZeDQMtoECrF+/NR8ZDgyMjkj86Z1dOdavoI3uMlfngE5nu7aw2M -28Q+jOuFxA+PwHxwJtHgeBPpA/luSGqCEahvrck0SM6C+kCuFxI/PCYY0yftoMkNhEKCxA6NCVRbYIOx -I7wa8NEYKiSOYATKOqGTpWBrYCmWJHGDLYjj5DibTPyZDd0cfxMu66OMjbCGwzi5cxSwA+PaJUxzMp0v -FvDLL/j4cbeZTjpn5Thz/1O+hOk/kbL2axkxZImB2XfEENfl/I57to7FPRbUbGXWWp4qVehN6A7AHOqQ -Bd1QxTnMWnyaLdNxHeh0z0x7WNZlxt5QC7p+nPQ8gapEiB52DppxKsyJnzYfNnhoWvGGmnC6ICVbqEp8 -Y4OjKby1nhreQuiQ4BuYfuEeE+RtCug+YTY74ZgtFaGiupRCU0jue96I5dCMxqhwJ+usR9aI+wclpYm9 -ekcmtmS7HSAoairVrZoeO63ViuUgpIH4e5kSvpXaPDxADwdZvnJCj7FJ9EGkkFcitZEyYuAGIN9zYNnY -FABOjT0CI0O5VBDiOIMErm+BwR3cfHUL7O3bcSx3q0ACVlUbavAYhiybjdKiNEh/DgtgrSh5HB07jvaS -PWEGNKe0DN9dX48tOzbRqvUSJ+2dn/5Z5FKZShBD+WEOZkud1Fui7QauKRWQy0pkMXxSBzASciYyYAaY -sNER/AcRZENVPB2xlDPWcp77PROZ3MeypCL0z1ym9vqMSyWNTCWHtzBdLPAU9SnQSPzJmi6RAGWJS6nM -fJS1qStKjnF+HHbVJogHaA7dQ8OyAUb/SFCRPTw0fcfW2U6JSbehd073IwfUneVmhcYjabLz13j4CldU -Sl37InebT+cgC2bC9jsmHwZc9Dztk2zN7RWex62BaSAz4bRz50/nLuTraRCRh5zFUrENE4TDVQIjw3U0 -Z1/rDY/AJcCX8W5H0bpCfaxVO6LV2ws+0zqQQ0ll3rrmEpjWHnA6FKamCy8AH4FyTXtT68vwjPPvwB1b -JjswwHRL00e/jWEu2iz2t28Q0NX+uiQKr8DEctURxF3MUuRMFSE68IKYMHiDVu/ftwbzi3vmgup59+ap -FRriyjDrKdVxEzcVGl8N6e08CoezkwTWRsQ/UT3mbT1W65Tm4ux1etu7H0c37jcdpL6jzUXPYI6t5siy -XfrjICyiGNSHg1isYxvhrBeydH1TN1CygNP2hTd0QmHj9Ov1Z20mh6bK5UZW5ndk0wH+3mzSJ2a8ZfY5 -PW+TL5njKwT1RM2HISNWbwn2Uj2OD/dV1VEWijXthjAjyvLVvLLS23Da1DY6KutZa199gu4/uFJjCLkY -6rCuS0JiNTbrR9ItojEpc2FnDRnoz2xnGCdvWbsyn86MMVgXfs9kMJ4vcXvWNC6t/BPVf/vi5/V2yWm+ -wmP2/dLxnJZfktbV27/jm4vCtur2v1Fe/17gvLTx2oha4h/+fUzgrjVdkLlZa1Ti9jcerVXczeIAcFDH -OeOGqhBCZkW6YvGWZRTG3CXJvmfaDI7R2fyWM22+SUm6pcn0rc+p0y39++WwrwxgXpmzDle37GOY2RLm -TEDZvY5Rb9N+hlCQcsDWCRjTzOHiL8WLV1e5gC++AB835uKliHFw9XfCu8sZyQu5CBqMLVSFr7IWV3z/ -/2IcY7v8yb0+6O2bLRTe/l5KbVUd2oIOahl3nS8vkbGYU7Ex27H6Rj8yt/Qr9hCzDO2HZTDQqnckY7Mm -40prPfrJouK8L59zR9bPaEpUup0Tzvuro6CKYoaweujuXaOHR3oA1uWvW7FtY+0GuR7Srh7p4eF2rEa1 -I9xX4n/5BcIrwjmeuSvHMD4iAS3WNMtoNpvZL7mZqAbZIq7tPg6wuza2lAcds2r3FoZLF545utjI77Hj -A9E0HLFrxETmMHdFUZXRPzKzDS3KbLxA1HD49UhR5OwKVj9ddmImUl5lVL9mubcJvP8162VUp7Xq8flv -W/rda5e+cnPO73HLZBqLeGHxm5cXP/Zrp4jfbJR76KMoalwgvSP8YuEBCbVUJmwSYzJfD5lGuUi96FUC -67jWhT/fdQdEUNON8ISUxJsL5kacfpAFJsrh2qfrPV57bQ+haAu89a4ulULQtJvm+RtBy/TRehFB9/Aj -XX+07XCv/6xYOJuNk8dSyJLadMHFgJ26YJewoFqTDfWVjHivPxTZWWL7yUULdkwYixA+471yHNZNXHT6 -bx9/+M+4JErTEOlm/Sg0LTIXxybwY/rREFPpMf/q32UNHPyA0N44Qyfs6umIcuHi8SxZb9tcN8ggLjVe -0q9pteUcHLlrjJ48HPb7cOYNgQc8bVZryiu9AM7ImWDaev8TR3CPGvwXO3Lu3Nfr+/luedd42Q28GA7W -ykS+GGq3tSMwchviqHUS9cTZbwyCemFPJ66ct99oFrIShrbLRfZctKLHSbf4546zg7AvM5tXQv6NIkI5 -/+h9Qw3sahlLmzHVh2ov1WO3J6M7ymW5hNUq/s49PzQv9OuvHpewauR5BpYt4XrefOfwxpUd9Zvp3L4t -tW9Ko5KTQ5QylXKKQaKsDLXfQLQPuIO6aUG5j1q6SNjXhvAfvgyB3rWAcDML92ami2bqsLWGcx1DtC/b -EvqKag9KSt6Baj6JGaK9b6HZX5J0kDjLaaSY2LTR7KcxiLRYnOXsY1WWUpkzYCc2mh21aXB3Oxu+FM0V -1dsTa0FOIkUzGRFugjn4n0EsnW26gl6vuAyYTqMt2befjT111NGs5yqI3eU024hIVmZ0STfh4pLfyw0T -5xakT6y3XInxUSTzPOigNsu666lTiA8sjG+9CeY+kXliZjai77pW0/+sx1ealhAE3bJNj7BVpWnTpkXv -yx6bQfXm1l8DtL9Fsnl186GZLRharM7EukrY+3jI3t3dvvoVTLv3ODm2vJR9wybXn53DQzct15+BCW2I -SDFr/1Ypcmjc4Uiyc8r2EpvryfXnM5dsE/PZRUGuP6/YAzR5pffJ3RDqOOm8e0LmkgSmcv2ZpqYpIZzY -8qGKZcrlJD75amRsrqNHemhnHdOff57OeuUpm3VB0mjJtusr4Dg5/R0y7Xvk+vNtR+H+PVFJjKFKzMGW -757bIH4oVrTkJKXh9A16MVeKayNhYmF/SnXaO/sxN/b3IJt+yx1MugPu3WEbOuVS0FArj+OJW8GcfdQG -3RjLD25DkXzW49F9H1DoDg5GuH9SsmCahopqyXe2oqKp+cQKKitT986h0B6x9fnq3cL/YHXhftM8+Z8A -AAD//5KPjizsPAAA +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 +Zv4HvDP3G+/R/wQAAP//kP4B5/w9AAA= `, }, diff --git a/main.go b/main.go index c9e7e3e..de5be99 100644 --- a/main.go +++ b/main.go @@ -27,9 +27,10 @@ var ( func main() { var ( - e *echo.Echo - psw string - isRun bool + e *echo.Echo + psw string + isRun bool + install bool ) if isRun = CheckConsole(); isRun && len(consoleData) == 0 { return @@ -37,6 +38,7 @@ func main() { golog.SetTimeFormat("2006/01/02 15:04:05") flag.StringVar(&cfg.path, "cfg", "", "The path of the `config file`") flag.StringVar(&psw, "psw", "", "The login password") + flag.BoolVar(&install, "install", false, "only install") flag.Parse() if err := script.InitEngine(); err != nil { golog.Fatal(err) @@ -91,6 +93,9 @@ func main() { } else { LoadConfig() LoadStorage(psw) + if install { + return + } LoadUsers() defer CloseLog() if err := LoadCustomAsset(cfg.AssetsDir, cfg.HTTP.Theme); err != nil { From b4ff15db82e8c1e22a475568925e0cf9ee902157 Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 30 Sep 2020 10:38:51 +0500 Subject: [PATCH 02/18] Added whitelist --- auth.go | 20 ++++++++++++++++++-- config.go | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/auth.go b/auth.go index 9105e63..ab07b8c 100644 --- a/auth.go +++ b/auth.go @@ -6,6 +6,7 @@ package main import ( "eonza/lib" + "net" "net/http" "strings" "time" @@ -54,6 +55,21 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { access string isAccess bool ) + ip := c.RealIP() + if len(cfg.Whitelist) > 0 { + var matched bool + clientip := net.ParseIP(ip) + for _, item := range cfg.Whitelist { + _, network, _ := net.ParseCIDR(item) + if network.Contains(clientip) { + matched = true + break + } + } + if !matched { + return echo.NewHTTPError(http.StatusForbidden, "Access denied") + } + } host := c.Request().Host[:strings.LastIndex(c.Request().Host, `:`)] if IsScript { access = scriptTask.Header.HTTP.Access @@ -61,9 +77,9 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { access = cfg.HTTP.Access } if access == AccessPrivate { - isAccess = lib.IsPrivate(host, c.RealIP()) + isAccess = lib.IsPrivate(host, ip) } else { - isAccess = lib.IsLocalhost(host, c.RealIP()) + isAccess = lib.IsLocalhost(host, ip) } if !isAccess { return echo.NewHTTPError(http.StatusForbidden, "Access denied") diff --git a/config.go b/config.go index b2f443e..2e587f4 100644 --- a/config.go +++ b/config.go @@ -42,6 +42,7 @@ type Config struct { Users UsersConfig `yaml:"users"` // Users settings HTTP lib.HTTPConfig `yaml:"http"` // Web-server settings Playground lib.PlaygroundConfig `yaml:"playground"` // Playground settings + Whitelist []string `yaml:"whitelist"` // Whitelist of IP-addresses path string // path to cfg file develop bool From 20fc82db75dd47a9831d30856a6af7eb9638900f Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 30 Sep 2020 11:38:40 +0500 Subject: [PATCH 03/18] Fixed whitelist --- auth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auth.go b/auth.go index ab07b8c..b40ca96 100644 --- a/auth.go +++ b/auth.go @@ -60,8 +60,8 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { var matched bool clientip := net.ParseIP(ip) for _, item := range cfg.Whitelist { - _, network, _ := net.ParseCIDR(item) - if network.Contains(clientip) { + _, network, err := net.ParseCIDR(item) + if err == nil && network.Contains(clientip) { matched = true break } From 98388e60f9b98e5f59005ae9164d2feb964da59c Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 30 Sep 2020 15:03:58 +0500 Subject: [PATCH 04/18] Added playground tasks limit --- api.go | 9 +++ assets.go | 168 +++++++++++++++++++++++++++-------------------------- config.go | 6 ++ const.go | 2 + lib/lib.go | 1 + 5 files changed, 103 insertions(+), 83 deletions(-) diff --git a/api.go b/api.go index 6bc99db..0a8be4e 100644 --- a/api.go +++ b/api.go @@ -154,6 +154,15 @@ func runHandle(c echo.Context) error { } if header.IsPlayground { header.Playground = &cfg.Playground + tasksLimit := cfg.Playground.Tasks + for _, item := range tasks { + if item.Status < TaskFinished { + tasksLimit-- + } + } + if tasksLimit <= 0 { + return jsonError(c, Lang(GetLangId(c.(*Auth).User), `errtasklimit`, cfg.Playground.Tasks)) + } } if src, err = GenSource(item, &header); err != nil { return jsonError(c, err) diff --git a/assets.go b/assets.go index 9c77123..1ad1d46 100644 --- a/assets.go +++ b/assets.go @@ -242,97 +242,99 @@ Nvhiu30Mie06ub+k1ipSjt0dc4O9xM5zHnum+YjNJivxEwAA///CQZLfyAIAAA== "/eonza-assets/languages/en.yaml": { name: "en.yaml", local: "../eonza-assets/languages/en.yaml", - size: 4446, - modtime: 1600423784, + size: 4545, + modtime: 1601459645, compressed: ` -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 `, }, "/eonza-assets/languages/ru.yaml": { name: "ru.yaml", local: "../eonza-assets/languages/ru.yaml", - size: 6976, - modtime: 1600423806, + size: 7126, + modtime: 1601459671, compressed: ` -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 -qkMlhqsP/TKLCvHvAAAA///t2m7TQBsAAA== +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 `, }, diff --git a/config.go b/config.go index 2e587f4..794fdaf 100644 --- a/config.go +++ b/config.go @@ -136,6 +136,12 @@ func LoadConfig() { } cfg.develop = cfg.Mode == ModeDevelop cfg.playground = cfg.Mode == ModePlayground + if cfg.playground { + if cfg.Playground.Tasks == 0 { + cfg.Playground.Tasks = DefTaskLimit + } + } + SetLogging(basename) if err = InitTaskManager(); err != nil { golog.Fatal(err) diff --git a/const.go b/const.go index af12302..e82fc1e 100644 --- a/const.go +++ b/const.go @@ -33,6 +33,8 @@ const ( // ConsolePrefix is the prefix of eonza console version ConsolePrefix = `ez` Localhost = `localhost` + // DefTaskLimit is the maximum running scripts in playground mode + DefTaskLimit = 2 ) // AppInfo contains information about the application diff --git a/lib/lib.go b/lib/lib.go index 36b3786..5aa3499 100644 --- a/lib/lib.go +++ b/lib/lib.go @@ -37,6 +37,7 @@ type PlaygroundConfig struct { 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 + Tasks int64 `yaml:"tasks"` // running task limit. By default, 1 } var ( From c4ebc57bf5933b28208e6a7685fa0d76ca149ec5 Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 30 Sep 2020 17:10:35 +0500 Subject: [PATCH 05/18] Fixed host access --- auth.go | 6 ++++++ config.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/auth.go b/auth.go index b40ca96..eb745c0 100644 --- a/auth.go +++ b/auth.go @@ -78,6 +78,12 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { } if access == AccessPrivate { isAccess = lib.IsPrivate(host, ip) + } else if access == AccessHost { + if IsScript { + isAccess = host == scriptTask.Header.HTTP.Host || host == Localhost + } else { + isAccess = host == cfg.HTTP.Host || host == Localhost + } } else { isAccess = lib.IsLocalhost(host, ip) } diff --git a/config.go b/config.go index 794fdaf..227a5e9 100644 --- a/config.go +++ b/config.go @@ -52,6 +52,7 @@ type Config struct { const ( AccessLocalhost = Localhost AccessPrivate = `private` + AccessHost = `host` ) var ( @@ -130,6 +131,7 @@ func LoadConfig() { cfg.HTTP.Theme = DefTheme } switch cfg.HTTP.Access { + case AccessHost: case AccessPrivate: default: cfg.HTTP.Access = AccessLocalhost From f337c92ddf64a723f0b3f3b08e8fabed15629e0c Mon Sep 17 00:00:00 2001 From: gentee Date: Fri, 2 Oct 2020 15:18:47 +0500 Subject: [PATCH 06/18] Added CheckOrigin for websockets --- assets.go | 4 ++-- auth.go | 5 ++++- task.go | 1 + taskmanager.go | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/assets.go b/assets.go index 1ad1d46..fe6e655 100644 --- a/assets.go +++ b/assets.go @@ -4971,7 +4971,7 @@ M3YyLKJk8NM51r0kPi+3Z5l/AgAA///y9sEPpgYAAA== name: "dialogs.tpl", local: "../eonza-assets/themes/default/templates/dialogs.tpl", size: 9352, - modtime: 1600353049, + modtime: 1601632567, compressed: ` H4sIAAAAAAAC/+xZbW/bOPJ/n08xVf/+y0Ejx4ndBpAjo710Axx20T1cdq8oir6gxZHNMyVqScoPF/i7 H0g9WpbTNL0tWmBfNJVmhjPDmeH8RvS1CiVLNehtioGjcaPPN57GOOVEowOMBg7lcy9LuSDUmZ4AAFyv @@ -5209,7 +5209,7 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", size: 15868, - modtime: 1601286051, + modtime: 1601484115, compressed: ` H4sIAAAAAAAC/9xb/4/jNnb/3X/FG/U2lrGWPLO7AQKP5TTYXFG02ybo7l0QDAYBLdE2dyhSJSl7fBP/ 78UjKVnf7JnNJWh7+8OsSD5++L7x8fFJXlx9/8P7Tz//+GfYmpwvR4vqP0qyJYwAFjk1BNItUZqaJCjN diff --git a/auth.go b/auth.go index eb745c0..946cd50 100644 --- a/auth.go +++ b/auth.go @@ -70,7 +70,10 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { return echo.NewHTTPError(http.StatusForbidden, "Access denied") } } - host := c.Request().Host[:strings.LastIndex(c.Request().Host, `:`)] + host := c.Request().Host + if offPort := strings.LastIndex(c.Request().Host, `:`); offPort > 0 { + host = host[:offPort] + } if IsScript { access = scriptTask.Header.HTTP.Access } else { diff --git a/task.go b/task.go index 18f3be9..f0602ba 100644 --- a/task.go +++ b/task.go @@ -348,6 +348,7 @@ func initTask() script.Settings { func wsTaskHandle(c echo.Context) error { // var cmd WsCmd + upgrader.CheckOrigin = func(r *http.Request) bool { return true } ws, err := upgrader.Upgrade(c.Response(), c.Request(), nil) if err != nil { return err diff --git a/taskmanager.go b/taskmanager.go index 597c9d5..9729c0f 100644 --- a/taskmanager.go +++ b/taskmanager.go @@ -276,6 +276,8 @@ func getPort() (int, error) { } func wsMainHandle(c echo.Context) error { + + upgrader.CheckOrigin = func(r *http.Request) bool { return true } ws, err := upgrader.Upgrade(c.Response(), c.Request(), nil) if err != nil { return err From 1557de4b5c1e57b7f8f55b2edfb7c73b82e6a3c1 Mon Sep 17 00:00:00 2001 From: gentee Date: Fri, 2 Oct 2020 15:50:57 +0500 Subject: [PATCH 07/18] Added PortShift --- assets.go | 189 +++++++++++++++++++++++++++--------------------------- config.go | 17 ++--- render.go | 2 + 3 files changed, 106 insertions(+), 102 deletions(-) diff --git a/assets.go b/assets.go index fe6e655..e5d05c2 100644 --- a/assets.go +++ b/assets.go @@ -5208,81 +5208,81 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 15868, - modtime: 1601484115, + size: 15919, + modtime: 1601635584, compressed: ` -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 -Zv4HvDP3G+/R/wQAAP//kP4B5/w9AAA= +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 `, }, @@ -5454,27 +5454,28 @@ zm1QLulKESOvfWinyh+HHc7E65ad6v2xzevbvv/6+Nmqon9yMXSqf6gcuk5tyaZYGd6bQNDw3QFsdt9g "/eonza-assets/themes/default/templates/tasks.tpl": { name: "tasks.tpl", local: "../eonza-assets/themes/default/templates/tasks.tpl", - size: 3222, - modtime: 1595850669, + size: 3254, + modtime: 1601635616, compressed: ` -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 +AAD//wrAIv+2DAAA `, }, diff --git a/config.go b/config.go index 227a5e9..7df7500 100644 --- a/config.go +++ b/config.go @@ -35,14 +35,15 @@ type UsersConfig struct { // Config stores application's settings type Config struct { - 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 - Whitelist []string `yaml:"whitelist"` // Whitelist of IP-addresses + 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 + Whitelist []string `yaml:"whitelist,omitempty"` // Whitelist of IP-addresses + PortShift int64 `yaml:"portshift,omitempty"` // shift of the port path string // path to cfg file develop bool diff --git a/render.go b/render.go index 1930729..85d33e4 100644 --- a/render.go +++ b/render.go @@ -25,6 +25,7 @@ type Render struct { Lang string Login bool Localhost bool + PortShift int64 // Port int /* Params map[string]string Url string @@ -126,6 +127,7 @@ func RenderPage(c echo.Context, url string) (string, error) { } render.Login = len(storage.Settings.PasswordHash) > 0 render.Localhost = cfg.HTTP.Host == Localhost + render.PortShift = cfg.PortShift data = render } From 1818bb42ffc945903d9db52a6de7e27936b98af1 Mon Sep 17 00:00:00 2001 From: gentee Date: Fri, 2 Oct 2020 21:55:44 +0500 Subject: [PATCH 08/18] Added cdn parameter in config --- api.go | 1 + assets.go | 127 +++++++++++++++++++++++---------------------- config.go | 4 +- render.go | 2 + script/encoding.go | 1 + server.go | 8 +-- 6 files changed, 75 insertions(+), 68 deletions(-) diff --git a/api.go b/api.go index 0a8be4e..d0ae15c 100644 --- a/api.go +++ b/api.go @@ -137,6 +137,7 @@ func runHandle(c echo.Context) error { Title: title, AssetsDir: cfg.AssetsDir, LogDir: cfg.Log.Dir, + CDN: cfg.CDN, Console: console, IsPlayground: cfg.playground, UserID: c.(*Auth).User.ID, diff --git a/assets.go b/assets.go index e5d05c2..043f8c0 100644 --- a/assets.go +++ b/assets.go @@ -5323,70 +5323,71 @@ h+TsfwEAAP//D3J6AGEOAAA= "/eonza-assets/themes/default/templates/script.tpl": { name: "script.tpl", local: "../eonza-assets/themes/default/templates/script.tpl", - size: 12890, - modtime: 1600684392, + size: 12962, + modtime: 1601645262, compressed: ` -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 +VaIyAAA= `, }, diff --git a/config.go b/config.go index 7df7500..eb2b58b 100644 --- a/config.go +++ b/config.go @@ -43,7 +43,9 @@ type Config struct { HTTP lib.HTTPConfig `yaml:"http"` // Web-server settings Playground lib.PlaygroundConfig `yaml:"playground"` // Playground settings Whitelist []string `yaml:"whitelist,omitempty"` // Whitelist of IP-addresses - PortShift int64 `yaml:"portshift,omitempty"` // shift of the port + // undocumented fields + PortShift int64 `yaml:"portshift,omitempty"` // shift of the port + CDN string `yaml:"cdn,omitempty"` // url for static files in task path string // path to cfg file develop bool diff --git a/render.go b/render.go index 85d33e4..6c823b5 100644 --- a/render.go +++ b/render.go @@ -39,6 +39,7 @@ type RenderScript struct { IsScript bool Start string Finish string + CDN string Source template.HTML Stdout template.HTML Logout template.HTML @@ -114,6 +115,7 @@ func RenderPage(c echo.Context, url string) (string, error) { renderScript.Finish = time.Unix(renderScript.Task.FinishTime, 0).Format(TimeFormat) } renderScript.IsScript = IsScript + renderScript.CDN = scriptTask.Header.CDN data = renderScript } else { render.App = appInfo diff --git a/script/encoding.go b/script/encoding.go index a5bc835..b6c8362 100644 --- a/script/encoding.go +++ b/script/encoding.go @@ -21,6 +21,7 @@ type Header struct { AssetsDir string LogDir string Theme string + CDN string Console bool IsPlayground bool SourceCode []byte diff --git a/server.go b/server.go index 59605cd..496a578 100644 --- a/server.go +++ b/server.go @@ -205,10 +205,10 @@ func RunServer(options WebSettings) *echo.Echo { e.Use(AuthHandle) e.Use(Logger) e.Use(md.Recover()) - /* e.Use(md.CORSWithConfig(md.CORSConfig{ - AllowOrigins: []string{"http://localhost"}, - AllowMethods: []string{http.MethodGet, http.MethodPost}, - }))*/ + /* e.Use(md.CORSWithConfig(md.CORSConfig{ + AllowOrigins: []string{"*"}, + AllowMethods: []string{http.MethodGet}, + }))}*/ //e.HTTPErrorHandler = customHTTPErrorHandler From 260271f64692acd57880f837f5a73c318e9a00e6 Mon Sep 17 00:00:00 2001 From: gentee Date: Sat, 3 Oct 2020 20:36:04 +0500 Subject: [PATCH 09/18] Fixed cdn task bug --- render.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.go b/render.go index 6c823b5..af63a08 100644 --- a/render.go +++ b/render.go @@ -96,6 +96,7 @@ func RenderPage(c echo.Context, url string) (string, error) { if IsScript { renderScript.Task = task renderScript.Title = scriptTask.Header.Title + renderScript.CDN = scriptTask.Header.CDN } else { renderScript.Task = *c.Get(`Task`).(*Task) renderScript.Title = c.Get(`Title`).(string) @@ -115,7 +116,6 @@ func RenderPage(c echo.Context, url string) (string, error) { renderScript.Finish = time.Unix(renderScript.Task.FinishTime, 0).Format(TimeFormat) } renderScript.IsScript = IsScript - renderScript.CDN = scriptTask.Header.CDN data = renderScript } else { render.App = appInfo From f125545523aab1aa5cd8a127b279476b692c3f2d Mon Sep 17 00:00:00 2001 From: gentee Date: Sun, 4 Oct 2020 17:20:36 +0500 Subject: [PATCH 10/18] Disabled exit & set password in playground --- assets.go | 411 ++++++++++++++++++++++++++-------------------------- server.go | 3 + settings.go | 3 + 3 files changed, 211 insertions(+), 206 deletions(-) diff --git a/assets.go b/assets.go index 043f8c0..eccf313 100644 --- a/assets.go +++ b/assets.go @@ -242,50 +242,50 @@ Nvhiu30Mie06ub+k1ipSjt0dc4O9xM5zHnum+YjNJivxEwAA///CQZLfyAIAAA== "/eonza-assets/languages/en.yaml": { name: "en.yaml", local: "../eonza-assets/languages/en.yaml", - size: 4545, - modtime: 1601459645, + size: 4605, + modtime: 1601812961, compressed: ` -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 `, }, "/eonza-assets/languages/ru.yaml": { name: "ru.yaml", local: "../eonza-assets/languages/ru.yaml", - size: 7126, - modtime: 1601459671, + size: 7216, + modtime: 1601812984, compressed: ` H4sIAAAAAAAC/5xZX2/byBF/309BHBDcHdA4737Ja4Fe0aJon4o+rKm1TJgiebuk//RJfy7nBPLFvfTa GL1znDQt+nQoLUs2LVnSV5j9RsXMLClScnJt36zd4ezszG9mfrOWO7FOtz24tF2Y2C6MILd9eyrkTpzh @@ -304,37 +304,37 @@ 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 `, }, @@ -5208,81 +5208,82 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 15919, - modtime: 1601635584, + size: 16342, + modtime: 1601813918, compressed: ` -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 `, }, @@ -5323,71 +5324,69 @@ h+TsfwEAAP//D3J6AGEOAAA= "/eonza-assets/themes/default/templates/script.tpl": { name: "script.tpl", local: "../eonza-assets/themes/default/templates/script.tpl", - size: 12962, - modtime: 1601645262, + size: 12639, + modtime: 1601810862, compressed: ` -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 -VaIyAAA= +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 `, }, diff --git a/server.go b/server.go index 496a578..884fa95 100644 --- a/server.go +++ b/server.go @@ -165,6 +165,9 @@ func indexHandle(c echo.Context) error { }*/ func exitHandle(c echo.Context) error { + if cfg.playground { + return jsonError(c, `Access denied`) + } golog.Info(`Finish`) stopchan <- os.Interrupt return c.JSON(http.StatusOK, Response{Success: true}) diff --git a/settings.go b/settings.go index 4bbea03..71854c4 100644 --- a/settings.go +++ b/settings.go @@ -58,6 +58,9 @@ func setPasswordHandle(c echo.Context) error { err error hash []byte ) + if cfg.playground { + return jsonError(c, Lang(GetLangId(c.(*Auth).User), `errplaypsw`)) + } if err = c.Bind(&psw); err != nil { return jsonError(c, err) } From f8045104421882d583a3bc6d41daa5555f0d2f37 Mon Sep 17 00:00:00 2001 From: gentee Date: Mon, 5 Oct 2020 10:17:07 +0500 Subject: [PATCH 11/18] Added IP protection to task --- api.go | 1 + assets.go | 100 ++++++++++++++++++++++----------------------- auth.go | 7 +++- script/encoding.go | 1 + 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/api.go b/api.go index d0ae15c..5d7413e 100644 --- a/api.go +++ b/api.go @@ -140,6 +140,7 @@ func runHandle(c echo.Context) error { CDN: cfg.CDN, Console: console, IsPlayground: cfg.playground, + IP: c.RealIP(), UserID: c.(*Auth).User.ID, Constants: storage.Settings.Constants, Lang: langCode, diff --git a/assets.go b/assets.go index eccf313..ef120e8 100644 --- a/assets.go +++ b/assets.go @@ -4919,7 +4919,7 @@ lWyiRStWXn2nT7ayYoSLWrOqynfEF595Yv9/LSEhAudHEkeP/J50/pM/k85+8i1xHyLaI9c/QbU3y0YE name: "card.tpl", local: "../eonza-assets/themes/default/templates/card.tpl", size: 4101, - modtime: 1599206095, + modtime: 1601821059, compressed: ` H4sIAAAAAAAC/7RXS3PjNhK++1e0MauRXDYpz2ztHihRM8c97CGHVC4u1xRENEXEIMAALcqORv89Bb5E ivTETiq6mGz04+vXR3jtEisLAnopMGaEz7R8DgjzQnFCBlLELOFWsM0VAMBayBISxZ2LWaGC/zIoA5nG @@ -5073,7 +5073,7 @@ Xq9YOOgEbmV8yvaSLulRNeshqEZgAtWbryGsbtvmQ7VOzWsZ/wkAAP//8CzwcgYxAAA= name: "editor.tpl", local: "../eonza-assets/themes/default/templates/editor.tpl", size: 25016, - modtime: 1600423837, + modtime: 1601821356, compressed: ` H4sIAAAAAAAC/+x8bW/rNpbwd/8KRlPXdms5ye3L86wcubNodzG7KGYKTFFg4fHe0hLtcCKTGop24ub6 vy/4JlEUqdg32U4XaD/0xuTh4eEhz/ux76qM4ZIDfixRGnH0xK+fYo52ZQE5igDO0wjlmFMWLQYA3B3i @@ -5482,55 +5482,55 @@ AAD//wrAIv+2DAAA "/eonza-assets/themes/default/templates/tree.tpl": { name: "tree.tpl", local: "../eonza-assets/themes/default/templates/tree.tpl", - size: 11751, - modtime: 1597322511, + size: 11799, + modtime: 1601822054, compressed: ` -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 `, }, diff --git a/auth.go b/auth.go index 946cd50..8d94977 100644 --- a/auth.go +++ b/auth.go @@ -49,6 +49,10 @@ func getCookie(c echo.Context, name string) string { return cookie.Value } +func accessIP(curIP, originalIP string) bool { + return curIP == originalIP || net.ParseIP(curIP).IsLoopback() +} + func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { return func(c echo.Context) (err error) { var ( @@ -83,7 +87,8 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { isAccess = lib.IsPrivate(host, ip) } else if access == AccessHost { if IsScript { - isAccess = host == scriptTask.Header.HTTP.Host || host == Localhost + isAccess = (host == scriptTask.Header.HTTP.Host && accessIP(ip, scriptTask.Header.IP)) || + host == Localhost } else { isAccess = host == cfg.HTTP.Host || host == Localhost } diff --git a/script/encoding.go b/script/encoding.go index b6c8362..a51bffa 100644 --- a/script/encoding.go +++ b/script/encoding.go @@ -28,6 +28,7 @@ type Header struct { Constants map[string]string Lang string UserID uint32 + IP string TaskID uint32 ServerPort int HTTP *lib.HTTPConfig From 05c62c20e27669b676cd911649df2d64d945b45b Mon Sep 17 00:00:00 2001 From: gentee Date: Mon, 5 Oct 2020 20:56:32 +0500 Subject: [PATCH 12/18] Added File/dir exists comparison --- assets.go | 378 ++++++++++++++++++++++++--------------------- script/embedded.go | 23 ++- 2 files changed, 216 insertions(+), 185 deletions(-) diff --git a/assets.go b/assets.go index ef120e8..d7dcae3 100644 --- a/assets.go +++ b/assets.go @@ -242,99 +242,101 @@ Nvhiu30Mie06ub+k1ipSjt0dc4O9xM5zHnum+YjNJivxEwAA///CQZLfyAIAAA== "/eonza-assets/languages/en.yaml": { name: "en.yaml", local: "../eonza-assets/languages/en.yaml", - size: 4605, - modtime: 1601812961, + size: 4633, + modtime: 1601892240, compressed: ` -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 +1ftPAAAA//+9FUgKGRIAAA== `, }, "/eonza-assets/languages/ru.yaml": { name: "ru.yaml", local: "../eonza-assets/languages/ru.yaml", - size: 7216, - modtime: 1601812984, + size: 7269, + modtime: 1601892277, compressed: ` -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 +t8yiQvwnAAD//9jencZlHAAA `, }, @@ -385,6 +387,20 @@ jlDI/wIJZW+TXwEAAP//M90lAMgDAAA= `, }, + "/eonza-assets/scripts/create-dir.yaml": { + name: "create-dir.yaml", + local: "../eonza-assets/scripts/create-dir.yaml", + size: 405, + modtime: 1601891683, + compressed: ` +H4sIAAAAAAAC/4yPMU4DMRBFe5/iSykCRSgQlVtyj8jaHSWWHO8yO0ZKF6VG3IEbUAQRUeQM4xshe1do +oaKz/rP++zOQiI/bwRoguj1ZNExOaNV6NoB4CWSxXGwKXCwN0NLQ1KQ8ahK6baBnChYPBkiRU7QQTmSA +HYX+T2eJgotbC06A6R27/WDNavL3TnZz810JqkcOPVncG6DrxXexjgaYnpJnaidnqa6E4sg34+LHugGy +I7SeqZGODyMfvRNfzxinXw36plf91LO+51N+gZ71ko/6oV/5pNd81Et+nRf+53vTtT/qteebcuut+Q4A +AP//KxwG9pUBAAA= +`, + }, + "/eonza-assets/scripts/create-file.yaml": { name: "create-file.yaml", local: "../eonza-assets/scripts/create-file.yaml", @@ -579,18 +595,18 @@ AAD//+UH+h5jBQAA "/eonza-assets/scripts/if.eonza.yaml": { name: "if.eonza.yaml", local: "../eonza-assets/scripts/if.eonza.yaml", - size: 1152, - modtime: 1597297512, + size: 1213, + modtime: 1601893667, compressed: ` -H4sIAAAAAAAC/5STzW4TMRDH736KUaqqIJGqgODgK+LABQ4grpW7mQRLXnvxR9TyIaWpxLUnLlwQbxBV -ihQVUl5h/EbI3k2ySRdB97Sej/9vZuxx6L3UI8cZgBYlcpDDQzT6g2AAXnqFHA72juXQeeGxRO33DhjA -AF2RHeknW96hqlJyfx3YGJXQIw42MABlRgrHqDg8ZQBB26A5eBuQVcKK0nHWb4pA5XAs7FYNjS3T/FmF -HB6t45V0vh18WBg9kF4a7VrxTxiAqbI19Qs5rf5bCdXQ9G20xsImZxbKngbeztPG38rTOBIJtpN41Jy2 -KsmG4KvgN+c+9Hqtw8tXb7aQRVndQhamrITFBNqhPv4btXY7b9cW6bF07TI2+vg+CLVWTt9YqJAuLDl2 -JqkCdsxShX9MEk+7Rnnq05XerSmp/f80JVq6rZZ6R73OcGM7ox/2WHrqmYG6Jh3Xe/Js9RiFAldYWdVl -rV40h+fKIbwVVooTVc+svXEcXgzhdWutbNiSpx90HSe0oN9xCvEintNPuqErWsTLHQ59p3mc0Jx+0ZyW -tKRZvAS6ollOn9EyTmnWwadvdEPLeB6ncRIv6Dp+SeJAXzNrwQozQA6f+gxADjft3mvAD/Ki3YePzdj2 -T8zgbJ8BfGZ/AgAA//9yvvKcgAQAAA== +H4sIAAAAAAAC/7STzW4TMRDH736KUaqqIJGqgODgK+LABQ4grpW7mQRLXnvxR5TyIaWpxLUnLlwQbxBV +ihQVUl5h/EbI3k2ySRdxYk/rmfn/f7bH49B7qUeOMwAtSuQgh8do9AfBALz0CjkcHZzKofPCY4naHxwx +gAG6IifST468Q1UlcX9T2ASV0CMONjAAZUYKx6g4PGUAQdugOXgbkFXCitJx1m82gcrhWNidPTSxTPPn +FXJ4tKlX0vl28XFh9EB6abRr1T9hAKbK0XReyLL6b21UQ9O39RoLm5LZKGcaeFunjb+j0zgSCbYnPGlW +OzvJgeCr4LfrPvR6rcXLV292kEVZ3UEWpqyExQTaoz7+G7VOO283EemxdO1tbP3xfRBq45y+sVAhNSwl +OiVDqRAn0nnXpdtm99qgAnY0QoV/tAEnXX2Y+PQe/suNiJZv61y9k15nubGd1Q97LM1JZqCuSaf1kD1b +v2ShwBVWVvUB1+PA4blyCG+FleJM1XfWHlcOL4bwujWTNuzY0w+6iVNa0u84g3gZL+gn3dI1LePVHoe+ +0yJOaUG/aEErWtE8XgFd0zzL57SKM5p38Okb3dIqXsRZnMZLuolfkjnQ18xassIMkMOnPgOQw+1x7zXg +B3lK78PH5toOz8zg/JABfGZ/AgAA///BX86ovQQAAA== `, }, @@ -818,16 +834,16 @@ B62MxGD0UJeL0aClJT2qaMIZzWu0dyIr25Zpd4O7ORUxUPs/tMU92UAEXzjdBGQrqoo6o18gW111ulef "/eonza-assets/scripts/while.yaml": { name: "while.yaml", local: "../eonza-assets/scripts/while.yaml", - size: 997, - modtime: 1597323909, + size: 1058, + modtime: 1601893683, compressed: ` -H4sIAAAAAAAC/5RTQa7TMBDd+xSjVFVBIqiAYOEte1iAxLIyySi15NjBHodWwIING47BDVgBFf8M7o2+ -7KRt0qb6/2cTzxvPezPjGYdEUleOMwAtauTweS0VMgCSpJDDYrZKyGzBAEp0RYLiISFrVE0fkzsShDVq -6nEldMXBegagTKWwRcXhFQPw2nrNgaxH1ggrasdZ3ssr6Wio/rQwupQkjXZJkLYNcnjJAEyT0Jg5pLDu -dCBqhU32kKsVNjoTUfIksuejOG3oIk5jJaLYWeCyt0aZJMBT4+lk55BlA+PN2/cjyaJuLiQLUzfCYhQ6 -U31xTbVzO7JHRBLWbpjGiR8/eaGOzPFrhfLIITnOOqk8TvRS+Ts6iZupVm4oPunDipKa7lOUGPAOSsqW -2eR1YydvP8tYHN2kgbpTWnWj//owjEKBMqZ7tm5BOHyIP3g32ALrR9Hh1/572IWb8Dv83/8Mf2H/I/wJ -/8JuRHP9VmFK5PA1Z9Bt3CmdR1n2JO3AY/jSVzT/aMrtnAF8Y7cBAAD//+93eerlAwAA +H4sIAAAAAAAC/7RTsc7TMBDe/RSnVFVBIqiAYPDKDgNIjJVJjtSSYwf7HFoBAwsLj8EbMAEVPIP7RshO +2iRtKqa/S33f+fu+c+7OIZHUleMMQIsaOXzYSoUMgCQp5LBabBKyWDGAEl2RoHhIyBZV03NyR4KwRk09 +roSuOFjPAJSpFLaoODxjAF5brzmQ9cgaYUXtOMt7eyUdjd0fFkaXkqTRLhnSvkEOTxmAaRIaK4dE604n +oVbYFI+1WmFjMgmlTBJ7POFpQ1c8jZWIZhfEdR9NKkmAp8bTEOeQZaPgxcvXE8uibq4sC1M3wmI0unB9 +csu1SzuyZ0QS1m5cxqCP771QZ+X4a4XyyCElZinvpELcSUdujjdkL9qgPM40Qvn/tAF3c33YUZyHO/ki +YqQ7ele2zmavGzt7+1HG4twnD9Sd06bbm+enSRYKlDFdz7vt4vAm/sGr0QpZP2GH78cv4RD+hh/hz/Fb ++AXHr+Fn+B0OE5nbtwpTIodPOYNuXYdy7mXZg7RA9+Fj/6LlW1PulwzgM/sXAAD//1P8EsAiBAAA `, }, @@ -5208,82 +5224,83 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 16342, - modtime: 1601813918, + size: 16428, + modtime: 1601912799, compressed: ` -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 `, }, @@ -10142,6 +10159,7 @@ var _escDirs = map[string][]os.FileInfo{ _escData["/eonza-assets/scripts/bash.yaml"], _escData["/eonza-assets/scripts/chdir.yaml"], _escData["/eonza-assets/scripts/copy-file.yaml"], + _escData["/eonza-assets/scripts/create-dir.yaml"], _escData["/eonza-assets/scripts/create-file.yaml"], _escData["/eonza-assets/scripts/curdir.yaml"], _escData["/eonza-assets/scripts/delete-dir.yaml"], diff --git a/script/embedded.go b/script/embedded.go index 61a4456..203543d 100644 --- a/script/embedded.go +++ b/script/embedded.go @@ -14,6 +14,7 @@ import ( "time" "github.com/gentee/gentee" + "github.com/gentee/gentee/vm" "gopkg.in/yaml.v2" ) @@ -125,12 +126,12 @@ var ( } ) -func IsCond(item *ConditionItem) (err error) { +func IsCond(rt *vm.Runtime, item *ConditionItem) (err error) { var ( i int64 val, s string ) - if len(item.Var) == 0 { + if len(item.Var) == 0 && len(item.Value) == 0 { return fmt.Errorf(`empty variable in If Statement`) } if val, err = Macro(item.Value); err != nil { @@ -149,6 +150,18 @@ func IsCond(item *ConditionItem) (err error) { } item.result = s == val } + case `fileexists`: + if len(item.Var) > 0 { + if s, err = GetVar(item.Var); err != nil { + return + } + } else { + s = val + } + if i, err = vm.ExistFile(rt, s); err != nil { + return + } + item.result = i != 0 default: return fmt.Errorf(`Unknown comparison type: %s`, item.Cmp) } @@ -158,7 +171,7 @@ func IsCond(item *ConditionItem) (err error) { return } -func Condition(casevar, list string) (ret int64, err error) { +func Condition(rt *vm.Runtime, casevar, list string) (ret int64, err error) { if len(casevar) > 0 { var used int64 if used, err = GetVarBool(casevar); err != nil || used != 0 { @@ -173,7 +186,7 @@ func Condition(casevar, list string) (ret int64, err error) { if count == 0 { ret = 1 } else { - if err = IsCond(&cond[0]); err != nil { + if err = IsCond(rt, &cond[0]); err != nil { return } // collect OR @@ -190,7 +203,7 @@ func Condition(casevar, list string) (ret int64, err error) { continue } } - if err = IsCond(&cond[i]); err != nil { + if err = IsCond(rt, &cond[i]); err != nil { return } cond[0].result = cond[i].result From 8d1186c46b1091a79bcb32f97f00f7da2ae2a63e Mon Sep 17 00:00:00 2001 From: gentee Date: Tue, 6 Oct 2020 13:56:58 +0500 Subject: [PATCH 13/18] Fixed module name --- assets.go | 136 +++++++++++++++++++++++++++--------------------------- go.mod | 2 +- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/assets.go b/assets.go index d7dcae3..a649b84 100644 --- a/assets.go +++ b/assets.go @@ -5224,83 +5224,83 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 16428, - modtime: 1601912799, + size: 16473, + modtime: 1601966800, compressed: ` -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 +AqP/CQAA///4nnixWUAAAA== `, }, diff --git a/go.mod b/go.mod index b6fd66e..49c5080 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module eonza +module github.com/gentee/eonza go 1.12 From 7d31bb2b1f487c69972cd273922b1f929c8d27b3 Mon Sep 17 00:00:00 2001 From: gentee Date: Tue, 6 Oct 2020 16:41:13 +0500 Subject: [PATCH 14/18] Fixed module name --- auth.go | 6 +++++- go.mod | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/auth.go b/auth.go index 8d94977..95de7d5 100644 --- a/auth.go +++ b/auth.go @@ -74,6 +74,11 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { return echo.NewHTTPError(http.StatusForbidden, "Access denied") } } + url := c.Request().URL.String() + if url == `/ping` { + return next(c) + } + host := c.Request().Host if offPort := strings.LastIndex(c.Request().Host, `:`); offPort > 0 { host = host[:offPort] @@ -101,7 +106,6 @@ func AuthHandle(next echo.HandlerFunc) echo.HandlerFunc { mutex.Lock() defer mutex.Unlock() - url := c.Request().URL.String() if len(storage.Settings.PasswordHash) > 0 && (url == `/` || strings.HasPrefix(url, `/api`) || strings.HasPrefix(url, `/ws`) || strings.HasPrefix(url, `/task`)) { hashid := getCookie(c, "hashid") diff --git a/go.mod b/go.mod index 49c5080..b6fd66e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gentee/eonza +module eonza go 1.12 From bffc8599def6b550c074ab80ebe5662b5b9b505e Mon Sep 17 00:00:00 2001 From: gentee Date: Wed, 7 Oct 2020 08:54:57 +0500 Subject: [PATCH 15/18] Fixed socket disconnection --- api.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api.go b/api.go index 5d7413e..03feb72 100644 --- a/api.go +++ b/api.go @@ -26,6 +26,7 @@ type CompileResponse struct { type RunResponse struct { Success bool `json:"success"` + Port int `json:"port"` ID uint32 `json:"id"` Error string `json:"error,omitempty"` } @@ -184,7 +185,7 @@ func runHandle(c echo.Context) error { if console { return c.Blob(http.StatusOK, ``, data.Bytes()) } - return c.JSON(http.StatusOK, RunResponse{Success: true, ID: header.TaskID}) + return c.JSON(http.StatusOK, RunResponse{Success: true, Port: header.HTTP.Port, ID: header.TaskID}) } func pingHandle(c echo.Context) error { From 354755318c39344bc246fd8d82400048875eeff6 Mon Sep 17 00:00:00 2001 From: gentee Date: Thu, 8 Oct 2020 16:32:44 +0500 Subject: [PATCH 16/18] Increased TimeoutOpen --- assets.go | 277 +++++++++++++++++++++++++++--------------------------- const.go | 2 +- 2 files changed, 140 insertions(+), 139 deletions(-) diff --git a/assets.go b/assets.go index a649b84..fd1c21a 100644 --- a/assets.go +++ b/assets.go @@ -5224,83 +5224,84 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== "/eonza-assets/themes/default/templates/index.tpl": { name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", - size: 16473, - modtime: 1601966800, + size: 16631, + modtime: 1602156634, compressed: ` -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 -AqP/CQAA///4nnixWUAAAA== +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 +6L8CAAD//3AEUQr3QAAA `, }, @@ -5341,69 +5342,69 @@ h+TsfwEAAP//D3J6AGEOAAA= "/eonza-assets/themes/default/templates/script.tpl": { name: "script.tpl", local: "../eonza-assets/themes/default/templates/script.tpl", - size: 12639, - modtime: 1601810862, + size: 12657, + modtime: 1602064869, compressed: ` -H4sIAAAAAAAC/9Q7/W/bOJa/+694UdeVvYnsJC0Ge7Ll2d12iu2h0xZN7wYDw8DQEm1zIpFaknLiS/2/ -H/ghi/qwk3QwOFwXWIvke4/vm++RmenZ209vvv76+SfYyCyd9ablD0bJDHoA0wxLBPEGcYFl5BVyFfzN -mx0WKMpw5G0JvssZlx7EjEpMZeTdkURuogRvSYwDPbgglEiC0kDEKMXR1ejS0JFEpng2n8Poq/qCxWI6 -NnNqNSX0FjhOI4/EjHqw4XgVefP56M3bj4vFeIW2an5EYuaB3OU48kiG1nh8H2h4I0NFRGwYl3Eh4fuo -NYjJXYrFBmPZohQLMd4WWJLVbpQROoqFeCb2ilGJ7rBgGf5OCpjR/0EWbzrWFu1NlyzZzXq9aUK2QBKI -wEN5bghvA5TnoIlG3gaT9UaGV5eX/YleVv8MSLBEHBRozFLGI2+ZFhgSxG8xDa48SDAVZlyiaUTJWLpE -POgyd3PVxRM5ijGfKSD76a7GG5IfxnGKhIi8DAXXoNQX3GkhgiVLE8jvgx+8A2hoeRcSyUK8UYO5+V44 -QBLfy6AGCVEEQr4jlIgNTuBH8F/8cKX+50MI/ovVauWX+I7SlPNAileyZDHnSlPbgKwi7+zMkH4fM3rg -Yfbw0J7d75UWFLGSdgn1gQhZQelFBaq0Y0Dnc7KC0XtxE3OSy8XC1eFSUsuKlXEKQt4UIsc0wYlXmjnn -JEN855Uy3G2IxJDddyjbA1bIlFCcwN/jlMS3kSd2ImZZhmgyuBp6lQ1dDYkMpanW02yFghwVAh8EfkmX -Ip/0hWGrX/E/1gLMTgqkjfZUiVqeo0Q8LdH1EyVK0a4pEMeiyPAz5Zk6Pvh99jmQb4slWT54mjySZFg0 -BVpyjG6PyDOfY5rUne9oeKsZm2zMlIp2c7rA6Tylkg1aCtgGGUtUnpRo6dVzEVrO+oSuWF/nHrRsrsI2 -EBt2F3lErBjPYAaX3qyvPp+AETMqWIq9Wd9+PQEnZWtv1k/Z+gmwgsferC9YwWMcs6RB3g7EQY8q09eV -FaM0HiiNQQCv/5bfDydsi/kqZXfBLkSFZBMPSBJ5B0FKtaIUc2np5pxlhCprtEPtHSIpTspEaA5SzDnj -Zmr28JBhIdAaO7lK0372Tl8xzwhFstrNOZSCNce78mR65ekvC6U8NvKUD2+KbCmChN1Ry1xf6BwpMc/6 -f5C7NxzpEG2wxtkdLdm67mZrWazr7MSKVIufykmUlUsXkWgZRZe1EJ5KtExxmRr0oLHOZ1OZzN6/Dadj -mejv+Xz0/q2uxpLZdCx5F3xfFYD9Gs5HlOHHsIyS+iEcELtPskepcNkiwuVjeCudOuuIZu4Y5lhrzInJ -cUK2sxPav3K1q5fLkz8NfvDKeMzQfWBjEnQGc+IQdCAqCF09K4Dr1/n9pJmZY5blzPrfSrmXmgBCYUVw -mghVZTAaLiW1+b38GvwFbzGVQ69GTlU9RETe56+7HIu5ojVS8bsYqU9FbEloEnkPOeKhmrqALUpFuEVp -gcXem03HB4ZaR4g5x5w0KQktcPsAs9rR1ZfkiOocHFJGcYtZt+TTB14QKDSvOs4wTRS6ycZ6w37rjG0b -9DH7XtejxzFwmTR1BhUyYYX0VFjc6E/n8Ove5QiVuODeMfaO13aG7aOFg9VzjpKE0HUIl/k9XP2Q30+W -KL5dc1bQxFS/Ibx4/fr15FBaJMEqxffweyFUgxPooAOUkjUNlkhgVVA0DlxlSu2QLQFdizph0XD6mt1T -tDTtD6IJ4gkQmheyDmJdSruEDYFbvCvyyNuilCRI4jdZ8oE0PaosGcCLsyRtLatMbfsbQeg6xYGCOdRQ -DqwuaCqpZ9b9LUSYEKESShJ5Z42NGrHQqynmREQcCwS7XIYDphLzUve9rjalKvFMD6cr8RxzVb1S3GxA -4CdFsOdWeg2vbtV8j4XWq6eFVsrWZWh90J8nQ+uxTV/XNlXhqsurY3w7A91nmbrUTiTpOvh3gYUkjEJo -NinHHoS6xY08JG71V5WgI+V0KoO6BByauoIqCZpy6kANc26p/T1OmSjrLYhghVKBS6p6Ujf7prqe9awk -U1NlgOCxc4vwu77E0NcPvwtFw0CdBg84KyTmz8Q63JQ8EQXdEya6EM6CwMWx5O9boEEw65XkZz3lWhLi -DaJrnEAEDz2ADMsNS0SoB2AXB0M73F/07P+pA6+QOFGA47+qNRRLssUlovq3xlJhAsey4BSEZByPVFLG -IwNsSNlox3KgD1SFYUBVp0nkwC9ylbv+oVF8ffYqqL3l6K9jh9PkxP7aKY5uuXcE7O17lXJ787nEWZ4i -icFLCErZWniLRX16R02pMFosHAX3VgWNdURgEaMc/+vrzx8GOnEbhVrG9MyI4zxFMR6M5y+nM89fjNcX -UOIP4k1pAnFHZLwBZwYgRgKD/9IPD6JZyv5LlOUTf1KDm3bBpbIJNusCW7fAvC6wfxfMAUzwChWp7IB7 -cfnqP0o4ZYD9cNLbO2pL2fpaHw6u1lIszYmhXNZ///HdJz8EH685xtS/AP/dpy8/6xnVDqmJX/7x5aOe -2OE0ZXdq6qcvXz590XMcJ77aesU4DBTpW7xTlaTeoVQxWcFAT4w2SHy6o585yzGXu8Et3g0rO2gmIWoY -1Jt757d4d+4tvAvwpyJHtEzu/rmmOr/Fu8W5783mPpwrBs7BX0zHCnLmDx31NHxG6YriO/jvAg8MDzap -hGCn1WDw4DRawg0QNbFiVIbgr5B/MR7Dt2/q82a79i2QDZf90PziNAT/Bcpz34wTJFEIKM/fIonMVCOD -ALjH72DobK/T2WE0ypmQg9/GQiaE/iiRuCVJ9JcHsB0Z7H+7KDvoEOSGiJGtIvbDiobcYDrgWORM1SvR -zNnNmrFcHCnWR/psGNahwFDHnGdi3Qk/aVTkxia1yX2vRdCyCxH4vkPBYR9GMZLxZmCPsVmNEbP1Ye9D -Hjv0NktJa5Jo5LIV0KtN1Nqig3qIBQIRXE6AwNRQU8CjFNO13EyAnJ83NadxJM4gquDnZFGDUUbQQLrH -giiCzyovfsX3ElqWgASnWGJDzfRbc427RXxxQuEdm/yzkJLRji0U7Jlq0759U8ocqe4eziIo92ljPIMt -gD1gde60aXQiQ6R50NNNQkfk3fceiShlhSMBpZZIElbWIok9YEXoMvj/JcbM1WUQtJzhzFluG1QvSrRU -7n5siz8ap40eLKwOd+wypJjFo1u8e8MS5bgRXL2qM2w2qyXVyhfMTyvQ9f22Q0UFKse6zCrL5RoHJneY -/vms9pDQwUvtmaPnmqzcQHLHmyudmrTI6IrwbOD1FZemdOp7FzDIVeg13EtjHPoMy7nrKor5HHEV8SqO -fsWiae0my69clm2wWidW3D+Gfl1D77W8pbJBhUOSE8egqlp/G4ud+DHOVLySZP+yK3ifHJFPDsnviMpH -4tJNG98RMnfiTZYMHtT++6b3xplqWf7z5tPHUY64wAMF5fB3qJOzRJ28dWF16fpLfKMdPOywr73PVrvY -waSlUrVmC5IjGcWuWjp29MippSDNvewRombR0jSDEyT1y1SX5AkrZNhOkyeFchZVFWMev/zJIxKVqddm -qyNiHdab6aJNVJlfbFiRJjcxZ2laVhuWwEjo2a8sh3No+SvUYeOUYCr/pe+jdbbtoGRW62KaS84RoRRz -Vb7AeeQ2eTU1noM/XfKZ33YhV4ojemkL9WQe912OncQFd9iuzNhirjwUo+jy5Il5/V3utyxWf4r7dVdb -ddQjhvoO5Tnok6cIbm7twqMxkrL10fhI2fo5sfGBrf/vwsNcVNbDo2rmnxUdBzn+7AB5js+/er7Pv2M8 -C49VrOfn7RX9CF874mp660bQf95UnVqqp7nsgNTPZBDBfNE70pJABA91ub67K3xaX2gD4Uy3QixXBZ7o -KlG0mXY5ZitwQbV3+kJyQtd+Fx40wF3F1vdsR8X+qT1dY4uHfe80Iccao7wQm8GD6j7DQ+95of+QIKxa -2QvQV97lDL6XF11BbFkIawzthx1m0daGQ7erBt++ge9Dh3HqDfWbDY5vl+y+S9klVfN7FoF/6cPLl85Y -V+567uzs8W73eLfcxu1sC8t3UNcDrc8qYS6V0JVrNkGCq4WR++xwkdA7khmu2rnAnWh1QYdiN2aU4ljW -2jRz7LD4FkuI9J3eL3h5o8eDO/FfnAyGwy7gEaMsx6pBGpgWaj85AlYdinpeV9xHQPUbi0OyKYAt5o2D -QkuM8rVGbaV+J61lfaOrzrdJh250j2gwL2BF2/TLt6Uj9E2/sKKNaaeXPLXzr1j88c3/rI4WVnRQ68z2 -x3rt09Lan4wVVOLEccSy+mH6djthcZFhKlWn+lOK1ec/d++TQfnwP+y1T+dTaOUL57DXqrUe2S0ueB3L -lB2nsOwLaol19M8IDtybmJz02g+7Vl3uS5hR+X7oPGHYu3H9ENVzHj8eDlczugdVjf1XJG5HpiddLEoH -PFx5lwA/m4kKQqJlaARJMYXD31xcz+fqkFosqqXyzfhVuXRp5bE/B6c3N9Uh+H51g4S41EzcqK8K1nSg -esX8kUW1ZPwhBFqkqRNPytj1SWMUO1fLk8bIdWhTMYVwWU2U2T3Ubl2bN7u11aMASzXomGvoQNfbLmKp -vMcRBY9rO9pX9ccQjVTz2pgkIQRXla5VoeDClFe1D/uLXmW8ur7KoA9Nbimny5QVguc5KZzxBlyZtytv -2Pf2PfeBdDo2f2A/Hev/kOJ/AwAA//+bq7iVXzEAAA== +H4sIAAAAAAAC/9Q7/W/bOJa/+694UdeVPYnsJC0Ge7Ll2d12iu2h0w6a3g0GhoGhJdrmRCI1JOXEl/p/ +P/BDFvVhJ+lgcLgusBHJ9x7fN98jPdOzt5/efPn15x9hI7N01puWfzBKZtADmGZYIog3iAssI6+Qq+Dv +3uywQFGGI29L8F3OuPQgZlRiKiPvjiRyEyV4S2Ic6MEFoUQSlAYiRimOrkaXho4kMsWz+RxGX9QXLBbT +sZlTqymht8BxGnkkZtSDDceryJvPR2/eflwsxiu0VfMjEjMP5C7HkUcytMbj+0DDGxkqImLDuIwLCd9G +rUFM7lIsNhjLFqVYiPG2wJKsdqOM0FEsxDOxV4xKdIcFy/A3UsCM/g+yeNOxtmhvumTJbtbrTROyBZJA +BB7Kc0N4G6A8B0008jaYrDcyvLq87E/0svpnQIIl4qBAY5YyHnnLtMCQIH6LaXDlQYKpMOMSTSNKxtIl +4kGXuZurLp7IUYz5TAHZT3c13pD8MI5TJETkZSi4BqW+4E4LESxZmkB+H3zvHUBDy7uQSBbijRrMzffC +AZL4XgY1SIgiEPIdoURscAI/gP/i+yv1Px9C8F+sViu/xHeUppwHUrySJYs5V5raBmQVeWdnhvT7mNED +D7OHh/bsfq+0oIiVtEuoD0TICkovKlClHQM6n5MVjN6Lm5iTXC4Wrg6XklpWrIxTEPKmEDmmCU680sw5 +JxniO6+U4W5DJIbsvkPZHrBCpoTiBP4RpyS+jTyxEzHLMkSTwdXQq2zoakhkKE21nmYrFOSoEPgg8Eu6 +FPmkLwxb/Yr/sRZgdlIgbbSnStTyHCXiaYmunyhRinZNgTgWRYafKc/U8cFvs8+BfFssyfLB0+SRJMOi +KdCSY3R7RJ75HNOk7nxHw1vN2GRjplS0m9MFTucplWzQUsA2yFii8qRES6+ei9By1id0xfo696BlcxW2 +gdiwu8gjYsV4BjO49GZ99fkEjJhRwVLszfr26wk4KVt7s37K1k+AFTz2Zn3BCh7jmCUN8nYgDnpUmb6u +rBil8UBpDAJ4/ff8fjhhW8xXKbsLdiEqJJt4QJLIOwhSqhWlmEtLN+csI1RZox1q7xBJcVImQnOQYs4Z +N1Ozh4cMC4HW2MlVmvazd/qCeUYoktVuzqEUrDnelSfTK09/WSjlsZGnfHhTZEsRJOyOWub6QudIiXnW +/5PcveFIh2iDNc7uaMnWdTdby2JdZydWpFr8VE6irFy6iETLKLqshfBUomWKy9SgB411PpvKZPb+bTgd +y0R/z+ej9291NZbMpmPJu+D7qgDs13A+ogw/hmWU1A/hgNh9kj1KhcsWES4fw1vp1FlHNHPHMMdaY05M +jhOynZ3Q/pWrXb1cnvxp8L1XxmOG7gMbk6AzmBOHoANRQejqWQFcv87vJ83MHLMsZ9b/Vsq91AQQCiuC +00SoKoPRcCmpze/l1+BveIupHHo1cqrqISLyfv6yy7GYK1ojFb+LkfpUxJaEJpH3kCMeqqkL2KJUhFuU +Fljsvdl0fGCodYSYc8xJk5LQArcPMKsdXX1JjqjOwSFlFLeYdUs+feAFgULzquMM00Shm2ysN+y3zti2 +QR+z73U9ehwDl0lTZ1AhE1ZIT4XFjf50Dr/uXY5QiQvuHWPveG1n2D5aOFg95yhJCF2HcJnfw9X3+f1k +ieLbNWcFTUz1G8KL169fTw6lRRKsUnwPvxdCNTiBDjpAKVnTYIkEVgVF48BVptQO2RLQtagTFg2nr9k9 +RUvT/iCaIJ4AoXkh6yDWpbRL2BC4xbsij7wtSkmCJH6TJR9I06PKkgG8OEvS1rLK1La/EYSuUxwomEMN +5cDqgqaSembd30KECREqoSSRd9bYqBELvZpiTkTEsUCwy2U4YCoxL3Xf62pTqhLP9HC6Es8xV9Urxc0G +BH5UBHtupdfw6lbN91hovXpaaKVsXYbWB/15MrQe2/R1bVMVrrq8Osa3M9B9lqlL7USSroM/CiwkYRRC +s0k59iDULW7kIXGrv6oEHSmnUxnUJeDQ1BVUSdCUUwdqmHNL7R9xykRZb0EEK5QKXFLVk7rZN9X1rGcl +mZoqAwSPnVuE3/Ulhr5++F0oGgbqNHjAWSExfybW4abkiSjonjDRhXAWBC6OJX/fAg2CWa8kP+sp15IQ +bxBd4wQieOgBZFhuWCJCPQC7OBja4f6iZ/9PHXiFxIkCHH+n1lAsyRaXiOrfGkuFCRzLglMQknE8UkkZ +jwywIWWjHcuBPlAVhgFVnSaRA7/IVe76p0bx9dmroPaWo+/GDqfJif21Uxzdcu8I2Nv3KuX25nOJszxF +EoOXEJSytfAWi/r0jppSYbRYOArurQoa64jAIkY5/veXnz4MdOI2CrWM6ZkRx3mKYjwYz19OZ56/GK8v +oMQfxJvSBOKOyHgDzgxAjAQG/6UfHkSzlP2XKMsn/qQGN+2CS2UTbNYFtm6BeV1gfxTMAUzwChWp7IB7 +cfnqP0o4ZYD9cNLbO2pL2fpaHw6u1lIszYmhXNZ///HdJz8EH685xtS/AP/dp88/6RnVDqmJX/75+aOe +2OE0ZXdq6sfPnz991nMcJ77aesU4DBTpW7xTlaTeoVQxWcFAT4w2SHy6oz9zlmMud4NbvBtWdtBMQtQw +qDf3zm/x7txbeBfgT0WOaJnc/XNNdX6Ld4tz35vNfThXDJyDv5iOFeTMHzrqafiM0hXFd/DfBR4YHmxS +CcFOq8HgwWm0hBsgamLFqAzBXyH/YjyGr1/V58127VsgGy77ofmL0xD8FyjPfTNOkEQhoDx/iyQyU40M +AuAev4Ohs71OZ4fRKGdCDn4bC5kQ+oNE4pYk0d8ewHZksP/touygQ5AbIka2itgPKxpyg+mAY5EzVa9E +M2c3a8ZycaRYH+mzYViHAkMdc56JdSf8pFGRG5vUJve9FkHLLkTg+w4Fh30YxUjGm4E9xmY1RszWh70P +eezQ2ywlrUmikctWQK82UWuLDuohFghEcDkBAlNDTQGPUkzXcjMBcn7e1JzGkTiDqIKfk0UNRhlBA+ke +C6IIflZ58Qu+l9CyBCQ4xRIbaqbfmmvcLeKLEwrv2ORfhZSMdmyhYM9Um/b1q1LmSHX3cBZBuU8b4xls +AewBq3OnTaMTGSLNg55uEjoi7773SEQpKxwJKLVEkrCyFknsAStCl8H/LzFmri6DoOUMZ85y26B6UaKl +cvdjW/zZOG30YGF1uGOXIcUsHt3i3RuWKMeN4OpVnWGzWS2pVr5g/rQCXd9vO1RUoHKsy6yyXK5xYHKH +6Z/Pag8JHbzUnjl6rsnKDSR3vLnSqUmLjK4IzwZeX3FpSqe+dwGDXIVew700xqHPsJy7rqKYzxFXEa/i +6FcsmtZusvzKZdkGq3Vixf1j6Nc19F7LWyobVDgkOXEMqqr1t7HYiR/iTMUrSfYvu4L3yRH55JD8hqh8 +JC7dtPENIXMn3mTJ4EHtv296b5ypluU/bz59HOWICzxQUA5/hzo5S9TJWxdWl66/xDfawcMO+9r7bLWL +HUxaKlVrtiA5klHsqqVjR4+cWgrS3MseIWoWLU0zOEFSv0x1SZ6wQobtNHlSKGdRVTHm8cufPCJRmXpt +tjoi1mG9mS7aRJX5xYYVaXITc5amZbVhCYyEnv3CcjiHlr9CHTZOCaby3/o+WmfbDkpmtS6mueQcEUox +V+ULnEduk1dT4zn40yWf+W0XcqU4ope2UE/mcd/l2ElccIftyowt5spDMYouT56Y19/kfsti9Ze4X3e1 +VUc9YqhvUJ6DPnmK4ObWLjwaIylbH42PlK2fExsf2Pr/LjzMRWU9PKpm/lnRcZDjrw6Q5/j8q+f7/DvG +s/BYxXp+3l7Rj/C1I66mt24E/fOm6tRSPc1lB6R+JoMI5ovekZYEInioy/XNXeHT+kIbCGe6FWK5KvBE +V4mizbTLMVuBC6q90xeSE7r2u/CgAe4qtr5nOyr2T+3pGls87HunCTnWGOWF2AweVPcZHnrPC/1DgrBq +ZS9AX3mXM/heXnQFsWUhrDG0H3aYRVsbDt2uGnz9Cr4PHcapN9RvNji+XbL7LmWXVM3fswj8Sx9evnTG +unLXc2dnj3e7x7vlNm5nW1i+g7oeaH1WCXOphK5cswkSXC2M3GeHi4Tekcxw1c4F7kSrCzoUuzGjFMey +1qaZY4fFt1hCpO/0fsHLGz0e3In/4mQwHHYBjxhlOVYN0sC0UPvJEbDqUNTzuuI+AqrfWCqS4+/KLGvY +/m7cEsmW98ZloSVY+X6jNld/J61lfcerTrxJh7Z012gwL2BF2/TL16Yj9E0HsaKNaae7PLXzr1j8+c3/ +qh4XVnRQ69X2x7rv09LaPxkrqMSJ45plPcT0fXfC4iLDVKre9ccUq89/7d4ng/KnAMNe+7w+hVa+eQ57 +rerrkd3igtexTCFyCsu+qZZYR39YAHV3n/TaT71WXe7bmFH5fug8atjbcv001XOeQx4OlzW6K1Wt/hck +bkemS10sSgc8XIKXAD+ZiQpComVoBEkxhcOvMK7nc3VsLRbVUvmK/KpcurTy2D8Hpzd31yH4fnWnhLjU +TNyorwrW9KR6xfzsoloy/hACLdLUiSdl7PqkMYqdq2VOY+Q6tKmhQrisJsp8H2q3rs2b3drqUYClGnTM +NXSgK3AXsVTe44iCx7Ud7Tv7Y4hGqnltTJIQgqtK16p0cGHKy9uH/UWvMl5dX2XQhya3lNNlygrB85wU +zngDrszblTfse/ue+2Q6HZuf3E/H+j+t+N8AAAD//yjds31xMQAA `, }, diff --git a/const.go b/const.go index e82fc1e..173370e 100644 --- a/const.go +++ b/const.go @@ -27,7 +27,7 @@ const ( PortsPool = 1000 TasksLimit = 50 TimeFormat = `2006/01/02 15:04:05` - TimeoutOpen = 3000 + TimeoutOpen = 4000 SourceCode = `source-code` DefLang = 0 // ConsolePrefix is the prefix of eonza console version From 9d285498981d9993c61697f8a991eed91e82994e Mon Sep 17 00:00:00 2001 From: gentee Date: Thu, 8 Oct 2020 16:38:15 +0500 Subject: [PATCH 17/18] Version 1.2.0 --- const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/const.go b/const.go index 173370e..09d421d 100644 --- a/const.go +++ b/const.go @@ -6,7 +6,7 @@ package main const ( // Version of the application - Version = "1.1.0+1" + Version = "1.2.0+1" // DefPort is the default web-server port DefPort = 3234 // DefTheme is the default web-server theme From 3423e81296061aee356661c6a7318e5c159b7937 Mon Sep 17 00:00:00 2001 From: gentee Date: Thu, 8 Oct 2020 16:44:33 +0500 Subject: [PATCH 18/18] Updated assets --- assets.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets.go b/assets.go index fd1c21a..dbffc4d 100644 --- a/assets.go +++ b/assets.go @@ -243,7 +243,7 @@ Nvhiu30Mie06ub+k1ipSjt0dc4O9xM5zHnum+YjNJivxEwAA///CQZLfyAIAAA== name: "en.yaml", local: "../eonza-assets/languages/en.yaml", size: 4633, - modtime: 1601892240, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/4xYW28cuw1+168gDhCcc4Dafp+XwMeXxqhjp14nwUHRB67EmVVXI0102Ut/fUFKsztO UrRPIj9S1IjibRfXIeYOrnlRuA6lMiUr1NkGnzq4roQAO6r8jhQao0fTwbUxgOBpDzqMI3oDOUDeECQd @@ -286,7 +286,7 @@ nuGL2OaXN5sq9P3HCHjB+bPUPf0b8Ea5oSfFOo9WFX7Ji6HYhZ1Taaoa84+8k/g79/zglzd5UHUYumhY name: "ru.yaml", local: "../eonza-assets/languages/ru.yaml", size: 7269, - modtime: 1601892277, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/5xZzW4jxxG+91MMDCxsA1nprsteA8RBgiA5BTm0hi1qoOHMuHtGPznxx2vtgrIUb5ys EFur3WyCnIxQFCmNSJF8heo3CqqqZzhDctdJbmJ3TXV11VdVX7XkbqzTHQ+ubRvGtg1DGNiuPRNyN85w @@ -391,7 +391,7 @@ jlDI/wIJZW+TXwEAAP//M90lAMgDAAA= name: "create-dir.yaml", local: "../eonza-assets/scripts/create-dir.yaml", size: 405, - modtime: 1601891683, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/4yPMU4DMRBFe5/iSykCRSgQlVtyj8jaHSWWHO8yO0ZKF6VG3IEbUAQRUeQM4xshe1do oaKz/rP++zOQiI/bwRoguj1ZNExOaNV6NoB4CWSxXGwKXCwN0NLQ1KQ8ahK6baBnChYPBkiRU7QQTmSA @@ -596,7 +596,7 @@ AAD//+UH+h5jBQAA name: "if.eonza.yaml", local: "../eonza-assets/scripts/if.eonza.yaml", size: 1213, - modtime: 1601893667, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/7STzW4TMRDH736KUaqqIJGqgODgK+LABQ4grpW7mQRLXnvxR5TyIaWpxLUnLlwQbxBV ihQVUl5h/EbI3k2ySRdxYk/rmfn/f7bH49B7qUeOMwAtSuQgh8do9AfBALz0CjkcHZzKofPCY4naHxwx @@ -835,7 +835,7 @@ B62MxGD0UJeL0aClJT2qaMIZzWu0dyIr25Zpd4O7ORUxUPs/tMU92UAEXzjdBGQrqoo6o18gW111ulef name: "while.yaml", local: "../eonza-assets/scripts/while.yaml", size: 1058, - modtime: 1601893683, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/7RTsc7TMBDe/RSnVFVBIqiAYPDKDgNIjJVJjtSSYwf7HFoBAwsLj8EbMAEVPIP7RshO 2iRtKqa/S33f+fu+c+7OIZHUleMMQIsaOXzYSoUMgCQp5LBabBKyWDGAEl2RoHhIyBZV03NyR4KwRk09 @@ -5225,7 +5225,7 @@ OENODWZ7LY47MIPW69k1LvAOyvLmmzb/UTqNMHdfi2v2X+SfAAAA//9sLKc6ggcAAA== name: "index.tpl", local: "../eonza-assets/themes/default/templates/index.tpl", size: 16631, - modtime: 1602156634, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/9x8bY/jNpL/e3+Kav13YnnHkmcms0Dgtpx/MNnD4W7uElzPbhAYjYCWaJvTEqkjKbu9 HX/3Q5GULEqyuyebxT3kRY9EFn+sJxaLRTmLm+9/+PDp5x//DDtd5MvRov6HkmwJI4BFQTWBdEekojoJ @@ -5343,7 +5343,7 @@ h+TsfwEAAP//D3J6AGEOAAA= name: "script.tpl", local: "../eonza-assets/themes/default/templates/script.tpl", size: 12657, - modtime: 1602064869, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/9Q7/W/bOJa/+694UdeVPYnsJC0Ge7Ll2d12iu2h0w6a3g0GhoGhJdrmRCI1JOXEl/p/ P/BDFvVhJ+lgcLgusBHJ9x7fN98jPdOzt5/efPn15x9hI7N01puWfzBKZtADmGZYIog3iAssI6+Qq+Dv @@ -5473,7 +5473,7 @@ zm1QLulKESOvfWinyh+HHc7E65ad6v2xzevbvv/6+Nmqon9yMXSqf6gcuk5tyaZYGd6bQNDw3QFsdt9g name: "tasks.tpl", local: "../eonza-assets/themes/default/templates/tasks.tpl", size: 3254, - modtime: 1601635616, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/8xWTY/bNhC9+1dMlbiSsZa1CdAevJJSoEXRQw9Fs5disWi4JLUiliIFcvwFQ/+9IPVh yXaDZJtDHSBLSe/NvBlynpRaakSNgIeaZwHyPSb7GHlVS4I8AMGyAIl9sUE+A0i3MdUKiVDcgMWD5FlQ @@ -5501,7 +5501,7 @@ AAD//wrAIv+2DAAA name: "tree.tpl", local: "../eonza-assets/themes/default/templates/tree.tpl", size: 11799, - modtime: 1601822054, + modtime: 1602157220, compressed: ` H4sIAAAAAAAC/8w6627jxtX/9RTH+rJLEivKdr5NUFCX7WIXBVoESYEiBQpDSIbkyBpnOMNyhrJVR+9e zIXkkCIpeZ0F6h+2OJxzvx95KZKC5BLkIcerqcRP8voplDjLKZJ4CiRdTWWBMZE4m64nAABLSmAfxoSl