dandelion_s1 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: defb22aa3bc5c08f20627b62117b79956d26fae9
-  data.tar.gz: f05f2b8d594b2d71d824d69c47e96ed5ef657a96
+  metadata.gz: 4a05e6e6bb8ae9266772efd9cb0acb112a9ea080
+  data.tar.gz: 96bc27d7c4d69e0c2d264270dd32f7be33ae27a9
 SHA512:
-  metadata.gz: c0c8aa85c39e7bdfbcd5a5bbe40dc299de87b50d21021dac0fccaefc4042e72f1fb2940357303f57eea9a054ae655ea780d1cbdbda575322c0aee71f79ad7896
-  data.tar.gz: 6ea4b45538e936120c85c2db335898b88ade4b3acff7dbad93d242908a8c0a990b053307ab1d917d5e64f3bf4f7de920a24c847a3ac6d73bd1e90da86c19e0d5
+  metadata.gz: 26d04e12c6e4c99b20112703fd461176499e73868b75ba86f208acd204cf69e044e33b8e18b4abf9db527dbae6477b5a904581ba5ebc0887d30e86d01947144d
+  data.tar.gz: 41ac1772805b24e868b916d36b5a54e9c2cfb5ed8931afc357098f17d7796677c1c2a2173627cc3b2c06a2192c406845f279429c3462e27dca565f8140cdf6e4

data/lib/dandelion_s1.rb

@@ -11,8 +11,9 @@ class DandelionS1 < RackRscript
 
   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
 
@@ -44,7 +45,7 @@ class DandelionS1 < RackRscript
     
     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
@@ -64,23 +65,24 @@ class DandelionS1 < RackRscript
     
     get '/login' do
       
-s=<<EOF      
-login
-  username: [     ]
-  password: [     ]
-
-  [login]('/login')
-EOF
-
-      Martile.new(s).to_html
+      login_form()
+      
     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']
+        
+      else
+        
+        login_form('Invalid username or password, try again.',401)
+        
+      end
       
     end
         
@@ -110,21 +112,28 @@ EOF
     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]]    
+  def login_form(msg='Log in to this site.', http_code=200)
     
+s=<<EOF      
+p #{msg}
+
+login
+  username: [     ]
+  password: [     ]
+
+  [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.3.1
 platform: ruby
 authors:
 - James Robertson