dandelion_s1 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: defb22aa3bc5c08f20627b62117b79956d26fae9
-  data.tar.gz: f05f2b8d594b2d71d824d69c47e96ed5ef657a96
+SHA256:
+  metadata.gz: bc83d81d5216867b5d224c4f645f3258b91647fb5c9289720ebb1a1ad90b3e2a
+  data.tar.gz: 6830244e9702bdc2301b110d09fb91f5db8c4b661074a9cc8cc3da3f95a771cc
 SHA512:
-  metadata.gz: c0c8aa85c39e7bdfbcd5a5bbe40dc299de87b50d21021dac0fccaefc4042e72f1fb2940357303f57eea9a054ae655ea780d1cbdbda575322c0aee71f79ad7896
-  data.tar.gz: 6ea4b45538e936120c85c2db335898b88ade4b3acff7dbad93d242908a8c0a990b053307ab1d917d5e64f3bf4f7de920a24c847a3ac6d73bd1e90da86c19e0d5
+  metadata.gz: 7b3b69f1bd3744946257f3f97923961a141f0590166b7e0f77600b8ecaa1ea2a23d7b86610351242abb2399825e435bebdfd877f655a1182ced01ecd9a95c8d1
+  data.tar.gz: e7a22834b7b7e86b35d89cce16fda4c36f35072535d3c0b03185ef743bd2554c76f16efcbbc3db030191966833559c12ed2ec1c6c99eed045bf74f635680f61a

data/lib/dandelion_s1.rb

@@ -8,45 +8,51 @@ require 'simple-config'
 
 
 class DandelionS1 < RackRscript
+  include RXFHelperModule
 
   def initialize(opts={})
 
-    h = {root: 'www', static: []}.merge(opts)
-    
+    h = {root: 'www', static: [], passwords: {'user' => 'us3r'}}.merge(opts)
+
+    @passwords = h[:passwords]
     access_list = h[:access]
-    @app_root = Dir.pwd
 
     #@access_list = {'/do/r/hello3' => 'user'}
-        
+
     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)\
+
+    h3 = %i(log pkg_src rsc_host rsc root static debug)\
         .inject({}) {|r,x| r.merge(x => h[x])}
-    
-    super(h3)
-    
+
+    super(**h3)
+    @log.debug '@access_list: ' + @access_list.inspect if @log
+    @log.debug 'end of initialize' if @log
+
   end
 
   def call(e)
 
     request = e['REQUEST_PATH']
-    
+    @log.debug 'request: ' + request.inspect if @log
+
     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
-    
+
     req = Rack::Request.new(e)
     user = req.session[:username]
-    #return [status_code=401, {"Content-Type" => 'text/plain'}, [user.inspect]]
-    return jumpto '/login' unless user
-    
+
+    @log.debug 'user: ' + user.inspect if @log
+    #@log.debug '@e: ' + e.inspect if @log
+    return jumpto '/login2?referer=' + e['PATH_INFO'] unless user
+
     if private_user.nil? then
       super(e)
     elsif (private_user.is_a? String and private_user == user) \
@@ -57,74 +63,91 @@ class DandelionS1 < RackRscript
     end
 
   end
-  
+
   protected
-  
-  def default_routes(env, params) 
-    
-    get '/login' do
-      
-s=<<EOF      
-login
-  username: [     ]
-  password: [     ]
 
-  [login]('/login')
-EOF
+  def default_routes(env, params)
+
+    log = @log
+
+    get '/login2/*' do
+      params[:splat].inspect
+      redirect '/login' + params[:splat].first
+    end
+
+    get '/login/*' do
+      url = params[:splat].any? ? params[:splat][0][/(?<=referer=).*/] : '/'
+      login_form(referer: url)
+    end
 
-      Martile.new(s).to_html
-    end    
-    
     post '/login' do
-      
+
       h = @req.params
-      @req.session[:username] = h['username']
 
-      'you are now logged in as ' + h['username']
-      
+      if @passwords[h['username']] == h['password'] then
+
+        @req.session[:username] = h['username']
+        #'you are now logged in as ' + h['username']
+        redirect h['referer']
+
+      else
+
+        login_form('Invalid username or password, try again.',401)
+
+      end
+
+
     end
-        
+
     get '/logout' do
-      
+
       @req.session.clear
       'you are now logged out'
-      
-    end       
-    
-    get '/session' do
-      
+
+    end
+
+    #get '/session' do
+
       #@req.session.expires
       #@req.session.options[:expire_after] = 1
-      @req.session.options.inspect
-      
-    end
-    
+      #@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
+
     end
 
     get '/unauthorised' do
-      'unauthorised user'
+      ['unauthorised user', 'text/plain', 403]
     end
-    
-    super(env, params)   
- 
-  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]]    
-    
+
+    super(env, params)
+
   end
 
+  def login_form(msg='Log in to this site.', http_code=200, referer: '/')
+
+s=<<EOF
+p #{msg}
+
+login
+  username: [     ]
+  password: [     ]
+  [! referer: #{referer}
+   ]
+  [login](/login)
+EOF
+
+    [Martile.new(s).to_s, 'text/slim', http_code]
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dandelion_s1
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTE1MTczMzU3WhcN
+  MjMwMTE1MTczMzU3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDDApll
+  54O5ep0PysImgjC3Fxb+VELPHRZ5Jr3qzRc66yG85xz+FKABLDyRrQ9NUJiIjAVW
+  I9/EtKmSogbcW5pmgf5UFjnGxqvgXsLf9JYb0AXrSJHEV+g2B4bZHLzu5TkaRCm0
+  xIBF3r0fQkmZq7EP6PM4MjOOZffB8eavJIeRi0fHSIxiSrXmhxClF6OIW8JBk5Hr
+  brO48B/mxeTjBMhyd3pU5Y3q4YckgXcIyrfen+/lfmlERU8shjuWfvd0QbMDVdQQ
+  TRf9EoDNsVoILqfVSwa6My7nTry7Ms/AEtdhU9s/stDa8ZbvYvQUXbh7n0ztSD1E
+  kn/NH3iYzD6DDPBrVkwkjWiionKx8gbx2ogoqXonJ9dZFmc/pxAYBIPua+TuIBc7
+  rv/k8MwbvmTdA6qVN4hrN3IeMdNHem6DWgL6XbI34mJ+2PVtWTqDG5r9joffFRAp
+  7LKz476sFoMzzr9dyPtQlVA1kwEShIjWunlOA10Z8Awf7+m/z38HNq8jX9sCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUfSCCglAL
+  TLGYNZXPFdevytu+E5owJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAMWGLNvh2P5idDQH6p+wxxVKnt/b2fDjXlAx8/A8Q
+  3q+6iEM1rEvmNsnYvagbyDczPEhvoxuWvVUL0huwa99R4nX5o4yqr4IOR6NVZ724
+  tiC022XXJ0ysp2jIlttnzKeYtadjPecS8MXy2XiIpHqNpAfRfxu3XHz6ZPDs2Ein
+  76MsY6p7rsKjhd6NfzEzWrudixdPXHEDRsWhvc4D8yJ8sXRRlsqvYyJzWPAxjYDP
+  dGYM0uAJz9SVDPY+Vtc5SxUSjcxum8Q9AxhIyRhN6fELUh/aWKXnCX6oxLLvtsNu
+  woIuTfN3+nievIwQikkOMmmOHoKClutOf/QvliSCEBWgPEYNitoCAbt5kde/pLqm
+  gHDzDElZg+1jI3TgwZ+kIKwt7Vun9eZH2g8dc31fjlfxzKBRnOh5p7CoxbW4rx7M
+  JtmSOhu/qtu75iQs8PmwtvhDACcdpf0Q5VGHeyLvKq5LqZMqX9BK9BOD41uV9rt/
+  k7EFkjCAj62C0O4oFjSMVJQW
   -----END CERTIFICATE-----
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rscript
@@ -38,62 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.4.6
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -111,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -119,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A kind of Rack-Rscript web server which facilitates static files, cookie