diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c98ec2c091..167c6ad829a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,7 @@ * **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin) * **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur) * **Graph**: Support for histograms [#600](https://github.com/grafana/grafana/issues/600) -* **Elasticsearch**: Support histogram aggregations [#3164](https://github.com/grafana/grafana/issues/3164) - +* **Prometheus**: Support table response formats (column per label) [#6140](https://github.com/grafana/grafana/issues/6140), thx [@mtanda](https://github.com/mtanda) ## Minor Enchancements @@ -20,10 +19,12 @@ * **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky) * **Templating**: Data source variable now supports multi value and panel repeats [#7030](https://github.com/grafana/grafana/issues/7030) thx [@mtanda](https://github.com/mtanda) * **Telegram**: Telegram alert is not sending metric and legend. [#8110](https://github.com/grafana/grafana/issues/8110), thx [@bashgeek](https://github.com/bashgeek) +* **Graph**: Support dashed lines [#514](https://github.com/grafana/grafana/issues/514), thx [@smalik03](https://github.com/smalik03) ## Fixes * **Table Panel**: Fixed annotation display in table panel, [#8023](https://github.com/grafana/grafana/issues/8023) * **Dashboard**: If refresh is blocked due to tab not visible, then refresh when it becomes visible [#8076](https://github.com/grafana/grafana/issues/8076) thanks [@SimenB](https://github.com/SimenB) +* **Snapshots**: Fixed problem with annotations & snapshots [#7659](https://github.com/grafana/grafana/issues/7659) # 4.2.0 (2017-03-22) ## Minor Enhancements diff --git a/conf/defaults.ini b/conf/defaults.ini index 9955c22ca17..8eca55fc67c 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -25,7 +25,7 @@ plugins = data/plugins #################################### Server ############################## [server] -# Protocol (http or https) +# Protocol (http, https, socket) protocol = http # The ip address to bind to, empty will bind to all interfaces @@ -57,6 +57,9 @@ enable_gzip = false cert_file = cert_key = +# Unix socket path +socket = /tmp/grafana.sock + #################################### Database ############################ [database] # You can configure the database connection by specifying type, host, name, user and password @@ -444,3 +447,4 @@ secret_key = url = username = password = +public_url = diff --git a/conf/sample.ini b/conf/sample.ini index 87505221790..84328e7d537 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -26,7 +26,7 @@ # #################################### Server #################################### [server] -# Protocol (http or https) +# Protocol (http, https, socket) ;protocol = http # The ip address to bind to, empty will bind to all interfaces @@ -59,6 +59,9 @@ ;cert_file = ;cert_key = +# Unix socket path +;socket = + #################################### Database #################################### [database] # You can configure the database connection by specifying type, host, name, user and password @@ -399,5 +402,6 @@ [external_image_storage.webdav] ;url = +;public_url = ;username = ;password = diff --git a/docs/Makefile b/docs/Makefile index e5c555f8019..c79d3087492 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,4 +1,4 @@ -.PHONY: all default docs docs-build docs-shell shell test +.PHONY: all default docs docs-build docs-shell shell checkvars # to allow `make DOCSPORT=9000 docs` DOCSPORT := 3004 @@ -11,23 +11,24 @@ DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005 +VERSION := $(shell head -n 1 VERSION) default: docs +checkvars: +ifndef ENV + $(error ENV is undefined set via ENV=staging or ENV=prod as argument to make) +endif + docs: docs-build $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004" -test: docs-build - $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "ls -la /site/content" - -docs-watch: docs-build +watch: docs-build $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs" -publish: docs-build - $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs root" - -publish-prod: docs-build - $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root" +publish: checkvars docs-build + $(info Publishing ENV=${ENV} and VERSION=${VERSION}) + $(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh ${ENV}-docs ${VERSION}" docs-build: docker build -t "$(DOCKER_DOCS_IMAGE)" --no-cache . diff --git a/docs/VERSION b/docs/VERSION index fd2a01863fd..2fa2c5705ad 100644 --- a/docs/VERSION +++ b/docs/VERSION @@ -1 +1 @@ -3.1.0 +v4.2 diff --git a/docs/sources/archive.md b/docs/sources/archive.md index af4ab5e7a8f..7102395f4c7 100644 --- a/docs/sources/archive.md +++ b/docs/sources/archive.md @@ -12,10 +12,7 @@ weight = 200 Here you can find links to older versions of the documentation that might be better suited for your version of Grafana. -- [Latest](/) -- [Version 3.1](/v3.1) -- [Version 3.0](/v3.0) -- [Version 2.6](/v2.6) -- [Version 2.5](/v2.5) -- [Version 2.1](/v2.1) -- [Version 2.0](/v2.0) +- [Latest](http://docs.grafana.org) +- [Version 4.2](http://docs.grafana.org/v4.2) +- [Version 3.1](http://docs.grafana.org/v3.1) +- [Version 3.0](http://docs.grafana.org/v3.0) diff --git a/docs/sources/features/panels/dashlist.md b/docs/sources/features/panels/dashlist.md index 5377c7c1941..b6f7d21c1c8 100644 --- a/docs/sources/features/panels/dashlist.md +++ b/docs/sources/features/panels/dashlist.md @@ -2,6 +2,7 @@ title = "Dashboard List" keywords = ["grafana", "dashboard list", "documentation", "panel", "dashlist"] type = "docs" +aliases = ["/reference/dashlist/"] [menu.docs] name = "Dashboard list" parent = "panels" diff --git a/docs/sources/features/panels/graph.md b/docs/sources/features/panels/graph.md index 7fbebcfeb97..fdd3f271184 100644 --- a/docs/sources/features/panels/graph.md +++ b/docs/sources/features/panels/graph.md @@ -2,6 +2,7 @@ title = "Graph Panel" keywords = ["grafana", "graph panel", "documentation", "guide", "graph"] type = "docs" +aliases = ["/reference/graph/"] [menu.docs] name = "Graph" parent = "panels" @@ -18,7 +19,8 @@ Clicking the title for a panel exposes a menu. The `edit` option opens addition options for the panel. ## General -![](/img/docs/v2/graph_general.png) + +![](/img/docs/v43/graph_general.png) The general tab allows customization of a panel's appearance and menu options. @@ -31,14 +33,14 @@ The general tab allows customization of a panel's appearance and menu options. ### Drilldown / detail link The drilldown section allows adding dynamic links to the panel that can link to other dashboards -or URLs +or URLs. Each link has a title, a type and params. A link can be either a ``dashboard`` or ``absolute`` links. -If it is a dashboard links, the `dashboard` value must be the name of a dashboard. If it's an -`absolute` link, the URL is the URL to link. +If it is a dashboard link, the `dashboard` value must be the name of a dashboard. If it is an +`absolute` link, the URL is the URL to the link. ``params`` allows adding additional URL params to the links. The format is the ``name=value`` with -multiple params separate by ``&``. Template variables can be added as values using ``$myvar``. +multiple params separated by ``&``. Template variables can be added as values using ``$myvar``. When linking to another dashboard that uses template variables, you can use ``var-myvar=value`` to populate the template variable to a desired value from the link. @@ -50,7 +52,7 @@ options. ## Axes & Grid -![](/img/docs/v2/graph_axes_grid_options.png) +![](/img/docs/v43/graph_axes_grid_options.png) The Axes & Grid tab controls the display of axes, grids and legend. @@ -74,7 +76,6 @@ values can be hidden from the legend using the ``Hide empty`` checkbox. ### Legend Values Additional values can be shown along-side the legend names: - - ``Total`` - Sum of all values returned from metric query - ``Current`` - Last value returned from the metric query - ``Min`` - Minimum of all values returned from metric query @@ -83,16 +84,16 @@ Additional values can be shown along-side the legend names: - ``Decimals`` - Controls how many decimals are displayed for legend values (and graph hover tooltips) The legend values are calculated client side by Grafana and depend on what type of -aggregation or point consolidation you metric query is using. All the above legend values cannot +aggregation or point consolidation your metric query is using. All the above legend values cannot be correct at the same time. For example if you plot a rate like requests/second, this is probably using average as aggregator, then the Total in the legend will not represent the total number of requests. It is just the sum of all data points received by Grafana. ## Display styles -![](/img/docs/v2/graph_display_styles.png) +![](/img/docs/v43/graph_display_styles.png) -Display styles controls properties of the graph. +Display styles control visual properties of the graph. ### Thresholds @@ -108,19 +109,19 @@ the graph crosses a particular threshold. ### Line Options -- ``Line Fill`` - Amount of color fill for a series. 0 is none. +- ``Line Fill`` - Amount of color fill for a series. 0 is none. - ``Line Width`` - The width of the line for a series. - ``Null point mode`` - How null values are displayed - ``Staircase line`` - Draws adjacent points as staircase ### Multiple Series -If there are multiple series, they can be display as a group. +If there are multiple series, they can be displayed as a group. - ``Stack`` - Each series is stacked on top of another -- ``Percent`` - Each series is draw as a percent of the total of all series +- ``Percent`` - Each series is drawn as a percentage of the total of all series -If you have stack enabled you can select what the mouse hover feature should show. +If you have stack enabled, you can select what the mouse hover feature should show. - Cumulative - Sum of series below plus the series you hover over - Individual - Just the value for the series you hover over @@ -134,11 +135,15 @@ If you have stack enabled you can select what the mouse hover feature should sho - ``All series`` - Show all series on the same tooltip and a x crosshairs to help follow all series -### Series specific overrides +### Series Specific Overrides -The section allows a series to be render different from the rest. For example, one series can be given -a thicker line width to make it standout. +The section allows a series to be rendered differently from the others. For example, one series can be given +a thicker line width to make it stand out. -## Time range +#### Dashes Drawing Style + +There is an option under Series overrides to draw lines as dashes. Set Dashes to the value True to override the line draw setting for a specific series. + +## Time Range ![](/img/docs/v2/graph_time_range.png) diff --git a/docs/sources/features/panels/singlestat.md b/docs/sources/features/panels/singlestat.md index 9f2edb7df05..eb9b2f26ea5 100644 --- a/docs/sources/features/panels/singlestat.md +++ b/docs/sources/features/panels/singlestat.md @@ -2,6 +2,7 @@ title = "Singlestat Panel" keywords = ["grafana", "dashboard", "documentation", "panels", "singlestat"] type = "docs" +aliases = ["/reference/singlestat/"] [menu.docs] name = "Singlestat" parent = "panels" diff --git a/docs/sources/features/panels/table_panel.md b/docs/sources/features/panels/table_panel.md index 249886e1f57..9ddc2cddaee 100644 --- a/docs/sources/features/panels/table_panel.md +++ b/docs/sources/features/panels/table_panel.md @@ -2,6 +2,7 @@ title = "Table Panel" keywords = ["grafana", "dashboard", "documentation", "panels", "table panel"] type = "docs" +aliases = ["/reference/table/"] [menu.docs] name = "Table" parent = "panels" diff --git a/docs/sources/http_api/dashboard.md b/docs/sources/http_api/dashboard.md index 12d46dc6aa4..053d4a8d329 100644 --- a/docs/sources/http_api/dashboard.md +++ b/docs/sources/http_api/dashboard.md @@ -221,10 +221,6 @@ Get all tags of dashboards } ] -## Dashboard from JSON file - -`GET /file/:file` - ## Search Dashboards `GET /api/search/` diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 176f843e86b..9cfee7140c4 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -313,7 +313,6 @@ example: auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user - allow_sign_up = false team_ids = allowed_organizations = @@ -644,6 +643,9 @@ Secret key. e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ### url Url to where Grafana will send PUT request with images +### public_url +Optional parameter. Url to send to users in notifications, directly appended with the resulting uploaded file name. + ### username basic auth username diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index f6d729054cd..07eb32874c7 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -94,8 +94,7 @@ td[class="stack-column-center"] {
-
- +
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 5652196b58c..58ea56cc8a7 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -255,6 +255,9 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R } if err := bus.Dispatch(cmd); err != nil { + if err == models.ErrSmtpNotEnabled { + return ApiError(412, err.Error(), err) + } return ApiError(500, "Failed to send alert notifications", err) } diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index ddf8681c3c8..1d99dac3d40 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -20,7 +20,7 @@ func GetDataSources(c *middleware.Context) Response { result := make(dtos.DataSourceList, 0) for _, ds := range query.Result { - dsItem := dtos.DataSource{ + dsItem := dtos.DataSourceListItemDTO{ Id: ds.Id, OrgId: ds.OrgId, Name: ds.Name, diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 564d86a25bf..2d8bdcbae03 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -84,7 +84,23 @@ type DataSource struct { SecureJsonFields map[string]bool `json:"secureJsonFields"` } -type DataSourceList []DataSource +type DataSourceListItemDTO struct { + Id int64 `json:"id"` + OrgId int64 `json:"orgId"` + Name string `json:"name"` + Type string `json:"type"` + TypeLogoUrl string `json:"typeLogoUrl"` + Access m.DsAccess `json:"access"` + Url string `json:"url"` + Password string `json:"password"` + User string `json:"user"` + Database string `json:"database"` + BasicAuth bool `json:"basicAuth"` + IsDefault bool `json:"isDefault"` + JsonData *simplejson.Json `json:"jsonData,omitempty"` +} + +type DataSourceList []DataSourceListItemDTO func (slice DataSourceList) Len() int { return len(slice) diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index fe7ca21f402..06ef5a22125 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "errors" "fmt" + "net" "net/http" "os" "path" @@ -13,9 +14,12 @@ import ( "github.com/grafana/grafana/pkg/api/live" httpstatic "github.com/grafana/grafana/pkg/api/static" + "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/cmd/grafana-cli/logger" + "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/setting" ) @@ -46,7 +50,7 @@ func (hs *HttpServer) Start(ctx context.Context) error { hs.streamManager.Run(ctx) listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort) - hs.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl) + hs.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl, "socket", setting.SocketPath) hs.httpSrv = &http.Server{Addr: listenAddr, Handler: hs.macaron} switch setting.Protocol { @@ -62,6 +66,18 @@ func (hs *HttpServer) Start(ctx context.Context) error { hs.log.Debug("server was shutdown gracefully") return nil } + case setting.SOCKET: + ln, err := net.Listen("unix", setting.SocketPath) + if err != nil { + hs.log.Debug("server was shutdown gracefully") + return nil + } + + err = hs.httpSrv.Serve(ln) + if err != nil { + hs.log.Debug("server was shutdown gracefully") + return nil + } default: hs.log.Error("Invalid protocol", "protocol", setting.Protocol) err = errors.New("Invalid Protocol") @@ -147,6 +163,7 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron { Delims: macaron.Delims{Left: "[[", Right: "]]"}, })) + m.Use(hs.healthHandler) m.Use(middleware.GetContextHandler()) m.Use(middleware.Sessioner(&setting.SessionOptions)) m.Use(middleware.RequestMetrics()) @@ -160,6 +177,27 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron { return m } +func (hs *HttpServer) healthHandler(ctx *macaron.Context) { + if ctx.Req.Method != "GET" || ctx.Req.URL.Path != "/api/health" { + return + } + + data := simplejson.New() + data.Set("database", "ok") + data.Set("version", setting.BuildVersion) + data.Set("commit", setting.BuildCommit) + + if err := bus.Dispatch(&models.GetDBHealthQuery{}); err != nil { + data.Set("database", "failing") + } + + ctx.Resp.Header().Set("Content-Type", "application/json; charset=UTF-8") + ctx.Resp.WriteHeader(200) + + dataBytes, _ := data.EncodePretty() + ctx.Resp.Write(dataBytes) +} + func (hs *HttpServer) mapStatic(m *macaron.Macaron, rootDir string, dir string, prefix string) { headers := func(c *macaron.Context) { c.Resp.Header().Set("Cache-Control", "public, max-age=3600") diff --git a/pkg/api/login.go b/pkg/api/login.go index d2bbf4e81b9..baec5f5f6c0 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -11,7 +11,6 @@ import ( "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" - "github.com/grafana/grafana/pkg/util" ) const ( @@ -79,8 +78,7 @@ func tryLoginUsingRememberCookie(c *middleware.Context) bool { user := userQuery.Result // validate remember me cookie - if val, _ := c.GetSuperSecureCookie( - util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName); val != user.Login { + if val, _ := c.GetSuperSecureCookie(user.Rands+user.Password, setting.CookieRememberName); val != user.Login { return false } @@ -142,7 +140,7 @@ func loginUserWithUser(user *m.User, c *middleware.Context) { days := 86400 * setting.LogInRememberDays if days > 0 { c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") - c.SetSuperSecureCookie(util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/") + c.SetSuperSecureCookie(user.Rands+user.Password, setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/") } c.Session.Set(middleware.SESS_KEY_USERID, user.Id) diff --git a/pkg/api/pluginproxy/pluginproxy_test.go b/pkg/api/pluginproxy/pluginproxy_test.go index f14ca6975e6..424c3fd670c 100644 --- a/pkg/api/pluginproxy/pluginproxy_test.go +++ b/pkg/api/pluginproxy/pluginproxy_test.go @@ -23,9 +23,14 @@ func TestPluginProxy(t *testing.T) { setting.SecretKey = "password" bus.AddHandler("test", func(query *m.GetPluginSettingByIdQuery) error { + key, err := util.Encrypt([]byte("123"), "password") + if err != nil { + return err + } + query.Result = &m.PluginSetting{ SecureJsonData: map[string][]byte{ - "key": util.Encrypt([]byte("123"), "password"), + "key": key, }, } return nil diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go index ae5c89a0049..883ef8eefda 100644 --- a/pkg/components/imguploader/imguploader.go +++ b/pkg/components/imguploader/imguploader.go @@ -47,10 +47,11 @@ func NewImageUploader() (ImageUploader, error) { return nil, fmt.Errorf("Could not find url key for image.uploader.webdav") } + public_url := webdavSec.Key("public_url").String() username := webdavSec.Key("username").String() password := webdavSec.Key("password").String() - return NewWebdavImageUploader(url, username, password) + return NewWebdavImageUploader(url, username, password, public_url) } return NopImageUploader{}, nil diff --git a/pkg/components/imguploader/s3uploader_test.go b/pkg/components/imguploader/s3uploader_test.go index 1204a2db4e2..f75ad05af64 100644 --- a/pkg/components/imguploader/s3uploader_test.go +++ b/pkg/components/imguploader/s3uploader_test.go @@ -8,7 +8,7 @@ import ( ) func TestUploadToS3(t *testing.T) { - SkipConvey("[Integration test] for external_image_store.webdav", t, func() { + SkipConvey("[Integration test] for external_image_store.s3", t, func() { setting.NewConfigContext(&setting.CommandLineArgs{ HomePath: "../../../", }) diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go index 93b3f9d2efa..ae3c5b5e194 100644 --- a/pkg/components/imguploader/webdavuploader.go +++ b/pkg/components/imguploader/webdavuploader.go @@ -14,9 +14,10 @@ import ( ) type WebdavUploader struct { - url string - username string - password string + url string + username string + password string + public_url string } var netTransport = &http.Transport{ @@ -33,7 +34,8 @@ var netClient = &http.Client{ func (u *WebdavUploader) Upload(pa string) (string, error) { url, _ := url.Parse(u.url) - url.Path = path.Join(url.Path, util.GetRandomString(20)+".png") + filename := util.GetRandomString(20) + ".png" + url.Path = path.Join(url.Path, filename) imgData, err := ioutil.ReadFile(pa) req, err := http.NewRequest("PUT", url.String(), bytes.NewReader(imgData)) @@ -53,13 +55,20 @@ func (u *WebdavUploader) Upload(pa string) (string, error) { return "", fmt.Errorf("Failed to upload image. Returned statuscode %v body %s", res.StatusCode, body) } + if u.public_url != "" { + publicURL, _ := url.Parse(u.public_url) + publicURL.Path = path.Join(publicURL.Path, filename) + return publicURL.String(), nil + } + return url.String(), nil } -func NewWebdavImageUploader(url, username, passwrod string) (*WebdavUploader, error) { +func NewWebdavImageUploader(url, username, password, public_url string) (*WebdavUploader, error) { return &WebdavUploader{ - url: url, - username: username, - password: passwrod, + url: url, + username: username, + password: password, + public_url: public_url, }, nil } diff --git a/pkg/components/imguploader/webdavuploader_test.go b/pkg/components/imguploader/webdavuploader_test.go index 273cd1c2a86..e88e28bd712 100644 --- a/pkg/components/imguploader/webdavuploader_test.go +++ b/pkg/components/imguploader/webdavuploader_test.go @@ -7,12 +7,21 @@ import ( ) func TestUploadToWebdav(t *testing.T) { - webdavUploader, _ := NewWebdavImageUploader("http://localhost:9998/dav/", "username", "password") + // Can be tested with this docker container: https://hub.docker.com/r/morrisjobke/webdav/ SkipConvey("[Integration test] for external_image_store.webdav", t, func() { + webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "") path, err := webdavUploader.Upload("../../../public/img/logo_transparent_400x.png") So(err, ShouldBeNil) - So(path, ShouldNotEqual, "") + So(path, ShouldStartWith, "http://localhost:8888/webdav/") + }) + + SkipConvey("[Integration test] for external_image_store.webdav with public url", t, func() { + webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://publicurl:8888/webdav") + path, err := webdavUploader.Upload("../../../public/img/logo_transparent_400x.png") + + So(err, ShouldBeNil) + So(path, ShouldStartWith, "http://publicurl:8888/webdav/") }) } diff --git a/pkg/components/securejsondata/securejsondata.go b/pkg/components/securejsondata/securejsondata.go index d7bec6894b0..caf4b369483 100644 --- a/pkg/components/securejsondata/securejsondata.go +++ b/pkg/components/securejsondata/securejsondata.go @@ -1,6 +1,7 @@ package securejsondata import ( + "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" ) @@ -10,7 +11,12 @@ type SecureJsonData map[string][]byte func (s SecureJsonData) Decrypt() map[string]string { decrypted := make(map[string]string) for key, data := range s { - decrypted[key] = string(util.Decrypt(data, setting.SecretKey)) + decryptedData, err := util.Decrypt(data, setting.SecretKey) + if err != nil { + log.Fatal(4, err.Error()) + } + + decrypted[key] = string(decryptedData) } return decrypted } @@ -18,7 +24,12 @@ func (s SecureJsonData) Decrypt() map[string]string { func GetEncryptedJsonData(sjd map[string]string) SecureJsonData { encrypted := make(SecureJsonData) for key, data := range sjd { - encrypted[key] = util.Encrypt([]byte(data), setting.SecretKey) + encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey) + if err != nil { + log.Fatal(4, err.Error()) + } + + encrypted[key] = encryptedData } return encrypted } diff --git a/pkg/log/log.go b/pkg/log/log.go index f69d0f6b9b4..56b2eb50c9f 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -15,6 +15,8 @@ import ( "github.com/go-stack/stack" "github.com/inconshreveable/log15" "github.com/inconshreveable/log15/term" + + "github.com/grafana/grafana/pkg/util" ) var Root log15.Logger @@ -172,7 +174,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) { Close() defaultLevelName, _ := getLogLevelFromConfig("log", "info", cfg) - defaultFilters := getFilters(cfg.Section("log").Key("filters").Strings(" ")) + defaultFilters := getFilters(util.SplitString(cfg.Section("log").Key("filters").String())) handlers := make([]log15.Handler, 0) @@ -185,7 +187,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) { // Log level. _, level := getLogLevelFromConfig("log."+mode, defaultLevelName, cfg) - modeFilters := getFilters(sec.Key("filters").Strings(" ")) + modeFilters := getFilters(util.SplitString(sec.Key("filters").String())) format := getLogFormat(sec.Key("format").MustString("")) var handler log15.Handler diff --git a/pkg/models/datasource_cache_test.go b/pkg/models/datasource_cache_test.go index 25fee55529d..5e821ea28c4 100644 --- a/pkg/models/datasource_cache_test.go +++ b/pkg/models/datasource_cache_test.go @@ -54,10 +54,15 @@ func TestDataSourceCache(t *testing.T) { }) ds.JsonData = json + + tlsCaCert, _ := util.Encrypt([]byte(caCert), "password") + tlsClientCert, _ := util.Encrypt([]byte(clientCert), "password") + tlsClientKey, _ := util.Encrypt([]byte(clientKey), "password") + ds.SecureJsonData = map[string][]byte{ - "tlsCACert": util.Encrypt([]byte(caCert), "password"), - "tlsClientCert": util.Encrypt([]byte(clientCert), "password"), - "tlsClientKey": util.Encrypt([]byte(clientKey), "password"), + "tlsCACert": tlsCaCert, + "tlsClientCert": tlsClientCert, + "tlsClientKey": tlsClientKey, } ds.Updated = t.Add(-1 * time.Minute) diff --git a/pkg/models/health.go b/pkg/models/health.go new file mode 100644 index 00000000000..ee206ed2d6f --- /dev/null +++ b/pkg/models/health.go @@ -0,0 +1,3 @@ +package models + +type GetDBHealthQuery struct{} diff --git a/pkg/models/notifications.go b/pkg/models/notifications.go index ad7aed3bc50..089d7c4360d 100644 --- a/pkg/models/notifications.go +++ b/pkg/models/notifications.go @@ -3,6 +3,7 @@ package models import "errors" var ErrInvalidEmailCode = errors.New("Invalid or expired email code") +var ErrSmtpNotEnabled = errors.New("SMTP not configured, check your grafana.ini config file's [smtp] section.") type SendEmailCommand struct { To []string diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go index ae1348cbf99..df9f1138b15 100644 --- a/pkg/services/notifications/mailer.go +++ b/pkg/services/notifications/mailer.go @@ -107,7 +107,7 @@ func createDialer() (*gomail.Dialer, error) { func buildEmailMessage(cmd *m.SendEmailCommand) (*Message, error) { if !setting.Smtp.Enabled { - return nil, errors.New("Grafana mailing/smtp options not configured, contact your Grafana admin") + return nil, m.ErrSmtpNotEnabled } var buffer bytes.Buffer diff --git a/pkg/services/sqlstore/health.go b/pkg/services/sqlstore/health.go new file mode 100644 index 00000000000..ca5a8d2d085 --- /dev/null +++ b/pkg/services/sqlstore/health.go @@ -0,0 +1,14 @@ +package sqlstore + +import ( + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" +) + +func init() { + bus.AddHandler("sql", GetDBHealthQuery) +} + +func GetDBHealthQuery(query *m.GetDBHealthQuery) error { + return x.Ping() +} diff --git a/pkg/services/sqlstore/plugin_setting.go b/pkg/services/sqlstore/plugin_setting.go index 8121b8c7b4b..f52d65cdc94 100644 --- a/pkg/services/sqlstore/plugin_setting.go +++ b/pkg/services/sqlstore/plugin_setting.go @@ -74,7 +74,12 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error { return err } else { for key, data := range cmd.SecureJsonData { - pluginSetting.SecureJsonData[key] = util.Encrypt([]byte(data), setting.SecretKey) + encryptedData, err := util.Encrypt([]byte(data), setting.SecretKey) + if err != nil { + return err + } + + pluginSetting.SecureJsonData[key] = encryptedData } // add state change event on commit success diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index fe759ec8df9..848dd884323 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -158,6 +158,7 @@ func getEngine() (*xorm.Engine, error) { } else { engine.SetMaxOpenConns(DbCfg.MaxOpenConn) engine.SetMaxIdleConns(DbCfg.MaxIdleConn) + engine.SetLogger(&xorm.DiscardLogger{}) // engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm"))) // engine.ShowSQL = true // engine.ShowInfo = true diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index cacb4547162..8cc0e723712 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -27,6 +27,7 @@ type Scheme string const ( HTTP Scheme = "http" HTTPS Scheme = "https" + SOCKET Scheme = "socket" DEFAULT_HTTP_ADDR string = "0.0.0.0" ) @@ -65,6 +66,7 @@ var ( HttpAddr, HttpPort string SshPort int CertFile, KeyFile string + SocketPath string RouterLogging bool DataProxyLogging bool StaticRootPath string @@ -473,6 +475,10 @@ func NewConfigContext(args *CommandLineArgs) error { CertFile = server.Key("cert_file").String() KeyFile = server.Key("cert_key").String() } + if server.Key("protocol").MustString("http") == "socket" { + Protocol = SOCKET + SocketPath = server.Key("socket").String() + } Domain = server.Key("domain").MustString("localhost") HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR) @@ -509,7 +515,7 @@ func NewConfigContext(args *CommandLineArgs) error { // read data source proxy white list DataProxyWhiteList = make(map[string]bool) - for _, hostAndIp := range security.Key("data_source_proxy_whitelist").Strings(" ") { + for _, hostAndIp := range util.SplitString(security.Key("data_source_proxy_whitelist").String()) { DataProxyWhiteList[hostAndIp] = true } diff --git a/pkg/social/social.go b/pkg/social/social.go index 29c4b7ecbb4..8e1e30fdf4f 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -8,6 +8,7 @@ import ( "golang.org/x/oauth2" "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" ) type BasicUserInfo struct { @@ -53,12 +54,12 @@ func NewOAuthService() { info := &setting.OAuthInfo{ ClientId: sec.Key("client_id").String(), ClientSecret: sec.Key("client_secret").String(), - Scopes: sec.Key("scopes").Strings(" "), + Scopes: util.SplitString(sec.Key("scopes").String()), AuthUrl: sec.Key("auth_url").String(), TokenUrl: sec.Key("token_url").String(), ApiUrl: sec.Key("api_url").String(), Enabled: sec.Key("enabled").MustBool(), - AllowedDomains: sec.Key("allowed_domains").Strings(" "), + AllowedDomains: util.SplitString(sec.Key("allowed_domains").String()), HostedDomain: sec.Key("hosted_domain").String(), AllowSignup: sec.Key("allow_sign_up").MustBool(), Name: sec.Key("name").MustString(name), @@ -92,7 +93,7 @@ func NewOAuthService() { apiUrl: info.ApiUrl, allowSignup: info.AllowSignup, teamIds: sec.Key("team_ids").Ints(","), - allowedOrganizations: sec.Key("allowed_organizations").Strings(" "), + allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()), } } @@ -115,7 +116,7 @@ func NewOAuthService() { apiUrl: info.ApiUrl, allowSignup: info.AllowSignup, teamIds: sec.Key("team_ids").Ints(","), - allowedOrganizations: sec.Key("allowed_organizations").Strings(" "), + allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()), } } @@ -135,7 +136,7 @@ func NewOAuthService() { Config: &config, url: setting.GrafanaNetUrl, allowSignup: info.AllowSignup, - allowedOrganizations: sec.Key("allowed_organizations").Strings(" "), + allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()), } } } diff --git a/pkg/tsdb/influxdb/query.go b/pkg/tsdb/influxdb/query.go index 19f374b938b..f271c5d245f 100644 --- a/pkg/tsdb/influxdb/query.go +++ b/pkg/tsdb/influxdb/query.go @@ -34,18 +34,13 @@ func (query *Query) Build(queryContext *tsdb.QueryContext) (string, error) { return "", err } - res = replaceVariable(res, "$timeFilter", query.renderTimeFilter(queryContext)) - res = replaceVariable(res, "$interval", interval.Text) - res = replaceVariable(res, "$__interval_ms", strconv.FormatInt(interval.Value.Nanoseconds()/int64(time.Millisecond), 10)) - res = replaceVariable(res, "$__interval", interval.Text) + res = strings.Replace(res, "$timeFilter", query.renderTimeFilter(queryContext), -1) + res = strings.Replace(res, "$interval", interval.Text, -1) + res = strings.Replace(res, "$__interval_ms", strconv.FormatInt(interval.Value.Nanoseconds()/int64(time.Millisecond), 10), -1) + res = strings.Replace(res, "$__interval", interval.Text, -1) return res, nil } -func replaceVariable(str string, variable string, value string) string { - count := strings.Count(str, variable) - return strings.Replace(str, variable, value, count) -} - func getDefinedInterval(query *Query, queryContext *tsdb.QueryContext) (*tsdb.Interval, error) { defaultInterval := tsdb.CalculateInterval(queryContext.TimeRange) diff --git a/pkg/util/encryption.go b/pkg/util/encryption.go index 42586ddac8b..2f8b5d7af56 100644 --- a/pkg/util/encryption.go +++ b/pkg/util/encryption.go @@ -5,26 +5,25 @@ import ( "crypto/cipher" "crypto/rand" "crypto/sha256" + "errors" "io" - - "github.com/grafana/grafana/pkg/log" ) const saltLength = 8 -func Decrypt(payload []byte, secret string) []byte { +func Decrypt(payload []byte, secret string) ([]byte, error) { salt := payload[:saltLength] key := encryptionKeyToBytes(secret, string(salt)) block, err := aes.NewCipher(key) if err != nil { - log.Fatal(4, err.Error()) + return nil, err } // The IV needs to be unique, but not secure. Therefore it's common to // include it at the beginning of the ciphertext. if len(payload) < aes.BlockSize { - log.Fatal(4, "payload too short") + return nil, errors.New("payload too short") } iv := payload[saltLength : saltLength+aes.BlockSize] payload = payload[saltLength+aes.BlockSize:] @@ -33,16 +32,16 @@ func Decrypt(payload []byte, secret string) []byte { // XORKeyStream can work in-place if the two arguments are the same. stream.XORKeyStream(payload, payload) - return payload + return payload, nil } -func Encrypt(payload []byte, secret string) []byte { +func Encrypt(payload []byte, secret string) ([]byte, error) { salt := GetRandomString(saltLength) key := encryptionKeyToBytes(secret, salt) block, err := aes.NewCipher(key) if err != nil { - log.Fatal(4, err.Error()) + return nil, err } // The IV needs to be unique, but not secure. Therefore it's common to @@ -51,13 +50,13 @@ func Encrypt(payload []byte, secret string) []byte { copy(ciphertext[:saltLength], []byte(salt)) iv := ciphertext[saltLength : saltLength+aes.BlockSize] if _, err := io.ReadFull(rand.Reader, iv); err != nil { - log.Fatal(4, err.Error()) + return nil, err } stream := cipher.NewCFBEncrypter(block, iv) stream.XORKeyStream(ciphertext[saltLength+aes.BlockSize:], payload) - return ciphertext + return ciphertext, nil } // Key needs to be 32bytes diff --git a/pkg/util/encryption_test.go b/pkg/util/encryption_test.go index 5f1dc18fea3..908931c9516 100644 --- a/pkg/util/encryption_test.go +++ b/pkg/util/encryption_test.go @@ -18,9 +18,11 @@ func TestEncryption(t *testing.T) { }) Convey("When decrypting basic payload", t, func() { - encrypted := Encrypt([]byte("grafana"), "1234") - decrypted := Decrypt(encrypted, "1234") + encrypted, encryptErr := Encrypt([]byte("grafana"), "1234") + decrypted, decryptErr := Decrypt(encrypted, "1234") + So(encryptErr, ShouldBeNil) + So(decryptErr, ShouldBeNil) So(string(decrypted), ShouldEqual, "grafana") }) diff --git a/pkg/util/strings.go b/pkg/util/strings.go index 8598949c2cb..3ccf8b8ce7e 100644 --- a/pkg/util/strings.go +++ b/pkg/util/strings.go @@ -1,5 +1,9 @@ package util +import ( + "regexp" +) + func StringsFallback2(val1 string, val2 string) string { return stringsFallback(val1, val2) } @@ -16,3 +20,11 @@ func stringsFallback(vals ...string) string { } return "" } + +func SplitString(str string) []string { + if len(str) == 0 { + return []string{} + } + + return regexp.MustCompile("[, ]+").Split(str, -1) +} diff --git a/pkg/util/strings_test.go b/pkg/util/strings_test.go index c959dfd1d54..ac8653158cc 100644 --- a/pkg/util/strings_test.go +++ b/pkg/util/strings_test.go @@ -13,3 +13,14 @@ func TestStringsUtil(t *testing.T) { So(StringsFallback3("", "", "3"), ShouldEqual, "3") }) } + +func TestSplitString(t *testing.T) { + Convey("Splits strings correctly", t, func() { + So(SplitString(""), ShouldResemble, []string{}) + So(SplitString("test"), ShouldResemble, []string{"test"}) + So(SplitString("test1 test2 test3"), ShouldResemble, []string{"test1", "test2", "test3"}) + So(SplitString("test1,test2,test3"), ShouldResemble, []string{"test1", "test2", "test3"}) + So(SplitString("test1, test2, test3"), ShouldResemble, []string{"test1", "test2", "test3"}) + So(SplitString("test1 , test2 test3"), ShouldResemble, []string{"test1", "test2", "test3"}) + }) +} diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts index daf03f8f827..782543787d7 100644 --- a/public/app/core/time_series2.ts +++ b/public/app/core/time_series2.ts @@ -35,6 +35,7 @@ export default class TimeSeries { isOutsideRange: boolean; lines: any; + dashes: any; bars: any; points: any; yaxis: any; @@ -61,6 +62,9 @@ export default class TimeSeries { applySeriesOverrides(overrides) { this.lines = {}; + this.dashes = { + dashLength: [] + }; this.points = {}; this.bars = {}; this.yaxis = 1; @@ -74,11 +78,18 @@ export default class TimeSeries { continue; } if (override.lines !== void 0) { this.lines.show = override.lines; } + if (override.dashes !== void 0) { + this.dashes.show = override.dashes; + this.lines.lineWidth = 0; + } if (override.points !== void 0) { this.points.show = override.points; } if (override.bars !== void 0) { this.bars.show = override.bars; } if (override.fill !== void 0) { this.lines.fill = translateFillOption(override.fill); } if (override.stack !== void 0) { this.stack = override.stack; } - if (override.linewidth !== void 0) { this.lines.lineWidth = override.linewidth; } + if (override.linewidth !== void 0) { + this.lines.lineWidth = override.linewidth; + this.dashes.lineWidth = override.linewidth; + } if (override.nullPointMode !== void 0) { this.nullPointMode = override.nullPointMode; } if (override.pointradius !== void 0) { this.points.radius = override.pointradius; } if (override.steppedLine !== void 0) { this.lines.steps = override.steppedLine; } diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts index c2422a63c27..e5660e294d9 100644 --- a/public/app/features/annotations/annotations_srv.ts +++ b/public/app/features/annotations/annotations_srv.ts @@ -144,6 +144,13 @@ export class AnnotationsSrv { } translateQueryResult(annotation, results) { + // if annotation has snapshotData + // make clone and remove it + if (annotation.snapshotData) { + annotation = angular.copy(annotation); + delete annotation.snapshotData; + } + for (var item of results) { item.source = annotation; item.min = item.time; diff --git a/public/app/features/annotations/event_manager.ts b/public/app/features/annotations/event_manager.ts index 85c41354c0d..6b8a58f0b57 100644 --- a/public/app/features/annotations/event_manager.ts +++ b/public/app/features/annotations/event_manager.ts @@ -58,7 +58,7 @@ export class EventManager { } addFlotEvents(annotations, flotOptions) { - if (!this.event || annotations.length === 0) { + if (!this.event && annotations.length === 0) { return; } diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index 5acc2bc60b4..8b71e23f467 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -65,7 +65,7 @@
Options
- Name + Name
@@ -87,11 +87,11 @@ label="Hide toggle" tooltip="Hides the annotation query toggle from showing at the top of the dashboard" checked="ctrl.currentAnnotation.hide" - label-class="width-7"> + label-class="width-9">
- +
diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js index 361db2d55b4..846dc0f7ed7 100644 --- a/public/app/features/dashboard/shareSnapshotCtrl.js +++ b/public/app/features/dashboard/shareSnapshotCtrl.js @@ -116,6 +116,7 @@ function (angular, _) { return { name: annotation.name, enable: annotation.enable, + iconColor: annotation.iconColor, snapshotData: annotation.snapshotData }; }).value(); diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts index c7fc795af53..e2bc0f33d14 100644 --- a/public/app/plugins/datasource/influxdb/influx_query.ts +++ b/public/app/plugins/datasource/influxdb/influx_query.ts @@ -194,7 +194,7 @@ export default class InfluxQuery { } var escapedValues = _.map(value, kbn.regexEscape); - return escapedValues.join('|'); + return '(' + escapedValues.join('|') + ')'; } render(interpolate?) { diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 3cd065719c7..9f1bd948852 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -7,6 +7,7 @@ import moment from 'moment'; import kbn from 'app/core/utils/kbn'; import * as dateMath from 'app/core/utils/datemath'; import PrometheusMetricFindQuery from './metric_find_query'; +import TableModel from 'app/core/table_model'; var durationSplitRegexp = /(\d+)(ms|s|m|h|d|w|M|y)/; @@ -20,7 +21,6 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS this.directUrl = instanceSettings.directUrl; this.basicAuth = instanceSettings.basicAuth; this.withCredentials = instanceSettings.withCredentials; - this.lastErrors = {}; this._request = function(method, url, requestId) { var options: any = { @@ -74,7 +74,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS options = _.clone(options); - _.each(options.targets, target => { + for (let target of options.targets) { if (!target.expr || target.hide) { return; } @@ -91,31 +91,33 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS var range = Math.ceil(end - start); target.step = query.step = this.adjustStep(query.step, this.intervalSeconds(options.interval), range); queries.push(query); - }); + } // No valid targets, return the empty result to save a round trip. if (_.isEmpty(queries)) { - var d = $q.defer(); - d.resolve({ data: [] }); - return d.promise; + return $q.when({ data: [] }); } var allQueryPromise = _.map(queries, query => { return this.performTimeSeriesQuery(query, start, end); }); - return $q.all(allQueryPromise).then(function(allResponse) { + return $q.all(allQueryPromise).then(responseList => { var result = []; + var index = 0; - _.each(allResponse, function(response, index) { + _.each(responseList, (response, index) => { if (response.status === 'error') { - self.lastErrors.query = response.error; throw response.error; } - delete self.lastErrors.query; - _.each(response.data.data.result, function(metricData) { - result.push(self.transformMetricData(metricData, activeTargets[index], start, end)); - }); + + if (activeTargets[index].format === "table") { + result.push(self.transformMetricDataToTable(response.data.data.result)); + } else { + for (let metricData of response.data.data.result) { + result.push(self.transformMetricData(metricData, activeTargets[index], start, end)); + } + } }); return { data: result }; @@ -273,6 +275,44 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS return { target: metricLabel, datapoints: dps }; }; + this.transformMetricDataToTable = function(series) { + var table = new TableModel(); + var self = this; + var i, j; + + if (series.length === 0) { + return table; + } + + _.each(series, function(series, seriesIndex) { + if (seriesIndex === 0) { + table.columns.push({text: 'Time', type: 'time'}); + _.each(_.keys(series.metric), function(key) { + table.columns.push({text: key}); + }); + table.columns.push({text: 'Value'}); + } + + if (series.values) { + for (i = 0; i < series.values.length; i++) { + var values = series.values[i]; + var reordered = [values[0] * 1000]; + if (series.metric) { + for (var key in series.metric) { + if (series.metric.hasOwnProperty(key)) { + reordered.push(series.metric[key]); + } + } + } + reordered.push(parseFloat(values[1])); + table.rows.push(reordered); + } + } + }); + + return table; + }; + this.createMetricLabel = function(labelData, options) { if (_.isUndefined(options) || _.isEmpty(options.legendFormat)) { return this.getOriginalMetricName(labelData); diff --git a/public/app/plugins/datasource/prometheus/partials/query.editor.html b/public/app/plugins/datasource/prometheus/partials/query.editor.html index 98bb359a093..f919800b813 100644 --- a/public/app/plugins/datasource/prometheus/partials/query.editor.html +++ b/public/app/plugins/datasource/prometheus/partials/query.editor.html @@ -42,6 +42,10 @@
+ +
+ +
-
+
diff --git a/public/app/plugins/panel/heatmap/axes_editor.ts b/public/app/plugins/panel/heatmap/axes_editor.ts index cd0f465636a..b8fcba871a7 100644 --- a/public/app/plugins/panel/heatmap/axes_editor.ts +++ b/public/app/plugins/panel/heatmap/axes_editor.ts @@ -26,8 +26,8 @@ export class AxesEditorCtrl { }; this.dataFormats = { - 'TS': 'timeseries', - 'TS Pre-bucketed': 'tsbuckets' + 'Time series': 'timeseries', + 'Time series Pre-bucketed': 'tsbuckets' }; } diff --git a/public/app/system.conf.js b/public/app/system.conf.js index f7ed0c5b2d2..ae8e93a726a 100644 --- a/public/app/system.conf.js +++ b/public/app/system.conf.js @@ -31,7 +31,8 @@ System.config({ "jquery.flot.crosshair": "vendor/flot/jquery.flot.crosshair", "jquery.flot.fillbelow": "vendor/flot/jquery.flot.fillbelow", "jquery.flot.gauge": "vendor/flot/jquery.flot.gauge", - "d3": "vendor/d3/d3.js" + "d3": "vendor/d3/d3.js", + "jquery.flot.dashes": "vendor/flot/jquery.flot.dashes" }, packages: { diff --git a/public/dashboards/default.json b/public/dashboards/default.json index 931d4c6f802..b16b5d710d6 100644 --- a/public/dashboards/default.json +++ b/public/dashboards/default.json @@ -82,6 +82,9 @@ "lines": true, "fill": 1, "linewidth": 2, + "dashes": false, + "dashLength": 10, + "spaceLength": 10, "points": false, "pointradius": 5, "bars": false, diff --git a/public/dashboards/template_vars.json b/public/dashboards/template_vars.json index a3c25d00371..f9ce493300c 100644 --- a/public/dashboards/template_vars.json +++ b/public/dashboards/template_vars.json @@ -50,6 +50,9 @@ "lines": true, "fill": 1, "linewidth": 1, + "dashes": false, + "dashLength": 10, + "spaceLength": 10, "points": false, "pointradius": 5, "bars": false, diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 15668c1924c..ce8354cdff5 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -4,9 +4,7 @@ - - + + -
@@ -107,11 +106,11 @@ td[class="stack-column-center"] { - - - + + +
- -
+ +
- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,21 +198,21 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.Title}}"}} - - -
- - -
-

{{.Title}}

+ + +
+ + +
+

{{.Title}}
@@ -222,13 +220,13 @@ text-decoration: underline;
- - -
- - -
-

{{.Message}}

+ + +
+ + +
+

{{.Message}}
@@ -237,26 +235,26 @@ text-decoration: underline;
{{if ne .State "ok" }} - - -
-
- - -
-
Metric name
+ + +
+
+ + + - {{range .EvalMatches}} - - + - {{end}} @@ -267,17 +265,17 @@ text-decoration: underline;
+
Metric name
 -
Value
+ 		+
Value
-
{{.Metric}}
+
+
{{.Metric}}
 -
{{.Value}}
+ 		+
{{.Value}}
{{end}} - - -
- - -
+ + +
+ + + @@ -287,25 +285,25 @@ text-decoration: underline;
{{if ne .ImageLink "" }} - Alerting Panel + Alerting Panel {{end}} {{if ne .EmbededImage "" }} - Alerting Panel + Alerting Panel {{end}}
- - -
- - -
- - -
- View your Alert rule + + +
+ + + -
+ + +
+ View your Alert rule
- - -
- Go to the Alerts page + + + +
+ Go to the Alerts page
@@ -323,20 +321,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + + diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index cd81f603eef..30f2b34ee9a 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,26 +198,26 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
+ + +
- - -
-

You have been added to {{.OrgName}}

+ + + - +
+

You have been added to {{.OrgName}}
@@ -227,22 +225,22 @@ text-decoration: underline;
- - -
- - -
-

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. -

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.

+ + +
+ + + - + - -
+

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
- - - + + @@ -259,20 +257,20 @@ text-decoration: underline;
Log in now
+ + +
Log in now
- - -
- - -
-
-

+ + + diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 65b6bfc2602..b925ced7267 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,26 +198,26 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
+ + +
- - -
-

You're invited to join {{.OrgName}}

+ + + - +
+

You're invited to join {{.OrgName}}
@@ -227,29 +225,29 @@ text-decoration: underline;
- - -
- - -
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+ + +
+ + + - - @@ -260,20 +258,20 @@ text-decoration: underline;
+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- - - + + - - + - +
Accept Invitation
+ + +
Accept Invitation
-

You can also copy/paste this link into your browser directly: {{.LinkUrl}}

+
+

You can also copy/paste this link into your browser directly: {{.LinkUrl}}
- - -
- - -
-
-

+ + + diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index aca5c7e60a2..3dd678f01d7 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,24 +198,24 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - +
+

Hi {{.Name}},
@@ -225,21 +223,21 @@ text-decoration: underline;
- - -
- - -
-

+ + +
+ + + - +
+

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

+

{{.AppUrl}}user/password/reset?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

+

Not working? Try copying and pasting it to your browser.
@@ -254,20 +252,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + + diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index c9e24bf575e..37457f9745e 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,24 +198,24 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
+ + +
- - -
-

Complete the signup

+ + + - +
+

Complete the signup
@@ -225,23 +223,23 @@ text-decoration: underline;
- - -
- - -
+ + +
+ + + - + - -
Copy and past the email verification code:
- {{.Code}}
in + {{.Code}}
in the sign up form or use the link below.
- - - + + @@ -258,20 +256,20 @@ text-decoration: underline;
Complete Sign Up
+ + +
Complete Sign Up
- - -
- - -
-
-

+ + + diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 3048a9dbf42..f6a04977be7 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,27 +198,27 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - + - - + @@ -230,23 +228,23 @@ text-decoration: underline;
+

Hi {{.Name}},
+
Welcome! Ready to start building some beautiful metric and analytic dashboards?
- - -
- - -
-

+ + +
+ + + - + - - +
+

If you are new to Grafana please read the Getting Started guide.

+
Thank you for joining our community.
-

The Grafana Team

+

The Grafana Team
@@ -261,20 +259,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + + diff --git a/public/sass/pages/_alerting.scss b/public/sass/pages/_alerting.scss index 70124f0cd85..2829849bcb8 100644 --- a/public/sass/pages/_alerting.scss +++ b/public/sass/pages/_alerting.scss @@ -50,9 +50,8 @@ .panel-alert-state { &--alerting { - animation: alerting-panel 1.6s cubic-bezier(1,.1,.73,1) 0s infinite alternate; box-shadow: 0 0 10px rgba($critical,0.5); - opacity: 1; + position: relative; .panel-alert-icon:before { color: $critical; @@ -60,6 +59,19 @@ } } + &--alerting::after { + content: ''; + position: absolute; + top: 0; + z-index: -1; + width: 100%; + height: 100%; + box-shadow: 0 0 10px rgba($critical,1); + opacity: 0; + animation: alerting-panel 1.6s cubic-bezier(1,.1,.73,1) 0s infinite alternate; + } + + &--ok { .panel-alert-icon:before { color: $online; @@ -70,6 +82,6 @@ @keyframes alerting-panel { 100% { - box-shadow: 0 0 15px $critical; + opacity: 1; } } diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index beaf463fa8f..e75406c2c8a 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -185,9 +185,9 @@ div.flot-text { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px rgba(82,168,236,10.8) } -.panel-hover-highlight { - box-shadow: inset 0 1px 1px rgba(0,0,0,0.025), 0 0 1px rgba(82,168,236,0.5) -} +// .panel-hover-highlight { +// box-shadow: inset 0 1px 1px rgba(0,0,0,0.025), 0 0 1px rgba(82,168,236,0.5) +// } .on-drag-hover { .panel-container { diff --git a/public/test/test-main.js b/public/test/test-main.js index 6fba92cc109..50553b7c8b3 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -40,6 +40,7 @@ "jquery.flot.fillbelow": "vendor/flot/jquery.flot.fillbelow", "jquery.flot.gauge": "vendor/flot/jquery.flot.gauge", "d3": "vendor/d3/d3.js", + "jquery.flot.dashes": "vendor/flot/jquery.flot.dashes" }, packages: { diff --git a/public/vendor/flot/jquery.flot.dashes.js b/public/vendor/flot/jquery.flot.dashes.js new file mode 100644 index 00000000000..5b204a5567b --- /dev/null +++ b/public/vendor/flot/jquery.flot.dashes.js @@ -0,0 +1,236 @@ +/* + * jQuery.flot.dashes + * + * options = { + * series: { + * dashes: { + * + * // show + * // default: false + * // Whether to show dashes for the series. + * show: , + * + * // lineWidth + * // default: 2 + * // The width of the dashed line in pixels. + * lineWidth: , + * + * // dashLength + * // default: 10 + * // Controls the length of the individual dashes and the amount of + * // space between them. + * // If this is a number, the dashes and spaces will have that length. + * // If this is an array, it is read as [ dashLength, spaceLength ] + * dashLength: or + * } + * } + * } + */ +(function($){ + + function init(plot) { + + plot.hooks.processDatapoints.push(function(plot, series, datapoints) { + + if (!series.dashes.show) return; + + plot.hooks.draw.push(function(plot, ctx) { + + var plotOffset = plot.getPlotOffset(), + axisx = series.xaxis, + axisy = series.yaxis; + + function plotDashes(xoffset, yoffset) { + + var points = datapoints.points, + ps = datapoints.pointsize, + prevx = null, + prevy = null, + dashRemainder = 0, + dashOn = true, + dashOnLength, + dashOffLength; + + if (series.dashes.dashLength[0]) { + dashOnLength = series.dashes.dashLength[0]; + if (series.dashes.dashLength[1]) { + dashOffLength = series.dashes.dashLength[1]; + } else { + dashOffLength = dashOnLength; + } + } else { + dashOffLength = dashOnLength = series.dashes.dashLength; + } + + ctx.beginPath(); + + for (var i = ps; i < points.length; i += ps) { + + var x1 = points[i - ps], + y1 = points[i - ps + 1], + x2 = points[i], + y2 = points[i + 1]; + + if (x1 == null || x2 == null) continue; + + // clip with ymin + if (y1 <= y2 && y1 < axisy.min) { + if (y2 < axisy.min) continue; // line segment is outside + // compute new intersection point + x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.min; + } else if (y2 <= y1 && y2 < axisy.min) { + if (y1 < axisy.min) continue; + x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.min; + } + + // clip with ymax + if (y1 >= y2 && y1 > axisy.max) { + if (y2 > axisy.max) continue; + x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.max; + } else if (y2 >= y1 && y2 > axisy.max) { + if (y1 > axisy.max) continue; + x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.max; + } + + // clip with xmin + if (x1 <= x2 && x1 < axisx.min) { + if (x2 < axisx.min) continue; + y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.min; + } else if (x2 <= x1 && x2 < axisx.min) { + if (x1 < axisx.min) continue; + y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.min; + } + + // clip with xmax + if (x1 >= x2 && x1 > axisx.max) { + if (x2 > axisx.max) continue; + y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.max; + } else if (x2 >= x1 && x2 > axisx.max) { + if (x1 > axisx.max) continue; + y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.max; + } + + if (x1 != prevx || y1 != prevy) { + ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); + } + + var ax1 = axisx.p2c(x1) + xoffset, + ay1 = axisy.p2c(y1) + yoffset, + ax2 = axisx.p2c(x2) + xoffset, + ay2 = axisy.p2c(y2) + yoffset, + dashOffset; + + function lineSegmentOffset(segmentLength) { + + var c = Math.sqrt(Math.pow(ax2 - ax1, 2) + Math.pow(ay2 - ay1, 2)); + + if (c <= segmentLength) { + return { + deltaX: ax2 - ax1, + deltaY: ay2 - ay1, + distance: c, + remainder: segmentLength - c + } + } else { + var xsign = ax2 > ax1 ? 1 : -1, + ysign = ay2 > ay1 ? 1 : -1; + return { + deltaX: xsign * Math.sqrt(Math.pow(segmentLength, 2) / (1 + Math.pow((ay2 - ay1)/(ax2 - ax1), 2))), + deltaY: ysign * Math.sqrt(Math.pow(segmentLength, 2) - Math.pow(segmentLength, 2) / (1 + Math.pow((ay2 - ay1)/(ax2 - ax1), 2))), + distance: segmentLength, + remainder: 0 + }; + } + } + //-end lineSegmentOffset + + do { + + dashOffset = lineSegmentOffset( + dashRemainder > 0 ? dashRemainder : + dashOn ? dashOnLength : dashOffLength); + + if (dashOffset.deltaX != 0 || dashOffset.deltaY != 0) { + if (dashOn) { + ctx.lineTo(ax1 + dashOffset.deltaX, ay1 + dashOffset.deltaY); + } else { + ctx.moveTo(ax1 + dashOffset.deltaX, ay1 + dashOffset.deltaY); + } + } + + dashOn = !dashOn; + dashRemainder = dashOffset.remainder; + ax1 += dashOffset.deltaX; + ay1 += dashOffset.deltaY; + + } while (dashOffset.distance > 0); + + prevx = x2; + prevy = y2; + } + + ctx.stroke(); + } + //-end plotDashes + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + ctx.lineJoin = 'round'; + + var lw = series.dashes.lineWidth, + sw = series.shadowSize; + + // FIXME: consider another form of shadow when filling is turned on + if (lw > 0 && sw > 0) { + // draw shadow as a thick and thin line with transparency + ctx.lineWidth = sw; + ctx.strokeStyle = "rgba(0,0,0,0.1)"; + // position shadow at angle from the mid of line + var angle = Math.PI/18; + plotDashes(Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2)); + ctx.lineWidth = sw/2; + plotDashes(Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4)); + } + + ctx.lineWidth = lw; + ctx.strokeStyle = series.color; + + if (lw > 0) { + plotDashes(0, 0); + } + + ctx.restore(); + + }); + //-end draw hook + + }); + //-end processDatapoints hook + + } + //-end init + + $.plot.plugins.push({ + init: init, + options: { + series: { + dashes: { + show: false, + lineWidth: 2, + dashLength: 10 + } + } + }, + name: 'dashes', + version: '0.1' + }); + +})(jQuery) diff --git a/vendor/github.com/Unknwon/com/.gitignore b/vendor/github.com/Unknwon/com/.gitignore deleted file mode 100644 index 0da157fe9ce..00000000000 --- a/vendor/github.com/Unknwon/com/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test -.idea - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.iml diff --git a/vendor/github.com/Unknwon/com/README.md b/vendor/github.com/Unknwon/com/README.md index 55d01d62137..8d821abd65e 100644 --- a/vendor/github.com/Unknwon/com/README.md +++ b/vendor/github.com/Unknwon/com/README.md @@ -1,7 +1,7 @@ -Common functions -=== +Common Functions +================ -[![Build Status](https://drone.io/github.com/Unknwon/com/status.png)](https://drone.io/github.com/Unknwon/com/latest) [![Go Walker](http://gowalker.org/api/v1/badge)](http://gowalker.org/github.com/Unknwon/com) +[![Build Status](https://travis-ci.org/Unknwon/com.svg)](https://travis-ci.org/Unknwon/com) [![Go Walker](http://gowalker.org/api/v1/badge)](http://gowalker.org/github.com/Unknwon/com) This is an open source project for commonly used functions for the Go programming language. @@ -17,8 +17,4 @@ Your contribute is welcome, but you have to check following steps after you adde 2. Make sure you wrote test cases with any possible condition for **all functions** in file `*_test.go`. 3. Make sure you wrote benchmarks for **all functions** in file `*_test.go`. 4. Make sure you wrote useful examples for **all functions** in file `example_test.go`. -5. Make sure you ran `go test -bench="."` and got **PASS** . - -## Performance - -See results on [drone.io](https://drone.io/github.com/Unknwon/com/latest) by `go test -bench="."`. +5. Make sure you ran `go test` and got **PASS** . diff --git a/vendor/github.com/Unknwon/com/cmd_test.go b/vendor/github.com/Unknwon/com/cmd_test.go deleted file mode 100644 index 97ad78f2e5c..00000000000 --- a/vendor/github.com/Unknwon/com/cmd_test.go +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "fmt" - "runtime" - "strings" - "testing" -) - -func TestColorLogS(t *testing.T) { - if runtime.GOOS != "windows" { - // Trace + path. - cls := ColorLogS("[TRAC] Trace level test with path( %s )", "/path/to/somethere") - clsR := fmt.Sprintf( - "[\033[%dmTRAC%s] Trace level test with path(\033[%dm%s%s)", - Blue, EndColor, Yellow, "/path/to/somethere", EndColor) - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Error + error. - cls = ColorLogS("[ERRO] Error level test with error[ %s ]", "test error") - clsR = fmt.Sprintf( - "[\033[%dmERRO%s] Error level test with error[\033[%dm%s%s]", - Red, EndColor, Red, "test error", EndColor) - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Warning + highlight. - cls = ColorLogS("[WARN] Warnning level test with highlight # %s #", "special offer!") - clsR = fmt.Sprintf( - "[\033[%dmWARN%s] Warnning level test with highlight \033[%dm%s%s", - Magenta, EndColor, Gray, "special offer!", EndColor) - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Success. - cls = ColorLogS("[SUCC] Success level test") - clsR = fmt.Sprintf( - "[\033[%dmSUCC%s] Success level test", - Green, EndColor) - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Default. - cls = ColorLogS("[INFO] Default level test") - clsR = fmt.Sprintf( - "[INFO] Default level test") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - } else { - // Trace + path. - cls := ColorLogS("[TRAC] Trace level test with path( %s )", "/path/to/somethere") - clsR := fmt.Sprintf( - "[TRAC] Trace level test with path(%s)", - "/path/to/somethere") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Error + error. - cls = ColorLogS("[ERRO] Error level test with error[ %s ]", "test error") - clsR = fmt.Sprintf( - "[ERRO] Error level test with error[%s]", - "test error") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Warning + highlight. - cls = ColorLogS("[WARN] Warnning level test with highlight # %s #", "special offer!") - clsR = fmt.Sprintf( - "[WARN] Warnning level test with highlight %s", - "special offer!") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Success. - cls = ColorLogS("[SUCC] Success level test") - clsR = fmt.Sprintf( - "[SUCC] Success level test") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - - // Default. - cls = ColorLogS("[INFO] Default level test") - clsR = fmt.Sprintf( - "[INFO] Default level test") - if cls != clsR { - t.Errorf("ColorLogS:\n Expect => %s\n Got => %s\n", clsR, cls) - } - } -} - -func TestExecCmd(t *testing.T) { - stdout, stderr, err := ExecCmd("go", "help", "get") - if err != nil { - t.Errorf("ExecCmd:\n Expect => %v\n Got => %v\n", nil, err) - } else if len(stderr) != 0 { - t.Errorf("ExecCmd:\n Expect => %s\n Got => %s\n", "", stderr) - } else if !strings.HasPrefix(stdout, "usage: go get") { - t.Errorf("ExecCmd:\n Expect => %s\n Got => %s\n", "usage: go get", stdout) - } -} - -func BenchmarkColorLogS(b *testing.B) { - log := fmt.Sprintf( - "[WARN] This is a tesing log that should be colored, path( %s ),"+ - " highlight # %s #, error [ %s ].", - "path to somewhere", "highlighted content", "tesing error") - for i := 0; i < b.N; i++ { - ColorLogS(log) - } -} - -func BenchmarkExecCmd(b *testing.B) { - for i := 0; i < b.N; i++ { - ExecCmd("go", "help", "get") - } -} diff --git a/vendor/github.com/Unknwon/com/convert.go b/vendor/github.com/Unknwon/com/convert.go index 9c3af84aa18..25b3e0e5620 100644 --- a/vendor/github.com/Unknwon/com/convert.go +++ b/vendor/github.com/Unknwon/com/convert.go @@ -32,7 +32,7 @@ func (f StrTo) Uint8() (uint8, error) { } func (f StrTo) Int() (int, error) { - v, err := strconv.ParseInt(f.String(), 10, 32) + v, err := strconv.ParseInt(f.String(), 10, 0) return int(v), err } diff --git a/vendor/github.com/Unknwon/com/convert_test.go b/vendor/github.com/Unknwon/com/convert_test.go deleted file mode 100644 index e97e27f42e5..00000000000 --- a/vendor/github.com/Unknwon/com/convert_test.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2014 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "testing" - - . "github.com/smartystreets/goconvey/convey" -) - -func TestHexStr2int(t *testing.T) { - Convey("Convert hex format string to decimal", t, func() { - hexDecs := map[string]int{ - "1": 1, - "002": 2, - "011": 17, - "0a1": 161, - "35e": 862, - } - - for hex, dec := range hexDecs { - val, err := HexStr2int(hex) - So(err, ShouldBeNil) - So(val, ShouldEqual, dec) - } - }) -} - -func TestInt2HexStr(t *testing.T) { - Convey("Convert decimal to hex format string", t, func() { - decHexs := map[int]string{ - 1: "1", - 2: "2", - 17: "11", - 161: "a1", - 862: "35e", - } - - for dec, hex := range decHexs { - val := Int2HexStr(dec) - So(val, ShouldEqual, hex) - } - }) -} diff --git a/vendor/github.com/Unknwon/com/dir_test.go b/vendor/github.com/Unknwon/com/dir_test.go deleted file mode 100644 index c6fbf9d27d3..00000000000 --- a/vendor/github.com/Unknwon/com/dir_test.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "os" - "testing" - - . "github.com/smartystreets/goconvey/convey" -) - -func TestIsDir(t *testing.T) { - Convey("Check if given path is a directory", t, func() { - Convey("Pass a file name", func() { - So(IsDir("file.go"), ShouldEqual, false) - }) - Convey("Pass a directory name", func() { - So(IsDir("testdata"), ShouldEqual, true) - }) - Convey("Pass a invalid path", func() { - So(IsDir("foo"), ShouldEqual, false) - }) - }) -} - -func TestCopyDir(t *testing.T) { - Convey("Items of two slices should be same", t, func() { - s1, err := StatDir("testdata", true) - So(err, ShouldEqual, nil) - - err = CopyDir("testdata", "testdata2") - So(err, ShouldEqual, nil) - - s2, err := StatDir("testdata2", true) - os.RemoveAll("testdata2") - So(err, ShouldEqual, nil) - - So(CompareSliceStr(s1, s2), ShouldEqual, true) - }) -} - -func BenchmarkIsDir(b *testing.B) { - for i := 0; i < b.N; i++ { - IsDir("file.go") - } -} diff --git a/vendor/github.com/Unknwon/com/example_test.go b/vendor/github.com/Unknwon/com/example_test.go deleted file mode 100644 index bc1930bf84a..00000000000 --- a/vendor/github.com/Unknwon/com/example_test.go +++ /dev/null @@ -1,299 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com_test - -import ( - "fmt" - "io/ioutil" - "net/http" - - "github.com/Unknwon/com" -) - -// ------------------------------ -// cmd.go -// ------------------------------ - -func ExampleColorLogS() { - coloredLog := com.ColorLogS(fmt.Sprintf( - "[WARN] This is a tesing log that should be colored, path( %s ),"+ - " highlight # %s #, error [ %s ].", - "path to somewhere", "highlighted content", "tesing error")) - fmt.Println(coloredLog) -} - -func ExampleColorLog() { - com.ColorLog(fmt.Sprintf( - "[WARN] This is a tesing log that should be colored, path( %s ),"+ - " highlight # %s #, error [ %s ].", - "path to somewhere", "highlighted content", "tesing error")) -} - -func ExampleExecCmd() { - stdout, stderr, err := com.ExecCmd("go", "help", "get") - fmt.Println(stdout, stderr, err) -} - -// ------------- END ------------ - -// ------------------------------ -// html.go -// ------------------------------ - -func ExampleHtml2JS() { - htm := "
Click me
\n\r" - js := string(com.Html2JS([]byte(htm))) - fmt.Println(js) - // Output:
Click me
\n -} - -// ------------- END ------------ - -// ------------------------------ -// path.go -// ------------------------------ - -func ExampleGetGOPATHs() { - gps := com.GetGOPATHs() - fmt.Println(gps) -} - -func ExampleGetSrcPath() { - srcPath, err := com.GetSrcPath("github.com/Unknwon/com") - if err != nil { - fmt.Println(err) - return - } - fmt.Println(srcPath) -} - -func ExampleHomeDir() { - hd, err := com.HomeDir() - fmt.Println(hd, err) -} - -// ------------- END ------------ - -// ------------------------------ -// file.go -// ------------------------------ - -func ExampleIsFile() { - if com.IsFile("file.go") { - fmt.Println("file.go exists") - return - } - fmt.Println("file.go is not a file or does not exist") -} - -func ExampleIsExist() { - if com.IsExist("file.go") { - fmt.Println("file.go exists") - return - } - fmt.Println("file.go does not exist") -} - -// ------------- END ------------ - -// ------------------------------ -// dir.go -// ------------------------------ - -func ExampleIsDir() { - if com.IsDir("files") { - fmt.Println("directory 'files' exists") - return - } - fmt.Println("'files' is not a directory or does not exist") -} - -// ------------- END ------------ - -// ------------------------------ -// string.go -// ------------------------------ - -func ExampleIsLetter() { - fmt.Println(com.IsLetter('1')) - fmt.Println(com.IsLetter('[')) - fmt.Println(com.IsLetter('a')) - fmt.Println(com.IsLetter('Z')) - // Output: - // false - // false - // true - // true -} - -func ExampleExpand() { - match := map[string]string{ - "domain": "gowalker.org", - "subdomain": "github.com", - } - s := "http://{domain}/{subdomain}/{0}/{1}" - fmt.Println(com.Expand(s, match, "Unknwon", "gowalker")) - // Output: http://gowalker.org/github.com/Unknwon/gowalker -} - -// ------------- END ------------ - -// ------------------------------ -// http.go -// ------------------------------ - -func ExampleHttpGet() ([]byte, error) { - rc, err := com.HttpGet(&http.Client{}, "http://gowalker.org", nil) - if err != nil { - return nil, err - } - p, err := ioutil.ReadAll(rc) - rc.Close() - return p, err -} - -func ExampleHttpGetBytes() ([]byte, error) { - p, err := com.HttpGetBytes(&http.Client{}, "http://gowalker.org", nil) - return p, err -} - -func ExampleHttpGetJSON() interface{} { - j := com.HttpGetJSON(&http.Client{}, "http://gowalker.org", nil) - return j -} - -type rawFile struct { - name string - rawURL string - data []byte -} - -func (rf *rawFile) Name() string { - return rf.name -} - -func (rf *rawFile) RawUrl() string { - return rf.rawURL -} - -func (rf *rawFile) Data() []byte { - return rf.data -} - -func (rf *rawFile) SetData(p []byte) { - rf.data = p -} - -func ExampleFetchFiles() { - // Code that should be outside of your function body. - // type rawFile struct { - // name string - // rawURL string - // data []byte - // } - - // func (rf *rawFile) Name() string { - // return rf.name - // } - - // func (rf *rawFile) RawUrl() string { - // return rf.rawURL - // } - - // func (rf *rawFile) Data() []byte { - // return rf.data - // } - - // func (rf *rawFile) SetData(p []byte) { - // rf.data = p - // } - - files := []com.RawFile{ - &rawFile{rawURL: "http://example.com"}, - &rawFile{rawURL: "http://example.com/foo"}, - } - err := com.FetchFiles(&http.Client{}, files, nil) - fmt.Println(err, len(files[0].Data()), len(files[1].Data())) -} - -func ExampleFetchFilesCurl() { - // Code that should be outside of your function body. - // type rawFile struct { - // name string - // rawURL string - // data []byte - // } - - // func (rf *rawFile) Name() string { - // return rf.name - // } - - // func (rf *rawFile) RawUrl() string { - // return rf.rawURL - // } - - // func (rf *rawFile) Data() []byte { - // return rf.data - // } - - // func (rf *rawFile) SetData(p []byte) { - // rf.data = p - // } - - files := []com.RawFile{ - &rawFile{rawURL: "http://example.com"}, - &rawFile{rawURL: "http://example.com/foo"}, - } - err := com.FetchFilesCurl(files) - fmt.Println(err, len(files[0].Data()), len(files[1].Data())) -} - -// ------------- END ------------ - -// ------------------------------ -// regex.go -// ------------------------------ - -func ExampleIsEmail() { - fmt.Println(com.IsEmail("test@example.com")) - fmt.Println(com.IsEmail("@example.com")) - // Output: - // true - // false -} - -func ExampleIsUrl() { - fmt.Println(com.IsUrl("http://example.com")) - fmt.Println(com.IsUrl("http//example.com")) - // Output: - // true - // false -} - -// ------------- END ------------ - -// ------------------------------ -// slice.go -// ------------------------------ - -func ExampleAppendStr() { - s := []string{"a"} - s = com.AppendStr(s, "a") - s = com.AppendStr(s, "b") - fmt.Println(s) - // Output: [a b] -} - -// ------------- END ------------ diff --git a/vendor/github.com/Unknwon/com/file_test.go b/vendor/github.com/Unknwon/com/file_test.go deleted file mode 100644 index 4ff00dcd2d9..00000000000 --- a/vendor/github.com/Unknwon/com/file_test.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "testing" - - . "github.com/smartystreets/goconvey/convey" -) - -func TestIsFile(t *testing.T) { - if !IsFile("file.go") { - t.Errorf("IsExist:\n Expect => %v\n Got => %v\n", true, false) - } - - if IsFile("testdata") { - t.Errorf("IsExist:\n Expect => %v\n Got => %v\n", false, true) - } - - if IsFile("files.go") { - t.Errorf("IsExist:\n Expect => %v\n Got => %v\n", false, true) - } -} - -func TestIsExist(t *testing.T) { - Convey("Check if file or directory exists", t, func() { - Convey("Pass a file name that exists", func() { - So(IsExist("file.go"), ShouldEqual, true) - }) - Convey("Pass a directory name that exists", func() { - So(IsExist("testdata"), ShouldEqual, true) - }) - Convey("Pass a directory name that does not exist", func() { - So(IsExist(".hg"), ShouldEqual, false) - }) - }) -} - -func BenchmarkIsFile(b *testing.B) { - for i := 0; i < b.N; i++ { - IsFile("file.go") - } -} - -func BenchmarkIsExist(b *testing.B) { - for i := 0; i < b.N; i++ { - IsExist("file.go") - } -} diff --git a/vendor/github.com/Unknwon/com/html_test.go b/vendor/github.com/Unknwon/com/html_test.go deleted file mode 100644 index 2c9f4047870..00000000000 --- a/vendor/github.com/Unknwon/com/html_test.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "testing" -) - -func TestHtml2JS(t *testing.T) { - htm := "
Click me
\n\r" - js := string(Html2JS([]byte(htm))) - jsR := `
Click me
\n` - if js != jsR { - t.Errorf("Html2JS:\n Expect => %s\n Got => %s\n", jsR, js) - } -} - -func BenchmarkHtml2JS(b *testing.B) { - htm := "
Click me
\n\r" - for i := 0; i < b.N; i++ { - Html2JS([]byte(htm)) - } -} diff --git a/vendor/github.com/Unknwon/com/http_test.go b/vendor/github.com/Unknwon/com/http_test.go deleted file mode 100644 index 902b6607a5d..00000000000 --- a/vendor/github.com/Unknwon/com/http_test.go +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "io/ioutil" - "net/http" - "strings" - "testing" -) - -var examplePrefix = ` - - - Example Domain -` - -func TestHttpGet(t *testing.T) { - // 200. - rc, err := HttpGet(&http.Client{}, "http://example.com", nil) - if err != nil { - t.Fatalf("HttpGet:\n Expect => %v\n Got => %s\n", nil, err) - } - p, err := ioutil.ReadAll(rc) - if err != nil { - t.Errorf("HttpGet:\n Expect => %v\n Got => %s\n", nil, err) - } - s := string(p) - if !strings.HasPrefix(s, examplePrefix) { - t.Errorf("HttpGet:\n Expect => %s\n Got => %s\n", examplePrefix, s) - } -} - -func TestHttpGetBytes(t *testing.T) { - p, err := HttpGetBytes(&http.Client{}, "http://example.com", nil) - if err != nil { - t.Errorf("HttpGetBytes:\n Expect => %v\n Got => %s\n", nil, err) - } - s := string(p) - if !strings.HasPrefix(s, examplePrefix) { - t.Errorf("HttpGet:\n Expect => %s\n Got => %s\n", examplePrefix, s) - } -} - -func TestHttpGetJSON(t *testing.T) { - -} - -type rawFile struct { - name string - rawURL string - data []byte -} - -func (rf *rawFile) Name() string { - return rf.name -} - -func (rf *rawFile) RawUrl() string { - return rf.rawURL -} - -func (rf *rawFile) Data() []byte { - return rf.data -} - -func (rf *rawFile) SetData(p []byte) { - rf.data = p -} - -func TestFetchFiles(t *testing.T) { - files := []RawFile{ - &rawFile{rawURL: "http://example.com"}, - &rawFile{rawURL: "http://example.com"}, - } - err := FetchFiles(&http.Client{}, files, nil) - if err != nil { - t.Errorf("FetchFiles:\n Expect => %v\n Got => %s\n", nil, err) - } else if len(files[0].Data()) != 1270 { - t.Errorf("FetchFiles:\n Expect => %d\n Got => %d\n", 1270, len(files[0].Data())) - } else if len(files[1].Data()) != 1270 { - t.Errorf("FetchFiles:\n Expect => %d\n Got => %d\n", 1270, len(files[1].Data())) - } -} - -func TestFetchFilesCurl(t *testing.T) { - files := []RawFile{ - &rawFile{rawURL: "http://example.com"}, - &rawFile{rawURL: "http://example.com"}, - } - err := FetchFilesCurl(files) - if err != nil { - t.Errorf("FetchFilesCurl:\n Expect => %v\n Got => %s\n", nil, err) - } else if len(files[0].Data()) != 1270 { - t.Errorf("FetchFilesCurl:\n Expect => %d\n Got => %d\n", 1270, len(files[0].Data())) - } else if len(files[1].Data()) != 1270 { - t.Errorf("FetchFilesCurl:\n Expect => %d\n Got => %d\n", 1270, len(files[1].Data())) - } -} diff --git a/vendor/github.com/Unknwon/com/math.go b/vendor/github.com/Unknwon/com/math.go index 70b7e251fb4..99c56b65947 100644 --- a/vendor/github.com/Unknwon/com/math.go +++ b/vendor/github.com/Unknwon/com/math.go @@ -14,11 +14,16 @@ package com -// PowInt is int type of math.Pow function. +// PowInt is int type of math.Pow function. func PowInt(x int, y int) int { - num := 1 - for i := 0; i < y; i++ { - num *= x + if y <= 0 { + return 1 + } else { + if y % 2 == 0 { + sqrt := PowInt(x, y/2) + return sqrt * sqrt + } else { + return PowInt(x, y-1) * x + } } - return num } diff --git a/vendor/github.com/Unknwon/com/path.go b/vendor/github.com/Unknwon/com/path.go index a501c8538d8..b1e860def42 100644 --- a/vendor/github.com/Unknwon/com/path.go +++ b/vendor/github.com/Unknwon/com/path.go @@ -64,9 +64,9 @@ func GetSrcPath(importPath string) (appPath string, err error) { // it returns error when the variable does not exist. func HomeDir() (home string, err error) { if runtime.GOOS == "windows" { - home = os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH") - if home == "" { - home = os.Getenv("USERPROFILE") + home = os.Getenv("USERPROFILE") + if len(home) == 0 { + home = os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH") } } else { home = os.Getenv("HOME") diff --git a/vendor/github.com/Unknwon/com/path_test.go b/vendor/github.com/Unknwon/com/path_test.go deleted file mode 100644 index da5488d4400..00000000000 --- a/vendor/github.com/Unknwon/com/path_test.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "os" - "runtime" - "testing" -) - -func TestGetGOPATHs(t *testing.T) { - var gpsR []string - - if runtime.GOOS != "windows" { - gpsR = []string{"path/to/gopath1", "path/to/gopath2", "path/to/gopath3"} - os.Setenv("GOPATH", "path/to/gopath1:path/to/gopath2:path/to/gopath3") - } else { - gpsR = []string{"path/to/gopath1", "path/to/gopath2", "path/to/gopath3"} - os.Setenv("GOPATH", "path\\to\\gopath1;path\\to\\gopath2;path\\to\\gopath3") - } - - gps := GetGOPATHs() - if !CompareSliceStr(gps, gpsR) { - t.Errorf("GetGOPATHs:\n Expect => %s\n Got => %s\n", gpsR, gps) - } -} - -func TestGetSrcPath(t *testing.T) { - -} - -func TestHomeDir(t *testing.T) { - _, err := HomeDir() - if err != nil { - t.Errorf("HomeDir:\n Expect => %v\n Got => %s\n", nil, err) - } -} - -func BenchmarkGetGOPATHs(b *testing.B) { - for i := 0; i < b.N; i++ { - GetGOPATHs() - } -} - -func BenchmarkGetSrcPath(b *testing.B) { - for i := 0; i < b.N; i++ { - GetSrcPath("github.com/Unknwon/com") - } -} - -func BenchmarkHomeDir(b *testing.B) { - for i := 0; i < b.N; i++ { - HomeDir() - } -} diff --git a/vendor/github.com/Unknwon/com/regex_test.go b/vendor/github.com/Unknwon/com/regex_test.go deleted file mode 100644 index b027bd1c8de..00000000000 --- a/vendor/github.com/Unknwon/com/regex_test.go +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "testing" -) - -func TestIsEmail(t *testing.T) { - emails := map[string]bool{ - `test@example.com`: true, - `single-character@b.org`: true, - `uncommon_address@test.museum`: true, - `local@sld.UPPER`: true, - `@missing.org`: false, - `missing@.com`: false, - `missing@qq.`: false, - `wrong-ip@127.1.1.1.26`: false, - } - for e, r := range emails { - b := IsEmail(e) - if b != r { - t.Errorf("IsEmail:\n Expect => %v\n Got => %v\n", r, b) - } - } -} - -func TestIsUrl(t *testing.T) { - urls := map[string]bool{ - "http://www.example.com": true, - "http://example.com": true, - "http://example.com?user=test&password=test": true, - "http://example.com?user=test#login": true, - "ftp://example.com": true, - "https://example.com": true, - "htp://example.com": false, - "http//example.com": false, - "http://example": true, - } - for u, r := range urls { - b := IsUrl(u) - if b != r { - t.Errorf("IsUrl:\n Expect => %v\n Got => %v\n", r, b) - } - } -} - -func BenchmarkIsEmail(b *testing.B) { - for i := 0; i < b.N; i++ { - IsEmail("test@example.com") - } -} - -func BenchmarkIsUrl(b *testing.B) { - for i := 0; i < b.N; i++ { - IsEmail("http://example.com") - } -} diff --git a/vendor/github.com/Unknwon/com/slice_test.go b/vendor/github.com/Unknwon/com/slice_test.go deleted file mode 100644 index 6a94156c231..00000000000 --- a/vendor/github.com/Unknwon/com/slice_test.go +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "fmt" - "testing" - - . "github.com/smartystreets/goconvey/convey" -) - -func TestAppendStr(t *testing.T) { - Convey("Append a string to a slice with no duplicates", t, func() { - s := []string{"a"} - - Convey("Append a string that does not exist in slice", func() { - s = AppendStr(s, "b") - So(len(s), ShouldEqual, 2) - }) - - Convey("Append a string that does exist in slice", func() { - s = AppendStr(s, "b") - So(len(s), ShouldEqual, 2) - }) - }) -} - -func TestCompareSliceStr(t *testing.T) { - Convey("Compares two 'string' type slices with elements and order", t, func() { - Convey("Compare two slices that do have same elements and order", func() { - So(CompareSliceStr( - []string{"1", "2", "3"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - - Convey("Compare two slices that do have same elements but does not have same order", func() { - So(!CompareSliceStr( - []string{"2", "1", "3"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - - Convey("Compare two slices that have different number of elements", func() { - So(!CompareSliceStr( - []string{"2", "1"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - }) -} - -func TestCompareSliceStrU(t *testing.T) { - Convey("Compare two 'string' type slices with elements and ignore the order", t, func() { - Convey("Compare two slices that do have same elements and order", func() { - So(CompareSliceStrU( - []string{"1", "2", "3"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - - Convey("Compare two slices that do have same elements but does not have same order", func() { - So(CompareSliceStrU( - []string{"2", "1", "3"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - - Convey("Compare two slices that have different number of elements", func() { - So(!CompareSliceStrU( - []string{"2", "1"}, []string{"1", "2", "3"}), ShouldBeTrue) - }) - }) -} - -func BenchmarkAppendStr(b *testing.B) { - s := []string{"a"} - for i := 0; i < b.N; i++ { - s = AppendStr(s, fmt.Sprint(b.N%3)) - } -} - -func BenchmarkCompareSliceStr(b *testing.B) { - s1 := []string{"1", "2", "3"} - s2 := []string{"1", "2", "3"} - for i := 0; i < b.N; i++ { - CompareSliceStr(s1, s2) - } -} - -func BenchmarkCompareSliceStrU(b *testing.B) { - s1 := []string{"1", "4", "2", "3"} - s2 := []string{"1", "2", "3", "4"} - for i := 0; i < b.N; i++ { - CompareSliceStrU(s1, s2) - } -} diff --git a/vendor/github.com/Unknwon/com/string.go b/vendor/github.com/Unknwon/com/string.go index 1ebb9014040..7080d174a81 100644 --- a/vendor/github.com/Unknwon/com/string.go +++ b/vendor/github.com/Unknwon/com/string.go @@ -15,53 +15,66 @@ package com import ( + "bytes" "crypto/aes" "crypto/cipher" "crypto/rand" - "encoding/base64" "errors" - "io" r "math/rand" "strconv" "strings" "time" + "unicode" + "unicode/utf8" ) -// AESEncrypt encrypts text and given key with AES. -func AESEncrypt(key, text []byte) ([]byte, error) { +// AESGCMEncrypt encrypts plaintext with the given key using AES in GCM mode. +func AESGCMEncrypt(key, plaintext []byte) ([]byte, error) { block, err := aes.NewCipher(key) if err != nil { return nil, err } - b := base64.StdEncoding.EncodeToString(text) - ciphertext := make([]byte, aes.BlockSize+len(b)) - iv := ciphertext[:aes.BlockSize] - if _, err := io.ReadFull(rand.Reader, iv); err != nil { + + gcm, err := cipher.NewGCM(block) + if err != nil { return nil, err } - cfb := cipher.NewCFBEncrypter(block, iv) - cfb.XORKeyStream(ciphertext[aes.BlockSize:], []byte(b)) - return ciphertext, nil + + nonce := make([]byte, gcm.NonceSize()) + if _, err := rand.Read(nonce); err != nil { + return nil, err + } + + ciphertext := gcm.Seal(nil, nonce, plaintext, nil) + return append(nonce, ciphertext...), nil } -// AESDecrypt decrypts text and given key with AES. -func AESDecrypt(key, text []byte) ([]byte, error) { +// AESGCMDecrypt decrypts ciphertext with the given key using AES in GCM mode. +func AESGCMDecrypt(key, ciphertext []byte) ([]byte, error) { block, err := aes.NewCipher(key) if err != nil { return nil, err } - if len(text) < aes.BlockSize { - return nil, errors.New("ciphertext too short") - } - iv := text[:aes.BlockSize] - text = text[aes.BlockSize:] - cfb := cipher.NewCFBDecrypter(block, iv) - cfb.XORKeyStream(text, text) - data, err := base64.StdEncoding.DecodeString(string(text)) + + gcm, err := cipher.NewGCM(block) if err != nil { return nil, err } - return data, nil + + size := gcm.NonceSize() + if len(ciphertext)-size <= 0 { + return nil, errors.New("Ciphertext is empty") + } + + nonce := ciphertext[:size] + ciphertext = ciphertext[size:] + + plainText, err := gcm.Open(nil, nonce, ciphertext, nil) + if err != nil { + return nil, err + } + + return plainText, nil } // IsLetter returns true if the 'l' is an English letter. @@ -138,3 +151,103 @@ func RandomCreateBytes(n int, alphabets ...byte) []byte { } return bytes } + +// ToSnakeCase can convert all upper case characters in a string to +// underscore format. +// +// Some samples. +// "FirstName" => "first_name" +// "HTTPServer" => "http_server" +// "NoHTTPS" => "no_https" +// "GO_PATH" => "go_path" +// "GO PATH" => "go_path" // space is converted to underscore. +// "GO-PATH" => "go_path" // hyphen is converted to underscore. +// +// From https://github.com/huandu/xstrings +func ToSnakeCase(str string) string { + if len(str) == 0 { + return "" + } + + buf := &bytes.Buffer{} + var prev, r0, r1 rune + var size int + + r0 = '_' + + for len(str) > 0 { + prev = r0 + r0, size = utf8.DecodeRuneInString(str) + str = str[size:] + + switch { + case r0 == utf8.RuneError: + buf.WriteByte(byte(str[0])) + + case unicode.IsUpper(r0): + if prev != '_' { + buf.WriteRune('_') + } + + buf.WriteRune(unicode.ToLower(r0)) + + if len(str) == 0 { + break + } + + r0, size = utf8.DecodeRuneInString(str) + str = str[size:] + + if !unicode.IsUpper(r0) { + buf.WriteRune(r0) + break + } + + // find next non-upper-case character and insert `_` properly. + // it's designed to convert `HTTPServer` to `http_server`. + // if there are more than 2 adjacent upper case characters in a word, + // treat them as an abbreviation plus a normal word. + for len(str) > 0 { + r1 = r0 + r0, size = utf8.DecodeRuneInString(str) + str = str[size:] + + if r0 == utf8.RuneError { + buf.WriteRune(unicode.ToLower(r1)) + buf.WriteByte(byte(str[0])) + break + } + + if !unicode.IsUpper(r0) { + if r0 == '_' || r0 == ' ' || r0 == '-' { + r0 = '_' + + buf.WriteRune(unicode.ToLower(r1)) + } else { + buf.WriteRune('_') + buf.WriteRune(unicode.ToLower(r1)) + buf.WriteRune(r0) + } + + break + } + + buf.WriteRune(unicode.ToLower(r1)) + } + + if len(str) == 0 || r0 == '_' { + buf.WriteRune(unicode.ToLower(r0)) + break + } + + default: + if r0 == ' ' || r0 == '-' { + r0 = '_' + } + + buf.WriteRune(r0) + } + } + + return buf.String() +} diff --git a/vendor/github.com/Unknwon/com/string_test.go b/vendor/github.com/Unknwon/com/string_test.go deleted file mode 100644 index ed90977b04a..00000000000 --- a/vendor/github.com/Unknwon/com/string_test.go +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2013 com authors -// -// Licensed under the Apache License, Version 2.0 (the "License"): you may -// not use this file except in compliance with the License. You may obtain -// a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations -// under the License. - -package com - -import ( - "testing" -) - -func TestIsLetter(t *testing.T) { - if IsLetter('1') { - t.Errorf("IsLetter:\n Expect => %v\n Got => %v\n", false, true) - } - - if IsLetter('[') { - t.Errorf("IsLetter:\n Expect => %v\n Got => %v\n", false, true) - } - - if !IsLetter('a') { - t.Errorf("IsLetter:\n Expect => %v\n Got => %v\n", true, false) - } - - if !IsLetter('Z') { - t.Errorf("IsLetter:\n Expect => %v\n Got => %v\n", true, false) - } -} - -func TestExpand(t *testing.T) { - match := map[string]string{ - "domain": "gowalker.org", - "subdomain": "github.com", - } - s := "http://{domain}/{subdomain}/{0}/{1}" - sR := "http://gowalker.org/github.com/Unknwon/gowalker" - if Expand(s, match, "Unknwon", "gowalker") != sR { - t.Errorf("Expand:\n Expect => %s\n Got => %s\n", sR, s) - } -} - -func TestReverse(t *testing.T) { - if Reverse("abcdefg") != "gfedcba" { - t.Errorf("Reverse:\n Except => %s\n Got =>%s\n", "gfedcba", Reverse("abcdefg")) - } - if Reverse("上善若水厚德载物") != "物载德厚水若善上" { - t.Errorf("Reverse:\n Except => %s\n Got =>%s\n", "物载德厚水若善上", Reverse("上善若水厚德载物")) - } -} - -func BenchmarkIsLetter(b *testing.B) { - for i := 0; i < b.N; i++ { - IsLetter('a') - } -} - -func BenchmarkExpand(b *testing.B) { - match := map[string]string{ - "domain": "gowalker.org", - "subdomain": "github.com", - } - s := "http://{domain}/{subdomain}/{0}/{1}" - for i := 0; i < b.N; i++ { - Expand(s, match, "Unknwon", "gowalker") - } -} - -func BenchmarkReverse(b *testing.B) { - s := "abscef中文" - for i := 0; i < b.N; i++ { - Reverse(s) - } -} diff --git a/vendor/github.com/go-macaron/binding/.travis.yml b/vendor/github.com/go-macaron/binding/.travis.yml deleted file mode 100644 index 2774fb35d50..00000000000 --- a/vendor/github.com/go-macaron/binding/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: false -language: go - -go: - - 1.3 - - 1.4 - - 1.5 - - tip - -script: go test -v -cover -race - -notifications: - email: - - u@gogs.io diff --git a/vendor/github.com/go-macaron/binding/binding.go b/vendor/github.com/go-macaron/binding/binding.go index 4b958ec964d..dbd7beb45f6 100644 --- a/vendor/github.com/go-macaron/binding/binding.go +++ b/vendor/github.com/go-macaron/binding/binding.go @@ -32,7 +32,7 @@ import ( "gopkg.in/macaron.v1" ) -const _VERSION = "0.2.0" +const _VERSION = "0.3.2" func Version() string { return _VERSION @@ -145,7 +145,7 @@ func Form(formStruct interface{}, ifacePtr ...interface{}) macaron.Handler { if parseErr != nil { errors.Add([]string{}, ERR_DESERIALIZATION, parseErr.Error()) } - mapForm(formStruct, ctx.Req.Form, nil, errors) + errors = mapForm(formStruct, ctx.Req.Form, nil, errors) validateAndMap(formStruct, ctx, errors, ifacePtr...) } } @@ -185,7 +185,7 @@ func MultipartForm(formStruct interface{}, ifacePtr ...interface{}) macaron.Hand ctx.Req.MultipartForm = form } } - mapForm(formStruct, ctx.Req.MultipartForm.Value, ctx.Req.MultipartForm.File, errors) + errors = mapForm(formStruct, ctx.Req.MultipartForm.Value, ctx.Req.MultipartForm.File, errors) validateAndMap(formStruct, ctx, errors, ifacePtr...) } } @@ -243,10 +243,10 @@ func Validate(obj interface{}) macaron.Handler { } var ( - alphaDashPattern = regexp.MustCompile("[^\\d\\w-_]") - alphaDashDotPattern = regexp.MustCompile("[^\\d\\w-_\\.]") - emailPattern = regexp.MustCompile("[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?") - urlPattern = regexp.MustCompile(`(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?`) + AlphaDashPattern = regexp.MustCompile("[^\\d\\w-_]") + AlphaDashDotPattern = regexp.MustCompile("[^\\d\\w-_\\.]") + EmailPattern = regexp.MustCompile("[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?") + URLPattern = regexp.MustCompile(`(http|https):\/\/(?:\\S+(?::\\S*)?@)?[\w\-_]+(\.[\w\-_]+)*([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?`) ) type ( @@ -255,7 +255,7 @@ type ( // IsMatch checks if rule matches. IsMatch func(string) bool // IsValid applies validation rule to condition. - IsValid func(Errors, string, interface{}) bool + IsValid func(Errors, string, interface{}) (bool, Errors) } // RuleMapper represents a validation rule mapper, // it allwos users to add custom validation rules. @@ -361,12 +361,12 @@ VALIDATE_RULES: break VALIDATE_RULES } case rule == "AlphaDash": - if alphaDashPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { + if AlphaDashPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { errors.Add([]string{field.Name}, ERR_ALPHA_DASH, "AlphaDash") break VALIDATE_RULES } case rule == "AlphaDashDot": - if alphaDashDotPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { + if AlphaDashDotPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { errors.Add([]string{field.Name}, ERR_ALPHA_DASH_DOT, "AlphaDashDot") break VALIDATE_RULES } @@ -414,7 +414,7 @@ VALIDATE_RULES: break VALIDATE_RULES } case rule == "Email": - if !emailPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { + if !EmailPattern.MatchString(fmt.Sprintf("%v", fieldValue)) { errors.Add([]string{field.Name}, ERR_EMAIL, "Email") break VALIDATE_RULES } @@ -422,7 +422,7 @@ VALIDATE_RULES: str := fmt.Sprintf("%v", fieldValue) if len(str) == 0 { continue - } else if !urlPattern.MatchString(str) { + } else if !URLPattern.MatchString(str) { errors.Add([]string{field.Name}, ERR_URL, "Url") break VALIDATE_RULES } @@ -449,7 +449,7 @@ VALIDATE_RULES: case strings.HasPrefix(rule, "Default("): if reflect.DeepEqual(zero, fieldValue) { if fieldVal.CanAddr() { - setWithProperType(field.Type.Kind(), rule[8:len(rule)-1], fieldVal, field.Tag.Get("form"), errors) + errors = setWithProperType(field.Type.Kind(), rule[8:len(rule)-1], fieldVal, field.Tag.Get("form"), errors) } else { errors.Add([]string{field.Name}, ERR_EXCLUDE, "Default") break VALIDATE_RULES @@ -457,9 +457,13 @@ VALIDATE_RULES: } default: // Apply custom validation rules. + var isValid bool for i := range ruleMapper { - if ruleMapper[i].IsMatch(rule) && !ruleMapper[i].IsValid(errors, field.Name, fieldValue) { - break VALIDATE_RULES + if ruleMapper[i].IsMatch(rule) { + isValid, errors = ruleMapper[i].IsValid(errors, field.Name, fieldValue) + if !isValid { + break VALIDATE_RULES + } } } } @@ -493,7 +497,7 @@ func SetNameMapper(nm NameMapper) { // Takes values from the form data and puts them into a struct func mapForm(formStruct reflect.Value, form map[string][]string, - formfile map[string][]*multipart.FileHeader, errors Errors) { + formfile map[string][]*multipart.FileHeader, errors Errors) Errors { if formStruct.Kind() == reflect.Ptr { formStruct = formStruct.Elem() @@ -506,12 +510,12 @@ func mapForm(formStruct reflect.Value, form map[string][]string, if typeField.Type.Kind() == reflect.Ptr && typeField.Anonymous { structField.Set(reflect.New(typeField.Type.Elem())) - mapForm(structField.Elem(), form, formfile, errors) + errors = mapForm(structField.Elem(), form, formfile, errors) if reflect.DeepEqual(structField.Elem().Interface(), reflect.Zero(structField.Elem().Type()).Interface()) { structField.Set(reflect.Zero(structField.Type())) } } else if typeField.Type.Kind() == reflect.Struct { - mapForm(structField, form, formfile, errors) + errors = mapForm(structField, form, formfile, errors) } inputFieldName := parseFormName(typeField.Name, typeField.Tag.Get("form")) @@ -526,11 +530,11 @@ func mapForm(formStruct reflect.Value, form map[string][]string, sliceOf := structField.Type().Elem().Kind() slice := reflect.MakeSlice(structField.Type(), numElems, numElems) for i := 0; i < numElems; i++ { - setWithProperType(sliceOf, inputValue[i], slice.Index(i), inputFieldName, errors) + errors = setWithProperType(sliceOf, inputValue[i], slice.Index(i), inputFieldName, errors) } formStruct.Field(i).Set(slice) } else { - setWithProperType(typeField.Type.Kind(), inputValue[0], structField, inputFieldName, errors) + errors = setWithProperType(typeField.Type.Kind(), inputValue[0], structField, inputFieldName, errors) } continue } @@ -551,13 +555,14 @@ func mapForm(formStruct reflect.Value, form map[string][]string, structField.Set(reflect.ValueOf(inputFile[0])) } } + return errors } // This sets the value in a struct of an indeterminate type to the // matching value from the request (via Form middleware) in the // same type, so that not all deserialized values have to be strings. // Supported types are string, int, float, and bool. -func setWithProperType(valueKind reflect.Kind, val string, structField reflect.Value, nameInTag string, errors Errors) { +func setWithProperType(valueKind reflect.Kind, val string, structField reflect.Value, nameInTag string, errors Errors) Errors { switch valueKind { case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: if val == "" { @@ -582,7 +587,7 @@ func setWithProperType(valueKind reflect.Kind, val string, structField reflect.V case reflect.Bool: if val == "on" { structField.SetBool(true) - return + break } if val == "" { @@ -617,6 +622,7 @@ func setWithProperType(valueKind reflect.Kind, val string, structField reflect.V case reflect.String: structField.SetString(val) } + return errors } // Don't pass in pointers to bind to. Can lead to bugs. diff --git a/vendor/github.com/go-macaron/inject/.travis.yml b/vendor/github.com/go-macaron/inject/.travis.yml deleted file mode 100644 index 2774fb35d50..00000000000 --- a/vendor/github.com/go-macaron/inject/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: false -language: go - -go: - - 1.3 - - 1.4 - - 1.5 - - tip - -script: go test -v -cover -race - -notifications: - email: - - u@gogs.io diff --git a/vendor/github.com/go-macaron/inject/inject.go b/vendor/github.com/go-macaron/inject/inject.go index b4a6ea45fe7..1c1f98eaaa0 100644 --- a/vendor/github.com/go-macaron/inject/inject.go +++ b/vendor/github.com/go-macaron/inject/inject.go @@ -50,6 +50,34 @@ type Invoker interface { Invoke(interface{}) ([]reflect.Value, error) } +// FastInvoker represents an interface in order to avoid the calling function via reflection. +// +// example: +// type handlerFuncHandler func(http.ResponseWriter, *http.Request) error +// func (f handlerFuncHandler)Invoke([]interface{}) ([]reflect.Value, error){ +// ret := f(p[0].(http.ResponseWriter), p[1].(*http.Request)) +// return []reflect.Value{reflect.ValueOf(ret)}, nil +// } +// +// type funcHandler func(int, string) +// func (f funcHandler)Invoke([]interface{}) ([]reflect.Value, error){ +// f(p[0].(int), p[1].(string)) +// return nil, nil +// } +type FastInvoker interface { + // Invoke attempts to call the ordinary functions. If f is a function + // with the appropriate signature, f.Invoke([]interface{}) is a Call that calls f. + // Returns a slice of reflect.Value representing the returned values of the function. + // Returns an error if the injection fails. + Invoke([]interface{}) ([]reflect.Value, error) +} + +// IsFastInvoker check interface is FastInvoker +func IsFastInvoker(h interface{}) bool { + _, ok := h.(FastInvoker) + return ok +} + // TypeMapper represents an interface for mapping interface{} values based on type. type TypeMapper interface { // Maps the interface{} value based on its immediate type from reflect.TypeOf. @@ -102,18 +130,50 @@ func New() Injector { // It panics if f is not a function func (inj *injector) Invoke(f interface{}) ([]reflect.Value, error) { t := reflect.TypeOf(f) - - var in = make([]reflect.Value, t.NumIn()) //Panic if t is not kind of Func - for i := 0; i < t.NumIn(); i++ { - argType := t.In(i) - val := inj.GetVal(argType) - if !val.IsValid() { - return nil, fmt.Errorf("Value not found for type %v", argType) - } - - in[i] = val + switch v := f.(type) { + case FastInvoker: + return inj.fastInvoke(v, t, t.NumIn()) + default: + return inj.callInvoke(f, t, t.NumIn()) } +} +func (inj *injector) fastInvoke(f FastInvoker, t reflect.Type, numIn int) ([]reflect.Value, error) { + var in []interface{} + if numIn > 0 { + in = make([]interface{}, numIn) // Panic if t is not kind of Func + var argType reflect.Type + var val reflect.Value + for i := 0; i < numIn; i++ { + argType = t.In(i) + val = inj.GetVal(argType) + if !val.IsValid() { + return nil, fmt.Errorf("Value not found for type %v", argType) + } + + in[i] = val.Interface() + } + } + return f.Invoke(in) +} + +// callInvoke reflect.Value.Call +func (inj *injector) callInvoke(f interface{}, t reflect.Type, numIn int) ([]reflect.Value, error) { + var in []reflect.Value + if numIn > 0 { + in = make([]reflect.Value, numIn) + var argType reflect.Type + var val reflect.Value + for i := 0; i < numIn; i++ { + argType = t.In(i) + val = inj.GetVal(argType) + if !val.IsValid() { + return nil, fmt.Errorf("Value not found for type %v", argType) + } + + in[i] = val + } + } return reflect.ValueOf(f).Call(in), nil } diff --git a/vendor/github.com/go-macaron/session/.gitignore b/vendor/github.com/go-macaron/session/.gitignore deleted file mode 100644 index 9297dbcd7c4..00000000000 --- a/vendor/github.com/go-macaron/session/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ledis/tmp.db -nodb/tmp.db \ No newline at end of file diff --git a/vendor/github.com/go-macaron/session/.travis.yml b/vendor/github.com/go-macaron/session/.travis.yml deleted file mode 100644 index 2774fb35d50..00000000000 --- a/vendor/github.com/go-macaron/session/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: false -language: go - -go: - - 1.3 - - 1.4 - - 1.5 - - tip - -script: go test -v -cover -race - -notifications: - email: - - u@gogs.io diff --git a/vendor/github.com/go-macaron/session/README.md b/vendor/github.com/go-macaron/session/README.md index 280ace36dc7..b11bd4a793d 100644 --- a/vendor/github.com/go-macaron/session/README.md +++ b/vendor/github.com/go-macaron/session/README.md @@ -1,4 +1,4 @@ -# session [![Build Status](https://travis-ci.org/go-macaron/session.svg?branch=master)](https://travis-ci.org/go-macaron/session) [![](http://gocover.io/_badge/github.com/go-macaron/session)](http://gocover.io/github.com/go-macaron/session) +# session [![Build Status](https://travis-ci.org/go-macaron/session.svg?branch=master)](https://travis-ci.org/go-macaron/session) Middleware session provides session management for [Macaron](https://github.com/go-macaron/macaron). It can use many session providers, including memory, file, Redis, Memcache, PostgreSQL, MySQL, Couchbase, Ledis and Nodb. @@ -9,7 +9,7 @@ Middleware session provides session management for [Macaron](https://github.com/ ## Getting Help - [API Reference](https://gowalker.org/github.com/go-macaron/session) -- [Documentation](http://go-macaron.com/docs/middlewares/session) +- [Documentation](https://go-macaron.com/docs/middlewares/session) ## Credits diff --git a/vendor/github.com/go-macaron/session/file.go b/vendor/github.com/go-macaron/session/file.go index 438269ea845..9bbc7aed20b 100644 --- a/vendor/github.com/go-macaron/session/file.go +++ b/vendor/github.com/go-macaron/session/file.go @@ -86,7 +86,7 @@ func (s *FileStore) Release() error { return err } - return ioutil.WriteFile(s.p.filepath(s.sid), data, os.ModePerm) + return ioutil.WriteFile(s.p.filepath(s.sid), data, 0600) } // Flush deletes all session data. @@ -121,7 +121,7 @@ func (p *FileProvider) filepath(sid string) string { // Read returns raw session store by session ID. func (p *FileProvider) Read(sid string) (_ RawStore, err error) { filename := p.filepath(sid) - if err = os.MkdirAll(path.Dir(filename), os.ModePerm); err != nil { + if err = os.MkdirAll(path.Dir(filename), 0700); err != nil { return nil, err } p.lock.RLock() @@ -129,7 +129,7 @@ func (p *FileProvider) Read(sid string) (_ RawStore, err error) { var f *os.File if com.IsFile(filename) { - f, err = os.OpenFile(filename, os.O_RDWR, os.ModePerm) + f, err = os.OpenFile(filename, os.O_RDONLY, 0600) } else { f, err = os.Create(filename) } @@ -187,15 +187,15 @@ func (p *FileProvider) regenerate(oldsid, sid string) (err error) { if err != nil { return err } - if err = os.MkdirAll(path.Dir(oldname), os.ModePerm); err != nil { + if err = os.MkdirAll(path.Dir(oldname), 0700); err != nil { return err } - if err = ioutil.WriteFile(oldname, data, os.ModePerm); err != nil { + if err = ioutil.WriteFile(oldname, data, 0600); err != nil { return err } } - if err = os.MkdirAll(path.Dir(filename), os.ModePerm); err != nil { + if err = os.MkdirAll(path.Dir(filename), 0700); err != nil { return err } if err = os.Rename(oldname, filename); err != nil { diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE new file mode 100644 index 00000000000..6a66aea5eaf --- /dev/null +++ b/vendor/golang.org/x/crypto/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS new file mode 100644 index 00000000000..733099041f8 --- /dev/null +++ b/vendor/golang.org/x/crypto/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the Go project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of Go, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of Go. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of Go or any code incorporated within this +implementation of Go constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of Go +shall terminate as of the date such litigation is filed. diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go new file mode 100644 index 00000000000..593f6530084 --- /dev/null +++ b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go @@ -0,0 +1,77 @@ +// Copyright 2012 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +/* +Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC +2898 / PKCS #5 v2.0. + +A key derivation function is useful when encrypting data based on a password +or any other not-fully-random data. It uses a pseudorandom function to derive +a secure encryption key based on the password. + +While v2.0 of the standard defines only one pseudorandom function to use, +HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved +Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To +choose, you can pass the `New` functions from the different SHA packages to +pbkdf2.Key. +*/ +package pbkdf2 // import "golang.org/x/crypto/pbkdf2" + +import ( + "crypto/hmac" + "hash" +) + +// Key derives a key from the password, salt and iteration count, returning a +// []byte of length keylen that can be used as cryptographic key. The key is +// derived based on the method described as PBKDF2 with the HMAC variant using +// the supplied hash function. +// +// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you +// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by +// doing: +// +// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New) +// +// Remember to get a good random salt. At least 8 bytes is recommended by the +// RFC. +// +// Using a higher iteration count will increase the cost of an exhaustive +// search but will also make derivation proportionally slower. +func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte { + prf := hmac.New(h, password) + hashLen := prf.Size() + numBlocks := (keyLen + hashLen - 1) / hashLen + + var buf [4]byte + dk := make([]byte, 0, numBlocks*hashLen) + U := make([]byte, hashLen) + for block := 1; block <= numBlocks; block++ { + // N.B.: || means concatenation, ^ means XOR + // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter + // U_1 = PRF(password, salt || uint(i)) + prf.Reset() + prf.Write(salt) + buf[0] = byte(block >> 24) + buf[1] = byte(block >> 16) + buf[2] = byte(block >> 8) + buf[3] = byte(block) + prf.Write(buf[:4]) + dk = prf.Sum(dk) + T := dk[len(dk)-hashLen:] + copy(U, T) + + // U_n = PRF(password, U_(n-1)) + for n := 2; n <= iter; n++ { + prf.Reset() + prf.Write(U) + U = U[:0] + U = prf.Sum(U) + for x := range U { + T[x] ^= U[x] + } + } + } + return dk[:keyLen] +} diff --git a/vendor/gopkg.in/macaron.v1/.gitignore b/vendor/gopkg.in/macaron.v1/.gitignore deleted file mode 100644 index 57ee3ec50fe..00000000000 --- a/vendor/gopkg.in/macaron.v1/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -macaron.sublime-project -macaron.sublime-workspace \ No newline at end of file diff --git a/vendor/gopkg.in/macaron.v1/.travis.yml b/vendor/gopkg.in/macaron.v1/.travis.yml deleted file mode 100644 index 6eeb32a4e38..00000000000 --- a/vendor/gopkg.in/macaron.v1/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -sudo: false -language: go - -go: - - 1.3 - - 1.4 - - 1.5 - -script: go test -v -cover -race - -notifications: - email: - - u@gogs.io diff --git a/vendor/gopkg.in/macaron.v1/README.md b/vendor/gopkg.in/macaron.v1/README.md index 704ecf34077..cfc7f6fdb4d 100644 --- a/vendor/gopkg.in/macaron.v1/README.md +++ b/vendor/gopkg.in/macaron.v1/README.md @@ -1,12 +1,10 @@ -Macaron [![Build Status](https://travis-ci.org/go-macaron/macaron.svg?branch=v1)](https://travis-ci.org/go-macaron/macaron) [![](http://gocover.io/_badge/github.com/go-macaron/macaron)](http://gocover.io/github.com/go-macaron/macaron) +Macaron [![Build Status](https://travis-ci.org/go-macaron/macaron.svg?branch=v1)](https://travis-ci.org/go-macaron/macaron) ======================= ![Macaron Logo](https://raw.githubusercontent.com/go-macaron/macaron/v1/macaronlogo.png) Package macaron is a high productive and modular web framework in Go. -##### Current version: 0.8.0 - ## Getting Started The minimum requirement of Go is **1.3**. @@ -70,18 +68,18 @@ There are already many [middlewares](https://github.com/go-macaron) to simplify ## Use Cases -- [Gogs](http://gogs.io): A painless self-hosted Git Service -- [Peach](http://peachdocs.org): A modern web documentation server +- [Gogs](https://gogs.io): A painless self-hosted Git Service +- [Peach](https://peachdocs.org): A modern web documentation server - [Go Walker](https://gowalker.org): Go online API documentation -- [Switch](http://gopm.io): Gopm registry +- [Switch](https://gopm.io): Gopm registry - [YouGam](http://yougam.com): Online Forum - [Critical Stack Intel](https://intel.criticalstack.com/): A 100% free intel marketplace from Critical Stack, Inc. ## Getting Help - [API Reference](https://gowalker.org/gopkg.in/macaron.v1) -- [Documentation](http://go-macaron.com) -- [FAQs](http://go-macaron.com/docs/faqs) +- [Documentation](https://go-macaron.com) +- [FAQs](https://go-macaron.com/docs/faqs) - [![Join the chat at https://gitter.im/Unknwon/macaron](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-macaron/macaron?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## Credits diff --git a/vendor/gopkg.in/macaron.v1/context.go b/vendor/gopkg.in/macaron.v1/context.go index bb6caa41414..dffc50cf6f6 100644 --- a/vendor/gopkg.in/macaron.v1/context.go +++ b/vendor/gopkg.in/macaron.v1/context.go @@ -15,7 +15,7 @@ package macaron import ( - "crypto/md5" + "crypto/sha256" "encoding/hex" "html/template" "io" @@ -32,8 +32,8 @@ import ( "time" "github.com/Unknwon/com" - "github.com/go-macaron/inject" + "golang.org/x/crypto/pbkdf2" ) // Locale reprents a localization interface. @@ -72,6 +72,14 @@ func (r *Request) Body() *RequestBody { return &RequestBody{r.Request.Body} } +// ContextInvoker is an inject.FastInvoker wrapper of func(ctx *Context). +type ContextInvoker func(ctx *Context) + +func (invoke ContextInvoker) Invoke(params []interface{}) ([]reflect.Value, error) { + invoke(params[0].(*Context)) + return nil, nil +} + // Context represents the runtime context of current request of Macaron instance. // It is the integration of most frequently used middlewares and helper methods. type Context struct { @@ -84,7 +92,7 @@ type Context struct { Req Request Resp ResponseWriter params Params - Render // Not nil only if you use macaran.Render middleware. + Render Locale Data map[string]interface{} } @@ -145,9 +153,6 @@ func (ctx *Context) RemoteAddr() string { } func (ctx *Context) renderHTML(status int, setName, tplName string, data ...interface{}) { - if ctx.Render == nil { - panic("renderer middleware hasn't been registered") - } if len(data) <= 0 { ctx.Render.HTMLSet(status, setName, tplName, ctx.Data) } else if len(data) == 1 { @@ -159,7 +164,7 @@ func (ctx *Context) renderHTML(status int, setName, tplName string, data ...inte // HTML calls Render.HTML but allows less arguments. func (ctx *Context) HTML(status int, name string, data ...interface{}) { - ctx.renderHTML(status, _DEFAULT_TPL_SET_NAME, name, data...) + ctx.renderHTML(status, DEFAULT_TPL_SET_NAME, name, data...) } // HTML calls Render.HTMLSet but allows less arguments. @@ -221,6 +226,12 @@ func (ctx *Context) QueryEscape(name string) string { return template.HTMLEscapeString(ctx.Query(name)) } +// QueryBool returns query result in bool type. +func (ctx *Context) QueryBool(name string) bool { + v, _ := strconv.ParseBool(ctx.Query(name)) + return v +} + // QueryInt returns query result in int type. func (ctx *Context) QueryInt(name string) int { return com.StrTo(ctx.Query(name)).MustInt() @@ -353,6 +364,13 @@ func (ctx *Context) SetCookie(name string, value string, others ...interface{}) } } + if len(others) > 5 { + if v, ok := others[5].(time.Time); ok { + cookie.Expires = v + cookie.RawExpires = v.Format(time.UnixDate) + } + } + ctx.Resp.Header().Add("Set-Cookie", cookie.String()) } @@ -401,30 +419,29 @@ func (ctx *Context) GetSecureCookie(key string) (string, bool) { // SetSuperSecureCookie sets given cookie value to response header with secret string. func (ctx *Context) SetSuperSecureCookie(secret, name, value string, others ...interface{}) { - m := md5.Sum([]byte(secret)) - secret = hex.EncodeToString(m[:]) - text, err := com.AESEncrypt([]byte(secret), []byte(value)) + key := pbkdf2.Key([]byte(secret), []byte(secret), 1000, 16, sha256.New) + text, err := com.AESGCMEncrypt(key, []byte(value)) if err != nil { panic("error encrypting cookie: " + err.Error()) } + ctx.SetCookie(name, hex.EncodeToString(text), others...) } // GetSuperSecureCookie returns given cookie value from request header with secret string. -func (ctx *Context) GetSuperSecureCookie(secret, key string) (string, bool) { - val := ctx.GetCookie(key) +func (ctx *Context) GetSuperSecureCookie(secret, name string) (string, bool) { + val := ctx.GetCookie(name) if val == "" { return "", false } - data, err := hex.DecodeString(val) + text, err := hex.DecodeString(val) if err != nil { return "", false } - m := md5.Sum([]byte(secret)) - secret = hex.EncodeToString(m[:]) - text, err := com.AESDecrypt([]byte(secret), data) + key := pbkdf2.Key([]byte(secret), []byte(secret), 1000, 16, sha256.New) + text, err = com.AESGCMDecrypt(key, text) return string(text), err == nil } diff --git a/vendor/gopkg.in/macaron.v1/logger.go b/vendor/gopkg.in/macaron.v1/logger.go index 109b7b3330d..3c54c24d57e 100644 --- a/vendor/gopkg.in/macaron.v1/logger.go +++ b/vendor/gopkg.in/macaron.v1/logger.go @@ -19,27 +19,39 @@ import ( "fmt" "log" "net/http" + "reflect" "runtime" "time" ) -var ColorLog = true +var ( + ColorLog = true + LogTimeFormat = "2006-01-02 15:04:05" +) func init() { ColorLog = runtime.GOOS != "windows" } +// LoggerInvoker is an inject.FastInvoker wrapper of func(ctx *Context, log *log.Logger). +type LoggerInvoker func(ctx *Context, log *log.Logger) + +func (invoke LoggerInvoker) Invoke(params []interface{}) ([]reflect.Value, error) { + invoke(params[0].(*Context), params[1].(*log.Logger)) + return nil, nil +} + // Logger returns a middleware handler that logs the request as it goes in and the response as it goes out. func Logger() Handler { return func(ctx *Context, log *log.Logger) { start := time.Now() - log.Printf("Started %s %s for %s", ctx.Req.Method, ctx.Req.RequestURI, ctx.RemoteAddr()) + log.Printf("%s: Started %s %s for %s", time.Now().Format(LogTimeFormat), ctx.Req.Method, ctx.Req.RequestURI, ctx.RemoteAddr()) rw := ctx.Resp.(ResponseWriter) ctx.Next() - content := fmt.Sprintf("Completed %s %v %s in %v", ctx.Req.RequestURI, rw.Status(), http.StatusText(rw.Status()), time.Since(start)) + content := fmt.Sprintf("%s: Completed %s %v %s in %v", time.Now().Format(LogTimeFormat), ctx.Req.RequestURI, rw.Status(), http.StatusText(rw.Status()), time.Since(start)) if ColorLog { switch rw.Status() { case 200, 201, 202: diff --git a/vendor/gopkg.in/macaron.v1/macaron.go b/vendor/gopkg.in/macaron.v1/macaron.go index 94fd3f0ce20..30ffca1cd18 100644 --- a/vendor/gopkg.in/macaron.v1/macaron.go +++ b/vendor/gopkg.in/macaron.v1/macaron.go @@ -24,6 +24,7 @@ import ( "os" "reflect" "strings" + "sync" "github.com/Unknwon/com" "gopkg.in/ini.v1" @@ -31,7 +32,7 @@ import ( "github.com/go-macaron/inject" ) -const _VERSION = "0.8.0.1013" +const _VERSION = "1.2.1.0213" func Version() string { return _VERSION @@ -42,20 +43,63 @@ func Version() string { // and panics if an argument could not be fullfilled via dependency injection. type Handler interface{} -// validateHandler makes sure a handler is a callable function, -// and panics if it is not. -func validateHandler(h Handler) { +// handlerFuncInvoker is an inject.FastInvoker wrapper of func(http.ResponseWriter, *http.Request). +type handlerFuncInvoker func(http.ResponseWriter, *http.Request) + +func (invoke handlerFuncInvoker) Invoke(params []interface{}) ([]reflect.Value, error) { + invoke(params[0].(http.ResponseWriter), params[1].(*http.Request)) + return nil, nil +} + +// internalServerErrorInvoker is an inject.FastInvoker wrapper of func(rw http.ResponseWriter, err error). +type internalServerErrorInvoker func(rw http.ResponseWriter, err error) + +func (invoke internalServerErrorInvoker) Invoke(params []interface{}) ([]reflect.Value, error) { + invoke(params[0].(http.ResponseWriter), params[1].(error)) + return nil, nil +} + +// validateAndWrapHandler makes sure a handler is a callable function, it panics if not. +// When the handler is also potential to be any built-in inject.FastInvoker, +// it wraps the handler automatically to have some performance gain. +func validateAndWrapHandler(h Handler) Handler { if reflect.TypeOf(h).Kind() != reflect.Func { panic("Macaron handler must be a callable function") } + + if !inject.IsFastInvoker(h) { + switch v := h.(type) { + case func(*Context): + return ContextInvoker(v) + case func(*Context, *log.Logger): + return LoggerInvoker(v) + case func(http.ResponseWriter, *http.Request): + return handlerFuncInvoker(v) + case func(http.ResponseWriter, error): + return internalServerErrorInvoker(v) + } + } + return h } -// validateHandlers makes sure handlers are callable functions, -// and panics if any of them is not. -func validateHandlers(handlers []Handler) { - for _, h := range handlers { - validateHandler(h) +// validateAndWrapHandlers preforms validation and wrapping for each input handler. +// It accepts an optional wrapper function to perform custom wrapping on handlers. +func validateAndWrapHandlers(handlers []Handler, wrappers ...func(Handler) Handler) []Handler { + var wrapper func(Handler) Handler + if len(wrappers) > 0 { + wrapper = wrappers[0] } + + wrappedHandlers := make([]Handler, len(handlers)) + for i, h := range handlers { + h = validateAndWrapHandler(h) + if wrapper != nil && !inject.IsFastInvoker(h) { + h = wrapper(h) + } + wrappedHandlers[i] = h + } + + return wrappedHandlers } // Macaron represents the top level web application. @@ -100,7 +144,7 @@ func New() *Macaron { } // Classic creates a classic Macaron with some basic default middleware: -// mocaron.Logger, mocaron.Recovery and mocaron.Static. +// macaron.Logger, macaron.Recovery and macaron.Static. func Classic() *Macaron { m := New() m.Use(Logger()) @@ -122,7 +166,7 @@ func (m *Macaron) Handlers(handlers ...Handler) { // Action sets the handler that will be called after all the middleware has been invoked. // This is set to macaron.Router in a macaron.Classic(). func (m *Macaron) Action(handler Handler) { - validateHandler(handler) + handler = validateAndWrapHandler(handler) m.action = handler } @@ -138,7 +182,7 @@ func (m *Macaron) Before(handler BeforeHandler) { // and panics if the handler is not a callable func. // Middleware Handlers are invoked in the order that they are added. func (m *Macaron) Use(handler Handler) { - validateHandler(handler) + handler = validateAndWrapHandler(handler) m.handlers = append(m.handlers, handler) } @@ -151,6 +195,7 @@ func (m *Macaron) createContext(rw http.ResponseWriter, req *http.Request) *Cont Router: m.Router, Req: Request{req}, Resp: NewResponseWriter(rw), + Render: &DummyRender{rw}, Data: make(map[string]interface{}), } c.SetParent(m) @@ -208,7 +253,7 @@ func (m *Macaron) Run(args ...interface{}) { addr := host + ":" + com.ToStr(port) logger := m.GetVal(reflect.TypeOf(m.logger)).Interface().(*log.Logger) - logger.Printf("listening on %s (%s)\n", addr, Env) + logger.Printf("listening on %s (%s)\n", addr, safeEnv()) logger.Fatalln(http.ListenAndServe(addr, m)) } @@ -234,7 +279,8 @@ const ( var ( // Env is the environment that Macaron is executing in. // The MACARON_ENV is read on initialization to set this variable. - Env = DEV + Env = DEV + envLock sync.Mutex // Path of work directory. Root string @@ -247,11 +293,21 @@ var ( ) func setENV(e string) { + envLock.Lock() + defer envLock.Unlock() + if len(e) > 0 { Env = e } } +func safeEnv() string { + envLock.Lock() + defer envLock.Unlock() + + return Env +} + func init() { setENV(os.Getenv("MACARON_ENV")) diff --git a/vendor/gopkg.in/macaron.v1/macaronlogo.png b/vendor/gopkg.in/macaron.v1/macaronlogo.png index a2ab537b6d8..399759769a8 100644 Binary files a/vendor/gopkg.in/macaron.v1/macaronlogo.png and b/vendor/gopkg.in/macaron.v1/macaronlogo.png differ diff --git a/vendor/gopkg.in/macaron.v1/render.go b/vendor/gopkg.in/macaron.v1/render.go index 3706e4fe414..f45e431240a 100644 --- a/vendor/gopkg.in/macaron.v1/render.go +++ b/vendor/gopkg.in/macaron.v1/render.go @@ -21,6 +21,7 @@ import ( "encoding/xml" "fmt" "html/template" + "io" "io/ioutil" "net/http" "os" @@ -72,6 +73,7 @@ type ( // TemplateFileSystem represents a interface of template file system that able to list all files. TemplateFileSystem interface { ListFiles() []TemplateFile + Get(string) (io.Reader, error) } // Delims represents a set of Left and Right delimiters for HTML template rendering @@ -86,6 +88,8 @@ type ( RenderOptions struct { // Directory to load templates. Default is "templates". Directory string + // Addtional directories to overwite templates. + AppendDirectories []string // Layout template name. Will not render a layout if "". Default is to "". Layout string // Extensions to parse template files from. Defaults are [".tmpl", ".html"]. @@ -172,8 +176,32 @@ func NewTemplateFileSystem(opt RenderOptions, omitData bool) TplFileSystem { fs := TplFileSystem{} fs.files = make([]TemplateFile, 0, 10) - if err := filepath.Walk(opt.Directory, func(path string, info os.FileInfo, err error) error { - r, err := filepath.Rel(opt.Directory, path) + // Directories are composed in reverse order because later one overwrites previous ones, + // so once found, we can directly jump out of the loop. + dirs := make([]string, 0, len(opt.AppendDirectories)+1) + for i := len(opt.AppendDirectories) - 1; i >= 0; i-- { + dirs = append(dirs, opt.AppendDirectories[i]) + } + dirs = append(dirs, opt.Directory) + + var err error + for i := range dirs { + // Skip ones that does not exists for symlink test, + // but allow non-symlink ones added after start. + if !com.IsExist(dirs[i]) { + continue + } + + dirs[i], err = filepath.EvalSymlinks(dirs[i]) + if err != nil { + panic("EvalSymlinks(" + dirs[i] + "): " + err.Error()) + } + } + lastDir := dirs[len(dirs)-1] + + // We still walk the last (original) directory because it's non-sense we load templates not exist in original directory. + if err = filepath.Walk(lastDir, func(path string, info os.FileInfo, err error) error { + r, err := filepath.Rel(lastDir, path) if err != nil { return err } @@ -181,19 +209,31 @@ func NewTemplateFileSystem(opt RenderOptions, omitData bool) TplFileSystem { ext := GetExt(r) for _, extension := range opt.Extensions { - if ext == extension { - var data []byte - if !omitData { + if ext != extension { + continue + } + + var data []byte + if !omitData { + // Loop over candidates of directory, break out once found. + // The file always exists because it's inside the walk function, + // and read original file is the worst case. + for i := range dirs { + path = filepath.Join(dirs[i], r) + if !com.IsFile(path) { + continue + } + data, err = ioutil.ReadFile(path) if err != nil { return err } + break } - - name := filepath.ToSlash((r[0 : len(r)-len(ext)])) - fs.files = append(fs.files, NewTplFile(name, data, ext)) - break } + + name := filepath.ToSlash((r[0 : len(r)-len(ext)])) + fs.files = append(fs.files, NewTplFile(name, data, ext)) } return nil @@ -208,6 +248,15 @@ func (fs TplFileSystem) ListFiles() []TemplateFile { return fs.files } +func (fs TplFileSystem) Get(name string) (io.Reader, error) { + for i := range fs.files { + if fs.files[i].Name()+fs.files[i].Ext() == name { + return bytes.NewReader(fs.files[i].Data()), nil + } + } + return nil, fmt.Errorf("file '%s' not found", name) +} + func PrepareCharset(charset string) string { if len(charset) != 0 { return "; charset=" + charset @@ -225,8 +274,7 @@ func GetExt(s string) string { } func compile(opt RenderOptions) *template.Template { - dir := opt.Directory - t := template.New(dir) + t := template.New(opt.Directory) t.Delims(opt.Delims.Left, opt.Delims.Right) // Parse an initial template in case we don't have any. template.Must(t.Parse("Macaron")) @@ -248,24 +296,25 @@ func compile(opt RenderOptions) *template.Template { } const ( - _DEFAULT_TPL_SET_NAME = "DEFAULT" + DEFAULT_TPL_SET_NAME = "DEFAULT" ) -// templateSet represents a template set of type *template.Template. -type templateSet struct { +// TemplateSet represents a template set of type *template.Template. +type TemplateSet struct { lock sync.RWMutex sets map[string]*template.Template dirs map[string]string } -func newTemplateSet() *templateSet { - return &templateSet{ +// NewTemplateSet initializes a new empty template set. +func NewTemplateSet() *TemplateSet { + return &TemplateSet{ sets: make(map[string]*template.Template), dirs: make(map[string]string), } } -func (ts *templateSet) Set(name string, opt *RenderOptions) *template.Template { +func (ts *TemplateSet) Set(name string, opt *RenderOptions) *template.Template { t := compile(*opt) ts.lock.Lock() @@ -276,14 +325,14 @@ func (ts *templateSet) Set(name string, opt *RenderOptions) *template.Template { return t } -func (ts *templateSet) Get(name string) *template.Template { +func (ts *TemplateSet) Get(name string) *template.Template { ts.lock.RLock() defer ts.lock.RUnlock() return ts.sets[name] } -func (ts *templateSet) GetDir(name string) string { +func (ts *TemplateSet) GetDir(name string) string { ts.lock.RLock() defer ts.lock.RUnlock() @@ -332,8 +381,8 @@ func ParseTplSet(tplSet string) (tplName string, tplDir string) { func renderHandler(opt RenderOptions, tplSets []string) Handler { cs := PrepareCharset(opt.Charset) - ts := newTemplateSet() - ts.Set(_DEFAULT_TPL_SET_NAME, &opt) + ts := NewTemplateSet() + ts.Set(DEFAULT_TPL_SET_NAME, &opt) var tmpOpt RenderOptions for _, tplSet := range tplSets { @@ -346,7 +395,7 @@ func renderHandler(opt RenderOptions, tplSets []string) Handler { return func(ctx *Context) { r := &TplRender{ ResponseWriter: ctx.Resp, - templateSet: ts, + TemplateSet: ts, Opt: &opt, CompiledCharset: cs, } @@ -379,7 +428,7 @@ func Renderers(options RenderOptions, tplSets ...string) Handler { type TplRender struct { http.ResponseWriter - *templateSet + *TemplateSet Opt *RenderOptions CompiledCharset string @@ -486,11 +535,11 @@ func (r *TplRender) addYield(t *template.Template, tplName string, data interfac } func (r *TplRender) renderBytes(setName, tplName string, data interface{}, htmlOpt ...HTMLOptions) (*bytes.Buffer, error) { - t := r.templateSet.Get(setName) + t := r.TemplateSet.Get(setName) if Env == DEV { opt := *r.Opt - opt.Directory = r.templateSet.GetDir(setName) - t = r.templateSet.Set(setName, &opt) + opt.Directory = r.TemplateSet.GetDir(setName) + t = r.TemplateSet.Set(setName, &opt) } if t == nil { return nil, fmt.Errorf("html/template: template \"%s\" is undefined", tplName) @@ -523,12 +572,14 @@ func (r *TplRender) renderHTML(status int, setName, tplName string, data interfa r.Header().Set(_CONTENT_TYPE, r.Opt.HTMLContentType+r.CompiledCharset) r.WriteHeader(status) - out.WriteTo(r) + if _, err := out.WriteTo(r); err != nil { + out.Reset() + } bufpool.Put(out) } func (r *TplRender) HTML(status int, name string, data interface{}, htmlOpt ...HTMLOptions) { - r.renderHTML(status, _DEFAULT_TPL_SET_NAME, name, data, htmlOpt...) + r.renderHTML(status, DEFAULT_TPL_SET_NAME, name, data, htmlOpt...) } func (r *TplRender) HTMLSet(status int, setName, tplName string, data interface{}, htmlOpt ...HTMLOptions) { @@ -544,7 +595,7 @@ func (r *TplRender) HTMLSetBytes(setName, tplName string, data interface{}, html } func (r *TplRender) HTMLBytes(name string, data interface{}, htmlOpt ...HTMLOptions) ([]byte, error) { - return r.HTMLSetBytes(_DEFAULT_TPL_SET_NAME, name, data, htmlOpt...) + return r.HTMLSetBytes(DEFAULT_TPL_SET_NAME, name, data, htmlOpt...) } func (r *TplRender) HTMLSetString(setName, tplName string, data interface{}, htmlOpt ...HTMLOptions) (string, error) { @@ -581,13 +632,94 @@ func (r *TplRender) prepareHTMLOptions(htmlOpt []HTMLOptions) HTMLOptions { func (r *TplRender) SetTemplatePath(setName, dir string) { if len(setName) == 0 { - setName = _DEFAULT_TPL_SET_NAME + setName = DEFAULT_TPL_SET_NAME } opt := *r.Opt opt.Directory = dir - r.templateSet.Set(setName, &opt) + r.TemplateSet.Set(setName, &opt) } func (r *TplRender) HasTemplateSet(name string) bool { - return r.templateSet.Get(name) != nil + return r.TemplateSet.Get(name) != nil +} + +// DummyRender is used when user does not choose any real render to use. +// This way, we can print out friendly message which asks them to register one, +// instead of ugly and confusing 'nil pointer' panic. +type DummyRender struct { + http.ResponseWriter +} + +func renderNotRegistered() { + panic("middleware render hasn't been registered") +} + +func (r *DummyRender) SetResponseWriter(http.ResponseWriter) { + renderNotRegistered() +} + +func (r *DummyRender) JSON(int, interface{}) { + renderNotRegistered() +} + +func (r *DummyRender) JSONString(interface{}) (string, error) { + renderNotRegistered() + return "", nil +} + +func (r *DummyRender) RawData(int, []byte) { + renderNotRegistered() +} + +func (r *DummyRender) PlainText(int, []byte) { + renderNotRegistered() +} + +func (r *DummyRender) HTML(int, string, interface{}, ...HTMLOptions) { + renderNotRegistered() +} + +func (r *DummyRender) HTMLSet(int, string, string, interface{}, ...HTMLOptions) { + renderNotRegistered() +} + +func (r *DummyRender) HTMLSetString(string, string, interface{}, ...HTMLOptions) (string, error) { + renderNotRegistered() + return "", nil +} + +func (r *DummyRender) HTMLString(string, interface{}, ...HTMLOptions) (string, error) { + renderNotRegistered() + return "", nil +} + +func (r *DummyRender) HTMLSetBytes(string, string, interface{}, ...HTMLOptions) ([]byte, error) { + renderNotRegistered() + return nil, nil +} + +func (r *DummyRender) HTMLBytes(string, interface{}, ...HTMLOptions) ([]byte, error) { + renderNotRegistered() + return nil, nil +} + +func (r *DummyRender) XML(int, interface{}) { + renderNotRegistered() +} + +func (r *DummyRender) Error(int, ...string) { + renderNotRegistered() +} + +func (r *DummyRender) Status(int) { + renderNotRegistered() +} + +func (r *DummyRender) SetTemplatePath(string, string) { + renderNotRegistered() +} + +func (r *DummyRender) HasTemplateSet(string) bool { + renderNotRegistered() + return false } diff --git a/vendor/gopkg.in/macaron.v1/router.go b/vendor/gopkg.in/macaron.v1/router.go index f9b421a3302..21b00ec98ca 100644 --- a/vendor/gopkg.in/macaron.v1/router.go +++ b/vendor/gopkg.in/macaron.v1/router.go @@ -82,6 +82,9 @@ type Router struct { groups []group notFound http.HandlerFunc internalServerError func(*Context, error) + + // handlerWrapper is used to wrap arbitrary function from Handler to inject.FastInvoker. + handlerWrapper func(Handler) Handler } func NewRouter() *Router { @@ -173,7 +176,7 @@ func (r *Router) Handle(method string, pattern string, handlers []Handler) *Rout h = append(h, handlers...) handlers = h } - validateHandlers(handlers) + handlers = validateAndWrapHandlers(handlers, r.handlerWrapper) return r.handle(method, pattern, func(resp http.ResponseWriter, req *http.Request, params Params) { c := r.m.createContext(resp, req) @@ -251,23 +254,25 @@ func (r *Router) Combo(pattern string, h ...Handler) *ComboRouter { return &ComboRouter{r, pattern, h, map[string]bool{}, nil} } -// Configurable http.HandlerFunc which is called when no matching route is +// NotFound configurates http.HandlerFunc which is called when no matching route is // found. If it is not set, http.NotFound is used. // Be sure to set 404 response code in your handler. func (r *Router) NotFound(handlers ...Handler) { - validateHandlers(handlers) + handlers = validateAndWrapHandlers(handlers) r.notFound = func(rw http.ResponseWriter, req *http.Request) { c := r.m.createContext(rw, req) - c.handlers = append(r.m.handlers, handlers...) + c.handlers = make([]Handler, 0, len(r.m.handlers)+len(handlers)) + c.handlers = append(c.handlers, r.m.handlers...) + c.handlers = append(c.handlers, handlers...) c.run() } } -// Configurable handler which is called when route handler returns +// InternalServerError configurates handler which is called when route handler returns // error. If it is not set, default handler is used. // Be sure to set 500 response code in your handler. func (r *Router) InternalServerError(handlers ...Handler) { - validateHandlers(handlers) + handlers = validateAndWrapHandlers(handlers) r.internalServerError = func(c *Context, err error) { c.index = 0 c.handlers = handlers @@ -276,6 +281,11 @@ func (r *Router) InternalServerError(handlers ...Handler) { } } +// SetHandlerWrapper sets handlerWrapper for the router. +func (r *Router) SetHandlerWrapper(f func(Handler) Handler) { + r.handlerWrapper = f +} + func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) { if t, ok := r.routers[req.Method]; ok { h, p, ok := t.Match(req.URL.Path) diff --git a/vendor/gopkg.in/macaron.v1/static.go b/vendor/gopkg.in/macaron.v1/static.go index 4ff8342fc5e..60c521110e7 100644 --- a/vendor/gopkg.in/macaron.v1/static.go +++ b/vendor/gopkg.in/macaron.v1/static.go @@ -16,6 +16,7 @@ package macaron import ( + "encoding/base64" "log" "net/http" "path" @@ -35,6 +36,9 @@ type StaticOptions struct { // Expires defines which user-defined function to use for producing a HTTP Expires Header // https://developers.google.com/speed/docs/insights/LeverageBrowserCaching Expires func() string + // ETag defines if we should add an ETag header + // https://developers.google.com/web/fundamentals/performance/optimizing-content-efficiency/http-caching#validating-cached-responses-with-etags + ETag bool // FileSystem is the interface for supporting any implmentation of file system. FileSystem http.FileSystem } @@ -172,10 +176,21 @@ func staticHandler(ctx *Context, log *log.Logger, opt StaticOptions) bool { ctx.Resp.Header().Set("Expires", opt.Expires()) } + if opt.ETag { + tag := GenerateETag(string(fi.Size()), fi.Name(), fi.ModTime().UTC().Format(http.TimeFormat)) + ctx.Resp.Header().Set("ETag", tag) + } + http.ServeContent(ctx.Resp, ctx.Req.Request, file, fi.ModTime(), f) return true } +// GenerateETag generates an ETag based on size, filename and file modification time +func GenerateETag(fileSize, fileName, modTime string) string { + etag := fileSize + fileName + modTime + return base64.StdEncoding.EncodeToString([]byte(etag)) +} + // Static returns a middleware handler that serves static files in the given directory. func Static(directory string, staticOpt ...StaticOptions) Handler { opt := prepareStaticOptions(directory, staticOpt) diff --git a/vendor/vendor.json b/vendor/vendor.json index ee79351492d..4e884428eb7 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -6,6 +6,12 @@ "path": "appengine/cloudsql", "revision": "" }, + { + "checksumSHA1": "7HXb3cry6luicWeJM9Uxwzfo9Rs=", + "path": "github.com/Unknwon/com", + "revision": "0db4a625e949e956314d7d1adea9bf82384cc10c", + "revisionTime": "2017-02-13T07:20:14Z" + }, { "checksumSHA1": "6nleggdedlS1mdzSnu1xf1Pnd+8=", "path": "github.com/aws/aws-sdk-go", @@ -358,6 +364,24 @@ "version": "v1.21.1", "versionExact": "v1.21.1" }, + { + "checksumSHA1": "OkqfwXeTVoiIxNMDA7HKvmrCDw8=", + "path": "github.com/go-macaron/binding", + "revision": "48920167fa152d02f228cfbece7e0f1e452d200a", + "revisionTime": "2016-12-22T07:05:54Z" + }, + { + "checksumSHA1": "y0olVbiMQ6/UOa/eh52XYnies90=", + "path": "github.com/go-macaron/inject", + "revision": "d8a0b8677191f4380287cfebd08e462217bac7ad", + "revisionTime": "2016-06-27T17:00:12Z" + }, + { + "checksumSHA1": "gO0dj0NqsmBTkf4D0JzJDtOEx+U=", + "path": "github.com/go-macaron/session", + "revision": "b8e286a0dba8f4999042d6b258daf51b31d08938", + "revisionTime": "2017-03-20T17:22:09Z" + }, { "checksumSHA1": "42vkdsxNaLyPu+FktCzZ/8zsNSE=", "path": "github.com/go-sql-driver/mysql", @@ -452,6 +476,12 @@ "revision": "5db88ed452e937f2fd557de6f4f1af7f2eabed0b", "revisionTime": "2016-08-23T18:01:44Z" }, + { + "checksumSHA1": "1MGpGDQqnUoRpv7VEcQrXOBydXE=", + "path": "golang.org/x/crypto/pbkdf2", + "revision": "3543873453996aaab2fc6b3928a35fc5ca2b5afb", + "revisionTime": "2017-04-18T16:44:36Z" + }, { "checksumSHA1": "WHc3uByvGaMcnSoI21fhzYgbOgg=", "path": "golang.org/x/net/context/ctxhttp", @@ -487,6 +517,12 @@ "path": "gopkg.in/gomail.v2", "revision": "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1", "revisionTime": "2016-04-11T21:29:32Z" + }, + { + "checksumSHA1": "1HJvJZheB5NNl3i1R9zZJpiJ1G0=", + "path": "gopkg.in/macaron.v1", + "revision": "a325110f8b392bce3e5cdeb8c44bf98078ada3be", + "revisionTime": "2017-02-13T09:12:08Z" } ], "rootPath": "github.com/grafana/grafana"
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank