lwqzx_auth 0.1.6 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64272f39bbb1397e25389d8b596f1d66cb940dd350e4d32cddc3334567dda01a
-  data.tar.gz: c14332035bf008e1ed5c8a812e27590677bcff97887b0df36a24f820d8956103
+  metadata.gz: b8c9ac0050837dc3ba05208b6cf877256463594c799cf4b137670145dedc574f
+  data.tar.gz: ec8eddbbdddf5b3e47c56ae84dfa96631775be444fafbdb0188b0ce764e61d80
 SHA512:
-  metadata.gz: a842d49963961e790f055fe069db1805606e56d5b281193cbd5e1267b675163dc07871981c20f5a77064864ab72a450ee5e6a8ce654b7213c192265ef6181832
-  data.tar.gz: f0510454c1f24fcf8c0576aad604673d78de886ced7b4cbece782c09ee8be93f4fa63b877095909be0c276fb04a76249d93ff7a34609edcb20dc64b20de5b24b
+  metadata.gz: 3518aff0e40db0abf15db0eb3118eb732ad0649c984adcb8bdbc3157c4070db343a1ac76869612e7a1d21ca336e379ad03e6d63c819fa1656768b38f4673a087
+  data.tar.gz: '08cbd3dc914637acf9d81e091f1154596ab2323fe4a4a346c8d07c88f6cb225341cc5714936fc36db17e815224ba1d2107370694c20420910c86b4aa50d91090'

data/app/controllers/lwqzx_auth/application_controller.rb

@@ -1,6 +1,22 @@
 module LwqzxAuth
   class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception
-
+    before_action :check_me
+    def check_me
+      auth_token = cookies.signed[:auth_token]
+      unless auth_token.blank?
+        one = Remember.where(token: auth_token).first
+        if one
+          if one.expired > Time.now.to_i
+            session[:login] = one.login
+            session[:realname] = one.name
+            session[:groups] = one.groups
+          else 
+            cookies.delete(:auth_token)
+            one.delete
+          end
+        end
+      end
+    end
   end
 end

data/app/controllers/lwqzx_auth/auth_controller.rb

@@ -1,4 +1,5 @@
 require_dependency "lwqzx_auth/application_controller"
+require "rest-client"
 
 module LwqzxAuth
   class AuthController < ApplicationController
@@ -7,6 +8,13 @@ module LwqzxAuth
 
     def logout
       flash[:notice]="你已经登出"
+
+      auth_token = cookies[:auth_token]
+      unless auth_token.blank?
+        one = Remember.where(token: auth_token).first
+        cookies.delete(:auth_token)
+        one.delete if one
+      end
       reset_session
       redirect_to  main_app.root_path
     end
@@ -19,12 +27,26 @@ module LwqzxAuth
 
       login = params[:login]
       psd = params[:password]
+      
       hsh = lauth(login,psd)
-      if hsh.blank?
+      if hsh["name"].blank?
         redirect_to login_path , alert: "用户信息有误"
       else
-        name = hsh[:name]
-        groups = hsh[:groups]
+        login = hsh["login"]
+        name = hsh["name"]
+        groups = hsh["user_group"]
+        
+        #rememberme = params[:rememberme]
+        #if rememberme == "yes"
+        #  token = SecureRandom.urlsafe_base64
+        #  cookies.signed[:auth_token] = token
+        #  Remember.create(token: token, login: login, name: name, groups: groups,expired: 7.days.from_now.to_i)
+        #else 
+        #  auth_token = cookies[:auth_token]
+        #  cookies.delete(:auth_token)
+        #  Remember.where(token: auth_token).delete
+        #end
+
         session[:login] = login
         session[:realname] = name
         session[:groups] = groups
@@ -33,17 +55,11 @@ module LwqzxAuth
     end
 
     private
+
     def lauth(login,passwd)
-      lurl = "http://www.lwqzx.sdedu.net/kernel/net_school/active_app/login1.php"
-      res1 = RestClient.post lurl,{login_user_m_: login, login_password: passwd}
-      res2 = RestClient.get lurl,{cookies: res1.cookies}
-      content=res2.body.encode("UTF-8","GB2312")
-      doc = Nokogiri::HTML(content)
-      return {} if doc.include?("login_submit")
-      uname = doc.css("span.tt1 a:nth-child(1)").text
-      groups = doc.css("span.tt1 a:nth-child(5)")[0]["title"]
-      groups=groups.gsub("[","").gsub("]","").split("@").compact.reject(&:empty?)
-      return {login: login, name: uname, groups: groups}
+      lurl = "http://www.lwqzx.sdedu.net/kernel/net_school/core/jslogin.php"
+      res = ::RestClient.post lurl,{login: login, password: passwd}
+      return JSON.parse(res.body)
     end 
 
   end

data/app/models/lwqzx_auth/remember.rb

@@ -0,0 +1,10 @@
+module LwqzxAuth
+  class Remember
+    include Mongoid::Document
+    field :token, type: String
+    field :login, type: String
+    field :name, type: String
+    field :groups, type: String
+    field :expired, type: Integer
+  end
+end

data/app/views/lwqzx_auth/auth/login.html.slim

@@ -1,39 +1,20 @@
 h2.text-center =<> icon("fas","user") + ' 登 录'
 br
 .row
-  .col-sm-4
-  .col-sm-4
+  .col-12.col-md-4.offset-md-4.align-self-center
     = form_tag auth_path, role: "form", class: "loginForm card form-horizontal" do
       .card-body
-        strong 登录名
+        p: strong 登录名
+        div = text_field_tag :login,nil,class: "form-control login"
         br
-        = text_field_tag :login,nil,class: "form-control"
-        br
-        strong 密码:
-        br
-        = password_field_tag :password,nil, class: "form-control"
+        p: strong 密码
+        div = password_field_tag :password,nil, class: "form-control password"
         p.text-center
           a.rucaptcha-image-box href="#" = rucaptcha_image_tag
         p.text-center = rucaptcha_input_tag(class: 'form-control code',placeholder: "输入验证码")
-        
-      .card-footer
-        = submit_tag '登录', class: "btn-block btn-primary btn"
-
-  .col-sm-4
-
-javascript:
-  javascript:
-  $(".loginForm").submit(function(event){
-    if($("input.code").val()==""){alert("请填写验证码");return false;};
-    if($("input.login").val()==""){alert("登录名不能为空");return false;};
-    if($("input.password").val()==""){alert("密码不能为空");return false;};
-  });
-
-  $("a.rucaptcha-image-box").click(function(e){
-    e.preventDefault();
-    btn = $(e.currentTarget);
-    img = btn.find('img:first');
-    currentSrc = img.attr('src');
-    img.attr('src', currentSrc.split('?')[0] + '?' + (new Date()).getTime());
-    return false;
-  });
+        /p.text-center
+          =<> check_box_tag :rememberme, "yes", false
+          | 记住7天 
+        div.mt-3
+          = submit_tag '登录', class: "btn-block btn-primary btn btn-lg"
+      /.card-footer

data/lib/lwqzx_auth/version.rb

@@ -1,3 +1,3 @@
 module LwqzxAuth
-  VERSION = '0.1.6'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lwqzx_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.2
 platform: ruby
 authors:
 - zxy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
-dependencies: []
+date: 2020-12-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: auth function into host app.
 email:
 - zxy@qq.com
@@ -26,9 +40,7 @@ files:
 - app/controllers/lwqzx_auth/application_controller.rb
 - app/controllers/lwqzx_auth/auth_controller.rb
 - app/helpers/lwqzx_auth/application_helper.rb
-- app/jobs/lwqzx_auth/application_job.rb
-- app/mailers/lwqzx_auth/application_mailer.rb
-- app/models/lwqzx_auth/application_record.rb
+- app/models/lwqzx_auth/remember.rb
 - app/views/lwqzx_auth/auth/login.html.slim
 - config/initializers/rucaptcha.rb
 - config/routes.rb
@@ -55,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: add auth function to host application.

data/app/jobs/lwqzx_auth/application_job.rb

@@ -1,4 +0,0 @@
-module LwqzxAuth
-  class ApplicationJob < ActiveJob::Base
-  end
-end