dandelion_s1 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e9ff3cb5efdc68ee7385d5c1b8d975202d96526
-  data.tar.gz: 52f232490fdfdf27eeb3ddb9a875545a9710971e
+  metadata.gz: defb22aa3bc5c08f20627b62117b79956d26fae9
+  data.tar.gz: f05f2b8d594b2d71d824d69c47e96ed5ef657a96
 SHA512:
-  metadata.gz: f54b7004459dfd27f7c62ca188bfea688a1035c9707cc3f5c6b45a7bfcd71e1c8acfd5c31f6f1aeadbd2f0b01a32ade832fcb9db2a434b9479ae89ccad9d368d
-  data.tar.gz: 7dd3280337401fe36b4d6834508b622b801cbfaef7749e582f3790f128d6f216f332a44adc26cf99e6252d2db331c20173a0ba851764916083cc35d631ebad7b
+  metadata.gz: c0c8aa85c39e7bdfbcd5a5bbe40dc299de87b50d21021dac0fccaefc4042e72f1fb2940357303f57eea9a054ae655ea780d1cbdbda575322c0aee71f79ad7896
+  data.tar.gz: 6ea4b45538e936120c85c2db335898b88ade4b3acff7dbad93d242908a8c0a990b053307ab1d917d5e64f3bf4f7de920a24c847a3ac6d73bd1e90da86c19e0d5

data/lib/dandelion_s1.rb

@@ -2,94 +2,129 @@
 
 # file: dandelion_s1.rb
 
+require 'martile'
 require 'rack-rscript'
 require 'simple-config'
 
 
 class DandelionS1 < RackRscript
 
-  def initialize(h={})
+  def initialize(opts={})
 
-    raw_opts = {root: 'www', access: {}, static: [], log: nil}.merge h
+    h = {root: 'www', static: []}.merge(opts)
+    
+    access_list = h[:access]
     @app_root = Dir.pwd
 
-    @static = raw_opts[:static]
-    @root = raw_opts[:root]
-
     #@access_list = {'/do/r/hello3' => 'user'}
-    access_list = raw_opts[:access]
         
-    h2 = SimpleConfig.new(access_list).to_h
-    conf_access = h2[:body] || h2
-    @access_list = conf_access.inject({}) \
-                                {|r,x| k,v = x; r.merge(k.to_s => v.split)}
+    if access_list then
+      
+      h2 = SimpleConfig.new(access_list).to_h
+      conf_access = h2[:body] || h2
+      @access_list = conf_access.inject({}) \
+                                  {|r,x| k,v = x; r.merge(k.to_s => v.split)}
+    
+    end
+    
+    h3 = %i(log pkg_src rsc_host rsc_package_src root static debug)\
+        .inject({}) {|r,x| r.merge(x => h[x])}
+    
+    super(h3)
     
-    super(log: h[:log],  pkg_src: h[:pkg_src], rsc_host: h[:rsc_host], 
-          rsc_package_src: h[:rsc_package_src])
   end
 
   def call(e)
 
     request = e['REQUEST_PATH']
-    r = @access_list.detect {|k,v| request =~ Regexp.new(k)}
+    
+    return super(e) if request == '/login'
+    r = @access_list.detect {|k,v| request =~ Regexp.new(k)} if @access_list
     private_user = r ? r.last : nil
     
-    if private_user.nil? then 
-      super(e)
-    elsif private_user.is_a? String and private_user == e['REMOTE_USER']
+    req = Rack::Request.new(e)
+    user = req.session[:username]
+    #return [status_code=401, {"Content-Type" => 'text/plain'}, [user.inspect]]
+    return jumpto '/login' unless user
+    
+    if private_user.nil? then
       super(e)
-    elsif private_user.is_a? Array and 
-        private_user.any? {|x| x == e['REMOTE_USER']}
+    elsif (private_user.is_a? String and private_user == user) \
+        or (private_user.is_a? Array and private_user.any? {|x| x == user})
       super(e)
     else
-      request = '/unauthorised/'
-      content, content_type, status_code = run_route(request)        
-      content_type ||= 'text/html'
-      [status_code=401, {"Content-Type" => content_type}, [content]]
+      jumpto '/unauthorised'
     end
 
   end
+  
+  protected
+  
+  def default_routes(env, params) 
+    
+    get '/login' do
+      
+s=<<EOF      
+login
+  username: [     ]
+  password: [     ]
+
+  [login]('/login')
+EOF
+
+      Martile.new(s).to_html
+    end    
+    
+    post '/login' do
+      
+      h = @req.params
+      @req.session[:username] = h['username']
 
-  def default_routes(env, params)
-
-    super(env, params)
-
-    get /^(\/(?:#{@static.join('|')}).*)/ do |path|
-
-      filepath = File.join(@app_root, @root, path)
-
-      if @log then
-        @log.info 'DandelionS1/default_routes: ' + 
-            "root: %s path: %s" % [@root, path]
-      end
-
-      if path.length < 1 or path[-1] == '/' then
-        path += 'index.html' 
-        File.read filepath
-      elsif File.directory? filepath then
-        Redirect.new (path + '/') 
-      elsif File.exists? filepath then
-        h = {xml: 'application/xml', html: 'text/html', png: 'image/png', 
-             jpg: 'image/jpeg', txt: 'text/plain', css: 'text/css',
-             xsl: 'application/xml', svg: 'image/svg+xml'}
-        content_type = h[filepath[/\w+$/].to_sym]
-        [File.read(filepath), content_type || 'text/plain']
-      else
-        'oops, file ' + filepath + ' not found'
-      end
-
+      'you are now logged in as ' + h['username']
+      
     end
-
-    get /^\/$/ do
-
-      file = File.join(@root, 'index.html')
-      File.read file
+        
+    get '/logout' do
+      
+      @req.session.clear
+      'you are now logged out'
+      
+    end       
+    
+    get '/session' do
+      
+      #@req.session.expires
+      #@req.session.options[:expire_after] = 1
+      @req.session.options.inspect
+      
+    end
+    
+    get '/user' do
+      
+      if @req.session[:username] then
+        'You are ' + @req.session[:username]
+      else
+        'you need to log in to view this page'
+      end      
+      
     end
 
-    get '/unauthorised/' do
+    get '/unauthorised' do
       'unauthorised user'
     end
+    
+    super(env, params)   
  
-  end 
+  end   
+  
+  private
+  
+  def jumpto(request)
+    
+    content, content_type, status_code = run_route(request)        
+    content_type ||= 'text/html'
+    [status_code=401, {"Content-Type" => content_type}, [content]]    
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion_s1
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDQyNzIyMTQ1NVoXDTE4MDQyNzIyMTQ1NVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMGzM9MfeWs/zGWaupPrKUpsL4tUz7UkqTJVVcWGDTFIg7SsbLHz+POGHkOh
-  z6ay9LNH0ua0yvajLi9q41DMIzSdL8gclpnbeYHdx/elFVB8NSRJFBTVhXaUVyyh
-  +1eATgtt6jJoUW0sHrew7L1qBRS8NqcWy/Yg/nbovuTTf3yniCm2l8A5JFChuvy7
-  CQeefZuh2gNuGGhRf61XQIKlo5AOLQ9cR/yFjrh4A4psrV9P70dgIbE+zsshGbwy
-  YlJOSCvFkoxKvQ9JREZNXi8SPZ32u6Lr+zB4x/4f3St32buJ6T+RxfHnwo3XPijp
-  1MpA6OohLaZdOzEm0owUp9fiMj8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQULcvDrOBooFEE5msfBetruFE5RYIwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAD6Vf1puc
-  sn1e05khsZW3OVSiIEznQg5o33Xi2KhIK58XrMFhnaJS1FOZEsjksW4xebJO+j2c
-  pjeQas8LorRauB2wVDEaH/aHR38VY38GIuVTP1pA4CKeryyAIhN4qy+bRs3rFSl4
-  CgdxFOj2YDkZdxY8DVLXgN+i2Bbkk1SkcLDCtAS1EN5CVVIdM/vT2OX+k/itvHzB
-  KL2u5yhtxl3lhBYKtN0iV/B9zRRjHgkZdKt4oNnv0DMG4d7FCZNoF2QuUCt3BwbT
-  pyJm5LdEycjtTNHCuWHnBmZ5AVetwku2PZdaJAb5ygezNQbu5ynq/HBIMWdTabUY
-  Zfqb8EuDqrBL9w==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzIzMTAxNzM3WhcN
+  MTkwNzIzMTAxNzM3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMwm/h
+  0TYNxdxPLtVz83GYuCvgJLLBEhsSR1N3/k5grBT5A7npXECtoLAupTK7xMbG6EuJ
+  g0wmw6NI+T7dKYmpRJtqHwDM7h2iMIyJq5/NjYfuz/V2Xqc2GkAtLsMT2iBnHTkV
+  frKevCxAKfEwYLgvll2wnXcYfFBRngjPW8hhvQ91A3lHxib9SqtSPiNZmX79C3/M
+  p+zngMCEEWyaD9JZCaVY/lsj/hzGorx0qL0neUJn0oIvQzPClTyZ1nn2kYEid2qF
+  d7DSS0OQKb2kh8xEP9P5+IAL6mtGrpkFmN+LweELNPzH7UjQXcNQz70YTC5PygAI
+  EFguH9qMJd7p/2dLAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFG56mGI2GWi6FXxJ0CytmQqp8sWwMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAIr04+kPDkeFOt37EuGX
+  E0d+iUC8LPKUEANDVOFt/zPU8IAtu/a46Yt9TQ950rjmfzofw/jxt0d5f2uCGotP
+  LbGymxJUCmP04wFjVZFlEeM8KUt8T2lsS2c+3EnECKV3YX/bNmaQvrDYtS1+spE1
+  2hTRNOG6EjJFGgjd15MCsQk+CMhhc6/EqQHV2QmqbQPcHcZM55dvyNANG/JWheBn
+  2QZIQKcP2zU4/Vha3btUrOKjLdL48mFpU5W1JmHVcGalvG12WPInaxSNhcldbbNK
+  1N8hBgTHd/hcz/i08u1weglfL0QBkOx9HzswCq9Iuesya/Zb40PJIbW4/A2pKm0o
+  eek=
   -----END CERTIFICATE-----
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rscript
@@ -39,20 +38,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +61,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +71,27 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: martile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,6 +122,6 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: A kind of Rack-Rscript web server which facilitates static files, basic authentication,
-  and private pages.
+summary: A kind of Rack-Rscript web server which facilitates static files, cookie
+  based authentication, and private pages.
 test_files: []