hotspotlogin 1.3.1 → 1.4.0

data/Changelog

@@ -1,44 +1,44 @@
-* 1.3.1 (2011-10.03)
-  * "retry & delay" on logoff   
+* 1.4.0 (2013-03-01)
+	* Save credentials in cookies
 
 * 1.3.0 (2011-09-29)
-  * Italian and English localization based on R18n
-  * some mobile-friendliness (without special layouts or device detection)
-  * improved JS code for user stats
+	* Italian and English localization based on R18n
+	* some mobile-friendliness (without special layouts or device detection)
+	* improved JS code for user stats
 
 * 1.2.2 (2011-08-08)
-  * Fix logo link and links style
+	* Fix logo link and links style
 
 * 1.2.1 (2011-08-08)
-  * Fix command line options
+	* Fix command line options
 
 * 1.2.0 (2011-08-08)
-  * --logo-link
-  * --my-url ("My Account" link w/ dynamic replacement of the actual username) 
+	* --logo-link
+	* --my-url ("My Account" link w/ dynamic replacement of the actual username) 
 
 * 1.1.0 (2011-08-03)
-  * --signup-url
+	* --signup-url
 
 * 1.0.2 (2010-12-08)
-  * Display Reply-Message properly
-  * fix serious encoding issues
-  * use Rack instead of ERB utils for escaping
+	* Display Reply-Message properly
+		* fix serious encoding issues
+		* use Rack instead of ERB utils for escaping
 
 * 1.0.1 (2010-11-17)
-  * Urgent bugfix -- handle config['logo'] == nil (TypeError)
+	* Urgent bugfix -- handle config['logo'] == nil (TypeError)
 
 * 1.0.0 (2010-11-16)
-  * Major rewrite based on CoovaChilli JSON API (coova.org/CoovaChilli/JSON).
-    * tested with CoovaChilli 1.2.5, and IE7, FF3, Epiphany/WebKit
-    * uses JavaScript and popups, your browser must support/allow them
-    * periodic auto-refresh of accounting data to the end user, including
-      downstream and upstream network traffic
-    * supports Session and Idle Timeout, showing relevant info if applicable,
-      and refreshing info when user is disconnected
-    * view customization, with Your Org logo, custom text, etc.
-    * some legacy code still around, sorry
+	* Major rewrite based on CoovaChilli JSON API (coova.org/CoovaChilli/JSON).
+		* tested with CoovaChilli 1.2.5, and IE7, FF3, Epiphany/WebKit
+		* uses JavaScript and popups, your browser must support/allow them
+		* periodic auto-refresh of accounting data to the end user, including
+		  downstream and upstream network traffic
+		* supports Session and Idle Timeout, showing relevant info if applicable,
+		  and refreshing info when user is disconnected
+		* view customization, with Your Org logo, custom text, etc.
+		* some legacy code still around, sorry
 
 * 0.1.2 (2010-11-08) 
-  * Become session leader when forking/daemonizing.
-    * this is to avoid trapping terminal interrupts from a parent console
-      process, etc.
+	* Become session leader when forking/daemonizing.
+		* this is to avoid trapping terminal interrupts from a parent console
+		  process, etc.

data/i18n/en.yml

@@ -28,4 +28,4 @@ status:
   download_traffic: download
   upload_traffic: upload
   auto_updated_every: auto updated every
-
+remember_me: remember me

data/i18n/it.yml

@@ -28,3 +28,4 @@ status:
   download_traffic: download
   upload_traffic: upload
   auto_updated_every: "aggiornato automaticam. ogni"
+remember_me: ricordami

data/lib/hotspotlogin/app.rb

@@ -102,7 +102,11 @@ module HotSpotLogin
       erb :"js/UserStatus.js", :layout => false # localized strings...
     end
     
-    get '/hotspotlogin/?' do 
+    get '/hotspotlogin/' do # the trailing '/' causes issues apparently
+      redirect "/hotspotlogin?#{request.query_string}"
+    end
+    
+    get '/hotspotlogin' do # the trailing '/' causes issues apparently 
       if HotSpotLogin.config['uamsecret'] and
           HotSpotLogin.config['uamsecret'].length > 0
         uamsecret = HotSpotLogin.config['uamsecret']
@@ -112,9 +116,33 @@ module HotSpotLogin
       userpassword = HotSpotLogin.config['userpassword']
 
       # attempt to login
-      if params['login']  # == 'login'
-                          # So you can put whichever text you want in submit button
-                          # as in <input type="submit" name="login" value="MyText"...
+      if params['login'] # or (
+        # params['res'] == 'notyet' and request.cookies['UserName'] =~ /\S/
+      # ) 
+
+        if params['login']  # submit form button
+          #if params['UserName'] =~ /\S/ # save empty credentials as a way to reset cookie content
+          if params['remember_me'] == 'on'
+            %w{UserName Password}.each do |k|
+              if params[k]
+                response.set_cookie(k, 
+                                    :value    => params[k],
+                                    :path     => '/',
+                                    :expires  => Time.now+180*24*60*60
+                )
+              end
+            end
+          else
+            %w{UserName Password}.each do |k|
+              response.delete_cookie k
+            end
+          end
+        #else                # from cookies
+        # %w{chal uamip uamport UserName Password}.each do |k|
+        #   params[k] = request.cookies[k] if request.cookies[k]
+        # end
+        end
+
         hexchal = Array[params['chal']].pack('H32')
         if uamsecret
           newchal = 

data/lib/hotspotlogin/constants.rb

@@ -1,6 +1,6 @@
 module HotSpotLogin
 
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 
   DEFAULT_CONFIG = {
     'listen-address'    => '0.0.0.0',

data/public/hotspotlogin/css/default.css

@@ -79,8 +79,11 @@ h2#headline {
   text-align: left;
 }
 #submit-container button, #submit-container input[type="submit"] {
-  width: 4.5em;
+  height: 1.7em;
+  width: 5em;
   margin-top: 0.3em;
+  background: #77f;
+  color: white;
 }
 #custom-text {
   font-size: 94%;
@@ -106,13 +109,14 @@ a#signup {
   border: none;
   color: white;
   background: #77f;
-  padding: 0 0.2em 0.1em 0.2em;
+  padding: 0.2em 0.2em 0.1em 0.2em;
   font-style:normal;
 }
 
 a#signup {
   text-decoration: none;
   margin-left: 0.2em;
+  font-size: 130%;
 }
 
 a img {

data/views/_login_form.erb

@@ -7,22 +7,26 @@
     <tbody>
       <tr>
         <th scope="row"><%= t.username.short.capitalize %>:</td>
-        <td><input type="text" name="UserName" size="16" maxlength="255"></td>
+        <td><input type="text" name="UserName" size="16" maxlength="255" value="<%= request.cookies['UserName'] %>"></td>
       </tr>
       <tr>
         <th scope="row">Password:</td>
-        <td><input type="password" name="Password" size="16" maxlength="255"></td>
+        <td><input type="password" name="Password" size="16" maxlength="255" value="<%= request.cookies['Password'] %>"></td>
       </tr>
-      <tr> <!-- yeah, it's horrible -->
-        <td colspan="2" id="submit-container">
+      <tr>
+        <td id="submit-container">
           <input type="submit" name="login" value="<%= t.login.you!.capitalize %>">
         </td>
+        <td style="padding: none; text-align:right; font-style:italic; vertical-align:top; color:#444">
+          <%= t.remember_me.capitalize %> <input type="checkbox" checked name="remember_me" style="margin:none"/> 
+        </td>
       </tr>
     </tbody>
   </table>
 </form>
+<div style="height:1ex;"> <!-- separator --> </div>
 <% if signup_url =~ /\S/ %><span id="signup-container">
   <%= t.account.dont_have.you.capitalize %>?
-  <a id="signup" href="<%= signup_url %>" target="_blank"><%= t.signup.you!.capitalize %>!</a>
+  <a id="signup" href="<%= signup_url %>" target="_blank"><%= t.signup.you!.capitalize %></a>
 </span><% end %>
 

metadata

@@ -1,83 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hotspotlogin
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guido De Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: facets
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra-r18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-r18n
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated users to a Network Access Controller like ChilliSpot; this hotspotlogin implementation is based on Sinatra instead, and relies heavily on the CoovaChilli JSON interface.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated
+  users to a Network Access Controller like ChilliSpot; this hotspotlogin implementation
+  is based on Sinatra instead, and relies heavily on the CoovaChilli JSON interface.
 email: guido.derosa@vemarsas.it
-executables: 
+executables:
 - hotspotlogin
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Changelog
 - README.rdoc
 - bin/hotspotlogin
@@ -98,38 +105,30 @@ files:
 - views/hotspotlogin.erb
 - views/404.erb
 - views/_login_form.erb
-has_rdoc: true
 homepage: http://dev.vemarsas.it/projects/hospotlogin/wiki
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Login page/Captive portal based on Sinatra and the CoovaChilli JSON API
 test_files: []
-