diff --git a/docs/sources/guides/index.md b/docs/sources/guides/index.md
index c80dd624624..2ea09142880 100644
--- a/docs/sources/guides/index.md
+++ b/docs/sources/guides/index.md
@@ -4,6 +4,6 @@ type = "docs"
[menu.docs]
name = "Getting Started"
identifier = "guides"
-weight = 2
+weight = 3
+++
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 7a431e29692..c1072db47a5 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -4,10 +4,6 @@ description = "Install guide for Grafana"
keywords = ["grafana", "installation", "documentation"]
type = "docs"
aliases = ["v1.1", "guides/reference/admin"]
-[menu.docs]
-name = "Welcome to the Docs"
-identifier = "root"
-weight = -1
+++
# Welcome to the Grafana Documentation
@@ -22,7 +18,7 @@ other domains including industrial sensors, home automation, weather, and proces
- [Installing on Mac OS X](installation/mac)
- [Installing on Windows](installation/windows)
- [Installing on Docker](installation/docker)
-- [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
+- [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](administration/provisioning#configuration-management-tools)
- [Nightly Builds](https://grafana.com/grafana/download)
For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
diff --git a/docs/sources/installation/index.md b/docs/sources/installation/index.md
index 47d52817b64..a86f426dc13 100644
--- a/docs/sources/installation/index.md
+++ b/docs/sources/installation/index.md
@@ -7,6 +7,7 @@ aliases = ["installation/installation/", "v2.1/installation/install/"]
[menu.docs]
name = "Installation"
identifier = "installation"
+weight = 1
+++
## Installing Grafana
diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index badd3b5712a..20aea1acd2e 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -39,7 +39,7 @@ Click a panel title to open the panel menu, then click share in the panel menu t
### Direct Link Rendered Image
-You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available.
+You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `tools/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available.
Example of a link to a server-side rendered PNG:
diff --git a/docs/sources/features/whatsnew/index.md b/docs/sources/whatsnew/index.md
similarity index 90%
rename from docs/sources/features/whatsnew/index.md
rename to docs/sources/whatsnew/index.md
index 30357af4668..df472f07093 100644
--- a/docs/sources/features/whatsnew/index.md
+++ b/docs/sources/whatsnew/index.md
@@ -3,7 +3,7 @@ title = "What's New in Grafana"
[menu.docs]
name = "What's New In Grafana"
identifier = "whatsnew"
-weight = 2
+weight = 3
+++
diff --git a/docs/versions.json b/docs/versions.json
new file mode 100644
index 00000000000..03cb40f0e1f
--- /dev/null
+++ b/docs/versions.json
@@ -0,0 +1,9 @@
+[
+ { "version": "v5.0", "path": "/v5.0", "archived": false },
+ { "version": "v4.6", "path": "/", "archived": false, "current": true },
+ { "version": "v4.5", "path": "/v4.5", "archived": true },
+ { "version": "v4.4", "path": "/v4.4", "archived": true },
+ { "version": "v4.3", "path": "/v4.3", "archived": true },
+ { "version": "v4.1", "path": "/v4.1", "archived": true },
+ { "version": "v3.1", "path": "/v3.1", "archived": true }
+]
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index d11122016c4..42ea091ef10 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
+ "github.com/grafana/grafana/pkg/services/guardian"
)
func ValidateOrgAlert(c *middleware.Context) {
@@ -62,9 +63,22 @@ func GetAlerts(c *middleware.Context) Response {
return ApiError(500, "List alerts failed", err)
}
+ alertDTOs, resp := transformToDTOs(query.Result, c)
+ if resp != nil {
+ return resp
+ }
+
+ return Json(200, alertDTOs)
+}
+
+func transformToDTOs(alerts []*models.Alert, c *middleware.Context) ([]*dtos.AlertRule, Response) {
+ if len(alerts) == 0 {
+ return []*dtos.AlertRule{}, nil
+ }
+
dashboardIds := make([]int64, 0)
alertDTOs := make([]*dtos.AlertRule, 0)
- for _, alert := range query.Result {
+ for _, alert := range alerts {
dashboardIds = append(dashboardIds, alert.DashboardId)
alertDTOs = append(alertDTOs, &dtos.AlertRule{
Id: alert.Id,
@@ -83,10 +97,8 @@ func GetAlerts(c *middleware.Context) Response {
DashboardIds: dashboardIds,
}
- if len(alertDTOs) > 0 {
- if err := bus.Dispatch(&dashboardsQuery); err != nil {
- return ApiError(500, "List alerts failed", err)
- }
+ if err := bus.Dispatch(&dashboardsQuery); err != nil {
+ return nil, ApiError(500, "List alerts failed", err)
}
//TODO: should be possible to speed this up with lookup table
@@ -98,7 +110,26 @@ func GetAlerts(c *middleware.Context) Response {
}
}
- return Json(200, alertDTOs)
+ permissionsQuery := models.GetDashboardPermissionsForUserQuery{
+ DashboardIds: dashboardIds,
+ OrgId: c.OrgId,
+ UserId: c.SignedInUser.UserId,
+ OrgRole: c.SignedInUser.OrgRole,
+ }
+
+ if err := bus.Dispatch(&permissionsQuery); err != nil {
+ return nil, ApiError(500, "List alerts failed", err)
+ }
+
+ for _, alert := range alertDTOs {
+ for _, perm := range permissionsQuery.Result {
+ if alert.DashboardId == perm.DashboardId {
+ alert.CanEdit = perm.Permission > 1
+ }
+ }
+ }
+
+ return alertDTOs, nil
}
// POST /api/alerts/test
@@ -155,24 +186,6 @@ func GetAlert(c *middleware.Context) Response {
return Json(200, &query.Result)
}
-// DEL /api/alerts/:id
-func DelAlert(c *middleware.Context) Response {
- alertId := c.ParamsInt64(":alertId")
-
- if alertId == 0 {
- return ApiError(401, "Failed to parse alertid", nil)
- }
-
- cmd := models.DeleteAlertCommand{AlertId: alertId}
-
- if err := bus.Dispatch(&cmd); err != nil {
- return ApiError(500, "Failed to delete alert", err)
- }
-
- var resp = map[string]interface{}{"alertId": alertId}
- return Json(200, resp)
-}
-
func GetAlertNotifiers(c *middleware.Context) Response {
return Json(200, alerting.GetNotifiers())
}
@@ -267,6 +280,22 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R
//POST /api/alerts/:alertId/pause
func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
alertId := c.ParamsInt64("alertId")
+
+ query := models.GetAlertByIdQuery{Id: alertId}
+
+ if err := bus.Dispatch(&query); err != nil {
+ return ApiError(500, "Get Alert failed", err)
+ }
+
+ guardian := guardian.NewDashboardGuardian(query.Result.DashboardId, c.OrgId, c.SignedInUser)
+ if canEdit, err := guardian.CanEdit(); err != nil || !canEdit {
+ if err != nil {
+ return ApiError(500, "Error while checking permissions for Alert", err)
+ }
+
+ return ApiError(403, "Access denied to this dashboard and alert", nil)
+ }
+
cmd := models.PauseAlertCommand{
OrgId: c.OrgId,
AlertIds: []int64{alertId},
diff --git a/pkg/api/alerting_test.go b/pkg/api/alerting_test.go
new file mode 100644
index 00000000000..6b030053e22
--- /dev/null
+++ b/pkg/api/alerting_test.go
@@ -0,0 +1,97 @@
+package api
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ m "github.com/grafana/grafana/pkg/models"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAlertingApiEndpoint(t *testing.T) {
+ Convey("Given an alert in a dashboard with an acl", t, func() {
+
+ singleAlert := &m.Alert{Id: 1, DashboardId: 1, Name: "singlealert"}
+
+ bus.AddHandler("test", func(query *m.GetAlertByIdQuery) error {
+ query.Result = singleAlert
+ return nil
+ })
+
+ viewerRole := m.ROLE_VIEWER
+ editorRole := m.ROLE_EDITOR
+
+ aclMockResp := []*m.DashboardAclInfoDTO{}
+ bus.AddHandler("test", func(query *m.GetDashboardAclInfoListQuery) error {
+ query.Result = aclMockResp
+ return nil
+ })
+
+ bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error {
+ query.Result = []*m.Team{}
+ return nil
+ })
+
+ Convey("When user is editor and not in the ACL", func() {
+ Convey("Should not be able to pause the alert", func() {
+ cmd := dtos.PauseAlertCommand{
+ AlertId: 1,
+ Paused: true,
+ }
+ postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ CallPauseAlert(sc)
+ So(sc.resp.Code, ShouldEqual, 403)
+ })
+ })
+ })
+
+ Convey("When user is editor and dashboard has default ACL", func() {
+ aclMockResp = []*m.DashboardAclInfoDTO{
+ {Role: &viewerRole, Permission: m.PERMISSION_VIEW},
+ {Role: &editorRole, Permission: m.PERMISSION_EDIT},
+ }
+
+ Convey("Should be able to pause the alert", func() {
+ cmd := dtos.PauseAlertCommand{
+ AlertId: 1,
+ Paused: true,
+ }
+ postAlertScenario("When calling POST on", "/api/alerts/1/pause", "/api/alerts/:alertId/pause", m.ROLE_EDITOR, cmd, func(sc *scenarioContext) {
+ CallPauseAlert(sc)
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+ })
+ })
+}
+
+func CallPauseAlert(sc *scenarioContext) {
+ bus.AddHandler("test", func(cmd *m.PauseAlertCommand) error {
+ return nil
+ })
+
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+}
+
+func postAlertScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.PauseAlertCommand, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+
+ return PauseAlert(c, cmd)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
index 6b8cd443298..480962d8826 100644
--- a/pkg/api/annotations_test.go
+++ b/pkg/api/annotations_test.go
@@ -1,16 +1,13 @@
package api
import (
- "path/filepath"
"testing"
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/annotations"
- macaron "gopkg.in/macaron.v1"
. "github.com/smartystreets/goconvey/convey"
)
@@ -202,20 +199,7 @@ func postAnnotationScenario(desc string, url string, routePattern string, role m
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
+ sc := setupScenarioContext(url)
sc.defaultHandler = wrap(func(c *middleware.Context) Response {
sc.context = c
sc.context.UserId = TestUserID
@@ -238,20 +222,7 @@ func putAnnotationScenario(desc string, url string, routePattern string, role m.
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
+ sc := setupScenarioContext(url)
sc.defaultHandler = wrap(func(c *middleware.Context) Response {
sc.context = c
sc.context.UserId = TestUserID
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
new file mode 100644
index 00000000000..33fc1688603
--- /dev/null
+++ b/pkg/api/common_test.go
@@ -0,0 +1,105 @@
+package api
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "path/filepath"
+
+ "github.com/go-macaron/session"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/middleware"
+ "github.com/grafana/grafana/pkg/models"
+ macaron "gopkg.in/macaron.v1"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
+ loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn)
+}
+
+func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = role
+ if sc.handlerFunc != nil {
+ return sc.handlerFunc(sc.context)
+ }
+
+ return nil
+ })
+
+ switch method {
+ case "GET":
+ sc.m.Get(routePattern, sc.defaultHandler)
+ case "DELETE":
+ sc.m.Delete(routePattern, sc.defaultHandler)
+ }
+
+ fn(sc)
+ })
+}
+
+func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
+ sc.resp = httptest.NewRecorder()
+ req, err := http.NewRequest(method, url, nil)
+ So(err, ShouldBeNil)
+ sc.req = req
+
+ return sc
+}
+
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+ sc.resp = httptest.NewRecorder()
+ req, err := http.NewRequest(method, url, nil)
+ q := req.URL.Query()
+ for k, v := range queryParams {
+ q.Add(k, v)
+ }
+ req.URL.RawQuery = q.Encode()
+ So(err, ShouldBeNil)
+ sc.req = req
+
+ return sc
+}
+
+type scenarioContext struct {
+ m *macaron.Macaron
+ context *middleware.Context
+ resp *httptest.ResponseRecorder
+ handlerFunc handlerFunc
+ defaultHandler macaron.Handler
+ req *http.Request
+ url string
+}
+
+func (sc *scenarioContext) exec() {
+ sc.m.ServeHTTP(sc.resp, sc.req)
+}
+
+type scenarioFunc func(c *scenarioContext)
+type handlerFunc func(c *middleware.Context) Response
+
+func setupScenarioContext(url string) *scenarioContext {
+ sc := &scenarioContext{
+ url: url,
+ }
+ viewsPath, _ := filepath.Abs("../../public/views")
+
+ sc.m = macaron.New()
+ sc.m.Use(macaron.Renderer(macaron.RenderOptions{
+ Directory: viewsPath,
+ Delims: macaron.Delims{Left: "[[", Right: "]]"},
+ }))
+
+ sc.m.Use(middleware.GetContextHandler())
+ sc.m.Use(middleware.Sessioner(&session.Options{}))
+
+ return sc
+}
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index cf9f6b6bb8b..206b7f890b5 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -51,7 +51,6 @@ func GetDashboard(c *middleware.Context) Response {
guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser)
if canView, err := guardian.CanView(); err != nil || !canView {
- fmt.Printf("%v", err)
return dashboardGuardianResponse(err)
}
diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go
index c617a70cc0d..467045e360a 100644
--- a/pkg/api/dashboard_acl_test.go
+++ b/pkg/api/dashboard_acl_test.go
@@ -1,16 +1,13 @@
package api
import (
- "path/filepath"
"testing"
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
- macaron "gopkg.in/macaron.v1"
. "github.com/smartystreets/goconvey/convey"
)
@@ -42,6 +39,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
return nil
})
+ // This tests four scenarios:
+ // 1. user is an org admin
+ // 2. user is an org editor AND has been granted admin permission for the dashboard
+ // 3. user is an org viewer AND has been granted edit permission for the dashboard
+ // 4. user is an org editor AND has no permissions for the dashboard
+
Convey("When user is org admin", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_ADMIN, func(sc *scenarioContext) {
Convey("Should be able to access ACL", func() {
@@ -59,7 +62,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and has admin permission in the ACL", func() {
+ Convey("When user is org editor and has admin permission in the ACL", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 6, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_ADMIN})
@@ -150,11 +153,12 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and has edit permission in the ACL", func() {
- loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ Convey("When user is org viewer and has edit permission in the ACL", func() {
+ loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardId/acl", m.ROLE_VIEWER, func(sc *scenarioContext) {
mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT})
- Convey("Should not be able to access ACL", func() {
+ // Getting the permissions is an Admin permission
+ Convey("Should not be able to get list of permissions from ACL", func() {
sc.handlerFunc = GetDashboardAclList
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
@@ -162,7 +166,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_EDITOR, func(sc *scenarioContext) {
+ loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/id/1/acl/1", "/api/dashboards/id/:dashboardId/acl/:aclId", m.ROLE_VIEWER, func(sc *scenarioContext) {
mockResult = append(mockResult, &m.DashboardAclInfoDTO{Id: 1, OrgId: 1, DashboardId: 1, UserId: 1, Permission: m.PERMISSION_EDIT})
bus.AddHandler("test3", func(cmd *m.RemoveDashboardAclCommand) error {
@@ -178,7 +182,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
})
})
- Convey("When user is editor and not in the ACL", func() {
+ Convey("When user is org editor and not in the ACL", func() {
loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/id/1/acl", "/api/dashboards/id/:dashboardsId/acl", m.ROLE_EDITOR, func(sc *scenarioContext) {
Convey("Should not be able to access ACL", func() {
@@ -236,19 +240,7 @@ func postAclScenario(desc string, url string, routePattern string, role m.RoleTy
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
+ sc := setupScenarioContext(url)
sc.defaultHandler = wrap(func(c *middleware.Context) Response {
sc.context = c
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index e6228878625..c83479242fc 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -2,12 +2,8 @@ package api
import (
"encoding/json"
- "path/filepath"
"testing"
- macaron "gopkg.in/macaron.v1"
-
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
@@ -32,6 +28,10 @@ func (repo *fakeDashboardRepo) SaveDashboard(json *dashboards.SaveDashboardItem)
var fakeRepo *fakeDashboardRepo
+// This tests two main scenarios. If a user has access to execute an action on a dashboard:
+// 1. and the dashboard is in a folder which does not have an acl
+// 2. and the dashboard is in a folder which does have an acl
+
func TestDashboardApiEndpoint(t *testing.T) {
Convey("Given a dashboard with a parent folder which does not have an acl", t, func() {
fakeDash := m.NewDashboard("Child dash")
@@ -70,6 +70,10 @@ func TestDashboardApiEndpoint(t *testing.T) {
}),
}
+ // This tests two scenarios:
+ // 1. user is an org viewer
+ // 2. user is an org editor
+
Convey("When user is an Org Viewer", func() {
role := m.ROLE_VIEWER
@@ -200,6 +204,14 @@ func TestDashboardApiEndpoint(t *testing.T) {
}),
}
+ // This tests six scenarios:
+ // 1. user is an org viewer AND has no permissions for this dashboard
+ // 2. user is an org editor AND has no permissions for this dashboard
+ // 3. user is an org viewer AND has been granted edit permission for the dashboard
+ // 4. user is an org viewer AND all viewers have edit permission for this dashboard
+ // 5. user is an org viewer AND has been granted an admin permission
+ // 6. user is an org editor AND has been granted a view permission
+
Convey("When user is an Org Viewer and has no permissions for this dashboard", func() {
role := m.ROLE_VIEWER
@@ -488,20 +500,7 @@ func postDashboardScenario(desc string, url string, routePattern string, role m.
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
+ sc := setupScenarioContext(url)
sc.defaultHandler = wrap(func(c *middleware.Context) Response {
sc.context = c
sc.context.UserId = TestUserID
diff --git a/pkg/api/datasources_test.go b/pkg/api/datasources_test.go
index 72336693363..490393727d6 100644
--- a/pkg/api/datasources_test.go
+++ b/pkg/api/datasources_test.go
@@ -2,17 +2,11 @@ package api
import (
"encoding/json"
- "net/http"
- "net/http/httptest"
- "path/filepath"
"testing"
"github.com/grafana/grafana/pkg/models"
- macaron "gopkg.in/macaron.v1"
- "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
- "github.com/grafana/grafana/pkg/middleware"
. "github.com/smartystreets/goconvey/convey"
)
@@ -54,88 +48,3 @@ func TestDataSourcesProxy(t *testing.T) {
})
})
}
-
-func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
- loggedInUserScenarioWithRole(desc, "GET", url, url, models.ROLE_EDITOR, fn)
-}
-
-func loggedInUserScenarioWithRole(desc string, method string, url string, routePattern string, role models.RoleType, fn scenarioFunc) {
- Convey(desc+" "+url, func() {
- defer bus.ClearBusHandlers()
-
- sc := &scenarioContext{
- url: url,
- }
- viewsPath, _ := filepath.Abs("../../public/views")
-
- sc.m = macaron.New()
- sc.m.Use(macaron.Renderer(macaron.RenderOptions{
- Directory: viewsPath,
- Delims: macaron.Delims{Left: "[[", Right: "]]"},
- }))
-
- sc.m.Use(middleware.GetContextHandler())
- sc.m.Use(middleware.Sessioner(&session.Options{}))
-
- sc.defaultHandler = wrap(func(c *middleware.Context) Response {
- sc.context = c
- sc.context.UserId = TestUserID
- sc.context.OrgId = TestOrgID
- sc.context.OrgRole = role
- if sc.handlerFunc != nil {
- return sc.handlerFunc(sc.context)
- }
-
- return nil
- })
-
- switch method {
- case "GET":
- sc.m.Get(routePattern, sc.defaultHandler)
- case "DELETE":
- sc.m.Delete(routePattern, sc.defaultHandler)
- }
-
- fn(sc)
- })
-}
-
-func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
- sc.resp = httptest.NewRecorder()
- req, err := http.NewRequest(method, url, nil)
- So(err, ShouldBeNil)
- sc.req = req
-
- return sc
-}
-
-func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
- sc.resp = httptest.NewRecorder()
- req, err := http.NewRequest(method, url, nil)
- q := req.URL.Query()
- for k, v := range queryParams {
- q.Add(k, v)
- }
- req.URL.RawQuery = q.Encode()
- So(err, ShouldBeNil)
- sc.req = req
-
- return sc
-}
-
-type scenarioContext struct {
- m *macaron.Macaron
- context *middleware.Context
- resp *httptest.ResponseRecorder
- handlerFunc handlerFunc
- defaultHandler macaron.Handler
- req *http.Request
- url string
-}
-
-func (sc *scenarioContext) exec() {
- sc.m.ServeHTTP(sc.resp, sc.req)
-}
-
-type scenarioFunc func(c *scenarioContext)
-type handlerFunc func(c *middleware.Context) Response
diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go
index 4285ebc89cc..c32edb6e51c 100644
--- a/pkg/api/dtos/alerting.go
+++ b/pkg/api/dtos/alerting.go
@@ -20,6 +20,7 @@ type AlertRule struct {
EvalData *simplejson.Json `json:"evalData"`
ExecutionError string `json:"executionError"`
DashbboardUri string `json:"dashboardUri"`
+ CanEdit bool `json:"canEdit"`
}
type AlertNotification struct {
diff --git a/pkg/api/login.go b/pkg/api/login.go
index ebfe672f825..b6855af7baf 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -102,12 +102,13 @@ func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
}
authQuery := login.LoginUserQuery{
- Username: cmd.User,
- Password: cmd.Password,
+ Username: cmd.User,
+ Password: cmd.Password,
+ IpAddress: c.Req.RemoteAddr,
}
if err := bus.Dispatch(&authQuery); err != nil {
- if err == login.ErrInvalidCredentials {
+ if err == login.ErrInvalidCredentials || err == login.ErrTooManyLoginAttempts {
return ApiError(401, "Invalid username or password", err)
}
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index 45561783e43..5527c7271d6 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -3,21 +3,20 @@ package login
import (
"errors"
- "crypto/subtle"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
- "github.com/grafana/grafana/pkg/setting"
- "github.com/grafana/grafana/pkg/util"
)
var (
- ErrInvalidCredentials = errors.New("Invalid Username or Password")
+ ErrInvalidCredentials = errors.New("Invalid Username or Password")
+ ErrTooManyLoginAttempts = errors.New("Too many consecutive incorrect login attempts for user. Login for user temporarily blocked")
)
type LoginUserQuery struct {
- Username string
- Password string
- User *m.User
+ Username string
+ Password string
+ User *m.User
+ IpAddress string
}
func Init() {
@@ -26,41 +25,31 @@ func Init() {
}
func AuthenticateUser(query *LoginUserQuery) error {
- err := loginUsingGrafanaDB(query)
- if err == nil || err != ErrInvalidCredentials {
+ if err := validateLoginAttempts(query.Username); err != nil {
return err
}
- if setting.LdapEnabled {
- for _, server := range LdapCfg.Servers {
- author := NewLdapAuthenticator(server)
- err = author.Login(query)
- if err == nil || err != ErrInvalidCredentials {
- return err
- }
+ err := loginUsingGrafanaDB(query)
+ if err == nil || (err != m.ErrUserNotFound && err != ErrInvalidCredentials) {
+ return err
+ }
+
+ ldapEnabled, ldapErr := loginUsingLdap(query)
+ if ldapEnabled {
+ if ldapErr == nil || ldapErr != ErrInvalidCredentials {
+ return ldapErr
}
+
+ err = ldapErr
+ }
+
+ if err == ErrInvalidCredentials {
+ saveInvalidLoginAttempt(query)
+ }
+
+ if err == m.ErrUserNotFound {
+ return ErrInvalidCredentials
}
return err
}
-
-func loginUsingGrafanaDB(query *LoginUserQuery) error {
- userQuery := m.GetUserByLoginQuery{LoginOrEmail: query.Username}
-
- if err := bus.Dispatch(&userQuery); err != nil {
- if err == m.ErrUserNotFound {
- return ErrInvalidCredentials
- }
- return err
- }
-
- user := userQuery.Result
-
- passwordHashed := util.EncodePassword(query.Password, user.Salt)
- if subtle.ConstantTimeCompare([]byte(passwordHashed), []byte(user.Password)) != 1 {
- return ErrInvalidCredentials
- }
-
- query.User = user
- return nil
-}
diff --git a/pkg/login/auth_test.go b/pkg/login/auth_test.go
new file mode 100644
index 00000000000..59d3c8f2b33
--- /dev/null
+++ b/pkg/login/auth_test.go
@@ -0,0 +1,214 @@
+package login
+
+import (
+ "errors"
+ "testing"
+
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestAuthenticateUser(t *testing.T) {
+ Convey("Authenticate user", t, func() {
+ authScenario("When a user authenticates having too many login attempts", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(ErrTooManyLoginAttempts, sc)
+ mockLoginUsingGrafanaDB(nil, sc)
+ mockLoginUsingLdap(true, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeFalse)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate with valid credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(nil, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, nil)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate and unexpected error occurs", func(sc *authScenarioContext) {
+ customErr := errors.New("custom")
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(customErr, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, customErr)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeFalse)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and ldap disabled", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(false, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and invalid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeTrue)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and valid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, nil, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldBeNil)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When a non-existing grafana user authenticate and ldap returns unexpected error", func(sc *authScenarioContext) {
+ customErr := errors.New("custom")
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
+ mockLoginUsingLdap(true, customErr, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, customErr)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeFalse)
+ })
+ })
+
+ authScenario("When grafana user authenticate with invalid credentials and invalid ldap credentials", func(sc *authScenarioContext) {
+ mockLoginAttemptValidation(nil, sc)
+ mockLoginUsingGrafanaDB(ErrInvalidCredentials, sc)
+ mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+ mockSaveInvalidLoginAttempt(sc)
+
+ err := AuthenticateUser(sc.loginUserQuery)
+
+ Convey("it should result in", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
+ So(sc.grafanaLoginWasCalled, ShouldBeTrue)
+ So(sc.ldapLoginWasCalled, ShouldBeTrue)
+ So(sc.saveInvalidLoginAttemptWasCalled, ShouldBeTrue)
+ })
+ })
+ })
+}
+
+type authScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ grafanaLoginWasCalled bool
+ ldapLoginWasCalled bool
+ loginAttemptValidationWasCalled bool
+ saveInvalidLoginAttemptWasCalled bool
+}
+
+type authScenarioFunc func(sc *authScenarioContext)
+
+func mockLoginUsingGrafanaDB(err error, sc *authScenarioContext) {
+ loginUsingGrafanaDB = func(query *LoginUserQuery) error {
+ sc.grafanaLoginWasCalled = true
+ return err
+ }
+}
+
+func mockLoginUsingLdap(enabled bool, err error, sc *authScenarioContext) {
+ loginUsingLdap = func(query *LoginUserQuery) (bool, error) {
+ sc.ldapLoginWasCalled = true
+ return enabled, err
+ }
+}
+
+func mockLoginAttemptValidation(err error, sc *authScenarioContext) {
+ validateLoginAttempts = func(username string) error {
+ sc.loginAttemptValidationWasCalled = true
+ return err
+ }
+}
+
+func mockSaveInvalidLoginAttempt(sc *authScenarioContext) {
+ saveInvalidLoginAttempt = func(query *LoginUserQuery) {
+ sc.saveInvalidLoginAttemptWasCalled = true
+ }
+}
+
+func authScenario(desc string, fn authScenarioFunc) {
+ Convey(desc, func() {
+ origLoginUsingGrafanaDB := loginUsingGrafanaDB
+ origLoginUsingLdap := loginUsingLdap
+ origValidateLoginAttempts := validateLoginAttempts
+ origSaveInvalidLoginAttempt := saveInvalidLoginAttempt
+
+ sc := &authScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ }
+
+ defer func() {
+ loginUsingGrafanaDB = origLoginUsingGrafanaDB
+ loginUsingLdap = origLoginUsingLdap
+ validateLoginAttempts = origValidateLoginAttempts
+ saveInvalidLoginAttempt = origSaveInvalidLoginAttempt
+ }()
+
+ fn(sc)
+ })
+}
diff --git a/pkg/login/brute_force_login_protection.go b/pkg/login/brute_force_login_protection.go
new file mode 100644
index 00000000000..2ea93979c7a
--- /dev/null
+++ b/pkg/login/brute_force_login_protection.go
@@ -0,0 +1,48 @@
+package login
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var (
+ maxInvalidLoginAttempts int64 = 5
+ loginAttemptsWindow time.Duration = time.Minute * 5
+)
+
+var validateLoginAttempts = func(username string) error {
+ if setting.DisableBruteForceLoginProtection {
+ return nil
+ }
+
+ loginAttemptCountQuery := m.GetUserLoginAttemptCountQuery{
+ Username: username,
+ Since: time.Now().Add(-loginAttemptsWindow),
+ }
+
+ if err := bus.Dispatch(&loginAttemptCountQuery); err != nil {
+ return err
+ }
+
+ if loginAttemptCountQuery.Result >= maxInvalidLoginAttempts {
+ return ErrTooManyLoginAttempts
+ }
+
+ return nil
+}
+
+var saveInvalidLoginAttempt = func(query *LoginUserQuery) {
+ if setting.DisableBruteForceLoginProtection {
+ return
+ }
+
+ loginAttemptCommand := m.CreateLoginAttemptCommand{
+ Username: query.Username,
+ IpAddress: query.IpAddress,
+ }
+
+ bus.Dispatch(&loginAttemptCommand)
+}
diff --git a/pkg/login/brute_force_login_protection_test.go b/pkg/login/brute_force_login_protection_test.go
new file mode 100644
index 00000000000..5375134ba88
--- /dev/null
+++ b/pkg/login/brute_force_login_protection_test.go
@@ -0,0 +1,125 @@
+package login
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestLoginAttemptsValidation(t *testing.T) {
+ Convey("Validate login attempts", t, func() {
+ Convey("Given brute force login protection enabled", func() {
+ setting.DisableBruteForceLoginProtection = false
+
+ Convey("When user login attempt count equals max-1 ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts - 1)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count equals max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts)
+ err := validateLoginAttempts("user")
+
+ Convey("it should result in too many login attempts error", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ })
+ })
+
+ Convey("When user login attempt count is greater than max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts + 5)
+ err := validateLoginAttempts("user")
+
+ Convey("it should result in too many login attempts error", func() {
+ So(err, ShouldEqual, ErrTooManyLoginAttempts)
+ })
+ })
+
+ Convey("When saving invalid login attempt", func() {
+ defer bus.ClearBusHandlers()
+ createLoginAttemptCmd := &m.CreateLoginAttemptCommand{}
+
+ bus.AddHandler("test", func(cmd *m.CreateLoginAttemptCommand) error {
+ createLoginAttemptCmd = cmd
+ return nil
+ })
+
+ saveInvalidLoginAttempt(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ })
+
+ Convey("it should dispatch command", func() {
+ So(createLoginAttemptCmd, ShouldNotBeNil)
+ So(createLoginAttemptCmd.Username, ShouldEqual, "user")
+ So(createLoginAttemptCmd.IpAddress, ShouldEqual, "192.168.1.1:56433")
+ })
+ })
+ })
+
+ Convey("Given brute force login protection disabled", func() {
+ setting.DisableBruteForceLoginProtection = true
+
+ Convey("When user login attempt count equals max-1 ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts - 1)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count equals max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When user login attempt count is greater than max ", func() {
+ withLoginAttempts(maxInvalidLoginAttempts + 5)
+ err := validateLoginAttempts("user")
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("When saving invalid login attempt", func() {
+ defer bus.ClearBusHandlers()
+ createLoginAttemptCmd := (*m.CreateLoginAttemptCommand)(nil)
+
+ bus.AddHandler("test", func(cmd *m.CreateLoginAttemptCommand) error {
+ createLoginAttemptCmd = cmd
+ return nil
+ })
+
+ saveInvalidLoginAttempt(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ })
+
+ Convey("it should not dispatch command", func() {
+ So(createLoginAttemptCmd, ShouldBeNil)
+ })
+ })
+ })
+ })
+}
+
+func withLoginAttempts(loginAttempts int64) {
+ bus.AddHandler("test", func(query *m.GetUserLoginAttemptCountQuery) error {
+ query.Result = loginAttempts
+ return nil
+ })
+}
diff --git a/pkg/login/grafana_login.go b/pkg/login/grafana_login.go
new file mode 100644
index 00000000000..677ba776e4f
--- /dev/null
+++ b/pkg/login/grafana_login.go
@@ -0,0 +1,35 @@
+package login
+
+import (
+ "crypto/subtle"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+var validatePassword = func(providedPassword string, userPassword string, userSalt string) error {
+ passwordHashed := util.EncodePassword(providedPassword, userSalt)
+ if subtle.ConstantTimeCompare([]byte(passwordHashed), []byte(userPassword)) != 1 {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+}
+
+var loginUsingGrafanaDB = func(query *LoginUserQuery) error {
+ userQuery := m.GetUserByLoginQuery{LoginOrEmail: query.Username}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ return err
+ }
+
+ user := userQuery.Result
+
+ if err := validatePassword(query.Password, user.Password, user.Salt); err != nil {
+ return err
+ }
+
+ query.User = user
+ return nil
+}
diff --git a/pkg/login/grafana_login_test.go b/pkg/login/grafana_login_test.go
new file mode 100644
index 00000000000..88e52224113
--- /dev/null
+++ b/pkg/login/grafana_login_test.go
@@ -0,0 +1,139 @@
+package login
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestGrafanaLogin(t *testing.T) {
+ Convey("Login using Grafana DB", t, func() {
+ grafanaLoginScenario("When login with non-existing user", func(sc *grafanaLoginScenarioContext) {
+ sc.withNonExistingUser()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should result in user not found error", func() {
+ So(err, ShouldEqual, m.ErrUserNotFound)
+ })
+
+ Convey("it should not call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeFalse)
+ })
+
+ Convey("it should not pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldBeNil)
+ })
+ })
+
+ grafanaLoginScenario("When login with invalid credentials", func(sc *grafanaLoginScenarioContext) {
+ sc.withInvalidPassword()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should result in invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeTrue)
+ })
+
+ Convey("it should not pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldBeNil)
+ })
+ })
+
+ grafanaLoginScenario("When login with valid credentials", func(sc *grafanaLoginScenarioContext) {
+ sc.withValidCredentials()
+ err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+ Convey("it should not result in error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should call password validation", func() {
+ So(sc.validatePasswordCalled, ShouldBeTrue)
+ })
+
+ Convey("it should pupulate user object", func() {
+ So(sc.loginUserQuery.User, ShouldNotBeNil)
+ So(sc.loginUserQuery.User.Login, ShouldEqual, sc.loginUserQuery.Username)
+ So(sc.loginUserQuery.User.Password, ShouldEqual, sc.loginUserQuery.Password)
+ })
+ })
+ })
+}
+
+type grafanaLoginScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ validatePasswordCalled bool
+}
+
+type grafanaLoginScenarioFunc func(c *grafanaLoginScenarioContext)
+
+func grafanaLoginScenario(desc string, fn grafanaLoginScenarioFunc) {
+ Convey(desc, func() {
+ origValidatePassword := validatePassword
+
+ sc := &grafanaLoginScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ validatePasswordCalled: false,
+ }
+
+ defer func() {
+ validatePassword = origValidatePassword
+ }()
+
+ fn(sc)
+ })
+}
+
+func mockPasswordValidation(valid bool, sc *grafanaLoginScenarioContext) {
+ validatePassword = func(providedPassword string, userPassword string, userSalt string) error {
+ sc.validatePasswordCalled = true
+
+ if !valid {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+ }
+}
+
+func (sc *grafanaLoginScenarioContext) getUserByLoginQueryReturns(user *m.User) {
+ bus.AddHandler("test", func(query *m.GetUserByLoginQuery) error {
+ if user == nil {
+ return m.ErrUserNotFound
+ }
+
+ query.Result = user
+ return nil
+ })
+}
+
+func (sc *grafanaLoginScenarioContext) withValidCredentials() {
+ sc.getUserByLoginQueryReturns(&m.User{
+ Id: 1,
+ Login: sc.loginUserQuery.Username,
+ Password: sc.loginUserQuery.Password,
+ Salt: "salt",
+ })
+ mockPasswordValidation(true, sc)
+}
+
+func (sc *grafanaLoginScenarioContext) withNonExistingUser() {
+ sc.getUserByLoginQueryReturns(nil)
+}
+
+func (sc *grafanaLoginScenarioContext) withInvalidPassword() {
+ sc.getUserByLoginQueryReturns(&m.User{
+ Password: sc.loginUserQuery.Password,
+ Salt: "salt",
+ })
+ mockPasswordValidation(false, sc)
+}
diff --git a/pkg/login/ldap_login.go b/pkg/login/ldap_login.go
new file mode 100644
index 00000000000..b74b69db036
--- /dev/null
+++ b/pkg/login/ldap_login.go
@@ -0,0 +1,21 @@
+package login
+
+import (
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+var loginUsingLdap = func(query *LoginUserQuery) (bool, error) {
+ if !setting.LdapEnabled {
+ return false, nil
+ }
+
+ for _, server := range LdapCfg.Servers {
+ author := NewLdapAuthenticator(server)
+ err := author.Login(query)
+ if err == nil || err != ErrInvalidCredentials {
+ return true, err
+ }
+ }
+
+ return true, ErrInvalidCredentials
+}
diff --git a/pkg/login/ldap_login_test.go b/pkg/login/ldap_login_test.go
new file mode 100644
index 00000000000..6af125566e8
--- /dev/null
+++ b/pkg/login/ldap_login_test.go
@@ -0,0 +1,172 @@
+package login
+
+import (
+ "testing"
+
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/setting"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestLdapLogin(t *testing.T) {
+ Convey("Login using ldap", t, func() {
+ Convey("Given ldap enabled and a server configured", func() {
+ setting.LdapEnabled = true
+ LdapCfg.Servers = append(LdapCfg.Servers,
+ &LdapServerConf{
+ Host: "",
+ })
+
+ ldapLoginScenario("When login with invalid credentials", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(false)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should return invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeTrue)
+ })
+ })
+
+ ldapLoginScenario("When login with valid credentials", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(true)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should not return error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeTrue)
+ })
+ })
+ })
+
+ Convey("Given ldap enabled and no server configured", func() {
+ setting.LdapEnabled = true
+ LdapCfg.Servers = make([]*LdapServerConf, 0)
+
+ ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(true)
+ enabled, err := loginUsingLdap(sc.loginUserQuery)
+
+ Convey("it should return true", func() {
+ So(enabled, ShouldBeTrue)
+ })
+
+ Convey("it should return invalid credentials error", func() {
+ So(err, ShouldEqual, ErrInvalidCredentials)
+ })
+
+ Convey("it should not call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+ })
+ })
+ })
+
+ Convey("Given ldap disabled", func() {
+ setting.LdapEnabled = false
+
+ ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+ sc.withLoginResult(false)
+ enabled, err := loginUsingLdap(&LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ })
+
+ Convey("it should return false", func() {
+ So(enabled, ShouldBeFalse)
+ })
+
+ Convey("it should not return error", func() {
+ So(err, ShouldBeNil)
+ })
+
+ Convey("it should not call ldap login", func() {
+ So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+ })
+ })
+ })
+ })
+}
+
+func mockLdapAuthenticator(valid bool) *mockLdapAuther {
+ mock := &mockLdapAuther{
+ validLogin: valid,
+ }
+
+ NewLdapAuthenticator = func(server *LdapServerConf) ILdapAuther {
+ return mock
+ }
+
+ return mock
+}
+
+type mockLdapAuther struct {
+ validLogin bool
+ loginCalled bool
+}
+
+func (a *mockLdapAuther) Login(query *LoginUserQuery) error {
+ a.loginCalled = true
+
+ if !a.validLogin {
+ return ErrInvalidCredentials
+ }
+
+ return nil
+}
+
+func (a *mockLdapAuther) SyncSignedInUser(signedInUser *m.SignedInUser) error {
+ return nil
+}
+
+func (a *mockLdapAuther) GetGrafanaUserFor(ldapUser *LdapUserInfo) (*m.User, error) {
+ return nil, nil
+}
+
+func (a *mockLdapAuther) SyncOrgRoles(user *m.User, ldapUser *LdapUserInfo) error {
+ return nil
+}
+
+type ldapLoginScenarioContext struct {
+ loginUserQuery *LoginUserQuery
+ ldapAuthenticatorMock *mockLdapAuther
+}
+
+type ldapLoginScenarioFunc func(c *ldapLoginScenarioContext)
+
+func ldapLoginScenario(desc string, fn ldapLoginScenarioFunc) {
+ Convey(desc, func() {
+ origNewLdapAuthenticator := NewLdapAuthenticator
+
+ sc := &ldapLoginScenarioContext{
+ loginUserQuery: &LoginUserQuery{
+ Username: "user",
+ Password: "pwd",
+ IpAddress: "192.168.1.1:56433",
+ },
+ ldapAuthenticatorMock: &mockLdapAuther{},
+ }
+
+ defer func() {
+ NewLdapAuthenticator = origNewLdapAuthenticator
+ }()
+
+ fn(sc)
+ })
+}
+
+func (sc *ldapLoginScenarioContext) withLoginResult(valid bool) {
+ sc.ldapAuthenticatorMock = mockLdapAuthenticator(valid)
+}
diff --git a/pkg/login/settings.go b/pkg/login/ldap_settings.go
similarity index 100%
rename from pkg/login/settings.go
rename to pkg/login/ldap_settings.go
diff --git a/pkg/models/alert.go b/pkg/models/alert.go
index fa3f4b466a8..b378c5cf90f 100644
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -159,10 +159,6 @@ type SetAlertStateCommand struct {
Timestamp time.Time
}
-type DeleteAlertCommand struct {
- AlertId int64
-}
-
//Queries
type GetAlertsQuery struct {
OrgId int64
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index dccd93707a5..69e490ece11 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -199,6 +199,14 @@ type GetDashboardsQuery struct {
Result []*Dashboard
}
+type GetDashboardPermissionsForUserQuery struct {
+ DashboardIds []int64
+ OrgId int64
+ UserId int64
+ OrgRole RoleType
+ Result []*DashboardPermissionForUser
+}
+
type GetDashboardsByPluginIdQuery struct {
OrgId int64
PluginId string
@@ -221,3 +229,9 @@ type DashboardFolder struct {
Id int64 `json:"id"`
Title string `json:"title"`
}
+
+type DashboardPermissionForUser struct {
+ DashboardId int64 `json:"dashboardId"`
+ Permission PermissionType `json:"permission"`
+ PermissionName string `json:"permissionName"`
+}
diff --git a/pkg/models/login_attempt.go b/pkg/models/login_attempt.go
new file mode 100644
index 00000000000..e4391927702
--- /dev/null
+++ b/pkg/models/login_attempt.go
@@ -0,0 +1,36 @@
+package models
+
+import (
+ "time"
+)
+
+type LoginAttempt struct {
+ Id int64
+ Username string
+ IpAddress string
+ Created time.Time
+}
+
+// ---------------------
+// COMMANDS
+
+type CreateLoginAttemptCommand struct {
+ Username string
+ IpAddress string
+
+ Result LoginAttempt
+}
+
+type DeleteOldLoginAttemptsCommand struct {
+ OlderThan time.Time
+ DeletedRows int64
+}
+
+// ---------------------
+// QUERIES
+
+type GetUserLoginAttemptCountQuery struct {
+ Username string
+ Since time.Time
+ Result int64
+}
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
index 91511f96685..170e187b282 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
@@ -69,10 +69,14 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
for _, r := range pbres.Results {
qr := &tsdb.QueryResult{
- RefId: r.RefId,
- Series: []*tsdb.TimeSeries{},
- Error: errors.New(r.Error),
- ErrorString: r.Error,
+ RefId: r.RefId,
+ Series: []*tsdb.TimeSeries{},
+ Tables: []*tsdb.Table{},
+ }
+
+ if r.Error != "" {
+ qr.Error = errors.New(r.Error)
+ qr.ErrorString = r.Error
}
for _, s := range r.GetSeries() {
@@ -121,6 +125,7 @@ func (tw *DatasourcePluginWrapper) mapTable(t *datasource.Table) (*tsdb.Table, e
})
}
+ table.Rows = make([]tsdb.RowValues, 0)
for _, r := range t.GetRows() {
row := tsdb.RowValues{}
for _, rv := range r.Values {
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
index c85cb6cea52..834e8238e3a 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
@@ -75,7 +75,7 @@ func TestMappingRowValue(t *testing.T) {
boolRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_BOOL, BoolValue: true})
haveBool, ok := boolRowValue.(bool)
if !ok || haveBool != true {
- t.Fatalf("Expected true, was %s", haveBool)
+ t.Fatalf("Expected true, was %v", haveBool)
}
intRowValue, _ := dpw.mapRowValue(&datasource.RowValue{Kind: datasource.RowValue_TYPE_INT64, Int64Value: 42})
diff --git a/pkg/services/alerting/ticker_test.go b/pkg/services/alerting/ticker_test.go
index d4a5b958cdb..6670ee960a5 100644
--- a/pkg/services/alerting/ticker_test.go
+++ b/pkg/services/alerting/ticker_test.go
@@ -1,121 +1,121 @@
package alerting
-import (
- "testing"
- "time"
-
- "github.com/benbjohnson/clock"
-)
-
-func inspectTick(tick time.Time, last time.Time, offset time.Duration, t *testing.T) {
- if !tick.Equal(last.Add(time.Duration(1) * time.Second)) {
- t.Fatalf("expected a tick 1 second more than prev, %s. got: %s", last, tick)
- }
-}
-
-// returns the new last tick seen
-func assertAdvanceUntil(ticker *Ticker, last, desiredLast time.Time, offset, wait time.Duration, t *testing.T) time.Time {
- for {
- select {
- case tick := <-ticker.C:
- inspectTick(tick, last, offset, t)
- last = tick
- case <-time.NewTimer(wait).C:
- if last.Before(desiredLast) {
- t.Fatalf("waited %s for ticker to advance to %s, but only went up to %s", wait, desiredLast, last)
- }
- if last.After(desiredLast) {
- t.Fatalf("timer advanced too far. should only have gone up to %s, but it went up to %s", desiredLast, last)
- }
- return last
- }
- }
-}
-
-func assertNoAdvance(ticker *Ticker, desiredLast time.Time, wait time.Duration, t *testing.T) {
- for {
- select {
- case tick := <-ticker.C:
- t.Fatalf("timer should have stayed at %s, instead it advanced to %s", desiredLast, tick)
- case <-time.NewTimer(wait).C:
- return
- }
- }
-}
-
-func TestTickerRetro1Hour(t *testing.T) {
- offset := time.Duration(10) * time.Second
- last := time.Unix(0, 0)
- mock := clock.NewMock()
- mock.Add(time.Duration(1) * time.Hour)
- desiredLast := mock.Now().Add(-offset)
- ticker := NewTicker(last, offset, mock)
-
- last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
- assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
-
-}
-
-func TestAdvanceWithUpdateOffset(t *testing.T) {
- offset := time.Duration(10) * time.Second
- last := time.Unix(0, 0)
- mock := clock.NewMock()
- mock.Add(time.Duration(1) * time.Hour)
- desiredLast := mock.Now().Add(-offset)
- ticker := NewTicker(last, offset, mock)
-
- last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
- assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
-
- // lowering offset should see a few more ticks
- offset = time.Duration(5) * time.Second
- ticker.updateOffset(offset)
- desiredLast = mock.Now().Add(-offset)
- last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(9)*time.Millisecond, t)
- assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
-
- // advancing clock should see even more ticks
- mock.Add(time.Duration(1) * time.Hour)
- desiredLast = mock.Now().Add(-offset)
- last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(8)*time.Millisecond, t)
- assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
-
-}
-
-func getCase(lastSeconds, offsetSeconds int) (time.Time, time.Duration) {
- last := time.Unix(int64(lastSeconds), 0)
- offset := time.Duration(offsetSeconds) * time.Second
- return last, offset
-}
-
-func TestTickerNoAdvance(t *testing.T) {
-
- // it's 00:01:00 now. what are some cases where we don't want the ticker to advance?
- mock := clock.NewMock()
- mock.Add(time.Duration(60) * time.Second)
-
- type Case struct {
- last int
- offset int
- }
-
- // note that some cases add up to now, others go into the future
- cases := []Case{
- {50, 10},
- {50, 30},
- {59, 1},
- {59, 10},
- {59, 30},
- {60, 1},
- {60, 10},
- {60, 30},
- {90, 1},
- {90, 10},
- {90, 30},
- }
- for _, c := range cases {
- last, offset := getCase(c.last, c.offset)
- ticker := NewTicker(last, offset, mock)
- assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
- }
-}
+//import (
+// "testing"
+// "time"
+//
+// "github.com/benbjohnson/clock"
+//)
+//
+//func inspectTick(tick time.Time, last time.Time, offset time.Duration, t *testing.T) {
+// if !tick.Equal(last.Add(time.Duration(1) * time.Second)) {
+// t.Fatalf("expected a tick 1 second more than prev, %s. got: %s", last, tick)
+// }
+//}
+//
+//// returns the new last tick seen
+//func assertAdvanceUntil(ticker *Ticker, last, desiredLast time.Time, offset, wait time.Duration, t *testing.T) time.Time {
+// for {
+// select {
+// case tick := <-ticker.C:
+// inspectTick(tick, last, offset, t)
+// last = tick
+// case <-time.NewTimer(wait).C:
+// if last.Before(desiredLast) {
+// t.Fatalf("waited %s for ticker to advance to %s, but only went up to %s", wait, desiredLast, last)
+// }
+// if last.After(desiredLast) {
+// t.Fatalf("timer advanced too far. should only have gone up to %s, but it went up to %s", desiredLast, last)
+// }
+// return last
+// }
+// }
+//}
+//
+//func assertNoAdvance(ticker *Ticker, desiredLast time.Time, wait time.Duration, t *testing.T) {
+// for {
+// select {
+// case tick := <-ticker.C:
+// t.Fatalf("timer should have stayed at %s, instead it advanced to %s", desiredLast, tick)
+// case <-time.NewTimer(wait).C:
+// return
+// }
+// }
+//}
+//
+//func TestTickerRetro1Hour(t *testing.T) {
+// offset := time.Duration(10) * time.Second
+// last := time.Unix(0, 0)
+// mock := clock.NewMock()
+// mock.Add(time.Duration(1) * time.Hour)
+// desiredLast := mock.Now().Add(-offset)
+// ticker := NewTicker(last, offset, mock)
+//
+// last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
+// assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+//
+//}
+//
+//func TestAdvanceWithUpdateOffset(t *testing.T) {
+// offset := time.Duration(10) * time.Second
+// last := time.Unix(0, 0)
+// mock := clock.NewMock()
+// mock.Add(time.Duration(1) * time.Hour)
+// desiredLast := mock.Now().Add(-offset)
+// ticker := NewTicker(last, offset, mock)
+//
+// last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(10)*time.Millisecond, t)
+// assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+//
+// // lowering offset should see a few more ticks
+// offset = time.Duration(5) * time.Second
+// ticker.updateOffset(offset)
+// desiredLast = mock.Now().Add(-offset)
+// last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(9)*time.Millisecond, t)
+// assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+//
+// // advancing clock should see even more ticks
+// mock.Add(time.Duration(1) * time.Hour)
+// desiredLast = mock.Now().Add(-offset)
+// last = assertAdvanceUntil(ticker, last, desiredLast, offset, time.Duration(8)*time.Millisecond, t)
+// assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+//
+//}
+//
+//func getCase(lastSeconds, offsetSeconds int) (time.Time, time.Duration) {
+// last := time.Unix(int64(lastSeconds), 0)
+// offset := time.Duration(offsetSeconds) * time.Second
+// return last, offset
+//}
+//
+//func TestTickerNoAdvance(t *testing.T) {
+//
+// // it's 00:01:00 now. what are some cases where we don't want the ticker to advance?
+// mock := clock.NewMock()
+// mock.Add(time.Duration(60) * time.Second)
+//
+// type Case struct {
+// last int
+// offset int
+// }
+//
+// // note that some cases add up to now, others go into the future
+// cases := []Case{
+// {50, 10},
+// {50, 30},
+// {59, 1},
+// {59, 10},
+// {59, 30},
+// {60, 1},
+// {60, 10},
+// {60, 30},
+// {90, 1},
+// {90, 10},
+// {90, 30},
+// }
+// for _, c := range cases {
+// last, offset := getCase(c.last, c.offset)
+// ticker := NewTicker(last, offset, mock)
+// assertNoAdvance(ticker, last, time.Duration(500)*time.Millisecond, t)
+// }
+//}
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index 6e5e7684100..f9dcfce51b7 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -46,6 +46,7 @@ func (service *CleanUpService) start(ctx context.Context) error {
service.cleanUpTmpFiles()
service.deleteExpiredSnapshots()
service.deleteExpiredDashboardVersions()
+ service.deleteOldLoginAttempts()
case <-ctx.Done():
return ctx.Err()
}
@@ -88,3 +89,18 @@ func (service *CleanUpService) deleteExpiredSnapshots() {
func (service *CleanUpService) deleteExpiredDashboardVersions() {
bus.Dispatch(&m.DeleteExpiredVersionsCommand{})
}
+
+func (service *CleanUpService) deleteOldLoginAttempts() {
+ if setting.DisableBruteForceLoginProtection {
+ return
+ }
+
+ cmd := m.DeleteOldLoginAttemptsCommand{
+ OlderThan: time.Now().Add(time.Minute * -10),
+ }
+ if err := bus.Dispatch(&cmd); err != nil {
+ service.log.Error("Problem deleting expired login attempts", "error", err.Error())
+ } else {
+ service.log.Debug("Deleted expired login attempts", "rows affected", cmd.DeletedRows)
+ }
+}
diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index cb1aec8cd65..96af8bc49ee 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -14,7 +14,6 @@ func init() {
bus.AddHandler("sql", SaveAlerts)
bus.AddHandler("sql", HandleAlertsQuery)
bus.AddHandler("sql", GetAlertById)
- bus.AddHandler("sql", DeleteAlertById)
bus.AddHandler("sql", GetAllAlertQueryHandler)
bus.AddHandler("sql", SetAlertState)
bus.AddHandler("sql", GetAlertStatesForDashboard)
@@ -61,12 +60,6 @@ func deleteAlertByIdInternal(alertId int64, reason string, sess *DBSession) erro
return nil
}
-func DeleteAlertById(cmd *m.DeleteAlertCommand) error {
- return inTransaction(func(sess *DBSession) error {
- return deleteAlertByIdInternal(cmd.AlertId, "DeleteAlertCommand", sess)
- })
-}
-
func HandleAlertsQuery(query *m.GetAlertsQuery) error {
var sql bytes.Buffer
params := make([]interface{}, 0)
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index f4cdab22e89..81dab375188 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -1,6 +1,7 @@
package sqlstore
import (
+ "strings"
"time"
"github.com/grafana/grafana/pkg/bus"
@@ -19,6 +20,7 @@ func init() {
bus.AddHandler("sql", GetDashboardSlugById)
bus.AddHandler("sql", GetDashboardsByPluginId)
bus.AddHandler("sql", GetFoldersForSignedInUser)
+ bus.AddHandler("sql", GetDashboardPermissionsForUser)
}
func SaveDashboard(cmd *m.SaveDashboardCommand) error {
@@ -309,9 +311,10 @@ func GetFoldersForSignedInUser(query *m.GetFoldersForSignedInUserQuery) error {
LEFT JOIN dashboard_acl AS da ON d.id = da.dashboard_id
LEFT JOIN team_member AS ugm ON ugm.team_id = da.team_id
LEFT JOIN org_user ou ON ou.role = da.role AND ou.user_id = ?
- LEFT JOIN org_user ouRole ON ouRole.role = 'Editor' AND ouRole.user_id = ?`
+ LEFT JOIN org_user ouRole ON ouRole.role = 'Editor' AND ouRole.user_id = ? AND ouRole.org_id = ?`
params = append(params, query.SignedInUser.UserId)
params = append(params, query.SignedInUser.UserId)
+ params = append(params, query.OrgId)
sql += `WHERE
d.org_id = ? AND
@@ -389,6 +392,76 @@ func GetDashboards(query *m.GetDashboardsQuery) error {
return nil
}
+// GetDashboardPermissionsForUser returns the maximum permission the specified user has for a dashboard(s)
+// The function takes in a list of dashboard ids and the user id and role
+func GetDashboardPermissionsForUser(query *m.GetDashboardPermissionsForUserQuery) error {
+ if len(query.DashboardIds) == 0 {
+ return m.ErrCommandValidationFailed
+ }
+
+ if query.OrgRole == m.ROLE_ADMIN {
+ var permissions = make([]*m.DashboardPermissionForUser, 0)
+ for _, d := range query.DashboardIds {
+ permissions = append(permissions, &m.DashboardPermissionForUser{
+ DashboardId: d,
+ Permission: m.PERMISSION_ADMIN,
+ PermissionName: m.PERMISSION_ADMIN.String(),
+ })
+ }
+ query.Result = permissions
+
+ return nil
+ }
+
+ params := make([]interface{}, 0)
+
+ // check dashboards that have ACLs via user id, team id or role
+ sql := `SELECT d.id AS dashboard_id, MAX(COALESCE(da.permission, pt.permission)) AS permission
+ FROM dashboard AS d
+ LEFT JOIN dashboard_acl as da on d.folder_id = da.dashboard_id or d.id = da.dashboard_id
+ LEFT JOIN team_member as ugm on ugm.team_id = da.team_id
+ LEFT JOIN org_user ou ON ou.role = da.role AND ou.user_id = ?
+ `
+ params = append(params, query.UserId)
+
+ //check the user's role for dashboards that do not have hasAcl set
+ sql += `LEFT JOIN org_user ouRole ON ouRole.user_id = ? AND ouRole.org_id = ?`
+ params = append(params, query.UserId)
+ params = append(params, query.OrgId)
+
+ sql += `
+ LEFT JOIN (SELECT 1 AS permission, 'Viewer' AS 'role'
+ UNION SELECT 2 AS permission, 'Editor' AS 'role'
+ UNION SELECT 4 AS permission, 'Admin' AS 'role') pt ON ouRole.role = pt.role
+ WHERE
+ d.Id IN (?` + strings.Repeat(",?", len(query.DashboardIds)-1) + `) `
+ for _, id := range query.DashboardIds {
+ params = append(params, id)
+ }
+
+ sql += ` AND
+ d.org_id = ? AND
+ (
+ (d.has_acl = ? AND (da.user_id = ? OR ugm.user_id = ? OR ou.id IS NOT NULL))
+ OR (d.has_acl = ? AND ouRole.id IS NOT NULL)
+ )
+ group by d.id
+ order by d.id asc`
+ params = append(params, dialect.BooleanStr(true))
+ params = append(params, query.OrgId)
+ params = append(params, query.UserId)
+ params = append(params, query.UserId)
+ params = append(params, dialect.BooleanStr(false))
+
+ err := x.Sql(sql, params...).Find(&query.Result)
+
+ for _, p := range query.Result {
+ p.PermissionName = p.Permission.String()
+ }
+
+ return err
+}
+
func GetDashboardsByPluginId(query *m.GetDashboardsByPluginIdQuery) error {
var dashboards = make([]*m.Dashboard, 0)
whereExpr := "org_id=? AND plugin_id=? AND is_folder=" + dialect.BooleanStr(false)
diff --git a/pkg/services/sqlstore/dashboard_acl.go b/pkg/services/sqlstore/dashboard_acl.go
index 8d805c21685..9027f74f33a 100644
--- a/pkg/services/sqlstore/dashboard_acl.go
+++ b/pkg/services/sqlstore/dashboard_acl.go
@@ -126,14 +126,10 @@ func RemoveDashboardAcl(cmd *m.RemoveDashboardAclCommand) error {
}
func GetDashboardAclInfoList(query *m.GetDashboardAclInfoListQuery) error {
- dashboardFilter := fmt.Sprintf(`IN (
- SELECT %d
- UNION
- SELECT folder_id from dashboard where id = %d
- )`, query.DashboardId, query.DashboardId)
+ var err error
- rawSQL := `
- SELECT
+ if query.DashboardId == 0 {
+ sql := `SELECT
da.id,
da.org_id,
da.dashboard_id,
@@ -143,44 +139,71 @@ func GetDashboardAclInfoList(query *m.GetDashboardAclInfoListQuery) error {
da.role,
da.created,
da.updated,
- u.login AS user_login,
- u.email AS user_email,
- ug.name AS team
- FROM` + dialect.Quote("dashboard_acl") + ` as da
- LEFT OUTER JOIN ` + dialect.Quote("user") + ` AS u ON u.id = da.user_id
- LEFT OUTER JOIN team ug on ug.id = da.team_id
- WHERE dashboard_id ` + dashboardFilter + ` AND da.org_id = ?
+ '' as user_login,
+ '' as user_email,
+ '' as team
+ FROM dashboard_acl as da
+ WHERE da.dashboard_id = -1`
+ query.Result = make([]*m.DashboardAclInfoDTO, 0)
+ err = x.SQL(sql).Find(&query.Result)
- -- Also include default permission if has_acl = 0
+ } else {
+ dashboardFilter := fmt.Sprintf(`IN (
+ SELECT %d
+ UNION
+ SELECT folder_id from dashboard where id = %d
+ )`, query.DashboardId, query.DashboardId)
- UNION
- SELECT
- da.id,
- da.org_id,
- da.dashboard_id,
- da.user_id,
- da.team_id,
- da.permission,
- da.role,
- da.created,
- da.updated,
- '' as user_login,
- '' as user_email,
- '' as team
- FROM dashboard_acl as da,
- dashboard as dash
- LEFT JOIN dashboard folder on dash.folder_id = folder.id
- WHERE
- dash.id = ? AND (
- dash.has_acl = ` + dialect.BooleanStr(false) + ` or
- folder.has_acl = ` + dialect.BooleanStr(false) + `
- ) AND
- da.dashboard_id = -1
- ORDER BY 1 ASC
- `
+ rawSQL := `
+ SELECT
+ da.id,
+ da.org_id,
+ da.dashboard_id,
+ da.user_id,
+ da.team_id,
+ da.permission,
+ da.role,
+ da.created,
+ da.updated,
+ u.login AS user_login,
+ u.email AS user_email,
+ ug.name AS team
+ FROM` + dialect.Quote("dashboard_acl") + ` as da
+ LEFT OUTER JOIN ` + dialect.Quote("user") + ` AS u ON u.id = da.user_id
+ LEFT OUTER JOIN team ug on ug.id = da.team_id
+ WHERE dashboard_id ` + dashboardFilter + ` AND da.org_id = ?
- query.Result = make([]*m.DashboardAclInfoDTO, 0)
- err := x.SQL(rawSQL, query.OrgId, query.DashboardId).Find(&query.Result)
+ -- Also include default permission if has_acl = 0
+
+ UNION
+ SELECT
+ da.id,
+ da.org_id,
+ da.dashboard_id,
+ da.user_id,
+ da.team_id,
+ da.permission,
+ da.role,
+ da.created,
+ da.updated,
+ '' as user_login,
+ '' as user_email,
+ '' as team
+ FROM dashboard_acl as da,
+ dashboard as dash
+ LEFT JOIN dashboard folder on dash.folder_id = folder.id
+ WHERE
+ dash.id = ? AND (
+ dash.has_acl = ` + dialect.BooleanStr(false) + ` or
+ folder.has_acl = ` + dialect.BooleanStr(false) + `
+ ) AND
+ da.dashboard_id = -1
+ ORDER BY 1 ASC
+ `
+
+ query.Result = make([]*m.DashboardAclInfoDTO, 0)
+ err = x.SQL(rawSQL, query.OrgId, query.DashboardId).Find(&query.Result)
+ }
for _, p := range query.Result {
p.PermissionName = p.Permission.String()
diff --git a/pkg/services/sqlstore/dashboard_acl_test.go b/pkg/services/sqlstore/dashboard_acl_test.go
index bb6363883d6..8b712c73ece 100644
--- a/pkg/services/sqlstore/dashboard_acl_test.go
+++ b/pkg/services/sqlstore/dashboard_acl_test.go
@@ -232,5 +232,23 @@ func TestDashboardAclDataAccess(t *testing.T) {
})
})
+
+ Convey("Given a root folder", func() {
+ var rootFolderId int64 = 0
+
+ Convey("When reading dashboard acl should return default permissions", func() {
+ query := m.GetDashboardAclInfoListQuery{DashboardId: rootFolderId, OrgId: 1}
+
+ err := GetDashboardAclInfoList(&query)
+ So(err, ShouldBeNil)
+
+ So(len(query.Result), ShouldEqual, 2)
+ defaultPermissionsId := -1
+ So(query.Result[0].DashboardId, ShouldEqual, defaultPermissionsId)
+ So(*query.Result[0].Role, ShouldEqual, m.ROLE_VIEWER)
+ So(query.Result[1].DashboardId, ShouldEqual, defaultPermissionsId)
+ So(*query.Result[1].Role, ShouldEqual, m.ROLE_EDITOR)
+ })
+ })
})
}
diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go
index 3b1e05d3772..b5d21b37567 100644
--- a/pkg/services/sqlstore/dashboard_test.go
+++ b/pkg/services/sqlstore/dashboard_test.go
@@ -482,6 +482,24 @@ func TestDashboardDataAccess(t *testing.T) {
So(query.Result[0].Id, ShouldEqual, folder1.Id)
So(query.Result[1].Id, ShouldEqual, folder2.Id)
})
+
+ Convey("should have write access to all folders and dashboards", func() {
+ query := m.GetDashboardPermissionsForUserQuery{
+ DashboardIds: []int64{folder1.Id, folder2.Id},
+ OrgId: 1,
+ UserId: adminUser.Id,
+ OrgRole: m.ROLE_ADMIN,
+ }
+
+ err := GetDashboardPermissionsForUser(&query)
+ So(err, ShouldBeNil)
+
+ So(len(query.Result), ShouldEqual, 2)
+ So(query.Result[0].DashboardId, ShouldEqual, folder1.Id)
+ So(query.Result[0].Permission, ShouldEqual, m.PERMISSION_ADMIN)
+ So(query.Result[1].DashboardId, ShouldEqual, folder2.Id)
+ So(query.Result[1].Permission, ShouldEqual, m.PERMISSION_ADMIN)
+ })
})
Convey("Editor users", func() {
@@ -499,6 +517,24 @@ func TestDashboardDataAccess(t *testing.T) {
So(query.Result[1].Id, ShouldEqual, folder2.Id)
})
+ Convey("should have edit access to folders with default ACL", func() {
+ query := m.GetDashboardPermissionsForUserQuery{
+ DashboardIds: []int64{folder1.Id, folder2.Id},
+ OrgId: 1,
+ UserId: editorUser.Id,
+ OrgRole: m.ROLE_EDITOR,
+ }
+
+ err := GetDashboardPermissionsForUser(&query)
+ So(err, ShouldBeNil)
+
+ So(len(query.Result), ShouldEqual, 2)
+ So(query.Result[0].DashboardId, ShouldEqual, folder1.Id)
+ So(query.Result[0].Permission, ShouldEqual, m.PERMISSION_EDIT)
+ So(query.Result[1].DashboardId, ShouldEqual, folder2.Id)
+ So(query.Result[1].Permission, ShouldEqual, m.PERMISSION_EDIT)
+ })
+
Convey("Should have write access to one dashboard folder if default role changed to view for one folder", func() {
updateTestDashboardWithAcl(folder1.Id, editorUser.Id, m.PERMISSION_VIEW)
@@ -508,6 +544,7 @@ func TestDashboardDataAccess(t *testing.T) {
So(len(query.Result), ShouldEqual, 1)
So(query.Result[0].Id, ShouldEqual, folder2.Id)
})
+
})
Convey("Viewer users", func() {
@@ -523,6 +560,24 @@ func TestDashboardDataAccess(t *testing.T) {
So(len(query.Result), ShouldEqual, 0)
})
+ Convey("should have view access to folders with default ACL", func() {
+ query := m.GetDashboardPermissionsForUserQuery{
+ DashboardIds: []int64{folder1.Id, folder2.Id},
+ OrgId: 1,
+ UserId: viewerUser.Id,
+ OrgRole: m.ROLE_VIEWER,
+ }
+
+ err := GetDashboardPermissionsForUser(&query)
+ So(err, ShouldBeNil)
+
+ So(len(query.Result), ShouldEqual, 2)
+ So(query.Result[0].DashboardId, ShouldEqual, folder1.Id)
+ So(query.Result[0].Permission, ShouldEqual, m.PERMISSION_VIEW)
+ So(query.Result[1].DashboardId, ShouldEqual, folder2.Id)
+ So(query.Result[1].Permission, ShouldEqual, m.PERMISSION_VIEW)
+ })
+
Convey("Should be able to get one dashboard folder if default role changed to edit for one folder", func() {
updateTestDashboardWithAcl(folder1.Id, viewerUser.Id, m.PERMISSION_EDIT)
diff --git a/pkg/services/sqlstore/login_attempt.go b/pkg/services/sqlstore/login_attempt.go
new file mode 100644
index 00000000000..805d726df48
--- /dev/null
+++ b/pkg/services/sqlstore/login_attempt.go
@@ -0,0 +1,91 @@
+package sqlstore
+
+import (
+ "strconv"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+var getTimeNow = time.Now
+
+func init() {
+ bus.AddHandler("sql", CreateLoginAttempt)
+ bus.AddHandler("sql", DeleteOldLoginAttempts)
+ bus.AddHandler("sql", GetUserLoginAttemptCount)
+}
+
+func CreateLoginAttempt(cmd *m.CreateLoginAttemptCommand) error {
+ return inTransaction(func(sess *DBSession) error {
+ loginAttempt := m.LoginAttempt{
+ Username: cmd.Username,
+ IpAddress: cmd.IpAddress,
+ Created: getTimeNow(),
+ }
+
+ if _, err := sess.Insert(&loginAttempt); err != nil {
+ return err
+ }
+
+ cmd.Result = loginAttempt
+
+ return nil
+ })
+}
+
+func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error {
+ return inTransaction(func(sess *DBSession) error {
+ var maxId int64
+ sql := "SELECT max(id) as id FROM login_attempt WHERE created < " + dialect.DateTimeFunc("?")
+ result, err := sess.Query(sql, cmd.OlderThan)
+
+ if err != nil {
+ return err
+ }
+
+ maxId = toInt64(result[0]["id"])
+
+ if maxId == 0 {
+ return nil
+ }
+
+ sql = "DELETE FROM login_attempt WHERE id <= ?"
+
+ if result, err := sess.Exec(sql, maxId); err != nil {
+ return err
+ } else if cmd.DeletedRows, err = result.RowsAffected(); err != nil {
+ return err
+ }
+
+ return nil
+ })
+}
+
+func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error {
+ loginAttempt := new(m.LoginAttempt)
+ total, err := x.
+ Where("username = ?", query.Username).
+ And("created >="+dialect.DateTimeFunc("?"), query.Since).
+ Count(loginAttempt)
+
+ if err != nil {
+ return err
+ }
+
+ query.Result = total
+ return nil
+}
+
+func toInt64(i interface{}) int64 {
+ switch i.(type) {
+ case []byte:
+ n, _ := strconv.ParseInt(string(i.([]byte)), 10, 64)
+ return n
+ case int:
+ return int64(i.(int))
+ case int64:
+ return i.(int64)
+ }
+ return 0
+}
diff --git a/pkg/services/sqlstore/login_attempt_test.go b/pkg/services/sqlstore/login_attempt_test.go
new file mode 100644
index 00000000000..8008e2d8a62
--- /dev/null
+++ b/pkg/services/sqlstore/login_attempt_test.go
@@ -0,0 +1,125 @@
+package sqlstore
+
+import (
+ "testing"
+ "time"
+
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func mockTime(mock time.Time) time.Time {
+ getTimeNow = func() time.Time { return mock }
+ return mock
+}
+
+func TestLoginAttempts(t *testing.T) {
+ Convey("Testing Login Attempts DB Access", t, func() {
+ InitTestDB(t)
+
+ user := "user"
+ beginningOfTime := mockTime(time.Date(2017, 10, 22, 8, 0, 0, 0, time.Local))
+
+ err := CreateLoginAttempt(&m.CreateLoginAttemptCommand{
+ Username: user,
+ IpAddress: "192.168.0.1",
+ })
+ So(err, ShouldBeNil)
+
+ timePlusOneMinute := mockTime(beginningOfTime.Add(time.Minute * 1))
+
+ err = CreateLoginAttempt(&m.CreateLoginAttemptCommand{
+ Username: user,
+ IpAddress: "192.168.0.1",
+ })
+ So(err, ShouldBeNil)
+
+ timePlusTwoMinutes := mockTime(beginningOfTime.Add(time.Minute * 2))
+
+ err = CreateLoginAttempt(&m.CreateLoginAttemptCommand{
+ Username: user,
+ IpAddress: "192.168.0.1",
+ })
+ So(err, ShouldBeNil)
+
+ Convey("Should return a total count of zero login attempts when comparing since beginning of time + 2min and 1s", func() {
+ query := m.GetUserLoginAttemptCountQuery{
+ Username: user,
+ Since: timePlusTwoMinutes.Add(time.Second * 1),
+ }
+ err := GetUserLoginAttemptCount(&query)
+ So(err, ShouldBeNil)
+ So(query.Result, ShouldEqual, 0)
+ })
+
+ Convey("Should return the total count of login attempts since beginning of time", func() {
+ query := m.GetUserLoginAttemptCountQuery{
+ Username: user,
+ Since: beginningOfTime,
+ }
+ err := GetUserLoginAttemptCount(&query)
+ So(err, ShouldBeNil)
+ So(query.Result, ShouldEqual, 3)
+ })
+
+ Convey("Should return the total count of login attempts since beginning of time + 1min", func() {
+ query := m.GetUserLoginAttemptCountQuery{
+ Username: user,
+ Since: timePlusOneMinute,
+ }
+ err := GetUserLoginAttemptCount(&query)
+ So(err, ShouldBeNil)
+ So(query.Result, ShouldEqual, 2)
+ })
+
+ Convey("Should return the total count of login attempts since beginning of time + 2min", func() {
+ query := m.GetUserLoginAttemptCountQuery{
+ Username: user,
+ Since: timePlusTwoMinutes,
+ }
+ err := GetUserLoginAttemptCount(&query)
+ So(err, ShouldBeNil)
+ So(query.Result, ShouldEqual, 1)
+ })
+
+ Convey("Should return deleted rows older than beginning of time", func() {
+ cmd := m.DeleteOldLoginAttemptsCommand{
+ OlderThan: beginningOfTime,
+ }
+ err := DeleteOldLoginAttempts(&cmd)
+
+ So(err, ShouldBeNil)
+ So(cmd.DeletedRows, ShouldEqual, 0)
+ })
+
+ Convey("Should return deleted rows older than beginning of time + 1min", func() {
+ cmd := m.DeleteOldLoginAttemptsCommand{
+ OlderThan: timePlusOneMinute,
+ }
+ err := DeleteOldLoginAttempts(&cmd)
+
+ So(err, ShouldBeNil)
+ So(cmd.DeletedRows, ShouldEqual, 1)
+ })
+
+ Convey("Should return deleted rows older than beginning of time + 2min", func() {
+ cmd := m.DeleteOldLoginAttemptsCommand{
+ OlderThan: timePlusTwoMinutes,
+ }
+ err := DeleteOldLoginAttempts(&cmd)
+
+ So(err, ShouldBeNil)
+ So(cmd.DeletedRows, ShouldEqual, 2)
+ })
+
+ Convey("Should return deleted rows older than beginning of time + 2min and 1s", func() {
+ cmd := m.DeleteOldLoginAttemptsCommand{
+ OlderThan: timePlusTwoMinutes.Add(time.Second * 1),
+ }
+ err := DeleteOldLoginAttempts(&cmd)
+
+ So(err, ShouldBeNil)
+ So(cmd.DeletedRows, ShouldEqual, 3)
+ })
+ })
+}
diff --git a/pkg/services/sqlstore/migrations/login_attempt_mig.go b/pkg/services/sqlstore/migrations/login_attempt_mig.go
new file mode 100644
index 00000000000..e576ccd1a50
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/login_attempt_mig.go
@@ -0,0 +1,23 @@
+package migrations
+
+import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addLoginAttemptMigrations(mg *Migrator) {
+ loginAttemptV1 := Table{
+ Name: "login_attempt",
+ Columns: []*Column{
+ {Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+ {Name: "username", Type: DB_NVarchar, Length: 190, Nullable: false},
+ {Name: "ip_address", Type: DB_NVarchar, Length: 30, Nullable: false},
+ {Name: "created", Type: DB_DateTime, Nullable: false},
+ },
+ Indices: []*Index{
+ {Cols: []string{"username"}},
+ },
+ }
+
+ // create table
+ mg.AddMigration("create login attempt table", NewAddTableMigration(loginAttemptV1))
+ // add indices
+ mg.AddMigration("add index login_attempt.username", NewAddIndexMigration(loginAttemptV1, loginAttemptV1.Indices[0]))
+}
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 8e9268779ef..282f98e7318 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -29,6 +29,7 @@ func AddMigrations(mg *Migrator) {
addTeamMigrations(mg)
addDashboardAclMigrations(mg)
addTagMigration(mg)
+ addLoginAttemptMigrations(mg)
}
func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/migrator/dialect.go b/pkg/services/sqlstore/migrator/dialect.go
index 651405921d9..064b5981063 100644
--- a/pkg/services/sqlstore/migrator/dialect.go
+++ b/pkg/services/sqlstore/migrator/dialect.go
@@ -19,6 +19,7 @@ type Dialect interface {
LikeStr() string
Default(col *Column) string
BooleanStr(bool) string
+ DateTimeFunc(string) string
CreateIndexSql(tableName string, index *Index) string
CreateTableSql(table *Table) string
@@ -78,6 +79,10 @@ func (b *BaseDialect) Default(col *Column) string {
return col.Default
}
+func (db *BaseDialect) DateTimeFunc(value string) string {
+ return value
+}
+
func (b *BaseDialect) CreateTableSql(table *Table) string {
var sql string
sql = "CREATE TABLE IF NOT EXISTS "
diff --git a/pkg/services/sqlstore/migrator/sqlite_dialect.go b/pkg/services/sqlstore/migrator/sqlite_dialect.go
index fe1e781c8df..1a31cee4f5e 100644
--- a/pkg/services/sqlstore/migrator/sqlite_dialect.go
+++ b/pkg/services/sqlstore/migrator/sqlite_dialect.go
@@ -36,6 +36,10 @@ func (db *Sqlite3) BooleanStr(value bool) string {
return "0"
}
+func (db *Sqlite3) DateTimeFunc(value string) string {
+ return "datetime(" + value + ")"
+}
+
func (db *Sqlite3) SqlType(c *Column) string {
switch c.Type {
case DB_Date, DB_DateTime, DB_TimeStamp, DB_Time:
diff --git a/pkg/services/sqlstore/sqlutil/sqlutil.go b/pkg/services/sqlstore/sqlutil/sqlutil.go
index 4aa2ec27216..a33872ed687 100644
--- a/pkg/services/sqlstore/sqlutil/sqlutil.go
+++ b/pkg/services/sqlstore/sqlutil/sqlutil.go
@@ -12,7 +12,7 @@ type TestDB struct {
}
var TestDB_Sqlite3 = TestDB{DriverName: "sqlite3", ConnStr: ":memory:?_loc=Local"}
-var TestDB_Mysql = TestDB{DriverName: "mysql", ConnStr: "grafana:password@tcp(localhost:3306)/grafana_tests?collation=utf8mb4_unicode_ci"}
+var TestDB_Mysql = TestDB{DriverName: "mysql", ConnStr: "grafana:password@tcp(localhost:3306)/grafana_tests?collation=utf8mb4_unicode_ci&loc=Local"}
var TestDB_Postgres = TestDB{DriverName: "postgres", ConnStr: "user=grafanatest password=grafanatest host=localhost port=5432 dbname=grafanatest sslmode=disable"}
func CleanDB(x *xorm.Engine) {
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 8cdb94bd413..6ce80a69957 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -75,13 +75,14 @@ var (
EnforceDomain bool
// Security settings.
- SecretKey string
- LogInRememberDays int
- CookieUserName string
- CookieRememberName string
- DisableGravatar bool
- EmailCodeValidMinutes int
- DataProxyWhiteList map[string]bool
+ SecretKey string
+ LogInRememberDays int
+ CookieUserName string
+ CookieRememberName string
+ DisableGravatar bool
+ EmailCodeValidMinutes int
+ DataProxyWhiteList map[string]bool
+ DisableBruteForceLoginProtection bool
// Snapshots
ExternalSnapshotUrl string
@@ -514,6 +515,7 @@ func NewConfigContext(args *CommandLineArgs) error {
CookieUserName = security.Key("cookie_username").String()
CookieRememberName = security.Key("cookie_remember_name").String()
DisableGravatar = security.Key("disable_gravatar").MustBool(true)
+ DisableBruteForceLoginProtection = security.Key("disable_brute_force_login_protection").MustBool(false)
// read snapshots settings
snapshots := Cfg.Section("snapshots")
@@ -578,7 +580,7 @@ func NewConfigContext(args *CommandLineArgs) error {
// PhantomJS rendering
ImagesDir = filepath.Join(DataPath, "png")
- PhantomDir = filepath.Join(HomePath, "vendor/phantomjs")
+ PhantomDir = filepath.Join(HomePath, "tools/phantomjs")
analytics := Cfg.Section("analytics")
ReportingEnabled = analytics.Key("reporting_enabled").MustBool(true)
diff --git a/public/app/containers/AlertRuleList/AlertRuleList.jest.tsx b/public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
index a12340555e9..f5aa07b454a 100644
--- a/public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
+++ b/public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
@@ -24,6 +24,7 @@ describe('AlertRuleList', () => {
evalData: {},
executionError: '',
dashboardUri: 'db/mygool',
+ canEdit: true,
},
])
);
diff --git a/public/app/containers/AlertRuleList/AlertRuleList.tsx b/public/app/containers/AlertRuleList/AlertRuleList.tsx
index 429504e46d9..d2712706154 100644
--- a/public/app/containers/AlertRuleList/AlertRuleList.tsx
+++ b/public/app/containers/AlertRuleList/AlertRuleList.tsx
@@ -147,7 +147,8 @@ export class AlertRuleItem extends React.Component- Dashboad Links allow you to place links to other dashboards and web sites directly in below the dashboard header. + Dashboard Links allow you to place links to other dashboards and web sites directly in below the dashboard header.