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
1 change: 1 addition & 0 deletions WebContent/WEB-INF/jsp/engagement/AssessorSearch.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ div[id^='rtCust']{
</bs:row>
<bs:row>
<bs:button size="lg" color="primary" colsize="2" text="<i class='glyphicon glyphicon-plus'></i> Save" id="AddAssessment"></bs:button>
<jsp:include page="ExtendedEngagementButtons.jsp"/>
</bs:row>
<bs:row>
<bs:mco colsize="12">
Expand Down
2 changes: 2 additions & 0 deletions WebContent/WEB-INF/jsp/engagement/Engagement.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ label{
<!-- <li><a href="#tab_2" data-toggle="tab">Verifications</a></li>-->
<li><a href="#tab_3" data-toggle="tab">Search</a></li>
<li><a href="#tab_4" data-toggle="tab">Upload</a></li>
<jsp:include page="EngagementExtendedTabs.jsp" />
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_1">
Expand All @@ -88,6 +89,7 @@ label{
<div class="tab-pane" id="tab_4">
<jsp:include page="assessmentUpload.jsp" />
</div><!-- /.tab-pane -->
<jsp:include page="EngagementExtendedContent.jsp" />
</div><!-- /.tab-content -->
</div><!-- nav-tabs-custom -->
</div><!-- /.col -->
Expand Down
Empty file.
Empty file.
Empty file.
30 changes: 30 additions & 0 deletions WebContent/WEB-INF/jsp/users/Users.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,24 @@
</div>
</div>
</div>
<div class="row">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">GitHub Configuration</h3>
</div>
<div class="box-body">
<div class="row">
<bs:inputgroup name="Client Id" colsize="4" id="githubClientId"
placeholder=""><s:property value="githubClientId" /></bs:inputgroup>
<bs:inputgroup name="Client Secret" colsize="4"
id="githubClientSecret" password="true"
placeholder=""></bs:inputgroup>
<bs:button color="primary" id="githubSave" text="Save" size="md"
colsize="4" addlabel="true"></bs:button>
</div>
</div>
</div>
</div>
<div class="row">
<div class="box box-primary">
<div class="box-header with-border">
Expand All @@ -235,6 +253,18 @@
<div class="row">
<bs:inputgroup name="App Federation Metadata Url" colsize="12" id="saml2MetaUrl"
placeholder=""><s:property value="saml2MetaUrl" /></bs:inputgroup>
<div class="col-sm-4">
<div class="form-group">
<label>Force Re-authentication</label>
<div class="form-control" style="background: #0000">
<input class="icheckbox_minimal-blue" type="checkbox"
id="samlForceAuthn" <s:if test="samlForceAuthn">checked</s:if> />
</div>
<small class="text-muted">Uncheck to reuse an existing IdP session (seamless SSO).</small>
</div>
</div>
<bs:inputgroup name="Max Authentication Age (seconds)" colsize="4" id="samlMaxAuthLifetime"
placeholder="86400"><s:property value="samlMaxAuthLifetime" /></bs:inputgroup>
<bs:button color="primary" id="saml2Save" text="Save" size="md"
colsize="4" addlabel="true"></bs:button>
</div>
Expand Down
53 changes: 52 additions & 1 deletion WebContent/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,54 @@
<param-value>isAuthenticated</param-value>
</init-param>
</filter>


<filter-mapping>
<filter-name>corsFilter</filter-name>
<url-pattern>/github/*</url-pattern>
</filter-mapping>

<filter-mapping>
<filter-name>clearSavedRequestFilter</filter-name>
<url-pattern>/github/callback</url-pattern>
</filter-mapping>

<filter-mapping>
<filter-name>githubCallback</filter-name>
<url-pattern>/github/callback</url-pattern>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
<filter>
<filter-name>githubCallback</filter-name>
<filter-class>com.fuse.authentication.oauth.GitHubCallbackFilterWrapper</filter-class>
<init-param>
<param-name>defaultClient</param-name>
<param-value>githubClient</param-value>
</init-param>
</filter>

<filter-mapping>
<filter-name>GithubFilter</filter-name>
<url-pattern>/github/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
<filter>
<filter-name>GithubFilter</filter-name>
<filter-class>com.fuse.authentication.oauth.SecurityFilterWrapper</filter-class>
<init-param>
<param-name>configFactory</param-name>
<param-value>com.fuse.authentication.oauth.SecurityConfigFactory</param-value>
</init-param>
<init-param>
<param-name>clients</param-name>
<param-value>githubClient</param-value>
</init-param>
<init-param>
<param-name>authorizers</param-name>
<param-value>isAuthenticated</param-value>
</init-param>
</filter>

<filter-mapping>
<filter-name>corsFilter</filter-name>
<url-pattern>/saml2/*</url-pattern>
Expand All @@ -67,6 +114,10 @@
<filter>
<filter-name>saml2Callback</filter-name>
<filter-class>com.fuse.authentication.oauth.SAML2CallbackFilterWrapper</filter-class>
<init-param>
<param-name>defaultClient</param-name>
<param-value>saml2Client</param-value>
</init-param>
</filter>

<filter-mapping>
Expand Down
2 changes: 1 addition & 1 deletion WebContent/dist/js/scheduling.js

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions WebContent/dist/js/scheduling.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
* @license MIT
*/

/*!
* TOAST UI Editor : Code Syntax Highlight Plugin
* @version 3.1.0 | Fri Aug 05 2022
* @author NHN Cloud FE Development Lab <dl_javascript@nhn.com>
* @license MIT
*/

/*!
* TOAST UI Editor : Color Syntax Plugin
* @version 3.1.0 | Fri Aug 05 2022
Expand Down
2 changes: 1 addition & 1 deletion WebContent/dist/js/users.js

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions WebContent/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,18 @@
<div style="color:white; float:right">
<a href="reset.action" style="color:#030D1C"> Reset Your Password</a>
</div>
<br><br>
<br>
<s:if test="useSSO">
<button style="width:100%" class="btn btn-warning pull-right btn-lg" onClick="document.location='startOAuth'">SSO Sign
in</button>
</s:if>
<div style="text-align:center; margin-top: 15px; background-color: #00a2e9; border-radius: 10px; padding: 5px; color:white">
<a href="${pageContext.request.contextPath}/sso/saml" class="btn btn-block btn-lg " style="color: white">SSO Sign In</a>
</div>
</s:if>
<s:if test="useGithub">
<div style="text-align:center; margin-top: 15px; background-color: #24292e; border-radius: 10px; padding: 5px; color:white">
<a href="${pageContext.request.contextPath}/sso/github" class="btn btn-block btn-lg " style="color: white">Sign in with GitHub</a>
</div>
</s:if>
<br><br>
<s:if test="failed==true">
<div id="errorMsg" class="alert alert-danger alert-dismissable" style="padding-top:10px; margin-top:20px">
<h4>
Expand Down
Loading
Loading