dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Password reset link test condition more strict and move all WebWolf links to /WebWolf (#1645)

Browse Source 
* better check on host and port for password reset and make context roots more flexible

* spotless applied

* removed hardcoded /WebGoat from js

* removed hardcoded /WebGoat from js

* fix spotless

* fix scoreboard

* upgrade WebWolf bootstrap version and icons and templates - part 1

* fixed more bootstrap 5 style issues and context path issues

* organized WebSecurityConfig based on latest conventions and added basic support for oauth (more work needed)

* spotless applied

* added mock bean

* requires updates to properties - commented for now

* requires updates to properties - commented for now

* oauth secrets through env values

* user creation after oauth login

* integration test against non default context paths

* adjusted StartupMessage

* add global model element username

* conditionally show login oauth links

* fixed WebWolf login

---------

Co-authored-by: René Zubcevic <rene@Mac-mini-van-Rene.local>
This commit is contained in:
René Zubcevic
2023-11-14 10:01:59 +01:00
committed by GitHub
parent 5a4974f3c2
commit d1e44bbc98
114 changed files with 2763 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/resources/webwolf/templates/fragments/header.html
View File

@ -2,7 +2,8 @@
<head>
<title>WebWolf</title>
<div th:fragment="header-css">
<link rel="icon" th:href="@{/css/img/webwolf.ico}"/>
<link rel="shortcut icon" th:href="@{/css/img/webwolf.ico}" type="image/x-icon"/>
<link rel="stylesheet" th:href="@{/css/bootstrap-icons.css}"/>
<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"/>
<link rel="stylesheet" th:href="@{/css/webwolf.css}"/>
<script th:src="@{/webjars/jquery/jquery.min.js}"></script>
@ -11,35 +12,27 @@
</head>
<body>
<div th:fragment="header">
<nav class="navbar navbar-inverse">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid">
<div class="navbar-header">
<div class="navbar-item">
<a class="navbar-brand" th:href="@{/home}">WebWolf</a>
</div>
<ul class="nav navbar-nav">
<li class="active"><a th:href="@{/home}">Home</a></li>
</ul>
<ul class="nav navbar-nav">
<li><a th:href="@{/files}">Files</a></li>
</ul>
<ul class="nav navbar-nav">
<li><a th:href="@{/mail}">Mailbox</a></li>
</ul>
<ul class="nav navbar-nav">
<li><a th:href="@{/requests}">Incoming requests</a></li>
</ul>
<ul class="nav navbar-nav">
<li><a th:href="@{/jwt}">JWT</a></li>
<li class="nav-item"><a class="nav-link" th:href="@{/home}">Home</a></li>
<li class="nav-item"><a class="nav-link" th:href="@{/files}">Files</a></li>
<li class="nav-item"><a class="nav-link" th:href="@{/mail}">Mailbox</a></li>
<li class="nav-item"><a class="nav-link" th:href="@{/requests}">Incoming requests</a></li>
<li class="nav-item"><a class="nav-link" th:href="@{/jwt}">JWT</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">
<li class="nav-item"><a class="nav-link" href="#">
<span sec:authorize="isAuthenticated()">
<span class="glyphicon glyphicon-user"></span>
<span th:text="${#authentication.name}"></span></span></a>
</li>
<li><a th:href="@{/logout}">
<li class="nav-item"><a class="nav-link" th:href="@{/logout}">
<span sec:authorize="isAuthenticated()">
Sign out</span></a>
</li>