mirror of https://github.com/itflow-org/itflow
Small code cleanups
This commit is contained in:
Marcus Hill
parent
57afcc0423
commit
a3ca268fcf
|
|
@ -43,14 +43,14 @@ DEFINE("WORDING_UNAUTHORIZED", "HTTP/1.1 401 Unauthorized");
|
|||
*/
|
||||
|
||||
// Decline methods other than GET/POST
|
||||
if($_SERVER['REQUEST_METHOD'] !== "GET" AND $_SERVER['REQUEST_METHOD'] !== "POST"){
|
||||
if($_SERVER['REQUEST_METHOD'] !== "GET" && $_SERVER['REQUEST_METHOD'] !== "POST"){
|
||||
header("HTTP/1.1 405 Method Not Allowed");
|
||||
var_dump($_SERVER['REQUEST_METHOD']);
|
||||
exit();
|
||||
}
|
||||
|
||||
// Check API key is provided
|
||||
if(!isset($_GET['api_key']) AND !isset($_POST['api_key'])){
|
||||
if(!isset($_GET['api_key']) && !isset($_POST['api_key'])){
|
||||
header(WORDING_UNAUTHORIZED);
|
||||
exit();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
|||
$device_icon = "print";
|
||||
}elseif($asset_type == 'Camera'){
|
||||
$device_icon = "video";
|
||||
}elseif($asset_type == 'Switch' or $asset_type == 'Firewall/Router'){
|
||||
}elseif($asset_type == 'Switch' || $asset_type == 'Firewall/Router'){
|
||||
$device_icon = "network-wired";
|
||||
}elseif($asset_type == 'Access Point'){
|
||||
$device_icon = "wifi";
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
}
|
||||
|
||||
//Date Filter
|
||||
if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
|
||||
if($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])){
|
||||
$dtf = mysqli_real_escape_string($mysqli,$_GET['dtf']);
|
||||
$dtt = mysqli_real_escape_string($mysqli,$_GET['dtt']);
|
||||
}elseif($_GET['canned_date'] == "today"){
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
<div class="dropdown-menu">
|
||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#campaignTestModal<?php echo $campaign_id; ?>">Test</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<?php if($campaign_status == 'Draft' OR $campaign_status == 'Queued'){ ?>
|
||||
<?php if($campaign_status == 'Draft' || $campaign_status == 'Queued'){ ?>
|
||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#campaignEditModal<?php echo $campaign_id; ?>">Edit</a>
|
||||
<?php } ?>
|
||||
<a class="dropdown-item" href="post.php?copy_campaign=<?php echo $campaign_id; ?>">Copy</a>
|
||||
|
|
|
|||
|
|
@ -254,8 +254,8 @@ function mkdir_missing($dir) {
|
|||
}
|
||||
}
|
||||
|
||||
//Called during initial setup
|
||||
//Encrypts the master key with the user's password
|
||||
// Called during initial setup
|
||||
// Encrypts the master key with the user's password
|
||||
function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){
|
||||
$iv = keygen();
|
||||
$salt = keygen();
|
||||
|
|
@ -272,26 +272,26 @@ function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){
|
|||
}
|
||||
|
||||
/*
|
||||
For additional users / password changes
|
||||
New Users: Requires the admin setting up their account have the their own Specific/Session key configured
|
||||
Password Changes: Will use the current info in the session.
|
||||
* For additional users / password changes
|
||||
* New Users: Requires the admin setting up their account have a Specific/Session key configured
|
||||
* Password Changes: Will use the current info in the session.
|
||||
*/
|
||||
function encryptUserSpecificKey($user_password){
|
||||
$iv = keygen();
|
||||
$salt = keygen();
|
||||
|
||||
//Get the session info.
|
||||
// Get the session info.
|
||||
$user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext'];
|
||||
$user_encryption_session_iv = $_SESSION['user_encryption_session_iv'];
|
||||
$user_encryption_session_key = $_COOKIE['user_encryption_session_key'];
|
||||
|
||||
//Decrypt the session key to get the master key
|
||||
// Decrypt the session key to get the master key
|
||||
$site_encryption_master_key = openssl_decrypt($user_encryption_session_ciphertext, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv);
|
||||
|
||||
//Generate 128-bit (16 byte/char) kdhash of the users (new) password
|
||||
// Generate 128-bit (16 byte/char) kdhash of the users (new) password
|
||||
$user_password_kdhash = hash_pbkdf2('sha256', $user_password, $salt, 100000, 16);
|
||||
|
||||
//Encrypt the master key with the users kdf'd hash and the IV
|
||||
// Encrypt the master key with the users kdf'd hash and the IV
|
||||
$ciphertext = openssl_encrypt($site_encryption_master_key, 'aes-128-cbc', $user_password_kdhash, 0, $iv);
|
||||
|
||||
$user_encryption_ciphertext = $salt . $iv . $ciphertext;
|
||||
|
|
@ -300,8 +300,8 @@ function encryptUserSpecificKey($user_password){
|
|||
|
||||
}
|
||||
|
||||
//Given a ciphertext (incl. IV) and the user's password, returns the site master key
|
||||
//Ran at login, to facilitate generateUserSessionKey
|
||||
// Given a ciphertext (incl. IV) and the user's password, returns the site master key
|
||||
// Ran at login, to facilitate generateUserSessionKey
|
||||
function decryptUserSpecificKey($user_encryption_ciphertext, $user_password){
|
||||
//Get the IV, salt and ciphertext
|
||||
$salt = substr($user_encryption_ciphertext, 0, 16);
|
||||
|
|
@ -317,7 +317,7 @@ function decryptUserSpecificKey($user_encryption_ciphertext, $user_password){
|
|||
}
|
||||
|
||||
/*
|
||||
Generates what is probably best described as an session key (ephemeral-ish)
|
||||
Generates what is probably best described as a session key (ephemeral-ish)
|
||||
- Allows us to store the master key on the server whilst the user is using the application, without prompting to type their password everytime they want to decrypt a credential
|
||||
- Ciphertext/IV is stored on the server in the users session, encryption key is controlled/provided by the user as a cookie
|
||||
- Only the user can decrypt their session ciphertext to get the master key
|
||||
|
|
@ -325,12 +325,12 @@ Generates what is probably best described as an session key (ephemeral-ish)
|
|||
*/
|
||||
function generateUserSessionKey($site_encryption_master_key){
|
||||
|
||||
//Generate both of these using keygen()
|
||||
// Generate both of these using keygen()
|
||||
$user_encryption_session_key = keygen();
|
||||
$user_encryption_session_iv = keygen();
|
||||
$user_encryption_session_ciphertext = openssl_encrypt($site_encryption_master_key, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv);
|
||||
|
||||
//Store ciphertext in the user's session
|
||||
// Store ciphertext in the user's session
|
||||
$_SESSION['user_encryption_session_ciphertext'] = $user_encryption_session_ciphertext;
|
||||
$_SESSION['user_encryption_session_iv'] = $user_encryption_session_iv;
|
||||
|
||||
|
|
@ -348,32 +348,32 @@ function generateUserSessionKey($site_encryption_master_key){
|
|||
}
|
||||
}
|
||||
|
||||
//Decrypts an encrypted password (website/asset login), returns it as a string
|
||||
// Decrypts an encrypted password (website/asset login), returns it as a string
|
||||
function decryptLoginEntry($login_password_ciphertext){
|
||||
|
||||
//Split the login into IV and Ciphertext
|
||||
// Split the login into IV and Ciphertext
|
||||
$login_iv = substr($login_password_ciphertext, 0, 16);
|
||||
$login_ciphertext = $salt = substr($login_password_ciphertext, 16);
|
||||
|
||||
//Get the user session info.
|
||||
// Get the user session info.
|
||||
$user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext'];
|
||||
$user_encryption_session_iv = $_SESSION['user_encryption_session_iv'];
|
||||
$user_encryption_session_key = $_COOKIE['user_encryption_session_key'];
|
||||
|
||||
//Decrypt the session key to get the master key
|
||||
// Decrypt the session key to get the master key
|
||||
$site_encryption_master_key = openssl_decrypt($user_encryption_session_ciphertext, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv);
|
||||
|
||||
//Decrypt the login password using the master key
|
||||
// Decrypt the login password using the master key
|
||||
$login_password_cleartext = openssl_decrypt($login_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $login_iv);
|
||||
return $login_password_cleartext;
|
||||
|
||||
}
|
||||
|
||||
//Encrypts a website/asset login password
|
||||
// Encrypts a website/asset login password
|
||||
function encryptLoginEntry($login_password_cleartext){
|
||||
$iv = keygen();
|
||||
|
||||
//Get the user session info.
|
||||
// Get the user session info.
|
||||
$user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext'];
|
||||
$user_encryption_session_iv = $_SESSION['user_encryption_session_iv'];
|
||||
$user_encryption_session_key = $_COOKIE['user_encryption_session_key'];
|
||||
|
|
@ -388,18 +388,6 @@ function encryptLoginEntry($login_password_cleartext){
|
|||
return $login_password_ciphertext;
|
||||
}
|
||||
|
||||
//For migrating/upgrading to the new encryption scheme
|
||||
//Have to supply the master key as the cookie might not be set properly (generally requires a refresh)
|
||||
function encryptUpgradeLoginEntry($login_password_cleartext, $site_encryption_master_key){
|
||||
$iv = keygen();
|
||||
|
||||
//Encrypt the website/asset login using the master key
|
||||
$ciphertext = openssl_encrypt($login_password_cleartext, 'aes-128-cbc', $site_encryption_master_key, 0, $iv);
|
||||
|
||||
$login_password_ciphertext = $iv . $ciphertext;
|
||||
return $login_password_ciphertext;
|
||||
}
|
||||
|
||||
// Get domain expiration date
|
||||
function getDomainExpirationDate($name){
|
||||
$ch = curl_init();
|
||||
|
|
|
|||
Loading…
Reference in New Issue