titech-pubnet-auth 0.2.1 → 0.2.2

data/bin/titech-pubnet-auth

@@ -68,7 +68,7 @@ pubnet_auth = TitechPubnetAuth.new
 retry_count = 0
 loop do |t|
   begin
-    if mputs 'network_available?', pubnet_auth.network_available? and
+    if mputs 'network_available?', pubnet_auth.network_available?
       if not mputs 'is_connected?', pubnet_auth.is_connected?
         if mputs 'auth', pubnet_auth.auth
           notifier.call

data/lib/titech_pubnet_auth/version.rb

@@ -1,3 +1,3 @@
 class TitechPubnetAuth
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/titech_pubnet_auth.rb

@@ -26,10 +26,10 @@ class TitechPubnetAuth
     @private = YAML.load(File::open(File::expand_path('config/private.yml',BASE_DIR),'r'))
   end
 
+  #
+  # called if network_available? and not is_connected?
+  #
   def auth(sample_uri = SAMPLE_URI.call)
-    return false if not network_available?
-    return true if is_connected?
-
     auth_page = @agent.get(sample_uri)
     return false if auth_page.uri.hostname != 'wlanauth.noc.titech.ac.jp'
 
@@ -43,12 +43,18 @@ class TitechPubnetAuth
     return is_connected?
   end
 
+  #
+  # called if network_available?
+  #
   def is_connected?(sample_uri = SAMPLE_URI.call)
     return @agent_with_proxy.get(sample_uri).uri.hostname == sample_uri.hostname
   rescue # retry without the proxy
     return @agent.get(sample_uri).uri.hostname == sample_uri.hostname
   end
-  
+
+  #
+  # note: titech-pubnet allows to access portal.titech.ac.jp without authentication.
+  #
   def network_available?
     @agent.get('http://portal.titech.ac.jp')
     return true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -71,7 +71,6 @@ files:
 - lib/titech_pubnet_auth/extension.rb
 - lib/titech_pubnet_auth/version.rb
 - lib/titech_pubnet_auth.rb
-- lib/titech_pubnet_auth.rb.back
 - bin/titech-pubnet-auth
 - bin/titech-pubnet-auth-daemon
 - config/private.yml.example

data/lib/titech_pubnet_auth.rb.back

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'mechanize'
-require 'uri'
-require 'yaml'
-
-$:.unshift File.dirname(__FILE__)
-require 'titech_pubnet_auth/extension'
-
-
-class TitechPubnetAuth
-  BASE_DIR = File.expand_path('..',File.dirname(__FILE__))
-
-  SAMPLE_URI = ->{%w[www.titech.ac.jp github.com twitter.com].map{|uri| URI.parse("http://#{uri}")}[rand(3)]}
-  
-  HTTP_PROXY = {ip: '131.112.125.238', port: 3128}
-
-  def initialize(opt = {open_timeout: 3})
-    @agent, @agent_with_proxy = Mechanize.new, Mechanize.new
-    [@agent,@agent_with_proxy].each{|agent|
-      agent.follow_meta_refresh = true
-      agent.open_timeout = opt[:open_timeout]
-    }
-    @agent_with_proxy.set_proxy(HTTP_PROXY[:ip], HTTP_PROXY[:port])
-
-    @private = YAML.load(File::open(File::expand_path('config/private.yml',BASE_DIR),'r'))
-  end
-
-  def auth(sample_uri = SAMPLE_URI.call)
-    return false if not network_available?
-    return true if is_connected?
-
-    auth_page = @agent.get(sample_uri)
-    return false if auth_page.uri.hostname != 'wlanauth.noc.titech.ac.jp'
-
-    auth_page.form do |form|
-      form.buttonClicked = 4
-      form.redirect_url = sample_uri
-      form.username = @private['username']
-      form.password = @private['password']
-    end.submit
-    
-    return is_connected?
-  end
-
-  def is_connected?(sample_uri = SAMPLE_URI.call)
-    return @agent_with_proxy.get(sample_uri).uri.hostname == sample_uri.hostname
-  rescue # retry without the proxy
-    return @agent.get(sample_uri).uri.hostname == sample_uri.hostname
-  end
-  
-  def network_available?
-    @agent.get('http://portal.titech.ac.jp')
-    return true
-  rescue => e
-    return false
-  end
-
-end