From a491c4b921be6cbfd9a7e58402c7afd1a28937da Mon Sep 17 00:00:00 2001 From: Sean Joseph Date: Sun, 29 Oct 2017 20:21:55 -0400 Subject: [PATCH] Added the secure logins for site. removed htaccess in favor of a custom authentication. Most pages are linking to the secure login screen now. I added a minutes page to keep the meeting minutes. Successful logins. --- lib/LoginController.php | 59 +++++++++++++++++++++++++++++++++++++++++ lib/View.php | 1 + lib/logins.inc.php | 13 +++++++++ lib/prelude.inc.php | 11 ++++++++ lib/protected.inc.php | 15 +++++++++++ post/login.php | 20 ++++++++++++++ secure/.htaccess | 12 --------- secure/index.php | 27 +++++++++++++++++++ secure/minutes.php | 14 ++++++++++ 9 files changed, 160 insertions(+), 12 deletions(-) create mode 100644 lib/LoginController.php create mode 100644 lib/logins.inc.php create mode 100644 lib/prelude.inc.php create mode 100644 lib/protected.inc.php create mode 100644 post/login.php delete mode 100644 secure/.htaccess create mode 100644 secure/index.php create mode 100644 secure/minutes.php diff --git a/lib/LoginController.php b/lib/LoginController.php new file mode 100644 index 0000000..541f543 --- /dev/null +++ b/lib/LoginController.php @@ -0,0 +1,59 @@ +get = $get; + $this->post = $post; + $this->logins = $logins; + + if(isset($post['username'])){ + $username = $post['username']; + if(array_key_exists($username,$logins)){ + if(isset($post['password'])) { + $hash = hash("sha256", $post['password']); + if ($hash == $logins[$username]) { + $this->success = true; + $this->redirect = "secure/minutes.php"; + } + else{ + $this->redirect = "secure/index.php"; + } + } + else{ + $this->redirect = "secure/index.php"; + } + + } + else{ + $this->redirect = "secure/index.php"; + } + } + else{ + $this->redirect = "secure/index.php"; + } + + } + + public function getRedirect(){ + return $this->redirect; + } + + public function validLogin(){ + return $this->success; + } + + private $get; //Get data + private $post; //Post data + private $logins; //Login data + private $success = false; // successful login flag + private $redirect; //Redirect location +} \ No newline at end of file diff --git a/lib/View.php b/lib/View.php index b85439e..62eee0e 100644 --- a/lib/View.php +++ b/lib/View.php @@ -14,6 +14,7 @@ class View $this->addNav("Progress", "./"); $this->addNav("Meet The Team", "./about.php"); $this->addNav("Course Site", "https://cse.msu.edu/~cse435/"); + $this->addNav("Secure", "./secure"); } public function head(){ diff --git a/lib/logins.inc.php b/lib/logins.inc.php new file mode 100644 index 0000000..583f171 --- /dev/null +++ b/lib/logins.inc.php @@ -0,0 +1,13 @@ + "1b598bb7f24d7d258a6bd2264177fb88896744e43214f86daa9f4738e5e8b5be", + "cse435" => "0f0484da86e5949eb820290270ab76e5fc63f1c4c06b0bb412cd3c551623069f", +); \ No newline at end of file diff --git a/lib/prelude.inc.php b/lib/prelude.inc.php new file mode 100644 index 0000000..b1d9ce8 --- /dev/null +++ b/lib/prelude.inc.php @@ -0,0 +1,11 @@ +validLogin()){ + + $_SESSION[LOGIN] = "We really out here."; +} + +header("Location: " . ROOT . $controller->getRedirect()); + diff --git a/secure/.htaccess b/secure/.htaccess deleted file mode 100644 index 59bc014..0000000 --- a/secure/.htaccess +++ /dev/null @@ -1,12 +0,0 @@ -AuthType Basic -AuthBasicProvider ldap -AuthName "Roaming Access" -AuthLDAPURL ldap://ds.cse.msu.edu:389/ou=People,dc=cse,dc=msu,dc=edu?uid?sub -AuthLDAPGroupAttribute memberUid -AuthLDAPGroupAttributeIsDN off -Require user cse435 -Require user joseph62 -Require user alphastep -Require user arentlog -Require user coppers4 -Require user murra203 diff --git a/secure/index.php b/secure/index.php new file mode 100644 index 0000000..6bd6bf5 --- /dev/null +++ b/secure/index.php @@ -0,0 +1,27 @@ + + + + + + Secure Pages Login + + +

Secure Pages Login

+
+
+ Login +

+ + +

+

+ + +

+ +
+
+ + diff --git a/secure/minutes.php b/secure/minutes.php new file mode 100644 index 0000000..a09249b --- /dev/null +++ b/secure/minutes.php @@ -0,0 +1,14 @@ + + + + + + Meeting Minutes + + +

Meeting Minutes

+ +