foreman_scc_manager 1.8.9 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab78f155bda869b47a6124ada7ebcdf9d067c6173c400dfd9c052c70227695f9
-  data.tar.gz: '009d1c1db82b1c52e4e0ab47ebdb1769dbb4ea0e71fb6a2a0b5b26fff5b0cb41'
+  metadata.gz: d9bb11cd54075948f57fe205b39e75e2d2bac3092cdcd3c1f15e9101bfaa0b3c
+  data.tar.gz: 61351f372d614b5de85b9ec6f490f08bea0c7b1848b06b66b89ca78fd6b4ca29
 SHA512:
-  metadata.gz: da25af4b803899a68ef9b3fae9646901437051d5b69dd4b5c588cca5e0018ea0b797d32255ed4dc5ba6ccb5044a119c2d712bb3b35905aeb231182145f910878
-  data.tar.gz: 15b7aa5a3f7a05e3c517aa6aa41fcef1c9bee3fb00d5f49405166264d21a7857fc348940c06a0279d88330d29b7480e90d2f3e32025ee2bcba95c1acf84f1c7b
+  metadata.gz: 8eb54567950e62fef53342af59aa070cf0f45c31832c8869b181250c20953b5850024ded8792ce2abd7a2c947b6317d86ac99a5038f97ffdb61f67728a2a50b8
+  data.tar.gz: ea314767654f27ab0d26097ccc235fbf83fb426e46ef242284f0da8572cc1dcdfe44d2966b471a177c45bf8fbe99c857105b653f61883e39441b021cf9f67c48

data/app/controllers/scc_accounts_controller.rb

@@ -2,7 +2,7 @@ class SccAccountsController < ApplicationController
   helper_method :scc_filtered_products
   before_action :find_organization
   before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
-  before_action :find_available_gpg_keys, only: %i[new edit]
+  before_action :find_available_gpg_keys, only: %i[new edit update create]
   include Foreman::Controller::AutoCompleteSearch
 
   # GET /scc_accounts

data/app/models/scc_account.rb

@@ -45,12 +45,7 @@ class SccAccount < ApplicationRecord
   end
 
   def sync_date_is_valid_datetime
-    errors.add(:sync_date, 'must be a valid datetime') if interval != NEVER &&
-                                                          sync_date.present? &&
-                                                          !sync_date.respond_to?(:min) &&
-                                                          !sync_date.respond_to?(:hour) &&
-                                                          !sync_date.respond_to?(:wday) &&
-                                                          !sync_date.respond_to?(:day)
+    errors.add(:sync_date, 'must be a valid datetime') if interval != NEVER && sync_date.blank?
   end
 
   def to_s
@@ -104,7 +99,7 @@ class SccAccount < ApplicationRecord
   end
 
   def add_recurring_logic(sync_date, interval)
-    sd = sync_date
+    sd = sync_date.presence || Time.now
 
     raise _('Interval cannot be nil') if interval.nil?
 

data/db/migrate/20210713092440_add_permissions.rb

@@ -0,0 +1,19 @@
+class AddPermissions < ActiveRecord::Migration[6.0]
+  PERMISSIONS = [
+    { 'name' => 'view_scc_products', 'resource_type' => 'SccProduct' },
+    { 'name' => 'subscribe_scc_products', 'resource_type' => 'SccProduct' },
+    { 'name' => 'test_connection_scc_accounts', 'resource_type' => 'SccAccount' }
+  ].freeze
+
+  def up
+    PERMISSIONS.each do |p|
+      Permission.find_or_create_by(:name => p['name'], :resource_type => p['resource_type'])
+    end
+  end
+
+  def down
+    PERMISSIONS.each do |p|
+      Permission.where(:name => p['name']).destroy_all
+    end
+  end
+end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.9'.freeze
+  VERSION = '1.8.10'.freeze
 end

data/test/controllers/api/v2/scc_accounts_test.rb

@@ -208,13 +208,52 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert_response :ok
   end
 
-  test 'should refuse update scc_account' do
+  test 'should refuse update scc_account with invalid interval' do
     account = scc_accounts(:two)
     put :update, params: { id: account.id, :scc_account => { :interval => 'yearly' } }
     assert_equal 'yearly', assigns(:scc_account).interval
     assert_response :unprocessable_entity
   end
 
+  test 'should refuse update scc_account with empty date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :interval => 'weekly', :sync_date => '' } }
+    assert_response :unprocessable_entity
+    assert_error_message 'Sync date must be a valid datetime'
+  end
+
+  test 'should fail to update scc_account with interval set and invalid date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => 'invalid_date', :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message 'Sync date must be a valid datetime'
+  end
+
+  test 'should fail to update scc_account with empty name' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Name can't be blank"
+  end
+
+  test 'should fail to update scc_account with empty login' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :login => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Login can't be blank"
+  end
+
+  test 'should fail to update scc_account with empty base_url' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :base_url => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Base url can't be blank"
+  end
+
   test 'new account SCC server connection-test' do
     scc_setup
     account = scc_accounts(:one)
@@ -305,4 +344,10 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     end
     assert_response :ok
   end
+
+  private
+
+  def assert_error_message(message)
+    assert_includes JSON.parse(response.body)['error']['full_messages'], message
+  end
 end

data/test/controllers/scc_accounts_controller_test.rb

@@ -69,8 +69,58 @@ class SccAccountsControllerTest < ActionController::TestCase
   test 'should update scc_account' do
     account = scc_accounts(:two)
     put :update, params: { id: account.id, :scc_account => { :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+    assert_redirected_to '/scc_accounts'
+    assert_equal 'weekly', SccAccount.find(account.id).interval
+  end
+
+  test 'should update scc_account with empty date if interval not set' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => 'new_name', :sync_date => '', :interval => 'never' } }, session: set_session_user
+
+    assert_equal 'new_name', SccAccount.find(account.id).name
+  end
+
+  test 'updates scc_account even if the date is invalid' do
+    # @todo reminder to fix this in the future
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => 'new_name', :sync_date => 'invalid_date', :interval => 'never' } }, session: set_session_user
+
+    assert_not_equal account.name, SccAccount.find(account.id).name
+  end
+
+  test 'should fail to update scc_account with interval set and empty date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => '', :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal SccAccount.find(account.id).sync_date, account.sync_date
+  end
+
+  test 'should fail to update scc_account with interval set and invalid date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => 'invalid_date', :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal SccAccount.find(account.id).sync_date, account.sync_date
+  end
+
+  test 'should fail to update scc_account with empty name' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal account.name, SccAccount.find(account.id).name
+  end
+
+  test 'should fail to update scc_account with empty login' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :login => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal account.login, SccAccount.find(account.id).login
+  end
+
+  test 'should fail to update scc_account with empty base url' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :base_url => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
 
-    assert_equal 'weekly', assigns(:scc_account).interval
+    assert_equal account.base_url, SccAccount.find(account.id).base_url
   end
 
   test 'SCC server sync products' do

data/test/fixtures/models/scc_accounts.yml

@@ -6,6 +6,7 @@ one:
   name: onename
   interval: never
   organization_id: <%= ActiveRecord::FixtureSet.identify(:empty_organization) %>
+  sync_date: Time.now
 
 two:
   login: twouser
@@ -14,6 +15,7 @@ two:
   name: twoname
   interval: never
   organization_id: <%= ActiveRecord::FixtureSet.identify(:empty_organization) %>
+  sync_date: 2021-07-05T21:33:49
 
 account_missing_url:
   login: fakeuser1

data/test/unit/access_permissions_test.rb

@@ -0,0 +1,16 @@
+require 'test_plugin_helper'
+require 'unit/shared/access_permissions_test_base'
+
+# Permissions are added in AccessPermissions with lists of controllers and
+# actions that they enable access to.  For non-admin users, we need to test
+# that there are permissions available that cover every controller action, else
+# it can't be delegated and this will lead to parts of the application that
+# aren't functional for non-admin users.
+#
+# In particular, it's important that actions for AJAX requests are added to
+# an appropriate permission so views using those requests function.
+class AccessPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(ForemanSccManager::Engine.routes, [])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.10
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -158,6 +158,7 @@ files:
 - db/migrate/20210205082733_add_subscription_valid_to_scc_products_and_repos.rb
 - db/migrate/20210210104407_add_root_repository_id_to_scc_repository.rb
 - db/migrate/20210224095050_connect_katello_root_repository_to_scc_repository.rb
+- db/migrate/20210713092440_add_permissions.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -194,6 +195,7 @@ files:
 - test/support/fixtures_support.rb
 - test/test_controller_helper.rb
 - test/test_plugin_helper.rb
+- test/unit/access_permissions_test.rb
 - test/unit/foreman_scc_manager_test.rb
 homepage: https://www.orcharhino.com/
 licenses:
@@ -219,6 +221,7 @@ signing_key:
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
+- test/unit/access_permissions_test.rb
 - test/unit/foreman_scc_manager_test.rb
 - test/test_controller_helper.rb
 - test/features/sync_test.rb