sct 1.11.3 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83b5089b7b2e78f5a4b94b62278fa9159e60f1e70654eb65921e59f3b2c69d8e
-  data.tar.gz: 8967410c1dbbfc370d64b6744f93cc76ac01be25db05967d4830cc515292a0db
+  metadata.gz: 8ebb6543f329c7409b5f0c07026826c4530ecc1862da704fd829cd3ee15d0f90
+  data.tar.gz: 57f8d6eff3e2eba63bf31c959793aad4bc3036c0195ece0bc43544a600ff8409
 SHA512:
-  metadata.gz: 077e1d0700e0a844cc430bda5ec36016056325a3ec5afa272321ce85da4aaa7dc0a5575011b73fd0973a8a94d80efbde84fc88c193549826c5d0b4e8bd5dbad2
-  data.tar.gz: 8599299496eafc2f35e5ca362d10a2caf37883d174a68b8dddaf898cf54164e8830d033607ba7197f0ef8954ee66288f757dc4bc4122817b1e1c646f1450169e
+  metadata.gz: ed0317fb42edb91e0955e2d08f187bb9c31ea8e841e644dd9de4f742d6773e11cc1c14e5bcbaf680d03df9282caf8cde6a7df5923d902e563fbe18767cdd6249
+  data.tar.gz: 2f0ee40fdc170606d75f9caa3969cb971999c6890041131fd9c09368c4bcd5728a6de92b7917460c825206b87920c790cfbc5b5c3076ea64ce9adfee34df1a7c

data/henk/lib/henk/commands_generator.rb

@@ -28,8 +28,7 @@ module Henk
                 c.syntax = 'sct henk create'
                 c.description = 'Create a client in your local development.'
                 c.required_option '--domain DOMAIN', 'The domain name of the new customer.'
-                c.required_option '--organization-name ORGANIZATION_NAME', 'The name of the organization.'
-                c.required_option '--modules MODULES', 'Allowed modules. ex: 01, 02, 03, ...'
+                c.required_option '--organization_name ORGANIZATION_NAME', 'The name of the organization.'
 
                 c.action do |args, options|
                     c.validate options

data/henk/lib/henk/runner.rb

@@ -1,4 +1,5 @@
 require 'pp'
+require 'tmpdir'
 
 module Henk
     class Runner
@@ -24,30 +25,17 @@ module Henk
 
         def initialize
             @options_mapping = {
-                "organization_name" => {
-                    "name" => "organization-name"
+                "create" => {
+                    "domain" => "domain",
+                    "organization_name" => "organization_name",
                 },
-                "modules"  => {
-                    "name" => "modules",
-                    "type" => "array"
+                "copy" => {
+                    "domain" => "export",
+                    "target_environment" => "target",
                 },
-                "database_source" => {
-                    "name" => "database-source"
-                },
-                "target_domain" => {
-                    "name" => "target-domain"
-                },
-                "copy_data" => {
-                    "name" => "copy-data"
-                },
-                "source_environment" => {
-                    "name" => "source-environment"
-                },
-                "target_environment" => {
-                    "name" => "target-environment"
-                },
-                "user_email" => {
-                    "name" => "user-email"
+                "remove" => {
+                    "domain" => "domain",
+                    "user_email" => "creator",
                 }
             }
         end
@@ -83,24 +71,42 @@ module Henk
         end
 
         def henk command, options = {}
-            begin
-                volumes = get_volumes_string(options.dev)
-                image = get_latest_image
-                verbose = options.verbose
+            volumes = get_volumes_string
+            image = "eu.gcr.io/dev-pasc-vcdm/henk-core-tasks:latest"
+            verbose = options.verbose
+            env_file = create_env_file
 
-                options = options_to_string options
-                to_run = "docker run -it --rm --network spend-cloud #{volumes} #{image} #{command} #{options}"
+            options = options_to_string command, options
+            to_run = "docker run -it --rm --network spend-cloud -w /app -v #{env_file}:/app/.env:ro #{volumes} #{image} ./henk-#{command} #{options}"
 
-                if verbose
-                    puts "Running: #{to_run.green}"
-                end
-
-                self.run to_run
+            if verbose
+                puts "Running: #{to_run.green}"
             end
+
+            self.run to_run
+        ensure
+            File.delete(env_file) if env_file && File.exist?(env_file)
+        end
+
+        def create_env_file
+            content = <<~ENV
+APP_ENV=local
+DB_SERVICES_HOST=mysql-service
+DB_PORT=3306
+DB_DATABASE=spend-cloud-config
+DB_USERNAME=admin
+DB_PASSWORD=
+DB_GRANTS_USERNAME=admin
+DB_GRANTS_PASSWORD=
+APPLICATION_TOKEN=applicationtoken
+ENV
+            path = File.join(Dir.tmpdir, "henk-#{Time.now.to_i}-#{$$}.env")
+            File.write(path, content)
+            path
         end
 
         def list_clients
-            self.run "docker exec -it mysql-service mysql -u root -sN -e 'SELECT `043` FROM `spend-cloud-config`.`00_settings` ORDER BY `043` ASC'"
+            self.run "docker exec -it mysql-service mysql -u admin -sN -e 'SELECT `043` FROM `spend-cloud-config`.`00_settings` ORDER BY `043` ASC'"
         end
 
         def encrypt_config_data domain
@@ -117,73 +123,39 @@ module Henk
             self.run command
         end
 
-        def get_latest_image
-            latest_version = `gcloud container images list-tags eu.gcr.io/dev-pasc-vcdm/henk-app --limit 1 --format=\"json\" | jq -r '[.[0].tags | sort_by(length)[] | select(match(\"^[0-9]+$\"))] | first'`
-            return "eu.gcr.io/dev-pasc-vcdm/henk-app:#{latest_version.strip}"
-        end
-
-        def get_volumes_string dev = false
+        def get_volumes_string
             volumes = {
                 "spend-cloud_shared-storage" => "/data"
             }
 
-            if dev
-                repoPath = Sct::Helper.homePath + "/development/henk"
-
-                if not Dir.exists?(repoPath)
-                    puts "Warning: ".yellow + "To run in development mode you need a checkout for the Henk repository. Continuing in normal mode."
-                else
-                    dev_volumes = {
-                        repoPath + "/modules"                   => "/var/scripts/modules",
-                        repoPath + "/client.py"                 => "/var/scripts/client.py",
-                        repoPath + "/environment_mapping.json"  => "/var/scripts/environment_mapping.json",
-                        repoPath + "/logging-config.json"       => "/var/scripts/logging-config.json",
-                        repoPath + "/schemas"                   => "/var/scripts/schemas",
-                        repoPath + "/resources"                 => "/var/local"
-                    }
-
-                    volumes = volumes.merge(dev_volumes)
-                end
-            end
-
             return volumes.map{|k,v| "-v #{k}:#{v}"}.join(' ')
         end
 
-        def options_to_string options = {}
+        def options_to_string command, options = {}
             options_str = ''
 
-            if options.verbose
-                options_str += '--verbose '
-            end
-
             if options.overwrite
-                options_str += '--overwrite '
-            end
-
-            if options.copy_data
-                options_str += '--copy-data '
+                options_str += '-overwrite '
             end
 
             options = options.__hash__
 
-            options.delete(:dev)
             options.delete(:verbose)
             options.delete(:overwrite)
             options.delete(:copy_data)
+            options.delete(:source_environment)
+            options.delete(:database_source)
+            options.delete(:target_domain)
+
+            command_mapping = self.options_mapping[command] || {}
 
             parsed_options = []
 
             options.each do |k,v|
-                if self.options_mapping["#{k}"]
-                    mapping = self.options_mapping["#{k}"]
-                    k = mapping['name']
-
-                    if mapping['type'] == "array"
-                        v = v.split(',').join(' ')
-                    end
+                key = k.to_s
+                if command_mapping[key]
+                    parsed_options << "-#{command_mapping[key]} #{v}"
                 end
-
-                parsed_options << "--#{k} #{v}"
             end
 
             options_str += parsed_options.join(' ')
@@ -255,7 +227,8 @@ module Henk
 
         def remove_customer_from_config_database customer
             puts "Finding client_id for #{customer}...".blue
-            client_id_result = `docker exec mysql-service mysql -u root -sN -e 'SELECT client_id FROM \`spend-cloud-config\`.\`00_settings\` WHERE \`043\` = "#{customer}"'`.strip
+            escaped = escape_sql_string(customer)
+            client_id_result = `docker exec mysql-service mysql -u admin -sN -e 'SELECT client_id FROM \`spend-cloud-config\`.\`00_settings\` WHERE \`043\` = "#{escaped}"'`.strip
 
             if !client_id_result.empty?
                 client_id = client_id_result.to_i
@@ -270,7 +243,7 @@ module Henk
                 puts "Removed all config database entries".green
             else
                 puts "Warning: ".yellow + "Could not find client_id in config database, attempting cleanup with domain name only"
-                run_query "DELETE FROM `00_settings` WHERE `043` = \"#{customer}\"", database: "spend-cloud-config"
+                run_query "DELETE FROM `00_settings` WHERE `043` = \"#{escape_sql_string(customer)}\"", database: "spend-cloud-config"
             end
         end
 
@@ -288,8 +261,11 @@ module Henk
         end
 
         def copy_db_encryption_key customer, dir
+            uid = Process.uid
+            gid = Process.gid
+ 
             run "docker exec proactive-config mkdir -p /data/#{customer}"
-            run "docker exec proactive-config chown www-data:www-data /data/#{customer}"
+            run "docker exec proactive-config chown #{uid}:#{gid} /data/#{customer}"
             run "docker cp #{dir}/db_encryption.key proactive-config:/data/#{customer}/"
 
             puts "Copied db_encryption.key to proactive-config:/data/#{customer}/".green
@@ -321,7 +297,7 @@ module Henk
         end
 
         def update_and_encrypt_customer_config customer, customer_database
-            dsn = "mysql:host=mysql-service;user=root;dbname=#{customer_database};config=proactive-php;config-path=cfg/db;"
+            dsn = "mysql:host=mysql-service;user=admin;dbname=#{customer_database};config=proactive-php;config-path=cfg/db;"
 
             website_application = "https://#{customer}.dev.spend.cloud"
 
@@ -329,7 +305,7 @@ module Henk
 
             debug_email_address = "noreply@dev.spend.cloud"
 
-            query = "UPDATE `00_settings` SET `045` = \"#{dsn}\", `029` = \"#{website_application}\", `002` = \"#{email_administrator}\", `031` = \"#{debug_email_address}\" WHERE `043` = \"#{customer}\""
+            query = "UPDATE `00_settings` SET `045` = \"#{escape_sql_string(dsn)}\", `029` = \"#{escape_sql_string(website_application)}\", `002` = \"#{escape_sql_string(email_administrator)}\", `031` = \"#{escape_sql_string(debug_email_address)}\" WHERE `043` = \"#{escape_sql_string(customer)}\""
 
             run_query query, database: "spend-cloud-config"
 
@@ -340,6 +316,10 @@ module Henk
             puts "Encrypted config values".green
         end
 
+        def escape_sql_string(value)
+            value.gsub('\\') { '\\\\' }.gsub('"') { '\\"' }
+        end
+
         def run_query query, database: nil, volume: nil
             command = "docker run --rm --network container:mysql-service"
 

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.11.3"
+  VERSION = "1.13.0"
 end

data/sct_core/lib/sct_core/command_executor.rb

@@ -12,6 +12,9 @@ module SctCore
         #
         # Derived from https://stackoverflow.com/a/5471032/3005
         def which(cmd)
+          raise ArgumentError, "Invalid command name: #{cmd}" if cmd.nil? || cmd.empty?
+          raise ArgumentError, "Invalid command name: #{cmd}" if cmd.include?('/') || cmd.include?('\\') || cmd.include?('..')
+
           # PATHEXT contains the list of file extensions that Windows considers executable, semicolon separated.
           # e.g. ".COM;.EXE;.BAT;.CMD"
           exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.13.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-28 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored