j1_template_mde 2018.4.26 → 2018.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9af654adc5781e70b236b5f49ee79aee1b69e26
-  data.tar.gz: 8a7501b1fb331f25849681cabca813f64c015c64
+  metadata.gz: 7e598f2b2266c1c903fb8033656e9b54dd135ee2
+  data.tar.gz: 9fd291480d254a446482bae7766f9d082e340efc
 SHA512:
-  metadata.gz: 7a457a75fabc48f95e12af75aee06a8dd8ae4955a8c510ab605ca07d366e10771c212f7ba8e77a3f972b3c3c250f72c0e572bb36c7ec113703b6456151136623
-  data.tar.gz: aec61c1a051c847fc2f36158d8a0741141c3574c81ff6efa3a9203ce6ddeb5e48541c62084bf11de549ca5964b5bb802e10ce4ec6ce2895e659d7e7bd6eff40d
+  metadata.gz: e36eb684b25b9b847b93e6059f8d4f6596ca05bde78b575c8fddbc34776c7e4424a371b3fb6318a75b0fb2caea8ede6f4b9d9a653deb0f9a151d289c0f4e9e28
+  data.tar.gz: ebc30dc30c3a84f7c862dc7402ed7b3b4ae5978ab35e409ac5c1d4380375a1aedb979528cc6fe8dc2f50cd7907743150fa1b2d541560bbb9314860fd33600aa4

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2018.4.26'
+  VERSION = '2018.4.27'
 end

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -284,6 +284,8 @@ module J1App
     # --------------------------------------------------------------------------
     before '/(pages|posts)/*' do
 
+      log_info! 'AuthManager', 'PreFlight', 'Initial checks initiated'
+
       # read existing/current cookie 'j1.web.session'
       # to update all data of j1_web_session (hash)
       # if request.warden.user.respond_to?(:info)
@@ -295,8 +297,8 @@ module J1App
 
         log_info! 'PreFlight', 'Cookie', 'Read web session data' # "#{session_decoded}"
       else
-        requested_page      = env['REQUEST_URI']
-        j1_web_session['requested_page'] = "#{env['REQUEST_URI']}"
+        requested_page                    = env['REQUEST_URI']
+        j1_web_session['requested_page']  = "#{env['REQUEST_URI']}"
       end
 
       # Create|Initialize the J1 web session cookie
@@ -330,22 +332,22 @@ module J1App
 
       # User state|content detection for implicit authentication
       # ------------------------------------------------------------------------
-      log_info! 'PreFlight', 'CheckConfig', 'Authentication check detected', "false" if authentication_enabled? == false
+      log_info! 'PreFlight', 'CheckConfig', 'Authentication check', 'disabled' if authentication_enabled? == false
       log_info! 'PreFlight', 'AuthCheck', 'Pass for all pages' if authentication_enabled? == false
       pass if authentication_enabled? == false
 
-      log_info! 'PreFlight', 'CheckConfig', 'Authentication check detected', "true"
-      log_info! 'PreFlight', 'DetectContent', 'Public content detected' if public_content?
+      log_info! 'PreFlight', 'CheckConfig', 'Authentication check', 'enabled'
+      log_info! 'PreFlight', 'DetectContent', 'Public content', 'YES' if public_content?
       log_info! 'PreFlight', 'DetectContent', 'Pass all public content' if public_content?
       pass if public_content?
 
-      log_info! 'PreFlight', 'DetectContent', 'Check for protected content'
+      log_info! 'PreFlight', 'DetectContent', 'Check content type'
 
       requested_page = env['REQUEST_URI']
       requested_page.scan(/(private|premium)/) do |match|
 
         category = match[0]
-        log_info! 'PreFlight', 'DetectContent', 'Content detected', "#{category}"
+        log_info! 'PreFlight', 'DetectContent', 'Content type detected', "#{category}"
 
         log_info! 'PreFlight', 'AuthCheck', 'Check authorisation status'
         if warden.authenticated?
@@ -368,7 +370,7 @@ module J1App
           if permissions[:"#{category}"].include? current_provider
             log_info! 'PreFlight', 'ContentCheck', 'Provider detected', "#{current_provider}"
             log_info! 'PreFlight', 'ContentCheck', 'Category detected', "#{category}"
-            log_info! 'PreFlight', 'ContentCheck', 'Category supported', 'YES'
+            log_info! 'PreFlight', 'ContentCheck', 'Category support', 'enabled'
 
             # Check permissions
             #
@@ -422,9 +424,9 @@ module J1App
                 path: '/'
             )
 
-            log_info! 'PreFlight', 'AuthCheck', 'Call for authentication'
+            log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
             allowed_users = providers["#{provider}"]['users'].join(',')
-            redirect "/access_protected_content?provider=#{provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
+            redirect "/page_validation?provider=#{provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
           end
           log_info! 'PreFlight', 'AuthCheck', 'Pass to requested page', "#{requested_page}"
           pass
@@ -437,7 +439,7 @@ module J1App
           provider_strategy = :"#{strategy}"
 
           log_info! 'PreFlight', 'AuthCheck', 'Start processing provider', "#{default_provider}"
-          log_info! 'PreFlight', 'AuthCheck', 'Set authentication strategy', "#{provider_strategy}"
+          log_info! 'PreFlight', 'AuthCheck', 'Authentication strategy', "#{provider_strategy}"
 
           case provider_strategy
 
@@ -457,12 +459,12 @@ module J1App
             logger.info "Hi There, #{j1_web_session[:user_name]}! You have access to the #{params['id']} team"
 
           when :member
-            log_info! 'PreFlight', 'AuthCheck', 'Process Authentication Strategy', "member"
+            log_info! 'PreFlight', 'AuthCheck', 'Process authentication strategy'
 
             if env['HTTP_COOKIE'].include? 'j1.web.session'
               session_encoded   = request.cookies['j1.web.session']
               session_decoded   = Base64.decode64(session_encoded)
-              log_info! 'PreFlight', 'Cookie', 'Read web session data' # "#{session_decoded}"
+              log_info! 'PreFlight', 'Cookie', 'Read web session data'          # "#{session_decoded}"
               j1_web_session    = JSON.parse(session_decoded)
             end
 
@@ -490,8 +492,8 @@ module J1App
             allowed_users   = providers["#{default_provider}"]['users'].join(',')
             requested_page  = env['REQUEST_URI']
 
-            log_info! 'PreFlight', 'Redirect', 'Call Request for Page Access Control'
-            redirect "/access_protected_content?provider=#{default_provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
+            log_info! 'PreFlight', 'Redirect', 'Call API request', 'PageValidate'
+            redirect "/page_validation?provider=#{default_provider}&category=#{category}&page=#{requested_page}&allowed_users=#{allowed_users}"
           else
             raise J1App::ConfigError
           end
@@ -502,16 +504,18 @@ module J1App
 
 
     # ==========================================================================
-    # APP|API ENDPOINTS (Sinatra HANDLERS)
+    # API ENDPOINTS (Sinatra HANDLERS)
     # ==========================================================================
 
-    # Authentication ENDPOINT called from the web (auth client)
+    # ENDPOINT authentication (called from WEB by auth client)
     # --------------------------------------------------------------------------
     get '/authentication' do
       # collect (common) GET parameter|s
       #
-      request                           =  params.fetch('request')
-      provider                          =  params.fetch('provider')
+      request   = params.fetch('request')
+      provider  = params.fetch('provider')
+
+      log_info! 'API', 'Authentication', 'Authentication request received'
 
       # SignIn
       # ------------------------------------------------------------------------
@@ -542,7 +546,7 @@ module J1App
         if warden.authenticated?
           log_info! 'Authentication', 'SignIn', 'User already signed in', "#{warden.user[:info]['nickname']} "
         else
-          log_info! 'Authentication', 'SignIn', 'Initiate OmniAuth request phase', "#{provider}"
+          log_info! 'Authentication', 'SignIn', 'Initiate OmniAuth authentication'
 
           # Make (really) sure that old session is cleared before login
           # --------------------------------------------------------------------
@@ -672,31 +676,29 @@ module J1App
         raise J1App::ConfigError
       end
     end
-    # END get '/authentication'
+    # END: get '/authentication'
     # --------------------------------------------------------------------------
 
-    # Post-processing ENDPOINT called after a user is authenticated
+    # ENDPOINT post_authentication (called after a user is authenticated)
     # --------------------------------------------------------------------------
     get '/post_authentication' do
       reward = {
-          :id       => 'unknown',
-          :name     => 'unknown',
-          :link     => '#'
+          :id    => 'unknown',
+          :name  => 'unknown',
+          :link  => '#'
       }
       campaign = {
-          :id       => 'unknown',
-          :link     => '#'
+          :id    => 'unknown',
+          :link  => '#'
       }
 
-      log_info! 'API', 'Post Authentication', 'Verification request detected'
+      log_info! 'API', 'Post Authentication', 'Identification request received'
 
       log_info! 'Post Authentication',  'Cookie', 'Read web session data'
       session_encoded   = request.cookies['j1.web.session']
       session_decoded   = Base64.decode64(session_encoded)
       j1_web_session    = JSON.parse(session_decoded)
 
-      log_info! 'Post Authentication', 'Identification', 'Update web session data'         # "#{j1_web_session}"
-
       user                              = warden.user
       user_json                         = user.to_json
 
@@ -754,14 +756,15 @@ module J1App
       if user.nil?
         # Collection of session data failed (e.g cookie > 4K)
         #
-        log_info! 'Post Authentication', 'Identification', 'Internal error', 'User authentication failed'
+        log_info! 'Post Authentication', 'Identification', 'Internal error', 'Authentication failed'
         warden.logout
         session.clear
         log_info! 'Post Authentication', 'Redirect', 'Pass to error page (access_denied)'
         description_title = "Access Denied"
         redirect "/access_denied?provider=unknown&user=unknown&category=unknown&title=#{description_title}"
       else
-        log_info! 'Post Authentication',  'Cookie', 'Update web session data'
+        log_info! 'Post Authentication', 'Identification', 'Authorization successful'
+        log_info! 'Post Authentication',  'Cookie', 'Update web session data'    # "#{j1_web_session}"
         j1_web_session['user_name']       = user[:info]['nickname']
         j1_web_session['user_id']         = user[:uid]
         j1_web_session['provider']        = user[:provider]
@@ -900,24 +903,24 @@ module J1App
           path: '/'
       )
 
-      log_info! 'Post Authentication', 'Identification', 'Signed in at provider', "#{user[:provider]}"
-      log_info! 'Post Authentication', 'Identification', 'Signed in as user', "#{user[:info]['nickname']}"
+      log_info! 'Post Authentication', 'Identification', 'Provider', "#{user[:provider]}"
+      log_info! 'Post Authentication', 'Identification', 'User', "#{user[:info]['nickname']}"
       log_info! 'Post Authentication', 'Redirect', 'Pass to requested page', "#{j1_web_session['requested_page']}"
       redirect j1_web_session['requested_page']
 
     end
-    # end get /post_authentication
+    # END: get /post_authentication
     # --------------------------------------------------------------------------
 
 
-    # Status|Info ENDPOINT called from the web to get current state on an user
+    # ENDPOINT status (called from WEB to get current state of an user)
     # --------------------------------------------------------------------------
     get '/status' do
       session_encoded   = request.cookies['j1.web.session']
       session_decoded   = Base64.decode64(session_encoded)
       j1_web_session    = JSON.parse(session_decoded)
 
-      log_info! 'API', 'Status Request', 'Info request detected'
+      log_info! 'API', 'Status Request', 'Info request received'
 
       # if request.warden.user.respond_to?(:info)
       #
@@ -979,8 +982,10 @@ module J1App
         }.to_json
       end
     end
+    # END: get /status
+    # --------------------------------------------------------------------------
 
-    # Exception ENDPOINT called from the app (auth manager)
+    #  ENDPOINT access_denied (exception, called from the app|auth manager)
     # --------------------------------------------------------------------------
     get '/access_denied' do
       provider          = params.fetch('provider')
@@ -988,7 +993,8 @@ module J1App
       user              = params.fetch('user')
       description_title = params.fetch('title')
 
-      log_info! 'API', 'Exception', 'Page Access Request denied'
+      log_info! 'API', 'ExceptionHandler', 'Request received'
+      log_info! 'ExceptionHandler', 'ERROR', 'Access Denied'
 
       session_encoded = request.cookies['j1.web.session']
       session_decoded = Base64.decode64(session_encoded)
@@ -1006,12 +1012,11 @@ module J1App
       j1_web_session['authenticated']   = 'false'
       j1_web_session['writer']          = 'middleware'
 
+      log_info! 'ExceptionHandler', 'Cookie', 'Write web session data'          # "#{session_json}"
+
       # write updated J1 session data to cookie
       #
-      log_info! 'API', 'Exception Handler', 'ERROR', 'Access Denied'
       session_json = j1_web_session.to_json
-      log_info! 'Exception Handler', 'Cookie', 'Write web session data' # "#{session_json}"
-
       session_encoded = Base64.encode64(session_json)
       response.set_cookie(
           'j1.web.session',
@@ -1020,7 +1025,7 @@ module J1App
           path: '/'
       )
 
-      log_info! 'Exception Handler', 'Redirect', 'Pass to error page', "Access Denied"
+      log_info! 'ExceptionHandler', 'Redirect', 'Pass to error page', "Access Denied"
 
       # Capitalize first char
       provider  =  provider.sub(/^./, &:upcase)
@@ -1037,11 +1042,11 @@ module J1App
 
       erb :auth_manager_ui
     end
-    # END get '/access_denied'
+    # END: get '/access_denied'
     # --------------------------------------------------------------------------
 
 
-    # Exception ENDPOINT called from the app (auth manager)
+    # ENDPOINT  invalid_funds (exception, called from the app|auth manager)
     # --------------------------------------------------------------------------
     get '/invalid_funds' do
       provider          = params.fetch('provider')
@@ -1049,7 +1054,8 @@ module J1App
       user              = params.fetch('user')
       description_title = params.fetch('title')
 
-      log_info! 'API', 'Exception', 'Invalid Funds'
+      log_info! 'API', 'ExceptionHandler', 'Request received'
+      log_info! 'ExceptionHandler', 'ERROR', 'Invalid Funds'
 
       session_encoded = request.cookies['j1.web.session']
       session_decoded = Base64.decode64(session_encoded)
@@ -1067,12 +1073,12 @@ module J1App
       j1_web_session['authenticated']   = 'false'
       j1_web_session['writer']          = 'middleware'
 
+      log_info! 'ExceptionHandler', 'Cookie', 'Write web session data'          # "#{session_json}"
+
       # write updated J1 session data to cookie
       #
       log_info! 'API', 'Exception Handler', 'ERROR', 'Invalid Funds'
       session_json = j1_web_session.to_json
-      log_info! 'Exception Handler', 'Cookie', 'Write web session data' # "#{session_json}"
-
       session_encoded = Base64.encode64(session_json)
       response.set_cookie(
           'j1.web.session',
@@ -1081,7 +1087,7 @@ module J1App
           path: '/'
       )
 
-      log_info! 'Exception Handler', 'Redirect', 'Pass to error page', 'Invalid Funds'
+      log_info! 'ExceptionHandler', 'Redirect', 'Pass to error page', 'Invalid Funds'
 
       # Capitalize first char
       provider  =  provider.sub(/^./, &:upcase)
@@ -1098,36 +1104,36 @@ module J1App
 
       erb :auth_manager_ui
     end
-    # END get /invalid_funds
+    # END: get /invalid_funds
     # --------------------------------------------------------------------------
 
 
     # access_protected_content ENDPOINT called from the app (auth manager)
     # --------------------------------------------------------------------------
-    get '/access_protected_content' do
-      provider        =  params.fetch('provider')
-      allowed_users   =  params.fetch('allowed_users')
-      page            =  params.fetch('page')
-      category        =  params.fetch('category')
+    get '/page_validation' do
+      provider        = params.fetch('provider')
+      allowed_users   = params.fetch('allowed_users')
+      page            = params.fetch('page')
+      category        = params.fetch('category')
 
-      log_info! 'API', 'PageAccessControl', 'Page Access Request detected'
+      log_info! 'API', 'PageAccessControl', 'PageValidate request received'
 
       # Capitalize first char
       # provider        =  provider.sub(/^./, &:upcase)
 
-      log_info! 'PageAccessControl', 'AuthCheck', 'Check authentication for provider', "#{provider}"
+      log_info! 'PageAccessControl', 'AuthCheck', 'Check provider', "#{provider}"
       # jadams, 2019-03-16: Hier ist das Problem
       #
       if warden.authenticated?
-        log_info! 'PageAccessControl', 'AuthCheck', 'Grant access for provider', "#{provider}"
+        log_info! 'PageAccessControl', 'AuthCheck', 'Grant access for', "#{provider}"
         log_info! 'PageAccessControl', 'Redirect', 'Pass to page', "#{page}"
         route = page
       else
-        log_info! 'PageAccessControl', 'AuthCheck', 'Authentication failed for provider', "#{provider}"
+        log_info! 'PageAccessControl', 'AuthCheck', 'Authentication failed', "#{provider}"
         route = "/authentication?request=signin&provider=#{provider}&allowed_users=#{allowed_users}"
       end
 
-      log_info! 'PageAccessControl', 'Redirect', 'Pass to SignIn dialog for page', "#{page}"
+      log_info! 'PageAccessControl', 'Redirect', 'Pass to SignIn dialog, page', "#{page}"
       # Capitalize first char
       provider                =  provider.sub(/^./, &:upcase)
 
@@ -1143,10 +1149,11 @@ module J1App
 
       erb :auth_manager_ui
     end
-    # END get '/access_protected_content'
+    # END: get '/page_validation
     # --------------------------------------------------------------------------
 
-
+    # ENDPOINT iframe
+    # --------------------------------------------------------------------------
     get '/iframe' do
       @website_url = "https://jekyll-one.github.io/"
       erb :iframe
@@ -1159,6 +1166,7 @@ module J1App
       log_info! 'Fallback', 'Redirect', 'Pass to requested page', "#{j1_web_session['requested_page']}"
       redirect j1_web_session['requested_page']
     end
-
+    # END: get /iframe
+    # --------------------------------------------------------------------------
   end
 end

data/lib/starter_web/Gemfile

@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
 # Theme Rubies
 # Default: J1 Template
 #
-gem 'j1_template_mde', '~> 2018.4.26'
+gem 'j1_template_mde', '~> 2018.4.27'
 
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -109,7 +109,7 @@ gem 'i18n', '0.9.5'
 # If any (additional) plugins are used, they go here:
 #
 group :jekyll_plugins do
-  gem 'asciidoctor', '>= 1.5.6'
+  gem 'asciidoctor', '>= 2.0'
 # gem 'asciidoctor-pdf', '>= 1.5.0.alpha.16'
   gem 'asciidoctor-rouge', '>= 0.3'
   gem 'jekyll-asciidoc', '>= 2.1.0'

data/lib/starter_web/_config.yml

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.26
+version:                                2018.4.27
 
 
 # ==============================================================================
@@ -603,7 +603,7 @@ j1_auth:
             blacklist:                  []
 
     patreon:
-      home_url:                         https://github.com
+      home_url:                         https://patreon.com
       product_url:                      https://patreon.com/jekyll_one
       strategy:                         member
       scope:                            [ users, pledges-to-me ]
@@ -621,7 +621,7 @@ j1_auth:
         premium:
           enabled:                      true
           users:
-            whitelist:                  [ "@jekyll-one.com" ]
+            whitelist:                  []
             blacklist:                  []
           payment:
             activated:                  [ "Premium Content", "Value Content" ]
@@ -754,7 +754,7 @@ defaults:
       author:                           J1 Team
       resources:                        toccer
       toc:                              true
-      adsense:                          true
+      adsense:                          false
       comments:                         false
 
       icons: