mno-enterprise-core 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f917a6e753baa8624dce8b43b2bcb11fbcf2181e
-  data.tar.gz: 65f316eaa0ffdc58c30b77fa277c5ab7a719b736
+  metadata.gz: a9bc8575caf93295002d64712d732d5fc882a09a
+  data.tar.gz: e27125cc924ba10ac4f62eecb668a1018a4717ad
 SHA512:
-  metadata.gz: 3b7d6482aab8df033971214542cd4812f207c57d428d62501a20c2bffc529bb5b99d6a1ebc566e1ca7737e5bda6ba05b72d1530cb4b09dfdc55addb077613168
-  data.tar.gz: 73a4607b1a631b6654fd83193880abce436ed050800d165497059ef5c32a3ef66fc5a9c71c923582be1685e83ab69a2777f99c354bcf831a2ddd48f0ab543c3e
+  metadata.gz: '0680225db073172cefab691f5bd89183d9f82858ff5fe3ad51760639109bde0f59563c7b241bdaf2100d89bd3479096e3371385aab09532e299985e6eeb7068f'
+  data.tar.gz: d5d82305dbe6d5c81290d99ce572694009cd7f2176e4edf275bd2deaa5ccb369a185163aeb76d9f61583ea6261c5ae277221b5e6ca52c936829f2ddad639d957

data/app/controllers/mno_enterprise/application_controller.rb

@@ -2,7 +2,6 @@ module MnoEnterprise
   class ApplicationController < ActionController::Base
     protect_from_forgery
     include ApplicationHelper
-    prepend_before_filter :skip_devise_trackable_on_xhr
 
     before_filter :set_default_meta
     before_filter :store_location
@@ -19,6 +18,8 @@ module MnoEnterprise
       include MnoEnterprise::Concerns::Controllers::AngularCSRF
     end
 
+    rescue_from Faraday::ConnectionFailed, Faraday::TimeoutError, with: :handle_mnohub_error
+
     #============================================
     # CanCan Authorization Rescue
     #============================================
@@ -45,14 +46,10 @@ module MnoEnterprise
     #============================================
     protected
 
-    # Do not updated devise last access timestamps on ajax call so that
-    # timeout feature works properly
-    # Only GET request get ignored - POST/PUT/DELETE requests reflect a
-    # user action and should therefore be taken into account
-    def skip_devise_trackable_on_xhr
-      if request.format == 'application/json' && request.get?
-        request.env["devise.skip_trackable"] = true
-      end
+    # Do not update devise last access timestamps
+    # Used on XHR polling calls so that the timeout feature works properly
+    def skip_devise_trackable
+      request.env['devise.skip_trackable'] = true
     end
 
     # Return the user to the 'return_to' url if one was specified
@@ -138,5 +135,24 @@ module MnoEnterprise
       uri.fragment = fragment.to_s
       uri.to_s
     end
+
+    def handle_mnohub_error(exception)
+      @status = case exception
+                when Faraday::ConnectionFailed
+                  503 # :service_unavailable
+                when Faraday::TimeoutError
+                  429 # :too_many_requests
+                else
+                  exception
+                end
+
+      respond_to do |format|
+        format.html do
+          @meta = {title: 'Backend unavailable'}
+          render 'error_page', layout: 'mno_enterprise/public', status: @status
+        end
+        format.json {render json: {error: 'API hub unavailable'}, status: @status}
+      end
+    end
   end
 end

data/app/models/mno_enterprise/app.rb

@@ -61,7 +61,7 @@ module MnoEnterprise
     # Sanitize the app description
     # E.g.: replace any mention of Maestrano by the tenant name
     def sanitized_description
-      @sanitized_description ||= (self.description || '').gsub(/(?!cdn\.)maestrano(?!\.com)/i,MnoEnterprise.app_name)
+      @sanitized_description ||= (self.description || '').gsub(/(?<!cdn\.)(?<!cdn-prd-)maestrano(?!\.com)/i,MnoEnterprise.app_name)
     end
 
     # Methods for appinfo flags

data/app/models/mno_enterprise/user.rb

@@ -51,7 +51,7 @@ module MnoEnterprise
       :last_sign_in_ip, :confirmation_token, :confirmed_at, :confirmation_sent_at, :unconfirmed_email,
       :failed_attempts, :unlock_token, :locked_at, :name, :surname, :company, :phone, :phone_country_code,
       :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required, :admin_role,
-      :api_key, :api_secret, :developer, :kpi_enabled, :external_id, :meta_data
+      :api_key, :api_secret, :developer, :kpi_enabled, :external_id, :meta_data, :password_valid
 
     define_model_callbacks :validation #required by Devise
 
@@ -94,14 +94,14 @@ module MnoEnterprise
     # The auth_hash includes an email and password
     # Return nil in case of failure
     def self.authenticate(auth_hash)
-      u = self.post("user_sessions", auth_hash)
-
+      # retro compatibilty issue: previous version were returning nil if the user was not found or if the password was invalid
+      # see https://maestrano.atlassian.net/browse/MNOE-209
+      # we now validate that the password is valid in /core/lib/devise/strategies/remote_authenticatable.rb
+      u = self.post("user_sessions", auth_hash.merge(validate_password: true))
       if u && u.id
         u.clear_attribute_changes!
-        return u
       end
-
-      nil
+      return u
     end
 
 

data/app/views/system_notifications/organization-invite-notification.html.erb

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+  </head>
+  <body>
+    <p class="header">
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
+    </p>
+
+    <p>Hi there,</p>
+
+    <p>You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!</p>
+
+    <% if @info[:team] %>
+      <p>You have been added to the <%= @info[:team] %> team.</p>
+    <% end %>
+
+    <p>
+       Regards,<br/>
+       The Marketplace team
+    </p>
+
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

data/app/views/system_notifications/organization-invite-notification.text.erb

@@ -0,0 +1,12 @@
+Hi there
+=================================================================
+
+You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!
+
+<% if @info[:team] %>
+You have been added to the <%= @info[:team] %> team.
+<% end %>
+
+
+Regards,
+The Marketplace team

data/config/locales/templates/components/en.yml

@@ -62,7 +62,7 @@ en:
           current_password: 'Current Password'
           new_password: 'New Password'
           confirm_password: 'Confirm Password'
-          eight_characters_minimum: 'Eight characters minimum'
+          minimum_length: '{length} characters minimum'
           one_uppercase_character: 'One uppercase character'
           one_number: 'One number'
           one_lowercase_character: 'One lowercase character'

data/config/locales/templates/dashboard/marketplace/en.yml

@@ -37,7 +37,7 @@ en:
             platform_admin: "Platform moderator"
             edited_by_user: "Edited by User"
             edited_by_user_tooltip: "Show edit history"
-            edited_by_admin: "Edited by Admin"
+            edited_by_admin: "Edited by Platform moderator"
             just_now: "Just Now"
             company_feedback: "Company feedback"
             review_title: "Review"

data/config/locales/templates/onboarding/en.yml

@@ -25,6 +25,8 @@ en:
           search: "Search"
           categories: "Categories"
           max_apps_selected: "You cannot start with more than 4 apps, you will be able to add more at a later stage."
+          max_apps_selected_tooltip: "You can only select 4 applications at a time, please remove one application before adding a new one"
+          conflicting_app_selected_tooltip: "You cannot install this App as it is incompatible with: {appName}"
         data_sync:
           what_data: "What data will be synchronised"
           start: "Visualise what data will be synchronised from your applications by clicking on their icons."

data/config/locales/views/auth/sessions/en.yml

@@ -5,3 +5,11 @@ en:
         new:
           title: Sign In
           sign_in: Sign in
+          timeout: You are logged off due to inactivity. Please log in again
+        timeout:
+          header: "Session Timeout"
+          body:
+            can_login: "Your session has expired due to inactivity. You can extend your session or log out by clicking on the relevant option below"
+          stay_logged_in: "Stay Logged In"
+          log_off: "Log Off"
+          error: "We could not manage to remain you logged in. You will be redirected to the login page"

data/config/locales/views/errors/en.yml

@@ -0,0 +1,13 @@
+en:
+  mno_enterprise:
+    errors:
+      "503":
+        title: "Looks like we're having some server issues."
+        description: "We will redirect you as soon as it's online. Otherwise try again in a moment."
+      "500":
+        title: "Looks like we're having some server issues."
+        description: "If the problem persists, please contact support at %{support_email}."
+      "429":
+        title: "Too many requests."
+        description: "We are receiving too many requests. Please try again in a moment."
+      redirection: "Go to Homepage"

data/lib/devise/controllers/extension_helpers.rb

@@ -31,7 +31,7 @@ module DeviseExtension
 
       # redirect for password update with alert message
       def redirect_for_password_change(scope)
-        redirect_to change_password_required_path_for(scope), :alert => 'Your password is expired. Please renew your password.'
+        redirect_to change_password_required_path_for(scope), alert: 'Your password has expired. Please renew your password.'
       end
 
       # path for change password

data/lib/devise/strategies/remote_authenticatable.rb

@@ -1,19 +1,20 @@
 module Devise
   module Strategies
     class RemoteAuthenticatable < Authenticatable
-      
+
       # def valid?
       #   true || params[scope]
       # end
-      
+
       # For an example check : https://github.com/plataformatec/devise/blob/master/lib/devise/strategies/database_authenticatable.rb
       # Method called by warden to authenticate a resource.
       def authenticate!
         # authentication_hash doesn't include the password
         auth_params = params[scope]
-        
+
+
         # mapping.to is a wrapper over the resource model
-        resource = mapping.to.new
+        resource = mapping.to.new.remote_authentication(auth_params)
 
         return fail! unless resource
 
@@ -24,7 +25,7 @@ module Devise
         #
         # If the block returns true the resource will be loged in
         # If the block returns false the authentication will fail!
-        if validate(resource){ resource = resource.remote_authentication(auth_params) }
+        if validate(resource) { resource.password_valid }
           success!(resource)
         end
       end
@@ -35,10 +36,10 @@ end
 Warden::Strategies.add :remote_authenticatable, Devise::Strategies::RemoteAuthenticatable
 Devise.add_module :remote_authenticatable, strategy: true, controller: :sessions, route: :session
 
-Warden::Manager.after_authentication do |user,auth,opts|
+Warden::Manager.after_authentication do |user, auth, opts|
   Rails.cache.delete(['user', user.to_key]) if user
 end
 
-Warden::Manager.before_logout do |user,auth,opts|
+Warden::Manager.before_logout do |user, auth, opts|
   Rails.cache.delete(['user', user.to_key]) if user
 end

data/lib/mno_enterprise/testing_support/factories/org_invite.rb

@@ -16,6 +16,7 @@ FactoryGirl.define do
       
       created_at 1.days.ago
       updated_at 1.hour.ago
+      notification_sent_at 1.hour.ago
       
       # Properly build the resource with Her
       initialize_with { new(attributes).tap { |e| e.clear_attribute_changes! } }

data/lib/mno_enterprise/testing_support/request_spec_helper.rb

@@ -0,0 +1,20 @@
+# Helpers used in Request Specs
+module MnoEnterprise::TestingSupport::RequestSpecHelper
+  shared_context 'signed in user' do
+    # Simulate a user login by login through devise
+    def login
+      # Stub user manipulation
+      api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+      api_stub_for(put: "/users/#{user.id}", response: from_api(user))
+
+      # Stub session authentication
+      api_stub_for(post: '/user_sessions', code: 200, response: from_api(user))
+
+      # Log in
+      post '/mnoe/auth/users/sign_in', user: {email: user.email, password: 'securepassword'}
+    end
+
+    let(:user) { FactoryGirl.build(:user, password_valid: true) }
+    before { login }
+  end
+end

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end

data/spec/controllers/mno_enterprise/application_controller_spec.rb

@@ -27,5 +27,43 @@ module MnoEnterprise
       it { expect(controller.after_sign_in_path_for(User.new(admin_role: ""))).to eq('/dashboard/') }
       it { expect(controller.after_sign_in_path_for(User.new(admin_role: "admin"))).to eq('/admin/') }
     end
+
+    describe 'Error Handling' do
+      subject { get :index, format: :json }
+
+      context 'ConnectionFailed' do
+        controller(MnoEnterprise::ApplicationController) do
+          skip_before_filter :perform_return_to, only: [:index]
+
+          def index
+            raise Faraday::ConnectionFailed, nil
+          end
+
+          def handle_mnohub_error(exception)
+            super
+          end
+        end
+
+        subject { get :index, format: :json }
+
+        it { is_expected.to have_http_status(:service_unavailable) }
+      end
+
+      context 'TimeoutError' do
+        controller(MnoEnterprise::ApplicationController) do
+          skip_before_filter :perform_return_to, only: [:index]
+
+          def index
+            raise Faraday::TimeoutError, nil
+          end
+
+          def handle_mnohub_error(exception)
+            super
+          end
+        end
+
+        it { is_expected.to have_http_status(:too_many_requests) }
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/app_spec.rb

@@ -41,6 +41,11 @@ module MnoEnterprise
         app.description = 'Screenshot: <img src="//cdn.maestrano.com/web/mno/screenshot.png"/>'
         expect(app.sanitized_description).to eq(app.description)
       end
+
+      it 'does not replace for bucket name cdn-prd-maestrano' do
+        app.description = '<a href="https://s3.amazonaws.com/cdn-prd-maestrano/somefile" target="_blank">report</a>'
+        expect(app.sanitized_description).to eq(app.description)
+      end
     end
 
     describe '#regenerate_api_key!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -369,6 +369,8 @@ files:
 - app/views/system_notifications/organization-invite-existing-user.text.erb
 - app/views/system_notifications/organization-invite-new-user.html.erb
 - app/views/system_notifications/organization-invite-new-user.text.erb
+- app/views/system_notifications/organization-invite-notification.html.erb
+- app/views/system_notifications/organization-invite-notification.text.erb
 - app/views/system_notifications/password-change.html.erb
 - app/views/system_notifications/password-change.text.erb
 - app/views/system_notifications/reconfirmation-instructions.html.erb
@@ -468,6 +470,7 @@ files:
 - config/locales/views/auth/unlocks/en.yml
 - config/locales/views/auth/unlocks/id.yml
 - config/locales/views/auth/unlocks/zh.yml
+- config/locales/views/errors/en.yml
 - config/locales/views/pages/en.yml
 - config/locales/views/pages/id.yml
 - config/locales/views/pages/zh.yml
@@ -600,6 +603,7 @@ files:
 - lib/mno_enterprise/testing_support/mno_enterprise_api_test_helper.rb
 - lib/mno_enterprise/testing_support/mnoe_faraday_test_adapter.rb
 - lib/mno_enterprise/testing_support/organizations_shared_helpers.rb
+- lib/mno_enterprise/testing_support/request_spec_helper.rb
 - lib/mno_enterprise/testing_support/shared_contexts/rake_task.rb
 - lib/mno_enterprise/testing_support/shared_examples/jpi_v1_admin.rb
 - lib/mno_enterprise/testing_support/user_action_shared.rb
@@ -657,7 +661,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - Core functionnality