dandelion_s1 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e9ff3cb5efdc68ee7385d5c1b8d975202d96526
-  data.tar.gz: 52f232490fdfdf27eeb3ddb9a875545a9710971e
+SHA256:
+  metadata.gz: 1c59a8096fccc922ca6c3100e5e393282995c5a482d173330ddcb85f8e3490d7
+  data.tar.gz: 3e47b63dc991f237c69e3c6c9a90a84fa6b1d4b767569a2304ac1b33751f09c5
 SHA512:
-  metadata.gz: f54b7004459dfd27f7c62ca188bfea688a1035c9707cc3f5c6b45a7bfcd71e1c8acfd5c31f6f1aeadbd2f0b01a32ade832fcb9db2a434b9479ae89ccad9d368d
-  data.tar.gz: 7dd3280337401fe36b4d6834508b622b801cbfaef7749e582f3790f128d6f216f332a44adc26cf99e6252d2db331c20173a0ba851764916083cc35d631ebad7b
+  metadata.gz: 439b570707d88cd65f9a2e7569c68146c165bc32277196d451849ec28648e7e675cb6f96db693f8c6bdf0bd53073c525a6d4bfecae8eb6def45243e27ace596d
+  data.tar.gz: c31007f28494b3019556eb21c0b9a42d4e04ce6327e7557e9c629878e0e40096df80610dc984b3e07fadc7271c771fb521a90dc1471db64afb8214068968d55b

data/lib/dandelion_s1.rb

@@ -2,94 +2,152 @@
 
 # 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
-    @app_root = Dir.pwd
+    h = {root: 'www', static: [], passwords: {'user' => 'us3r'}}.merge(opts)
 
-    @static = raw_opts[:static]
-    @root = raw_opts[:root]
+    @passwords = h[:passwords]
+    access_list = h[:access]
+    @app_root = Dir.pwd
 
     #@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)}
-    
-    super(log: h[:log],  pkg_src: h[:pkg_src], rsc_host: h[:rsc_host], 
-          rsc_package_src: h[:rsc_package_src])
+
+    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 root static debug)\
+        .inject({}) {|r,x| r.merge(x => h[x])}
+
+    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']
-    r = @access_list.detect {|k,v| request =~ Regexp.new(k)}
+    @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
-    
-    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]
+
+    @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? 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)
 
-    super(env, params)
+    log = @log
+
+    get '/login2/*' do
+      params[:splat].inspect
+      redirect '/login' + params[:splat].first
+    end
 
-    get /^(\/(?:#{@static.join('|')}).*)/ do |path|
+    get '/login/*' do
+      url = params[:splat].any? ? params[:splat][0][/(?<=referer=).*/] : '/'
+      login_form(referer: url)
+    end
 
-      filepath = File.join(@app_root, @root, path)
+    post '/login' do
 
-      if @log then
-        @log.info 'DandelionS1/default_routes: ' + 
-            "root: %s path: %s" % [@root, path]
-      end
+      h = @req.params
+
+      if @passwords[h['username']] == h['password'] then
+
+        @req.session[:username] = h['username']
+        #'you are now logged in as ' + h['username']
+        redirect h['referer']
 
-      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'
+
+        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
+
+      #@req.session.expires
+      #@req.session.options[:expire_after] = 1
+      @req.session.options.inspect
+
     end
 
-    get /^\/$/ do
+    get '/user' do
+
+      if @req.session[:username] then
+        'You are ' + @req.session[:username]
+      else
+        'you need to log in to view this page'
+      end
 
-      file = File.join(@root, 'index.html')
-      File.read file
     end
 
-    get '/unauthorised/' do
-      'unauthorised user'
+    get '/unauthorised' do
+      ['unauthorised user', 'text/plain', 403]
     end
- 
-  end 
+
+    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.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ 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==
+  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: 2017-11-13 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-rscript
@@ -39,42 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.3
 - !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.3
+        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.3
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: martile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,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:
   - - ">="
@@ -100,9 +124,9 @@ 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, 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: []