Stable release

skeeks-semenov · skeeks-semenov · commit 6c3e288f4de7 · 2016-04-17T21:36:53.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 CHANGELOG
 ==============
 
-1.0.0-alpha
+1.0.0
 -----------------
-  * Can be used
+  * Stable release
diff --git a/HttpBasicAuthComponent.php b/HttpBasicAuthComponent.php
@@ -24,44 +24,65 @@ class HttpBasicAuthComponent extends Component
      */
     public $password = 'password';
 
+    /**
+     * @var bool
+     */
+    public $usePasswordHash = false;
+
+    /**
+     * @var null
+     */
+    public $viewFail = null;
 
-    public function execute()
+
+    public function verify()
     {
-        if (!isset($_SERVER['PHP_AUTH_PW']))
+        if (\Yii::$app->request->authUser != $this->login || !$this->_verifyPassword())
         {
-            $this->_authentificateHttp();
+            $this->_fail();
         }
+    }
 
-        if(!@$_SERVER['PHP_AUTH_PW'])
+    /**
+     * @return bool
+     */
+    protected function _verifyPassword()
+    {
+        if ($this->usePasswordHash)
         {
-            $this->_authentificateHttp();
-        }
-
-        else
+            return (bool) (md5(\Yii::$app->request->authPassword) == $this->password);
+        } else
         {
-            if (@$_SERVER['PHP_AUTH_USER'] != $this->login || @$_SERVER['PHP_AUTH_PW'] != $this->password)
-            {
-                $this->_authentificateHttp();
-            }
+            return (bool) (\Yii::$app->request->authPassword == $this->password);
         }
     }
 
-    protected function _authentificateHttp()
+    protected function _fail()
     {
-        $appName = \Yii::$app->id;
-        Header("WWW-Authenticate: Basic realm=\"{$appName}\"");
-        Header("HTTP/1.0 401 Unauthorized");
-        echo <<<HTML
-        <style>
-            .sx-title
-            {
-                text-align: center;
-                font-size: 20px;
-                padding: 200px;
-            }
-        </style>
-        <p class="sx-title">{$appName} Authorization required.</p>
+        $appName = \Yii::$app->name;
+
+        if ($this->viewFail)
+        {
+            Header("WWW-Authenticate: Basic realm=\"{$appName}\"");
+            Header("HTTP/1.0 401 Unauthorized");
+
+            echo \Yii::$app->view->render($this->viewFail);
+        } else
+        {
+            Header("WWW-Authenticate: Basic realm=\"{$appName}\"");
+            Header("HTTP/1.0 401 Unauthorized");
+            echo <<<HTML
+            <style>
+                .sx-title
+                {
+                    text-align: center;
+                    font-size: 20px;
+                    padding: 200px;
+                }
+            </style>
+            <p class="sx-title">{$appName} Authorization required.</p>
 HTML;
+        }
 
         exit;
     }
diff --git a/README.md b/README.md
@@ -23,7 +23,22 @@ Configuration app
 
 ```php
 
-
+'on beforeRequest' => function ($event) {
+    \Yii::$app->httpBasicAuth->verify();
+},
+
+'components' =>
+[
+    'httpBasicAuth' =>
+    [
+        'class'             => 'skeeks\yii2\httpBasicAuth\HttpBasicAuthComponent',
+        'login'             => 'login',
+        'password'          => 'password',
+        'usePasswordHash'   => false,                               //optionality
+        'viewFail'          => '@app/views/http-basic-auth-fail'    //optionality
+    ],
+
+]
 
 ```
 
diff --git a/_ide/YiiApplication.php b/_ide/YiiApplication.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * The pseudo-only IDE tips
+ *
+ * @author Semenov Alexander <semenov@skeeks.com>
+ * @link http://skeeks.com/
+ * @copyright 2010 SkeekS (СкикС)
+ * @date 10.09.2015
+ */
+namespace yii\web;
+use skeeks\yii2\httpBasicAuth\HttpBasicAuthComponent;
+
+/**
+ * @property HttpBasicAuthComponent $httpBasicAuth
+
+ * Class Application
+ * @package yii\web
+ */
+class Application
+{}
