🚨 Lint update

Author: pboling

.rubocop_gradual.lock

@@ -5,13 +5,8 @@
   "app/controllers/masq/passwords_controller.rb:4013562638": [
     [8, 18, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]
   ],
-  "app/controllers/masq/server_controller.rb:4249946322": [
-    [47, 16, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560],
-    [89, 25, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]
-  ],
-  "app/controllers/masq/sessions_controller.rb:2546607075": [
-    [39, 21, 3, "Style/AndOr: Use `&&` instead of `and`.", 193409806],
-    [49, 20, 1, "Lint/AssignmentInCondition: Wrap assignment in parentheses if intentional", 177560]
+  "app/controllers/masq/sessions_controller.rb:3600302919": [
+    [39, 21, 3, "Style/AndOr: Use `&&` instead of `and`.", 193409806]
   ],
   "app/models/masq/persona.rb:3585878101": [
     [14, 5, 55, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 1041090622],

app/controllers/masq/consumer_controller.rb

@@ -2,20 +2,23 @@ module Masq
   class ConsumerController < BaseController
     skip_before_action :verify_authenticity_token
 
+    def index
+    end
+
     def start
       begin
-        oidreq = openid_consumer.begin(params[:openid_identifier])
+        open_id_req = openid_consumer.begin(params[:openid_identifier])
       rescue OpenID::OpenIDError => e
         redirect_to(consumer_path, alert: "Discovery failed for #{params[:openid_identifier]}: #{e}")
         return
       end
       if params[:use_sreg]
-        sregreq = OpenID::SReg::Request.new
-        sregreq.policy_url = "http://www.policy-url.com"
-        sregreq.request_fields(["nickname", "email"], true) # required
-        sregreq.request_fields(["fullname", "dob"], false) # optional
-        oidreq.add_extension(sregreq)
-        oidreq.return_to_args["did_sreg"] = "y"
+        open_id_sreg_req = OpenID::SReg::Request.new
+        open_id_sreg_req.policy_url = "http://www.policy-url.com"
+        open_id_sreg_req.request_fields(["nickname", "email"], true) # required
+        open_id_sreg_req.request_fields(["fullname", "dob"], false) # optional
+        open_id_req.add_extension(open_id_sreg_req)
+        open_id_req.return_to_args["did_sreg"] = "y"
       end
       if params[:use_ax_fetch]
         axreq = OpenID::AX::FetchRequest.new
@@ -33,50 +36,50 @@ def start
           ["http://axschema.org/pref/timezone", "timezone"],
         ]
         requested_attrs.each { |a| axreq.add(OpenID::AX::AttrInfo.new(a[0], a[1], a[2] || false, a[3] || 1)) }
-        oidreq.add_extension(axreq)
-        oidreq.return_to_args["did_ax_fetch"] = "y"
+        open_id_req.add_extension(axreq)
+        open_id_req.return_to_args["did_ax_fetch"] = "y"
       end
       if params[:use_ax_store]
         ax_store_req = OpenID::AX::StoreRequest.new
         ax_store_req.set_values("http://axschema.org/contact/email", %w([email protected]))
         ax_store_req.set_values("http://axschema.org/birthDate", %w(1976-08-07))
         ax_store_req.set_values("http://axschema.org/customValueThatIsNotSupported", %w(unsupported))
-        oidreq.add_extension(ax_store_req)
-        oidreq.return_to_args["did_ax_store"] = "y"
+        open_id_req.add_extension(ax_store_req)
+        open_id_req.return_to_args["did_ax_store"] = "y"
       end
       if params[:use_pape]
-        papereq = OpenID::PAPE::Request.new
-        papereq.add_policy_uri(OpenID::PAPE::AUTH_PHISHING_RESISTANT)
-        papereq.max_auth_age = 60
-        oidreq.add_extension(papereq)
-        oidreq.return_to_args["did_pape"] = "y"
+        open_id_pape_req = OpenID::PAPE::Request.new
+        open_id_pape_req.add_policy_uri(OpenID::PAPE::AUTH_PHISHING_RESISTANT)
+        open_id_pape_req.max_auth_age = 60
+        open_id_req.add_extension(open_id_pape_req)
+        open_id_req.return_to_args["did_pape"] = "y"
       end
       if params[:force_post]
-        oidreq.return_to_args["force_post"] = "x" * 2048
+        open_id_req.return_to_args["force_post"] = "x" * 2048
       end
-      if oidreq.send_redirect?(consumer_url, consumer_complete_url, params[:immediate])
-        redirect_to(oidreq.redirect_url(consumer_url, consumer_complete_url, params[:immediate]))
+      if open_id_req.send_redirect?(consumer_url, consumer_complete_url, params[:immediate])
+        redirect_to(open_id_req.redirect_url(consumer_url, consumer_complete_url, params[:immediate]))
       else
-        @form_text = oidreq.form_markup(consumer_url, consumer_complete_url, params[:immediate], {"id" => "checkid_form"})
+        @form_text = open_id_req.form_markup(consumer_url, consumer_complete_url, params[:immediate], {"id" => "checkid_form"})
       end
     end
 
     def complete
-      parameters = params.to_unsafe_h.reject { |k, v| request.path_parameters[k.to_sym] }
-      oidresp = openid_consumer.complete(parameters, url_for({}))
-      case oidresp.status
+      parameters = params.to_unsafe_h.reject { |k, _v| request.path_parameters[k.to_sym] }
+      open_id_req = openid_consumer.complete(parameters, url_for({}))
+      case open_id_req.status
       when OpenID::Consumer::SETUP_NEEDED
         flash[:alert] = t(:immediate_request_failed_setup_needed)
       when OpenID::Consumer::CANCEL
         flash[:alert] = t(:openid_transaction_cancelled)
       when OpenID::Consumer::FAILURE
-        flash[:alert] = oidresp.display_identifier ?
-          t(:verification_of_identifier_failed, identifier: oidresp.display_identifier, message: oidresp.message) :
-          t(:verification_failed_message, message: oidresp.message)
+        flash[:alert] = open_id_req.display_identifier ?
+          t(:verification_of_identifier_failed, identifier: open_id_req.display_identifier, message: open_id_req.message) :
+          t(:verification_failed_message, message: open_id_req.message)
       when OpenID::Consumer::SUCCESS
-        flash[:notice] = t(:verification_of_identifier_succeeded, identifier: oidresp.display_identifier)
+        flash[:notice] = t(:verification_of_identifier_succeeded, identifier: open_id_req.display_identifier)
         if params[:did_sreg]
-          sreg_resp = OpenID::SReg::Response.from_success_response(oidresp)
+          sreg_resp = OpenID::SReg::Response.from_success_response(open_id_req)
           sreg_message = "\n\n" + t(:simple_registration_data_requested)
           if sreg_resp.empty?
             sreg_message << ", " + t(:but_none_was_returned)
@@ -87,7 +90,7 @@ def complete
           flash[:notice] += sreg_message
         end
         if params[:did_ax_fetch]
-          ax_fetch_resp = OpenID::AX::FetchResponse.from_success_response(oidresp)
+          ax_fetch_resp = OpenID::AX::FetchResponse.from_success_response(open_id_req)
           ax_fetch_message = "\n\n" + t(:attribute_exchange_data_requested)
           if ax_fetch_resp
             ax_fetch_message << ". " + t(:the_following_data_were_sent) + "\n"
@@ -98,7 +101,7 @@ def complete
           flash[:notice] += ax_fetch_message
         end
         if params[:did_ax_store]
-          ax_store_resp = OpenID::AX::StoreResponse.from_success_response(oidresp)
+          ax_store_resp = OpenID::AX::StoreResponse.from_success_response(open_id_req)
           ax_store_message = "\n\n" + t(:attribute_exchange_store_requested)
           ax_store_message << if ax_store_resp
             if ax_store_resp.succeeded?
@@ -112,7 +115,7 @@ def complete
           flash[:notice] += ax_store_message
         end
         if params[:did_pape]
-          pape_resp = OpenID::PAPE::Response.from_success_response(oidresp)
+          pape_resp = OpenID::PAPE::Response.from_success_response(open_id_req)
           pape_message = "\n\n" + t(:authentication_policies_requested)
           if pape_resp.auth_policies.empty?
             pape_message << ", " + t(:but_the_server_did_not_report_one)
@@ -124,6 +127,9 @@ def complete
           pape_message << "\nNIST Auth Level: #{pape_resp.nist_auth_level}" if pape_resp.nist_auth_level
           flash[:notice] += pape_message
         end
+      else
+        # NOOP
+        # This should never happen.
       end
       redirect_to(action: "index")
     end

app/controllers/masq/server_controller.rb

@@ -5,7 +5,7 @@ class ServerController < BaseController
     skip_before_action :verify_authenticity_token
     # Error handling
     rescue_from OpenID::Server::ProtocolError, with: :render_openid_error
-    # Actions other than index require a logged in user
+    # Actions other than index require a logged-in user
     before_action :login_required, except: %i[index cancel seatbelt_config seatbelt_login_state]
     before_action :ensure_valid_checkid_request, except: %i[index cancel seatbelt_config seatbelt_login_state]
     after_action :clear_checkid_request, only: %i[cancel complete]
@@ -26,7 +26,7 @@ def index
           elsif openid_request
             handle_non_checkid_request
           else
-            render(plain: t(:this_is_openid_not_a_human_ressource))
+            render(plain: t(:this_is_openid_not_a_human_resource))
           end
         end
         format.xrds
@@ -40,11 +40,12 @@ def index
     # be answered based on the users release policy. If the request is immediate
     # (relying party wants no user interaction, used e.g. for ajax requests)
     # the request can only be answered if no further information (like simple
-    # registration data) is requested. Otherwise the user will be redirected
+    # registration data) is requested. Otherwise, the user will be redirected
     # to the decision page.
     def proceed
       identity = identifier(current_account)
-      if @site = current_account.sites.find_by(url: checkid_request.trust_root)
+      @site = current_account.sites.find_by(url: checkid_request.trust_root)
+      if @site
         resp = checkid_request.answer(true, nil, identity)
         resp = add_sreg(resp, @site.sreg_properties) if sreg_request
         resp = add_ax(resp, @site.ax_properties) if ax_fetch_request
@@ -60,15 +61,15 @@ def proceed
     end
 
     # Displays the decision page on that the user can confirm the request and
-    # choose which data should be transfered to the relying party.
+    # choose which data should be transferred to the relying party.
     def decide
       @site = current_account.sites.where(url: checkid_request.trust_root).first_or_initialize
       @site.persona = current_account.personas.find_by(params[:persona_id]) || current_account.personas.first if sreg_request || ax_store_request || ax_fetch_request
     end
 
     # This action is called by submitting the decision form, the information entered by
     # the user is used to answer the request. If the user decides to always trust the
-    # relying party, a new site according to the release policies the will be created.
+    # relying party, a new site according to the release policies will be created.
     def complete
       if params[:cancel]
         cancel
@@ -86,7 +87,8 @@ def complete
           not_accepted = []
           accepted = []
           ax_store_request.data.each do |type_uri, values|
-            if property = Persona.attribute_name_for_type_uri(type_uri)
+            property = Persona.attribute_name_for_type_uri(type_uri)
+            if property
               store_attribute = params[:site][:ax_store][property.to_sym]
               if store_attribute && !store_attribute[:value].blank?
                 @site.persona.update_attribute(property, values.first)

app/controllers/masq/sessions_controller.rb

@@ -46,7 +46,8 @@ def set_login_cookie
     end
 
     def redirect_after_login
-      if return_to = session[:return_to]
+      return_to = session[:return_to]
+      if return_to
         session[:return_to] = nil
         redirect_to(return_to)
       else

app/controllers/masq/sites_controller.rb

@@ -36,6 +36,9 @@ def destroy
       end
     end
 
+    def create
+    end
+
     private
 
     def site

app/models/masq/account.rb

@@ -24,7 +24,7 @@ class Account < ActiveRecord::Base
     after_save :deliver_forgot_password
 
     # attr_accessible :login, :email, :password, :password_confirmation, :public_persona_id, :yubikey_mandatory
-    attr_accessor :password
+    attr_accessor :password, :password_confirmation
 
     class ActivationCodeNotFound < StandardError; end
 

config/locales/de.yml

@@ -210,7 +210,7 @@ de:
   i_forgot_my_password: Ich habe mein Passwort vergessen
 
   # server controller
-  this_is_openid_not_a_human_ressource: Dies ist ein OpenID-Server-Endpunkt und keine von Menschen lesbare Ressource.
+  this_is_openid_not_a_human_resource: Dies ist ein OpenID-Server-Endpunkt und keine von Menschen lesbare Ressource.
   identity_verification_request_invalid: Die Anfrage zur Identitätsprüfung ist ungültig.
   service_provider_requires_reauthentication_last_login_too_long_ago: Der Dienstanbieter erfordert eine erneute Authentifizierung, da Ihr letzter Login zu lange her war.
   login_to_verify_identity: Bitte loggen Sie sich ein, um Ihre Identität zu bestätigen.

config/locales/en.yml

@@ -210,7 +210,7 @@ en:
   i_forgot_my_password: I forgot my password
 
   # server controller
-  this_is_openid_not_a_human_ressource: This is an OpenID server endpoint, not a human readable resource.
+  this_is_openid_not_a_human_resource: This is an OpenID server endpoint, not a human readable resource.
   identity_verification_request_invalid: The identity verification request is invalid.
   service_provider_requires_reauthentication_last_login_too_long_ago: The Service Provider requires reauthentication, because your last login is too long ago.
   login_to_verify_identity: Please log in to verify your identity.

config/locales/es.yml

@@ -199,7 +199,7 @@ es:
   i_forgot_my_password: Olvidé mi clave
 
   # server controller
-  this_is_openid_not_a_human_ressource: "Este es un punto de conexión del servidor OpenID, no un recurso utilizable por personas"
+  this_is_openid_not_a_human_resource: "Este es un punto de conexión del servidor OpenID, no un recurso utilizable por personas"
   identity_verification_request_invalid: La petición de verificación de identidad es inválida.
   service_provider_requires_reauthentication_last_login_too_long_ago: "El proveedor del servicio requiere autenticación, porque tu último ingreso fue hace demasiado tiempo."
   login_to_verify_identity: Por favor ingresa para verificar tu identidad.

config/locales/nl.yml

@@ -197,7 +197,7 @@ nl:
   i_forgot_my_password: Ik ben mijn wachtwoord vergeten
 
   # server controller
-  this_is_openid_not_a_human_ressource: Dit is een OpenID server eindpunt, geen voor mensen leesbare bron.
+  this_is_openid_not_a_human_resource: Dit is een OpenID server eindpunt, geen voor mensen leesbare bron.
   identity_verification_request_invalid: De vereficatie van de identiteit is ongeldig.
   service_provider_requires_reauthentication_last_login_too_long_ago: De dienst vereist een nieuwe autenticatie, omdat uw laatste inlog te lang geleden was.
   login_to_verify_identity: Log alstublieft in om uw identiteit te verefiëren.