Modified the HTML code to show a more friendly environment

This commit is contained in:
Dimitrios Stoupis 2019-11-30 16:55:32 +00:00
parent 0c1eaf3a31
commit c16b10236e
No known key found for this signature in database
GPG Key ID: B264799BAB5100BB
7 changed files with 356 additions and 268 deletions

View File

@ -36,74 +36,41 @@ if (empty($_POST)) {
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8" />
<link rel="stylesheet" type="text/css" href="./style.css"> <link rel="stylesheet" type="text/css" href="./style.css">
<title>Authorisation Mattermost</title> <title>Mattermost - LDAP Authorization</title>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
</head> </head>
<body> <body>
<div id="form-wrapper" style="text-align: center;">
<div id="form_credentials">
<center> <h1>LDAP Authentication</h1>
<table background="images/login.png" border="0" width="729" height="343" cellspacing="1" cellpadding="4"> <div id="form_icon">
<tr> <img src="./auth_icon.png" alt="authentication icon" >
<td width="40%">&nbsp;</td>
<td width="60%">
<table border="0" width="100%">
<tr>
<td align="center">
<div class="LoginTitle">Mattermost desires access to your LDAP data:</div>
<form method="post">
<table border="0" width="90%" cellpadding="1">
<tr>
<td colspan="2" align="left">
<div class="messageLogin" align="center">
</div> </div>
&nbsp; <br>
<h2>Authorize Mattermost to get the following data:</h2>
<table>
<tr>
<td>
&nbsp; <strong>Full Name</strong><br/>
&nbsp; <strong>E-mail</strong><br/>
&nbsp; For the user <strong>' . $_SESSION['uid'] . '</strong><br/>
</td> </td>
</tr> </tr>
<tr>
<td align="center" width="100%" class="LoginUsername">
Login as : <b>' . $_SESSION['uid'] . ' </b>
</td>
</tr>
<tr>
<td align="left" width="100%" class="LoginUsername">
<br/>
Requested Data : <br/>
&nbsp; -> Username,<br/>
&nbsp; -> Full Name,<br/>
&nbsp; -> Email
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td colspan="2" align="center"> <input type="submit" class="GreenButton" name="authorized" value="Authorize" >
<input type="submit" class="GreenButton" name="authorized" value="Deny" > </td>
</tr>
</table> </table>
<br>
<form method="POST">
<input type="submit" value="Authorize" name="authorized" id="input_accept" class="input_field">
<input type="submit" value="Deny" name="authorized" id="input_deny" class="input_field">
</form> </form>
</div>
</td> </div>
</tr>
</table>
</td>
</tr>
</table>
</center>
</body> </body>
</html> </html>
'); ');

View File

@ -1,77 +0,0 @@
<?php
session_start();
/**
* @author Denis CLAVIER <clavierd at gmail dot com>
*/
// include our LDAP object
require_once __DIR__.'/LDAP/LDAP.php';
require_once __DIR__.'/LDAP/config_ldap.php';
// Verify all fields have been filled
if (empty($_POST['user']) || empty($_POST['password']))
{
echo 'Please fill in your Username and Password<br /><br />';
echo 'Click <a href="./index.php">here</a> to come back to login page';
}
else
{
// Check received data length (to prevent code injection)
if (strlen($_POST['user']) > 15)
{
echo 'Username has incorrect format ... Please try again<br /><br />';
echo 'Click <a href="./index.php">here</a> to come back to login page';
}
elseif (strlen($_POST['password']) > 50 || strlen($_POST['password']) <= 7)
{
echo 'Password has incorrect format ... Please try again<br /><br />';
echo 'Click <a href="./index.php">here</a> to come back to login page';
}
else
{
// Remove every html tag and useless space on username (to prevent XSS)
$user=strip_tags(trim($_POST['user']));
$user=$_POST['user'];
$password=$_POST['password'];
// Open a LDAP connection
$ldap = new LDAP($ldap_host,$ldap_port,$ldap_version);
// Check user credential on LDAP
try{
$authenticated = $ldap->checkLogin($user,$password,$ldap_search_attribute,$ldap_filter,$ldap_base_dn,$ldap_bind_dn,$ldap_bind_pass);
}
catch (Exception $e)
{
$resp = json_encode(array("error" => "Impossible to get data", "message" => $e->getMessage()));
$authenticated = false;
}
// If user is authenticated
if ($authenticated)
{
$_SESSION['uid']=$user;
// If user came here with an autorize request, redirect him to the authorize page. Else prompt a simple message.
if (isset($_SESSION['auth_page']))
{
$auth_page=$_SESSION['auth_page'];
header('Location: ' . $auth_page);
exit();
}
else
{
echo "Congratulation you are authenticated ! <br /><br /> However there is nothing to do here ...";
}
}
// check login on LDAP has failed. Login and password were invalid or LDAP is unreachable
else
{
echo "Authentication failed ... Check your username and password.<br />If error persist contact your administrator.<br /><br />";
echo 'Click <a href="./index.php">here</a> to come back to login page';
echo '<br /><br /><br />' . $resp;
}
}
}

41
oauth/form_prompt.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" href="./style.css">
<title>LDAP Connection Interface</title>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
</head>
<body>
<div id="form-wrapper" style="text-align: center;">
<div id="form_credentials">
<h1>LDAP Authentication</h1>
<div id="form_icon_prompt">
<img src="./prompt_icon.png" alt="authentication icon" >
</div>
<br>
<form method="POST">
<div class="input_container">
<i class="fas fa-user"></i>
<input placeholder="Username" type="text" name="user" id="field_username" class="input_field">
</div><br>
<div class="input_container">
<i class="fas fa-lock"></i>
<input placeholder="Password" type="password" name="password" id="field_password" class="input_field">
</div><br>
<div class="grt">
</div>
<input type="submit" value="Login" name="login" id="input_login" class="input_field">
</form>
</div>
</div>
</body>
</html>

BIN
oauth/images/auth_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -1,72 +1,91 @@
<?php <?php
session_start(); session_start();
?> /**
* @author Denis CLAVIER <clavierd at gmail dot com>
<!DOCTYPE html> * A modified verion by dimst23
<html> */
<head>
<link rel="stylesheet" type="text/css" href="./style.css">
<title>LDAP Connection Interface</title>
</head>
<body>
<center>
<table background="images/login.png" border="0" width="733" height="348" cellspacing="1" cellpadding="4">
<tr>
<td width="40%">&nbsp;</td>
<td width="60%">
<table border="0" width="100%">
<tr>
<td align="center">
<div class="LoginTitle">LDAP Authentification</div>
<form method="post" action="connexion.php"> // include our LDAP object
require_once __DIR__.'/LDAP/LDAP.php';
require_once __DIR__.'/LDAP/config_ldap.php';
<table border="0" width="90%" cellpadding="1"> $prompt_template = new DOMDocument();
<tr> $prompt_template->loadHTMLFile('form_prompt.html');
<td colspan="2" align="left">
<div class="messageLogin" align="center">
</div>
&nbsp;
</td>
</tr>
<tr>
<td align="left" width="40%" class="LoginUsername">
Username:&nbsp;
</td>
<td width="60%">
<input type="text" name="user" size="25" value="" >
</td>
</tr>
<tr>
<td align="left" width="40%" class="LoginUsername">
Password:&nbsp;
</td>
<td width="60%">
<input type="password" name="password" size="25" value="" >
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td colspan="2" align="center"> <input type="submit" class="GreenButton" name="login" value=" Connect " > </td>
</tr>
</table> function messageShow($html_template, $message = 'No Msg') {
</form> $modification_node = $html_template->getElementsByTagName('div')->item(5);
$page_fragment = $html_template->createDocumentFragment();
$page_fragment->appendXML($message);
</td> $modification_node->appendChild($page_fragment);
</tr>
</table>
</td> echo $html_template->saveHTML();
</tr> }
</table>
</center>
</body> // Verify all fields have been filled
</html> if (empty($_POST['user']) || empty($_POST['password']))
{
if (empty($_POST['user'])) {
messageShow($prompt_template, 'Username field can\'t be empty.');
} else {
messageShow($prompt_template, 'Password field can\'t be empty.');
}
}
else
{
// Check received data length (to prevent code injection)
if (strlen($_POST['user']) > 15)
{
messageShow($prompt_template, 'Username has incorrect format ... Please try again');
}
elseif (strlen($_POST['password']) > 50 || strlen($_POST['password']) <= 7)
{
messageShow($prompt_template, 'Password has incorrect format ... Please try again');
}
else
{
// Remove every html tag and useless space on username (to prevent XSS)
$user=strip_tags(trim($_POST['user']));
$user=$_POST['user'];
$password=$_POST['password'];
// Open a LDAP connection
$ldap = new LDAP($ldap_host,$ldap_port,$ldap_version);
// Check user credential on LDAP
try{
$authenticated = $ldap->checkLogin($user,$password,$ldap_search_attribute,$ldap_filter,$ldap_base_dn,$ldap_bind_dn,$ldap_bind_pass);
}
catch (Exception $e)
{
$authenticated = false;
}
// If user is authenticated
if ($authenticated)
{
$_SESSION['uid']=$user;
// If user came here with an autorize request, redirect him to the authorize page. Else prompt a simple message.
if (isset($_SESSION['auth_page']))
{
$auth_page=$_SESSION['auth_page'];
header('Location: ' . $auth_page);
exit();
}
else
{
messageShow($prompt_template, 'Congratulation you are authenticated ! <br /><br /> However there is nothing to do here ...');
}
}
// check login on LDAP has failed. Login and password were invalid or LDAP is unreachable
else
{
messageShow($prompt_template, 'Authentication failed ... Check your username and password.<br />If the error persists contact your administrator.<br /><br />');
}
}
}

View File

@ -1,57 +1,195 @@
html :root {
{ --form_bg: #ffffff;
--input_bg: #E5E5E5;
--input_hover:#eaeaea;
--accept_bg: #1FCC44;
--accept_hover: #40e263;
--deny_bg: #cc1f1f;
--deny_hover: #e24040;
--icon_color:#6b6b6b;
}
html {
height: 100%; height: 100%;
margin: 0; margin: 0;
} }
/* Overide browser defaults */
* {
padding: 0;
margin: 0;
box-sizing: border-box;
}
/* Style the form wrapper */
body { body {
font-family:"Tahoma","Arial", serif; /* Set custom font */
font-size:8px; font-family: 'Roboto', sans-serif;
font-weight: normal; margin: auto;
color: black; text-align: center;
text-decoration:none; }
background-color: white;
height: 100%; table {
margin: 0; margin-left: auto;
margin-right: auto;
font-size: larger;
border-style: solid;
border-width: 2px;
margin-top: 5%;
} }
.LoginTitle {
color: #000000;
font-family : "Tahoma","Arial", serif;
font-size : 18pt; /* Display the image centered on the left */
font-weight: normal; #form_icon,
#form_icon_prompt {
/* Center the image */
display: flex;
justify-content: center;
align-items: center;
margin-top: 5%;
} }
.LoginUsername { #form_icon img {
color: #000000; width: 100%;
font-family : "Tahoma","Arial", serif; max-width: 450px;
font-size : 14pt;
font-weight: normal;
} }
.LoginComment { #form_icon_prompt img {
color: #000000; width: 50%;
font-family : "Tahoma","Arial", serif; max-width: 350px;
font-size : 8pt;
font-weight: normal;
} }
.GreenButton
{ /* Style the form_credentials */
#form_credentials {
/* Center the content */
display: inline-block;
justify-content: center;
align-items: center;
position: absolute;
transform: translate(-50%, 25%);
}
/* Style input fields */
.input_container {
background-color: var(--input_bg);
/* Vertically align icon and text inside the div*/
display: flex;
align-items: center;
padding-left: 20px;
}
.input_container:hover {
background-color: var(--input_hover);
}
.input_container,
#input_accept,
#input_deny,
#input_login {
height: 60px;
/* Make the borders more round */
border-radius: 12px;
width: 100%;
}
.input_field {
/* Customize the input tag with lighter font and some padding*/
color: var(--icon_color);
background-color: inherit;
width: 95%;
border: none;
font-size: 1.3rem;
font-weight: 400;
padding-left: 6.5%;
}
.input_field:hover,
.input_field:focus {
/* Remove the outline */
outline: none;
}
#input_accept,
#input_deny,
#input_login {
/* Submit button has a different color and different padding */
background-color: var(--accept_bg);
padding-left: 0;
font-weight: bold;
color: white; color: white;
font-family : "Tahoma", "Arial", serif; text-transform: capitalize;
font-size : 10pt; text-align: center;
font-weight: normal; display: inline-block;
height: 28px; margin-top: 25%;
background: transparent url(images/ButtonGreen.png) repeat-x left top; margin-right: 2%;
border: solid 1px #50B4AE; width: 50%;
font-weight: bold;
} }
.messageLogin { #input_accept:hover,
color: Yellow; #input_deny:hover,
font-family : "Tahoma", "Arial", serif; #input_login:hover {
font-size : 8pt; /* Simple color transition on hover */
font-weight: bold; transition: background-color, 500ms;
cursor: pointer;
}
#input_accept,
#input_deny {
width: 45%;
margin-top: 6%;
}
#input_deny {
background-color: var(--deny_bg);
}
#input_deny:hover {
background-color: var(--deny_hover);
}
/* General page styling */
h1,
span {
text-align: center;
padding-bottom: 2%;
padding-top: 0%;
font-weight: bolder;
font-size: 300%;
}
i {
color: var(--icon_color);
}
/* Make it responsive */
@media screen and (max-width:768px) {
/* Make the layout a single column and add some margin to the wrapper */
#form_wrapper {
grid-template-columns: 1fr;
margin-left: 10px;
margin-right: 10px;
}
/* On small screens we don't display the image */
#form_icon {
display: flex;
}
} }