update eFic2eFic bridge and default files
--- a/bridges/default/editbio.php
+++ b/bridges/default/editbio.php
@@ -46,9 +46,20 @@
$uid = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : false;
if(!$uid) $uid = USERUID;
- if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") $output .= write_error(_NOTAUTHORIZED);
+ if($uid && !isNumber($uid)) accessDenied( );
+ if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") accessDenied( );
if(isMEMBER) $output .= "<div id=\"pagetitle\">"._EDITPERSONAL."</div>";
else $output .= "<div id=\"pagetitle\">"._NEWACCOUNT."</div>";
+
+ // check for MD5 password hashes after a user logs in to edit their bio and warn them if their password is insecure
+ // all MD5 hashes are 32 exact characters long, hexadecimal, 0-9 and a-f random
+ // this set is a bit cursed... but it works
+ $pwdcharlengthquery = dbquery("SELECT CHAR_LENGTH(password) FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = ".USERUID.";");
+ $pwdlengthfetch = dbrow($pwdcharlengthquery);
+ $pwdlengthstring = end($pwdlengthfetch);
+ $pwdcheck = (int) $pwdlengthstring;
+ if ($pwdcheck == 32) $output .= "<center>"._INSECUREPWD."</center><br>";
+
if(!empty($_POST['submit'])) {
$penname = isset($_POST['newpenname']) ? escapestring($_POST['newpenname']) : false;
$email = escapestring($_POST['email']);
@@ -164,7 +175,7 @@
$output .= write_message(_PENNAMEINUSE." "._TRYAGAIN);
}
else {
- dbquery("UPDATE "._AUTHORTABLE." SET penname = '".escapestring($penname)."' WHERE uid = '$_POST[uid]'");
+ dbquery("UPDATE "._AUTHORTABLE." SET penname = '".escapestring($penname)."' WHERE uid = '$uid'");
if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_NEWPEN, USERPENNAME, USERUID, $_POST['oldpenname'], $uid, $penname))."', '".USERUID."', INET6_ATON('".$_SERVER['REMOTE_ADDR']."'), 'EB', " . time() . ")");
}
}
@@ -183,7 +194,7 @@
}
/* End dynamic fields */
dbquery("UPDATE "._AUTHORTABLE." SET realname='".descript(strip_tags(escapestring($_POST['realname'])), $allowed_tags)."', email='$email', bio='".descript(strip_tags(escapestring($_POST['bio']), $allowed_tags))."', image='".($imageupload && !empty($_POST['image']) ? escapestring($_POST['image']) : "")."' WHERE uid = '$uid'");
- $output .= write_message(_ACTIONSUCCESSFUL." ".(isset($_GET['uid']) ? _BACK2ADMIN : _BACK2ACCT." "._LOGINAGAIN));
+ $output .= write_message(_ACTIONSUCCESSFUL." ".(isset($_GET['uid']) ? _BACK2ADMIN : _BACK2ACCT."<br>"._LOGINAGAIN));
}
}
else {
@@ -207,8 +218,8 @@
else if(isset($user)) $output .= " ".$user['penname'];
$output .= "</div>
- <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? $user['realname'] : "")."\"></div>
- <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? $user['email'] : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div>
+ <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? htmlspecialchars($user['realname'], ENT_QUOTES) : "")."\"></div>
+ <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? htmlspecialchars($user['email'], ENT_QUOTES) : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div>
<div><label for='bio'>"._BIO.":</label></div>
<div style='width: 450px; margin: 0 auto;'>
<textarea class=\"textbox\" name=\"bio\" cols=\"50\" rows=\"6\">".(isset($user['bio']) ? stripslashes($user['bio']) : "")."</TEXTAREA></div>";
--- a/bridges/default/get_session_vars.php
+++ b/bridges/default/get_session_vars.php
@@ -25,7 +25,7 @@
if(!defined("_CHARSET")) exit( );
// Get session variables from cookie data if not logged in.
// To bridge to another program replace (or add to) this information with the bridge to your other script. See examples in the includes/bridges/ folder.
-if (!empty($_COOKIE[$sitekey."_useruid"])) {
+if (!empty($_COOKIE[$sitekey."_useruid"]) && isNumber($_COOKIE[$sitekey."_useruid"])) {
$userdata = dbassoc(dbquery("SELECT ap.*, "._UIDFIELD." as uid, "._PENNAMEFIELD." as penname, "._EMAILFIELD." as email, "._PASSWORDFIELD." as password FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '".$_COOKIE[$sitekey."_useruid"]."'"));
if($userdata && $userdata['level'] != -1 && $_COOKIE[$sitekey.'_salt'] == md5($userdata['email'] . $userdata['password'])) {
define("USERUID", $userdata['uid']);
@@ -67,3 +67,4 @@
if(empty($siteskin)) $siteskin = $defaultskin;
?>
+
--- a/bridges/default/login.php
+++ b/bridges/default/login.php
@@ -65,12 +65,17 @@
dbclose( );
exit( );
}
- if(password_verify($_POST['password'], $encryptedpasswordb) == $encryptedpasswordb) {
+ if(password_verify($_POST['password'], $encryptedpasswordb)) {
if(isset($_POST['cookiecheck'])) {
- setcookie($sitekey."_useruid",$passwd['uid'], time()+60*60*24*30, "/");
- setcookie($sitekey."_salt", md5($passwd['email'] . $encryptedpasswordb), time()+60*60*24*30, "/");
+ setcookie($sitekey."_useruid", $passwd['uid'], array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
+ setcookie($sitekey."_salt", md5($passwd['email'].$encryptedpasswordb), array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
}
- if(!isset($_SESSION)) session_start( );
+ if(!isset($_SESSION)) {
+ ini_set('session.cookie_httponly', '1');
+ ini_set('session.cookie_samesite', 'Lax');
+ session_start( );
+ }
+ session_regenerate_id(true);
$_SESSION[$sitekey."_useruid"] = $passwd['uid'];
$_SESSION[$sitekey."_salt"] = md5($passwd['email'] . $encryptedpasswordb);
$logincode = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'login'");
@@ -81,10 +86,15 @@
else if($passwd['password'] == $encryptedpasswordm) {
if(isset($_POST['cookiecheck'])) {
- setcookie($sitekey."_useruid",$passwd['uid'], time()+60*60*24*30, "/");
- setcookie($sitekey."_salt", md5($passwd['email'] . $encryptedpasswordm), time()+60*60*24*30, "/");
+ setcookie($sitekey."_useruid", $passwd['uid'], array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
+ setcookie($sitekey."_salt", md5($passwd['email'].$encryptedpasswordm), array('expires' => time()+60*60*24*30, 'path' => "/", 'httponly' => true, 'samesite' => 'Lax'));
}
- if(!isset($_SESSION)) session_start( );
+ if(!isset($_SESSION)) {
+ ini_set('session.cookie_httponly', '1');
+ ini_set('session.cookie_samesite', 'Lax');
+ session_start( );
+ }
+ session_regenerate_id(true);
$_SESSION[$sitekey."_useruid"] = $passwd['uid'];
$_SESSION[$sitekey."_salt"] = md5($passwd['email'] . $encryptedpasswordm);
$logincode = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'login'");
--- a/bridges/default/profile.php
+++ b/bridges/default/profile.php
@@ -29,24 +29,24 @@
$result2 = dbquery("SELECT *, date as date FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
$userinfo = dbassoc($result2);
$nameinfo = "";
-if($userinfo['email'])
+if(isset($userinfo['email']))
$nameinfo .= " [<a href=\"viewuser.php?action=contact&uid=".$userinfo['uid']."\">"._CONTACT."</a>]";
-if(!empty($favorites) && isMEMBER && $userinfo['uid'] != USERUID) {
- $fav = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'AU' AND item = '".$userinfo['uid']."'");
- if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"user.php?action=favau&uid=".USERUID."&add=".$userinfo['uid']."\">"._ADDAUTHOR2FAVES."</a>]";
+if(!empty($favorites) && isMEMBER && isset($userinfo['uid']) != USERUID) {
+ $fav = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_favorites WHERE uid = '".USERUID."' AND type = 'AU' AND item = '".(isset($userinfo['uid']))."'");
+ if(dbnumrows($fav) == 0) $nameinfo .= " [<a href=\"user.php?action=favau&uid=".USERUID."&add=".(isset($userinfo['uid']))."\">"._ADDAUTHOR2FAVES."</a>]";
}
-$tpl->assign("userpenname", $userinfo['penname']." ".$nameinfo);
-$tpl->assign("membersince", date("$dateformat", $userinfo['date']));
+$tpl->assign("userpenname", ($userinfo['penname'] ?? null)." ".$nameinfo);
+$tpl->assign("membersince", date("$dateformat", ($userinfo['date'] ?? null)));
-if($userinfo['realname'])
+if(isset($userinfo['realname']))
$tpl->assign("realname", $userinfo['realname']);
-if($userinfo['bio']) {
+if(isset($userinfo['bio'])) {
$bio = nl2br($userinfo['bio']);
$tpl->assign("bio", stripslashes($bio));
}
-if($userinfo['image'])
- $tpl->assign("image", "<img src=\"".$userinfo['image']."\">");
+if(isset($userinfo['image']))
+ $tpl->assign("image", "<img src=\"".htmlspecialchars($userinfo['image'], ENT_QUOTES)."\">");
$tpl->assign("userlevel", isset($userinfo['level']) && $userinfo['level'] > 0 && $userinfo['level'] < 4 ? _ADMINISTRATOR.(isADMIN ? " - ".$userinfo['level'] : "") : _MEMBER);
@@ -86,7 +86,7 @@
$adminopts = "";
if(isADMIN && uLEVEL < 3) {
$adminopts .= "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> ".(isset($userinfo['validated']) && $userinfo['validated'] ? "[<a href=\"admin.php?action=members&revoke=$uid\" class=\"vuadmin\">"._REVOKEVAL."</a>] " : "[<a href=\"admin.php?action=members&validate=$uid\" class=\"vuadmin\">"._VALIDATE."</a>] ")."[<a href=\"user.php?action=editbio&uid=$uid\" class=\"vuadmin\">"._EDIT."</a>] [<a href=\"admin.php?action=members&delete=$uid\" class=\"vuadmin\">"._DELETE."</a>]";
- $adminopts .= " [<a href=\"admin.php?action=members&".($userinfo['level'] < 0 ? "unlock=".$userinfo['uid']."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".$userinfo['uid']."\" class=\"vuadmin\">"._LOCKMEM)."</a>]";
+ $adminopts .= " [<a href=\"admin.php?action=members&".(isset($userinfo['level']) < 0 ? "unlock=".($userinfo['uid'] ?? null)."\" class=\"vuadmin\">"._UNLOCKMEM : "lock=".($userinfo['uid'] ?? null)."\" class=\"vuadmin\">"._LOCKMEM)."</a>]";
$adminopts .= " [<a href=\"admin.php?action=admins&".(isset($userinfo['level']) && $userinfo['level'] > 0 ? "revoke=$uid\" class=\"vuadmin\">"._REVOKEADMIN."</a>] [<a href=\"admin.php?action=admins&do=edit&uid=$uid\" class=\"vuadmin\">"._EDITADMIN : "do=new&uid=$uid\" class=\"vuadmin\">"._MAKEADMIN)."</a>]</div>";
$tpl->assign("adminoptions", $adminopts);
}
--- a/bridges/eFic2eFic/editbio.php
+++ b/bridges/eFic2eFic/editbio.php
@@ -45,9 +45,20 @@
$uid = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : false;
if(!$uid) $uid = USERUID;
- if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") $output .= write_error(_NOTAUTHORIZED);
+ if($uid && !isNumber($uid)) accessDenied( );
+ if((!isADMIN || uLEVEL > 2) && $uid != USERUID && $action == "editbio") accessDenied( );
if(isMEMBER) $output .= "<div id=\"pagetitle\">"._EDITPERSONAL."</div>";
else $output .= "<div id=\"pagetitle\">"._NEWACCOUNT."</div>";
+
+ // check for MD5 password hashes after a user logs in to edit their bio and warn them if their password is insecure
+ // all MD5 hashes are 32 exact characters long, hexadecimal, 0-9 and a-f random
+ // this set is a bit cursed... but it works
+ $pwdcharlengthquery = dbquery("SELECT CHAR_LENGTH(password) FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = ".USERUID.";");
+ $pwdlengthfetch = dbrow($pwdcharlengthquery);
+ $pwdlengthstring = end($pwdlengthfetch);
+ $pwdcheck = (int) $pwdlengthstring;
+ if ($pwdcheck == 32) $output .= "<center>"._INSECUREPWD."</center><br>";
+
if(!empty($_POST['submit'])) {
$penname = isset($_POST['newpenname']) ? escapestring($_POST['newpenname']) : false;
$email = escapestring($_POST['email']);
@@ -180,7 +191,7 @@
}
/* End dynamic fields */
dbquery("UPDATE "._AUTHORTABLE." SET realname='".descript(strip_tags(escapestring($_POST['realname'])), $allowed_tags)."', email='$email', bio='".descript(strip_tags(escapestring($_POST['bio']), $allowed_tags))."', image='".($imageupload && !empty($_POST['image']) ? escapestring($_POST['image']) : "")."' WHERE uid = '$uid'");
- $output .= write_message(_ACTIONSUCCESSFUL." ".(isset($_GET['uid']) ? _BACK2ADMIN : _BACK2ACCT." "._LOGINAGAIN));
+ $output .= write_message(_ACTIONSUCCESSFUL." ".(isset($_GET['uid']) ? _BACK2ADMIN : _BACK2ACCT."<br>"._LOGINAGAIN));
}
}
else {
@@ -203,8 +214,8 @@
$output .= "<INPUT name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"".(isset($user) ? $user['penname'] : "")."\"><INPUT name=\"oldpenname\" type=\"hidden\" value=\"".(isset($user) ? $user['penname'] : "")."\"><font color=\"red\">*</font> ";
else if(isset($user)) $output .= " ".$user['penname'];
$output .= "</div>
- <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? $user['realname'] : "")."\"></div>
- <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? $user['email'] : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div>
+ <div><label for='realname'>"._REALNAME.": </label><INPUT type=\"text\" class=\"textbox=\" name=\"realname\" maxlength=\"200\" value=\"".(isset($user) ? htmlspecialchars($user['realname'], ENT_QUOTES) : "")."\"></div>
+ <div><label for='email'>"._EMAIL.":</label><INPUT type=\"text\" class=\"textbox=\" name=\"email\" value=\"".(isset($user) ? htmlspecialchars($user['email'], ENT_QUOTES) : "")."\" maxlength=\"200\" size=\"35\"><font color=\"red\">*</font></div>
<div><label for='bio'>"._BIO.":</label></div>
<div style='width: 450px; margin: 0 auto;'><textarea class=\"textbox\" name=\"bio\" cols=\"50\" rows=\"6\">".(isset($user) ? stripslashes($user['bio']) : "")."</TEXTAREA></div>";
/* The section adds fields to the form from the authorfields table to the authorinfo table allowing dynamic additions to the bio/registration page */
@@ -234,9 +245,9 @@
if($action != "register" || $pwdsetting)
$output .= "<div><label for='password'>"._PASSWORD.":</label> <INPUT name=\"password\" class=\"textbox\" value=\"\" type=\"password\">".($action == "register" ? "<font color=\"red\">*</font>" : "")."</div>
<div><label for='password2'>"._PASSWORD2.":</label> <INPUT name=\"password2\" class=\"textbox=\" value=\"\" type=\"password\">".($action == "register" ? "<font color=\"red\">*</font>" : "")."</div>";
- if(!empty($captcha) && $action == "register") $output .= "<div><label for='userdigit'>"._CAPTCHANOTE."</label><input MAXLENGTH=5 SIZE=5 name=\"userdigit\" type=\"text\" value=\"\"><div style='text-align: center;'><img width=120 height=30 src=\""._BASEDIR."includes/button.php\" style=\"border: 1px solid #111;\"></div></div>";
+ if(!empty($captcha) && $action == "register") $output .= "<div><label for='userdigit'>"._CAPTCHANOTE."</label><input MAXLENGTH=5 SIZE=5 name=\"userdigit\" type=\"text\" value=\"\"><div style='text-align: center;'><img width=240 height=60 src=\""._BASEDIR."includes/button.php\" style=\"border: 1px solid #111;\"></div></div>";
$output .= "<div style='text-align: center; margin: 1em;'><INPUT type=\"hidden\" name=\"uid\" value=\"".(isset($user) ? $user['uid'] : "")."\"><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\">";
- if(!isADMIN)
+ if(!isADMIN && $action != "register")
{
$output .= " [<a href=\"admin.php?action=members&delete=$uid\">"._DELETE."</a>]";
}