Merge pull request sclorg#17 from ewolinetz/app_auth_vars

Updating application to use env vars for authentication instead of st…
duke-libraries · Jun 16, 2015 · 16716f4 · 16716f4
2 parents 0569c56 + eae3441
commit 16716f4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
@@ -1,6 +1,6 @@
 class ArticlesController < ApplicationController
 
-  http_basic_authenticate_with name: "openshift", password: "secret", except: [:index, :show]
+  http_basic_authenticate_with name: ENV["APPLICATION_USER"], password: ENV["APPLICATION_PASSWORD"], except: [:index, :show]
 
   def index
     @articles = Article.all

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -1,6 +1,6 @@
 class CommentsController < ApplicationController
 
-  http_basic_authenticate_with name: "openshift", password: "secret", only: :destroy
+  http_basic_authenticate_with name: ENV["APPLICATION_USER"], password: ENV["APPLICATION_PASSWORD"], only: :destroy
 
   def create
     @article = Article.find(params[:article_id])

diff --git a/openshift/templates/rails-postgresql.json b/openshift/templates/rails-postgresql.json
@@ -205,6 +205,14 @@
                   {
                     "name": "APPLICATION_DOMAIN",
                     "value": "${APPLICATION_DOMAIN}"
+                  },
+                  {
+                    "name": "APPLICATION_USER",
+                    "value": "${APPLICATION_USER}"
+                  },
+                  {
+                    "name": "APPLICATION_PASSWORD",
+                    "value": "${APPLICATION_PASSWORD}"
                   }
                 ]
               }
@@ -335,16 +343,14 @@
       "from": "[a-z0-9]{127}"
     },
     {
-      "name": "ADMIN_USERNAME",
-      "description": "administrator username",
-      "generate": "expression",
-      "from": "admin[A-Z0-9]{3}"
+      "name": "APPLICATION_USER",
+      "description": "The application user that is used within the sample application to authorize access on pages",
+      "value": "openshift"
     },
     {
-      "name": "ADMIN_PASSWORD",
-      "description": "administrator password",
-      "generate": "expression",
-      "from": "[a-zA-Z0-9]{8}"
+      "name": "APPLICATION_PASSWORD",
+      "description": "The application password that is used within the sample application to authorize access on pages",
+      "value": "secret"
     },
     {
       "name": "DATABASE_SERVICE_NAME",

diff --git a/openshift/templates/rails.json b/openshift/templates/rails.json
@@ -161,6 +161,14 @@
                   {
                     "name": "APPLICATION_DOMAIN",
                     "value": "${APPLICATION_DOMAIN}"
+                  },
+                  {
+                    "name": "APPLICATION_USER",
+                    "value": "${APPLICATION_USER}"
+                  },
+                  {
+                    "name": "APPLICATION_PASSWORD",
+                    "value": "${APPLICATION_PASSWORD}"
                   }
                 ],
                 "ports": [
@@ -205,6 +213,16 @@
       "description": "Your secret key for verifying the integrity of signed cookies",
       "generate": "expression",
       "from": "[a-z0-9]{127}"
+    },
+    {
+      "name": "APPLICATION_USER",
+      "description": "The application user that is used within the sample application to authorize access on pages",
+      "value": "openshift"
+    },
+    {
+      "name": "APPLICATION_PASSWORD",
+      "description": "The application password that is used within the sample application to authorize access on pages",
+      "value": "secret"
     }
   ]
 }