casino 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae3e798e52bff45a98cc97f8c3ff311eedd8dd49
-  data.tar.gz: 1c4c65c4f35d51b3a39834ef57c3a73098e02c04
+  metadata.gz: 51eff1f39a70f787e2addb40bef646e6d3c5d280
+  data.tar.gz: 79bff8cc8bd3f72da3474ff258b6f85c8ad0b4be
 SHA512:
-  metadata.gz: 1c9d475a473c98034e9e1855811816678a9675b0ea289f5e63dc8a3fb080719cacdd351e179e143e2726a4e7ca0d8562c0ff3402c3015be57bb86d608cdc1cea
-  data.tar.gz: 7201dfd17c106e0cd256ff043335885f5a6e3e4905a098ddba85fd1502c40e421b50953f54d56713093cbbc730d723a9ce0c3c05ffc7e4c226552086b5d62d43
+  metadata.gz: eb885c575ed4c09c1aeb767994e05b6859c4a0682dbb5b3a84ae4a3479271b2447faaaf5cdb9641b7d5e1eed763e1d8e1af881c7ecb5bee0c90bc340cf60de21
+  data.tar.gz: a4199bd96c19138bc07230598fcd80c36b4b2c2b3f4c9ae3e5d1a8fcc4a4eab4a3dbe9b02bcf03dfc2beab8212b7fa432ff85f4c7e1e5c610e777c69d2e97c5e

data/README.md

@@ -2,7 +2,7 @@
 
 CASino Rails Engine (used in CASinoApp).
 
-It currently supports [CAS 1.0 and CAS 2.0](http://jasig.github.io/cas) as well as [CAS 3.1 Single Sign Out](https://wiki.jasig.org/display/CASUM/Single+Sign+Out).
+It currently supports [CAS 1.0 and CAS 2.0](http://apereo.github.io/cas) as well as [CAS 3.1 Single Sign Out](https://wiki.jasig.org/display/CASUM/Single+Sign+Out).
 
 ## Setup
 

data/app/assets/stylesheets/casino.scss

@@ -301,6 +301,35 @@ table {
   table.tickets {
     margin-bottom: 10px;
   }
+
+  table.login_attempts {
+    margin-bottom: 10px;
+  }
+
+  a.all_login_attempts {
+    font-size: .95em;
+  }
+}
+
+/// LOGIN ATTEMPTS ///
+.login_attempts_index {
+  width: 800px;
+
+  h1 {
+    float: left;
+  }
+
+  .button {
+    float: right;
+  }
+
+  .pagination {
+    padding-top: .6em;
+    height: 2em;
+    .next {
+      float: right;
+    }
+  }
 }
 
 /// LOGOUT ///
@@ -319,6 +348,24 @@ table {
 }
 
 
+@media only screen and (min-width: 800px)  {
+  th.browser_info {
+    width: 16em;
+  }
+
+  th.created_at, th.activity {
+    width: 16em;
+  }
+
+  th.actions, th.successful {
+    width: 10em;
+  }
+
+  td.successful {
+    padding-left: 2em;
+  }
+}
+
 /// RESPONSIVE ///
 @media only screen and (max-width: 600px)  {
   .container {
@@ -329,6 +376,12 @@ table {
     width: 100%;
   }
 
+  .login_attempts {
+    table {
+      padding-top: 100px;
+    }
+  }
+
   .sessions, .logout {
     .info {
       margin-top: 40px;
@@ -366,11 +419,17 @@ table {
 
 @media only screen and (max-width: 800px)  {
   .container {
-    .sessions {
+    .sessions, .login_attempts_index {
       margin-top: 10px;
       width: 100%;
     }
 
+    .login_attempts_index {
+      table {
+        padding-top: 100px;
+      }
+    }
+
     table, thead, tbody, th, td, tr {
       display: block;
     }

data/app/controllers/casino/login_attempts_controller.rb

@@ -0,0 +1,10 @@
+class CASino::LoginAttemptsController < CASino::ApplicationController
+  include CASino::SessionsHelper
+
+  before_action :ensure_signed_in, only: [:index]
+
+  def index
+    @login_attempts = current_user.login_attempts.order(created_at: :desc)
+                                  .page(params[:page]).per(10)
+  end
+end

data/app/controllers/casino/sessions_controller.rb

@@ -11,6 +11,7 @@ class CASino::SessionsController < CASino::ApplicationController
   def index
     @ticket_granting_tickets = current_user.ticket_granting_tickets.active
     @two_factor_authenticators = current_user.two_factor_authenticators.active
+    @login_attempts = current_user.login_attempts.order(created_at: :desc).first(5)
   end
 
   def new
@@ -22,6 +23,7 @@ class CASino::SessionsController < CASino::ApplicationController
   def create
     validation_result = validate_login_credentials(params[:username], params[:password])
     if !validation_result
+      log_failed_login params[:username]
       show_login_error I18n.t('login_credential_acceptor.invalid_login_credentials')
     else
       sign_in(validation_result, long_term: params[:rememberMe], credentials_supplied: true)
@@ -59,6 +61,7 @@ class CASino::SessionsController < CASino::ApplicationController
   end
 
   private
+
   def show_login_error(message)
     flash.now[:error] = message
     render :new, status: :forbidden

data/app/helpers/casino/sessions_helper.rb

@@ -33,6 +33,7 @@ module CASino::SessionsHelper
 
   def sign_in(authentication_result, options = {})
     tgt = acquire_ticket_granting_ticket(authentication_result, request.user_agent, request.remote_ip, options)
+    create_login_attempt(tgt.user, true)
     set_tgt_cookie(tgt)
     handle_signed_in(tgt, options)
   end
@@ -50,7 +51,20 @@ module CASino::SessionsHelper
     cookies.delete :tgt
   end
 
+  def log_failed_login(username)
+    CASino::User.where(username: username).each do |user|
+      create_login_attempt(user, false)
+    end
+  end
+
+  def create_login_attempt(user, successful)
+    user.login_attempts.create! successful: successful,
+                                user_ip: request.ip,
+                                user_agent: request.user_agent
+  end
+
   private
+
   def handle_signed_in(tgt, options = {})
     if tgt.awaiting_two_factor_authentication?
       @ticket_granting_ticket = tgt

data/app/models/casino/login_attempt.rb

@@ -0,0 +1,11 @@
+class CASino::LoginAttempt < ActiveRecord::Base
+  include CASino::ModelConcern::BrowserInfo
+
+  belongs_to :user
+
+  def username=(username)
+    super
+
+    self.user = CASino::User.find_by_username(username)
+  end
+end

data/app/models/casino/model_concern/browser_info.rb

@@ -0,0 +1,14 @@
+module CASino::ModelConcern::BrowserInfo
+  extend ActiveSupport::Concern
+
+  def browser_info
+    unless self.user_agent.blank?
+      user_agent = UserAgent.parse(self.user_agent)
+      if user_agent.platform.nil?
+        "#{user_agent.browser}"
+      else
+        "#{user_agent.browser} (#{user_agent.platform})"
+      end
+    end
+  end
+end

data/app/models/casino/ticket_granting_ticket.rb

@@ -2,6 +2,7 @@ require 'user_agent'
 
 class CASino::TicketGrantingTicket < ActiveRecord::Base
   include CASino::ModelConcern::Ticket
+  include CASino::ModelConcern::BrowserInfo
 
   self.ticket_prefix = 'TGC'.freeze
 
@@ -28,17 +29,6 @@ class CASino::TicketGrantingTicket < ActiveRecord::Base
     tgts.destroy_all
   end
 
-  def browser_info
-    unless self.user_agent.blank?
-      user_agent = UserAgent.parse(self.user_agent)
-      if user_agent.platform.nil?
-        "#{user_agent.browser}"
-      else
-        "#{user_agent.browser} (#{user_agent.platform})"
-      end
-    end
-  end
-
   def same_user?(other_ticket)
     if other_ticket.nil?
       false

data/app/models/casino/user.rb

@@ -4,6 +4,7 @@ class CASino::User < ActiveRecord::Base
 
   has_many :ticket_granting_tickets
   has_many :two_factor_authenticators
+  has_many :login_attempts
 
   def active_two_factor_authenticator
     self.two_factor_authenticators.where(active: true).first

data/app/views/casino/kaminari/_next_page.html.erb

@@ -0,0 +1,5 @@
+<span class="next">
+  <%= link_to url, rel: 'next', remote: remote do %>
+    <%= t('views.pagination.next').html_safe %>
+  <% end %>
+</span>

data/app/views/casino/kaminari/_paginator.html.erb

@@ -0,0 +1,6 @@
+<%= paginator.render do -%>
+  <nav class="pagination">
+    <%= prev_page_tag unless current_page.first? %>
+    <%= next_page_tag unless current_page.last? %>
+  </nav>
+<% end -%>

data/app/views/casino/kaminari/_prev_page.html.erb

@@ -0,0 +1,5 @@
+<span class="prev">
+  <%= link_to url, rel: 'prev', remote: remote do %>
+    <%= t('views.pagination.previous').html_safe %>
+  <% end %>
+</span>

data/app/views/casino/login_attempts/_table.html.erb

@@ -0,0 +1,28 @@
+<table width="100%" class="login_attempts">
+  <thead>
+    <tr>
+      <th class="browser_info"><%= CASino::LoginAttempt.human_attribute_name(:browser_info) %></th>
+      <th class="user_ip"><%= CASino::LoginAttempt.human_attribute_name(:user_ip) %></th>
+      <th class="created_at"><%= CASino::LoginAttempt.human_attribute_name(:created_at) %></th>
+      <th class="successful"><%= CASino::LoginAttempt.human_attribute_name(:successful) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @login_attempts.each do |login_attempt| %>
+      <tr>
+        <td data-label="<%= CASino::LoginAttempt.human_attribute_name(:browser_info) %>">
+          <%= login_attempt.browser_info %>
+        </td>
+        <td data-label="<%= CASino::LoginAttempt.human_attribute_name(:user_ip) %>">
+          <%= login_attempt.user_ip %>
+        </td>
+        <td data-label="<%= CASino::LoginAttempt.human_attribute_name(:created_at) %>">
+          <%= l login_attempt.created_at %>
+        </td>
+        <td class="successful" data-label="<%= CASino::LoginAttempt.human_attribute_name(:successful) %>">
+          <%= (login_attempt.successful ? '&#9989;' : '&#10060;').html_safe %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/casino/login_attempts/index.html.erb

@@ -0,0 +1,14 @@
+<div class="container">
+  <div class="login_attempts_index box">
+    <div class="info">
+      <h1><%= CASino::LoginAttempt.model_name.human(count: 2) %></h1>
+      <%= link_to t('shared.back'), sessions_path, :class => 'button' %>
+    </div>
+
+    <%= render 'table' %>
+
+    <%= paginate @login_attempts, views_prefix: 'casino' %>
+    <%= page_entries_info @login_attempts, entry_name: '' %>
+  </div>
+  <%= render 'footer' %>
+</div>

data/app/views/casino/sessions/index.html.erb

@@ -25,10 +25,10 @@
       <table width="100%" class="tickets">
         <thead>
           <tr>
-            <th><%= t('sessions.table.column_browser') %></th>
-            <th><%= t('sessions.table.column_services') %></th>
-            <th><%= t('sessions.table.column_activity') %></th>
-            <th width="180">&nbsp;</th>
+            <th class="browser_info"><%= t('sessions.table.column_browser') %></th>
+            <th class="services"><%= t('sessions.table.column_services') %></th>
+            <th class="activity"><%= t('sessions.table.column_activity') %></th>
+            <th class="actions">&nbsp;</th>
           </tr>
         </thead>
         <tbody>
@@ -43,7 +43,9 @@
                 <%= ticket_granting_ticket.service_tickets.size %>
               </td>
               <td data-label="<%= t('sessions.table.column_activity') %>">
-                <%= t 'datetime.ago', datetime: distance_of_time_in_words_to_now(ticket_granting_ticket.updated_at) %>
+                <span title="<%= l ticket_granting_ticket.updated_at %>">
+                  <%= t 'datetime.ago', datetime: distance_of_time_in_words_to_now(ticket_granting_ticket.updated_at) %>
+                </span>
               </td>
               <td>
                 <% if current_ticket_granting_ticket?(ticket_granting_ticket) %>
@@ -56,6 +58,11 @@
           <% end %>
         </tbody>
       </table>
+
+      <h3><%= t('sessions.last_login_attempts') %></h3>
+      <%= render partial: 'casino/login_attempts/table' %>
+
+      <%= link_to t('sessions.all_login_attempts'), login_attempts_path, class: 'all_login_attempts' %>
   </div>
   <%= render 'footer' %>
 </div>

data/casino.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'grape', '~> 0.8'
   s.add_runtime_dependency 'grape-entity', '~> 0.4'
   s.add_runtime_dependency 'rqrcode_png', '~> 0.1'
+  s.add_runtime_dependency 'kaminari', '~> 0.16'
 end

data/config/locales/de.yml

@@ -32,6 +32,8 @@ de:
       column_activity: "Letzte Aktivität"
     current_session: "Aktive Session"
     end_session: "Session beenden"
+    last_login_attempts: Letzte Loginversuche
+    all_login_attempts: Alle Loginversuche
   two_factor_authenticators:
     title: "Zwei-Faktor-Authentifizierung"
     setup: "Zwei-Faktor-Authentifizierung einrichten"
@@ -86,3 +88,35 @@ de:
       x_seconds:
         one: eine Sekunde
         other: ! '%{count} Sekunden'
+  time:
+    formats:
+      default: "%Y-%m-%d %H:%M"
+  shared:
+    back: Zurück
+  activerecord:
+    attributes:
+      casino/login_attempt:
+        created_at: Zeitpunkt
+        browser_info: Browser
+        user_ip: IP-Adresse
+        successful: Erfolgreich
+    models:
+      casino/login_attempt:
+        one: Loginversuch
+        other: Loginversuche
+  views:
+    pagination:
+      first: "« Erster"
+      last: Letzter »
+      next: Nächste Seite
+      previous: Vorherige Seite
+      truncate: "…"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          one: Zeige <b>1</b> %{entry_name}
+          other: Zeige <b>alle %{count}</b> %{entry_name}
+          zero: Keine %{entry_name} gefunden
+      more_pages:
+        display_entries: Zeige %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> von <b>%{total}</b>

data/config/locales/en.yml

@@ -32,6 +32,8 @@ en:
       column_activity: "Most recent activity"
     current_session: "Current session"
     end_session: "End session"
+    last_login_attempts: Last Login Attempts
+    all_login_attempts: All Login Attempts
   two_factor_authenticators:
     title: "Two-factor authentication"
     setup: "Set up two-factor authentication"
@@ -62,7 +64,7 @@ en:
         one: about one year
         other: about %{count} years
       almost_x_years:
-        one: nearly one year 
+        one: nearly one year
         other: nearly %{count} years
       half_a_minute: half minute
       less_than_x_minutes:
@@ -86,3 +88,35 @@ en:
       x_seconds:
         one: one second
         other: ! '%{count} seconds'
+  time:
+    formats:
+      default: "%Y-%m-%d %H:%M"
+  shared:
+    back: Back
+  activerecord:
+    attributes:
+      casino/login_attempt:
+        created_at: Time
+        browser_info: Browser
+        user_ip: IP Address
+        successful: Successful
+    models:
+      casino/login_attempt:
+        one: Login Attempt
+        other: Login Attempts
+  views:
+    pagination:
+      first: "« First"
+      last: "Last »"
+      previous: "‹ Prev"
+      next: "Next ›"
+      truncate: "…"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "No %{entry_name} found"
+          one: "Displaying <b>1</b> %{entry_name}"
+          other: "Displaying <b>all %{count}</b> %{entry_name}"
+      more_pages:
+        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"