3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-31 18:07:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

authenticate: show the device enrolled page as the user info page (#3151)

Browse source
This commit is contained in:
Caleb Doxsey 2022-03-17 12:15:57 -06:00 • committed by GitHub
parent bb7de0d227
commit da97546de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 109 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

41
authenticate/handlers.go
View file

@ -100,7 +100,12 @@ func (a *Authenticate) mountDashboard(r *mux.Router) {
sr.Path("/sign_out").Handler(httputil.HandlerFunc(a.SignOut))
sr.Path("/webauthn").Handler(a.webauthn)
sr.Path("/device-enrolled").Handler(httputil.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
handlers.DeviceEnrolled().ServeHTTP(w, r)
userInfoData, err := a.getUserInfoData(r)
if err != nil {
return err
}
handlers.DeviceEnrolled(userInfoData).ServeHTTP(w, r)
return nil
}))
@ -505,6 +510,7 @@ func (a *Authenticate) getSessionFromCtx(ctx context.Context) (*sessions.State,
func (a *Authenticate) userInfo(w http.ResponseWriter, r *http.Request) error {
ctx, span := trace.StartSpan(r.Context(), "authenticate.userInfo")
defer span.End()
r = r.WithContext(ctx)
// if we came in with a redirect URI, save it to a cookie so it doesn't expire with the HMAC
if redirectURI := r.FormValue(urlutil.QueryRedirectURI); redirectURI != "" {
@ -519,32 +525,42 @@ func (a *Authenticate) userInfo(w http.ResponseWriter, r *http.Request) error {
return nil
}
state := a.state.Load()
authenticateURL, err := a.options.Load().GetAuthenticateURL()
userInfoData, err := a.getUserInfoData(r)
if err != nil {
return err
}
s, err := a.getSessionFromCtx(ctx)
handlers.UserInfo(userInfoData).ServeHTTP(w, r)
return nil
}
func (a *Authenticate) getUserInfoData(r *http.Request) (handlers.UserInfoData, error) {
state := a.state.Load()
authenticateURL, err := a.options.Load().GetAuthenticateURL()
if err != nil {
return handlers.UserInfoData{}, err
}
s, err := a.getSessionFromCtx(r.Context())
if err != nil {
s.ID = uuid.New().String()
}
pbSession, isImpersonated, err := a.getCurrentSession(ctx)
pbSession, isImpersonated, err := a.getCurrentSession(r.Context())
if err != nil {
pbSession = &session.Session{
Id: s.ID,
}
}
pbUser, err := a.getUser(ctx, pbSession.GetUserId())
pbUser, err := a.getUser(r.Context(), pbSession.GetUserId())
if err != nil {
pbUser = &user.User{
Id: pbSession.GetUserId(),
}
}
pbDirectoryUser, err := a.getDirectoryUser(ctx, pbSession.GetUserId())
pbDirectoryUser, err := a.getDirectoryUser(r.Context(), pbSession.GetUserId())
if err != nil {
pbDirectoryUser = &directory.User{
Id: pbSession.GetUserId(),
@ -552,7 +568,7 @@ func (a *Authenticate) userInfo(w http.ResponseWriter, r *http.Request) error {
}
var groups []*directory.Group
for _, groupID := range pbDirectoryUser.GetGroupIds() {
pbDirectoryGroup, err := directory.GetGroup(ctx, state.dataBrokerClient, groupID)
pbDirectoryGroup, err := directory.GetGroup(r.Context(), state.dataBrokerClient, groupID)
if err != nil {
pbDirectoryGroup = &directory.Group{
Id: groupID,
@ -563,9 +579,9 @@ func (a *Authenticate) userInfo(w http.ResponseWriter, r *http.Request) error {
groups = append(groups, pbDirectoryGroup)
}
creationOptions, requestOptions, _ := a.webauthn.GetOptions(ctx)
creationOptions, requestOptions, _ := a.webauthn.GetOptions(r.Context())
handlers.UserInfo(handlers.UserInfoData{
return handlers.UserInfoData{
CSRFToken: csrf.Token(r),
DirectoryGroups: groups,
DirectoryUser: pbDirectoryUser,
@ -577,8 +593,7 @@ func (a *Authenticate) userInfo(w http.ResponseWriter, r *http.Request) error {
WebAuthnRequestOptions: requestOptions,
WebAuthnURL: urlutil.WebAuthnURL(r, authenticateURL, state.sharedKey, r.URL.Query()),
PomeriumVersion: version.FullVersion(),
}).ServeHTTP(w, r)
return nil
}, nil
}
func (a *Authenticate) saveSessionToDataBroker(

4
authenticate/handlers/device-enrolled.go
View file

@ -8,8 +8,8 @@ import (
)
// DeviceEnrolled displays an HTML page informing the user that they've successfully enrolled a device.
func DeviceEnrolled() http.Handler {
func DeviceEnrolled(data UserInfoData) http.Handler {
return httputil.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
return ui.ServePage(w, r, "DeviceEnrolled", map[string]interface{}{})
return ui.ServePage(w, r, "DeviceEnrolled", data.ToJSON())
})
}

22
ui/src/App.tsx
View file

@ -1,4 +1,9 @@
import DeviceEnrolledPage from "./components/DeviceEnrolledPage";
import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import { get } from "lodash";
import React, { FC } from "react";
import ErrorPage from "./components/ErrorPage";
import Footer from "./components/Footer";
import Header from "./components/Header";
@ -8,12 +13,7 @@ import UserInfoPage from "./components/UserInfoPage";
import WebAuthnRegistrationPage from "./components/WebAuthnRegistrationPage";
import { SubpageContextProvider } from "./context/Subpage";
import { createTheme } from "./theme";
import {PageData, UserInfoPageData} from "./types";
import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import React, { FC } from "react";
import {get} from "lodash";
import { PageData, UserInfoPageData } from "./types";
const theme = createTheme();
@ -21,15 +21,13 @@ const App: FC = () => {
const data = (window["POMERIUM_DATA"] || {}) as PageData;
let body: React.ReactNode = <></>;
switch (data?.page) {
case "DeviceEnrolled":
body = <DeviceEnrolledPage data={data} />;
break;
case "Error":
body = <ErrorPage data={data} />;
break;
case "SignOutConfirm":
body = <SignOutConfirmPage data={data} />;
break;
case "DeviceEnrolled":
case "UserInfo":
body = <UserInfoPage data={data} />;
break;
@ -40,7 +38,7 @@ const App: FC = () => {
return (
<ThemeProvider theme={theme}>
<CssBaseline />
<SubpageContextProvider>
<SubpageContextProvider page={data?.page}>
<Header includeSidebar={data?.page === "UserInfo"} data={data} />
<ToolbarOffset />
<Box sx={{ overflow: "hidden", height: "calc(100vh - 120px)" }}>
@ -55,7 +53,7 @@ const App: FC = () => {
<ToolbarOffset />
</Box>
</Box>
<Footer pomeriumVersion={get(data, 'pomeriumVersion')} />
<Footer pomeriumVersion={get(data, "pomeriumVersion")} />
</SubpageContextProvider>
</ThemeProvider>
);

19
ui/src/components/DeviceEnrolledPage.tsx
View file

@ -1,19 +0,0 @@
import HeroSection from "./HeroSection";
import Container from "@mui/material/Container";
import React, { FC } from "react";
import { DeviceEnrolledPageData } from "src/types";
type DeviceEnrolledPageProps = {
data: DeviceEnrolledPageData;
};
const DeviceEnrolledPage: FC<DeviceEnrolledPageProps> = () => {
return (
<Container maxWidth={false}>
<HeroSection
title="Device Enrolled"
text="Device Successfully Enrolled"
/>
</Container>
);
};
export default DeviceEnrolledPage;

40
ui/src/components/UserInfoPage.tsx
View file

@ -1,9 +1,18 @@
import { Drawer, useMediaQuery } from "@mui/material";
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogContentText,
DialogTitle,
Drawer,
useMediaQuery,
} from "@mui/material";
import Container from "@mui/material/Container";
import Stack from "@mui/material/Stack";
import { useTheme } from "@mui/material/styles";
import React, { FC, useContext } from "react";
import { UserInfoPageData } from "src/types";
import React, { FC, useContext, useEffect, useState } from "react";
import { UserInfoData } from "src/types";
import { SubpageContext } from "../context/Subpage";
import GroupDetails from "./GroupDetails";
@ -13,7 +22,7 @@ import { ToolbarOffset } from "./ToolbarOffset";
import { UserSidebarContent } from "./UserSidebarContent";
type UserInfoPageProps = {
data: UserInfoPageData;
data: UserInfoData & { page: "DeviceEnrolled" | "UserInfo" };
};
const UserInfoPage: FC<UserInfoPageProps> = ({ data }) => {
const theme = useTheme();
@ -23,8 +32,31 @@ const UserInfoPage: FC<UserInfoPageProps> = ({ data }) => {
});
const { subpage } = useContext(SubpageContext);
const [showDeviceEnrolled, setShowDeviceEnrolled] = useState(false);
useEffect(() => {
if (data.page === "DeviceEnrolled") {
setShowDeviceEnrolled(true);
} else {
setShowDeviceEnrolled(false);
}
}, [data.page]);
function handleCloseDeviceEnrolled() {
setShowDeviceEnrolled(false);
}
return (
<Container maxWidth={false}>
<Dialog open={showDeviceEnrolled} onClose={handleCloseDeviceEnrolled}>
<DialogTitle>Device Enrolled</DialogTitle>
<DialogContent>
<DialogContentText>Device Successfully Enrolled</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={handleCloseDeviceEnrolled}>OK</Button>
</DialogActions>
</Dialog>
{mdUp && (
<Drawer
anchor="left"

31
ui/src/context/Subpage.tsx
View file

@ -1,4 +1,4 @@
import React, {createContext, FC, useState} from 'react'
import React, { createContext, FC, useState } from "react";
export interface SubpageContextValue {
subpage: string;
@ -10,22 +10,25 @@ export const SubpageContext = createContext<SubpageContextValue>({
setSubpage: (_: string) => {},
});
export const SubpageContextProvider:FC = ({children}) => {
export type SubpageContextProviderProps = {
page: string;
};
export const SubpageContextProvider: FC<SubpageContextProviderProps> = ({
page,
children,
}) => {
const setSubpage = (subpage: string) => {
setState({...state, subpage})
}
setState({ ...state, subpage });
};
const initState = {
subpage: "User",
setSubpage
}
subpage: page === "DeviceEnrolled" ? "Devices Info" : "User",
setSubpage,
};
const [state, setState] = useState(initState)
const [state, setState] = useState(initState);
return (
<SubpageContext.Provider value={state}>
{children}
</SubpageContext.Provider>
)
}
<SubpageContext.Provider value={state}>{children}</SubpageContext.Provider>
);
};

28
ui/src/types/index.ts
View file

@ -95,18 +95,7 @@ export type ErrorPageData = BasePageData & {
version?: string;
};
export type DeviceEnrolledPageData = BasePageData & {
page: "DeviceEnrolled";
};
export type SignOutConfirmPageData = BasePageData & {
page: "SignOutConfirm";
url: string;
};
export type UserInfoPageData = BasePageData & {
page: "UserInfo";
export type UserInfoData = {
csrfToken: string;
directoryGroups?: Group[];
directoryUser?: DirectoryUser;
@ -118,6 +107,21 @@ export type UserInfoPageData = BasePageData & {
pomeriumVersion: string;
};
export type DeviceEnrolledPageData = BasePageData &
UserInfoData & {
page: "DeviceEnrolled";
};
export type SignOutConfirmPageData = BasePageData & {
page: "SignOutConfirm";
url: string;
};
export type UserInfoPageData = BasePageData &
UserInfoData & {
page: "UserInfo";
};
export type WebAuthnRegistrationPageData = BasePageData & {
page: "WebAuthnRegistration";