IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Snapshots: Disallow anonymous user to create snapshots (#31263)

Browse Source
This commit is contained in:
Marcus Efraimsson 2021-02-17 09:51:50 +01:00 committed by GitHub
parent b5cbbc3db1
commit 8f20b13f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/middleware/auth.go
View File

@ -119,15 +119,17 @@ func AdminOrFeatureEnabled(enabled bool) macaron.Handler {
} }
} }
// SnapshotPublicModeOrSignedIn creates a middleware that allows access
// if snapshot public mode is enabled or if user is signed in.
func SnapshotPublicModeOrSignedIn(cfg *setting.Cfg) macaron.Handler { func SnapshotPublicModeOrSignedIn(cfg *setting.Cfg) macaron.Handler {
return func(c *models.ReqContext) { return func(c *models.ReqContext) {
if cfg.SnapshotPublicMode { if cfg.SnapshotPublicMode {
return return
} }
_, err := c.Invoke(ReqSignedIn) if !c.IsSignedIn {
if err != nil { notAuthorized(c)
c.JsonApiErr(500, "Failed to invoke required signed in middleware", err) return
} }
} }
} }

13
pkg/middleware/auth_test.go
View File

@ -87,11 +87,22 @@ func TestMiddlewareAuth(t *testing.T) {
middlewareScenario(t, "Snapshot public mode disabled and unauthenticated request should return 401", func( middlewareScenario(t, "Snapshot public mode disabled and unauthenticated request should return 401", func(
t *testing.T, sc *scenarioContext) { t *testing.T, sc *scenarioContext) {
sc.m.Get("/api/snapshot", SnapshotPublicModeOrSignedIn(sc.cfg), sc.defaultHandler) sc.m.Get("/api/snapshot", func(c *models.ReqContext) {
c.IsSignedIn = false
}, SnapshotPublicModeOrSignedIn(sc.cfg), sc.defaultHandler)
sc.fakeReq("GET", "/api/snapshot").exec() sc.fakeReq("GET", "/api/snapshot").exec()
assert.Equal(t, 401, sc.resp.Code) assert.Equal(t, 401, sc.resp.Code)
}) })
middlewareScenario(t, "Snapshot public mode disabled and authenticated request should return 200", func(
t *testing.T, sc *scenarioContext) {
sc.m.Get("/api/snapshot", func(c *models.ReqContext) {
c.IsSignedIn = true
}, SnapshotPublicModeOrSignedIn(sc.cfg), sc.defaultHandler)
sc.fakeReq("GET", "/api/snapshot").exec()
assert.Equal(t, 200, sc.resp.Code)
})
middlewareScenario(t, "Snapshot public mode enabled and unauthenticated request should return 200", func( middlewareScenario(t, "Snapshot public mode enabled and unauthenticated request should return 200", func(
t *testing.T, sc *scenarioContext) { t *testing.T, sc *scenarioContext) {
sc.cfg.SnapshotPublicMode = true sc.cfg.SnapshotPublicMode = true

27
public/app/features/dashboard/components/ShareModal/ShareModal.tsx
View File

@ -6,21 +6,7 @@ import { ShareSnapshot } from './ShareSnapshot';
import { ShareExport } from './ShareExport'; import { ShareExport } from './ShareExport';
import { ShareEmbed } from './ShareEmbed'; import { ShareEmbed } from './ShareEmbed';
import { ShareModalTabModel } from './types'; import { ShareModalTabModel } from './types';
import { contextSrv } from 'app/core/core';
const shareCommonTabs: ShareModalTabModel[] = [
{ label: 'Link', value: 'link', component: ShareLink },
{ label: 'Snapshot', value: 'snapshot', component: ShareSnapshot },
];
// prettier-ignore
const shareDashboardTabs: ShareModalTabModel[] = [
{ label: 'Export', value: 'export', component: ShareExport },
];
// prettier-ignore
const sharePanelTabs: ShareModalTabModel[] = [
{ label: 'Embed', value: 'embed', component: ShareEmbed },
];
const customDashboardTabs: ShareModalTabModel[] = []; const customDashboardTabs: ShareModalTabModel[] = [];
const customPanelTabs: ShareModalTabModel[] = []; const customPanelTabs: ShareModalTabModel[] = [];
@ -43,13 +29,18 @@ function getInitialState(props: Props): State {
function getTabs(props: Props) { function getTabs(props: Props) {
const { panel } = props; const { panel } = props;
const tabs = [...shareCommonTabs];
const tabs: ShareModalTabModel[] = [{ label: 'Link', value: 'link', component: ShareLink }];
if (contextSrv.isSignedIn) {
tabs.push({ label: 'Snapshot', value: 'snapshot', component: ShareSnapshot });
}
if (panel) { if (panel) {
tabs.push(...sharePanelTabs); tabs.push({ label: 'Embed', value: 'embed', component: ShareEmbed });
tabs.push(...customPanelTabs); tabs.push(...customPanelTabs);
} else { } else {
tabs.push(...shareDashboardTabs); tabs.push({ label: 'Export', value: 'export', component: ShareExport });
tabs.push(...customDashboardTabs); tabs.push(...customDashboardTabs);
} }