Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/public/components/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class App extends React.PureComponent {
<LazyRoute path="/k8s/ns/:ns/persistentvolumeclaims/new/form" exact kind="PersistentVolumeClaim" loader={() => import('./storage/create-pvc' /* webpackChunkName: "create-pvc" */).then(m => m.CreatePVC)} />

<LazyRoute path="/monitoring" loader={() => import('./monitoring' /* webpackChunkName: "monitoring" */).then(m => m.MonitoringUI)} />

<LazyRoute path="/settings/idp/oidconnect" exact loader={() => import('./cluster-settings/openid-idp-form' /* webpackChunkName: "openid-idp-form" */).then(m => m.AddOpenIDPage)} />
<LazyRoute path="/settings/idp/htpasswd" exact loader={() => import('./cluster-settings/htpasswd-idp-form' /* webpackChunkName: "htpasswd-idp-form" */).then(m => m.AddHTPasswdPage)} />
<LazyRoute path="/settings/cluster" loader={() => import('./cluster-settings/cluster-settings' /* webpackChunkName: "cluster-settings" */).then(m => m.ClusterSettingsPage)} />

Expand Down
1 change: 1 addition & 0 deletions frontend/public/components/cluster-settings/oauth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const OAuthDetails: React.SFC<OAuthDetailsProps> = ({obj}: {obj: K8sResourceKind
const { identityProviders, tokenConfig = {} } = obj.spec;
const addIDPItems = {
htpasswd: 'HTPasswd',
oidconnect: 'OpenID Connect',
};
return <React.Fragment>
<div className="co-m-pane__body">
Expand Down
282 changes: 282 additions & 0 deletions frontend/public/components/cluster-settings/openid-idp-form.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
/* eslint-disable no-undef, no-unused-vars */

import * as React from 'react';
import * as _ from 'lodash-es';
import { Helmet } from 'react-helmet';

import { OAuthModel, SecretModel, ConfigMapModel } from '../../models';
import { k8sCreate, k8sGet, k8sPatch, K8sResourceKind, referenceFor } from '../../module/k8s';
import {
AsyncComponent,
ButtonBar,
Dropdown,
ListInput,
PromiseComponent,
history,
resourceObjPath,
} from '../utils';

// The name of the cluster-scoped OAuth configuration resource.
const oauthResourceName = 'cluster';

const DroppableFileInput = (props) => <AsyncComponent loader={() => import('../utils/file-input').then(c => c.DroppableFileInput)} {...props} />;

export class AddOpenIDPage extends PromiseComponent {
readonly state: AddOpenIDIDPPageState = {
name: 'openid',
mappingMethod: 'claim',
clientID: '',
clientSecretFileContent: '',
claimPreferredUsernames: [],
claimNames: [],
claimEmails: [],
issuer: '',
caFileContent: '',
extraScopes: [],
inProgress: false,
errorMessage: '',
};

getOAuthResource(): Promise<K8sResourceKind> {
return this.handlePromise(k8sGet(OAuthModel, oauthResourceName));
}

createClientSecret(): Promise<K8sResourceKind> {
const secret = {
apiVersion: 'v1',
kind: 'Secret',
metadata: {
generateName: 'openid-client-secret-',
namespace: 'openshift-config',
},
stringData: {
clientSecret: this.state.clientSecretFileContent,
},
};

return this.handlePromise(k8sCreate(SecretModel, secret));
}

createCAConfigMap(): Promise<K8sResourceKind> {
const { caFileContent } = this.state;
if (!caFileContent) {
return Promise.resolve(null);
}

const ca = {
apiVersion: 'v1',
kind: 'ConfigMap',
metadata: {
generateName: 'openid-ca-',
namespace: 'openshift-config',
},
stringData: {
ca: caFileContent,
},
};

return this.handlePromise(k8sCreate(ConfigMapModel, ca));
}

addOpenIDIDP(oauth: K8sResourceKind, clientSecretName: string, caName: string): Promise<K8sResourceKind> {
const { name, mappingMethod, clientID, issuer, extraScopes, claimPreferredUsernames, claimNames, claimEmails } = this.state;
const openID: any = {
name,
type: 'OpenID',
mappingMethod,
openID: {
clientID,
clientSecret: {
name: clientSecretName,
},
issuer,
extraScopes,
claims: {
preferredUsername: claimPreferredUsernames,
name: claimNames,
email: claimEmails,
},
},
};

if (caName) {
openID.ca = {
name: caName,
};
}

const patch = _.isEmpty(oauth.spec.identityProviders)
? { op: 'add', path: '/spec/identityProviders', value: [openID] }
: { op: 'add', path: '/spec/identityProviders/-', value: openID };
return this.handlePromise(k8sPatch(OAuthModel, oauth, [patch]));
}

submit: React.FormEventHandler<HTMLFormElement> = (e) => {
e.preventDefault();
if (!this.state.clientSecretFileContent) {
this.setState({errorMessage: 'You must specify a Client Secret file.'});
return;
}

// Clear any previous errors.
this.setState({errorMessage: ''});
this.getOAuthResource().then((oauth: K8sResourceKind) => {
const promises = [
this.createClientSecret(),
this.createCAConfigMap(),
];

Promise.all(promises).then(([secret, configMap]) => {
const caName = configMap ? configMap.metadata.name : '';
return this.addOpenIDIDP(oauth, secret.metadata.name, caName);
}).then(() => {
history.push(resourceObjPath(oauth, referenceFor(oauth)));
});
});
};

nameChanged: React.ReactEventHandler<HTMLInputElement> = (event) => {
this.setState({name: event.currentTarget.value});
};

clientIDChanged: React.ReactEventHandler<HTMLInputElement> = (event) => {
this.setState({clientID: event.currentTarget.value});
};

issuerChanged: React.ReactEventHandler<HTMLInputElement> = (event) => {
this.setState({issuer: event.currentTarget.value});
};

claimPreferredUsernamesChanged = (claimPreferredUsernames: string[]) => {
this.setState({claimPreferredUsernames});
};

claimNamesChanged = (claimNames: string[]) => {
this.setState({claimNames});
};

claimEmailsChanged = (claimEmails: string[]) => {
this.setState({claimEmails});
};

extraScopesChanged = (extraScopes: string[]) => {
this.setState({extraScopes});
};

mappingMethodChanged = (mappingMethod: string) => {
this.setState({mappingMethod});
};

clientSecretFileChanged = (clientSecretFileContent: string) => {
this.setState({clientSecretFileContent});
};

caFileChanged = (caFileContent: string) => {
this.setState({caFileContent});
};

render() {
const { name, mappingMethod, clientID, clientSecretFileContent, issuer, caFileContent } = this.state;
const title = 'Add Identity Provider: OpenID Connect';
const mappingMethods = {
'claim': 'Claim',
'lookup': 'Lookup',
'add': 'Add',
};
return <div className="co-m-pane__body">
<Helmet>
<title>{title}</title>
</Helmet>
<form onSubmit={this.submit} name="form" className="co-m-pane__body-group co-m-pane__form">
<h1 className="co-m-pane__heading">{title}</h1>
<p className="co-m-pane__explanation">
Integrate with an OpenID Connect identity provider using an Authorization Code Flow.
</p>
<div className="form-group">
<label className="control-label co-required" htmlFor="name">Name</label>
<input className="form-control"
type="text"
onChange={this.nameChanged}
value={name}
aria-describedby="oid-name-help"
id="name"
required />
<p className="help-block" id="oid-name-help">
Unique name of the new identity provider. This cannot be changed later.
</p>
</div>
<div className="form-group">
<label className="control-label co-required" htmlFor="tag">Mapping Method</label>
<Dropdown dropDownClassName="dropdown--full-width" items={mappingMethods} selectedKey={mappingMethod} title={mappingMethods[mappingMethod]} onChange={this.mappingMethodChanged} />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should eventually create a common component for mapping method so we don't repeat it 9 times, but I'd leave it for now

<div className="help-block" id="mapping-method-description">
{ /* TODO: Add doc link when available in 4.0 docs. */ }
Specifies how new identities are mapped to users when they log in.
</div>
</div>
<div className="form-group">
<label className="control-label co-required" htmlFor="clientID">ClientID</label>
<input className="form-control"
type="text"
onChange={this.clientIDChanged}
value={clientID}
id="clientID"
required />
</div>
<div className="form-group">
<DroppableFileInput
onChange={this.clientSecretFileChanged}
inputFileData={clientSecretFileContent}
id="clientsecret-file"
label="Client secret"
isRequired
hideContents />
</div>
<div className="form-group">
<label className="control-label co-required" htmlFor="issuer">Issuer URL</label>
<input className="form-control"
type="text"
onChange={this.issuerChanged}
value={issuer}
id="issuer"
required />
</div>
<div className="co-form-section__separator"></div>
<h3>Claims</h3>
<p className="co-help-text">The first non-empty claim is used. At least one claim is required.</p>
<ListInput label="Preferred Username" onChange={this.claimPreferredUsernamesChanged} />
<ListInput label="Name" onChange={this.claimNamesChanged} />
<ListInput label="Email" onChange={this.claimEmailsChanged} />
<div className="co-form-section__separator"></div>
<h3>More options</h3>
<div className="form-group">
<DroppableFileInput
onChange={this.caFileChanged}
inputFileData={caFileContent}
id="caFileContent"
label="CA File"
hideContents />
</div>
<ListInput label="Extra Scopes" onChange={this.extraScopesChanged} />
<ButtonBar errorMessage={this.state.errorMessage} inProgress={this.state.inProgress}>
<button type="submit" className="btn btn-primary">Add</button>
<button type="button" className="btn btn-default" onClick={history.goBack}>Cancel</button>
</ButtonBar>
</form>
</div>;
}
}

type AddOpenIDIDPPageState = {
name: string;
mappingMethod: 'claim' | 'lookup' | 'add';
clientID: string;
clientSecretFileContent: string;
claimPreferredUsernames: string[];
claimNames: string[];
claimEmails: string[];
issuer: string;
caFileContent: string;
extraScopes: string[];
inProgress: boolean;
errorMessage: string;
};
15 changes: 15 additions & 0 deletions frontend/public/components/utils/_list-input.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.co-list-input__add-btn {
padding-left: 0;
}

.co-list-input__remove-btn {
margin-top: -6px;
}

.co-list-input__row {
display: flex;
}

.co-list-input__value {
flex-grow: 1;
}
2 changes: 2 additions & 0 deletions frontend/public/components/utils/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export * from './k8s-watcher';
export * from './workload-pause';
export * from './list-dropdown';
export * from './status-icon';
export * from './list-input';

/*
Add the enum for NameValueEditorPair here and not in its namesake file because the editor should always be
loaded asynchronously in order not to bloat the vendor file. The enum reference into the editor
Expand Down
Loading