cpee 2.1.11 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efeba53ef2a09db39df28177cc7238d5df7c14277815e0a3f79ada2f7860222d
-  data.tar.gz: 8dd7c732a2067bc8e98ca9c71282baeb76d1e429f66b232cf6f24eccddf188ea
+  metadata.gz: 18b365831308d00c63c51738bb800255bb0fe6813f4cf368e7ec60b32609a2b8
+  data.tar.gz: a777bc87bcea1990238ff50950a0179c8b9076774496a53ed7bb1eedc2cb875c
 SHA512:
-  metadata.gz: e04e0dc7f1c15874fafb119045594a564c5f956a3609800d7c18717a9e8da5365d86db978c72404c231b2a32421da5f1f8d03a6ae5a516aea7fcb8ba06ee619c
-  data.tar.gz: 5d629666c2a58c1f1545b8222b243ab5f05ca9cc30629979daaa1a286188270d3699ea195176e943fc2cb45ca2a9fd28f350b9ca663fbdfa924f335a539a59f1
+  metadata.gz: 6b4c1476fffb5bfa7b7bbadebc9af1cdf2a8b8703ff15f4378946661613e95be0b3fbf54416637d63e4410f5563a723ca0e91a3fddaaeeb5e60a49e63e82eecd
+  data.tar.gz: 1f274d19467c64173562ba9d01dd97c192dd1b2a5ce15556d866c00fa0908e13666361b59bda02f5222b04c68a131940ac942b633c4cefcc4bb7e1e240c52873

data/cockpit/templates/Worklist.xml

@@ -12,15 +12,15 @@
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
         <parameters>
-          <label>"OK OR NOT OK"</label>
+          <label>OK OR NOT OK</label>
           <method>:post</method>
           <arguments>
-            <orgmodel>"organisation1"</orgmodel>
-            <domain>"Virtual Business 1"</domain>
-            <form>"http://cpee.org/~demo/form/form-f.html"</form>
-            <role>"Regular"</role>
-            <schaden>"55546"</schaden>
-            <text>"fetzen hin"</text>
+            <orgmodel>organisation1</orgmodel>
+            <domain>Virtual Business 1</domain>
+            <form>http://cpee.org/~demo/form/form-f.html</form>
+            <role>Regular</role>
+            <schaden>55546</schaden>
+            <text>fetzen hin</text>
           </arguments>
         </parameters>
         <code>
@@ -44,4 +44,4 @@
     <design_stage>development</design_stage>
     <design_dir>Templates.dir</design_dir>
   </attributes>
-</testset>
+</testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.11"
+  s.version          = "2.1.12"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
   s.add_runtime_dependency 'rubyzip', '~>2'
+  s.add_runtime_dependency 'charlock_holmes', '~>0'
 end

data/lib/cpee/implementation.rb

@@ -252,7 +252,7 @@ module CPEE
       end
 
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
-      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s))
+      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
       @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)
 
       Riddl::Parameter::Simple.new("id", id.to_s)

data/server/executionhandlers/ruby/connection.rb

@@ -12,6 +12,8 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require 'charlock_holmes'
+
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
     controller = arguments[0]
@@ -101,7 +103,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance_id)
     params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
     params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
-    params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+    params << Riddl::Header.new("CPEE-CALLBACK",File.join(@controller.instance_url,'callbacks',callback,'/'))
     params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
     params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
     params << Riddl::Header.new("CPEE-LABEL",@label||'')
@@ -239,6 +241,14 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     result
   end
 
+  def detected_encoding(text)
+    CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
+  end
+
+  def convert_to_utf8(text)
+    CharlockHolmes::Converter.convert(text, detected_encoding(text), "UTF-8")
+  end
+
   def structurize_result(result)
     result.map do |r|
       if r.is_a? Riddl::Parameter::Simple

data/server/executionhandlers/ruby/controller.rb

@@ -96,10 +96,10 @@ class Controller
     @opts[:host]
   end
   def base_url
-    @opts[:url]
+    File.join(@opts[:url],'/')
   end
   def instance_url
-    File.join(@opts[:url].to_s,@id.to_s)
+    File.join(@opts[:url].to_s,@id.to_s,'/')
   end
   def instance_id
     @id

data/server/routing/forward-votes.rb

@@ -84,11 +84,11 @@ Daemonite.new do |opts|
               opts[:redis].publish("forward:#{instance}/#{subscription_key}",mess)
             else
               client = Riddl::Client.new(url)
-              callback = m['instance-url'] + '/callbacks/' + subscription_key
+              callback = File.join(m['instance-url'],'/callbacks/',subscription_key,'/')
               status, result, headers = (client.post [
-                Riddl::Header.new("CPEE-BASE",m['cpee']),
+                Riddl::Header.new("CPEE-BASE",File.join(m['cpee'],'/')),
                 Riddl::Header.new("CPEE-INSTANCE",m['instance']),
-                Riddl::Header.new("CPEE-INSTANCE-URL",m['instance-url']),
+                Riddl::Header.new("CPEE-INSTANCE-URL",File.join(m['instance-url'],'/')),
                 Riddl::Header.new("CPEE-INSTANCE-UUID",m['instance-uuid']),
                 Riddl::Header.new("CPEE-CALLBACK",callback),
                 Riddl::Header.new("CPEE-CALLBACK-ID",subscription_key),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -102,6 +102,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -632,18 +646,13 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
 - server/server.rb
 - tools/cpee
-- tools/cpee.sic
 - tools/server/cpee
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init

data/server/routing/end.pid

@@ -1 +0,0 @@
-42643

data/server/routing/forward-events.pid

@@ -1 +0,0 @@
-42631

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-42635

data/server/routing/persist.pid

@@ -1 +0,0 @@
-42639

data/tools/cpee.sic

@@ -1,306 +0,0 @@
-#!/usr/bin/ruby
-curpath = __dir__
-require 'rubygems'
-require 'optparse'
-require 'fileutils'
-require 'webrick'
-require 'typhoeus'
-require 'xml/smart'
-require 'zip'
-require 'pp'
-
-def wrap(s, width=78, indent=18)
-	lines = []
-	line, s = s[0..indent-2], s[indent..-1]
-  s.split(/\n/).each do |ss|
-    ss.split(/[ \t]+/).each do |word|
-      if line.size + word.size >= width
-        lines << line
-        line = (" " * (indent)) + word
-      else
-        line << " " << word
-      end
-    end
-    lines << line if line
-    line = (" " * (indent-1))
-  end
-	return lines.join "\n"
-end
-
-ARGV.options { |opt|
-  opt.summary_indent = ' ' * 2
-  opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
-  opt.on("Options:")
-  opt.on("--help", "-h", "This text") { puts opt; exit }
-	opt.on("")
-  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
-	opt.on("")
-  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
-	opt.on("")
-  opt.on(wrap("[start URL]       stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
-	opt.on("")
-  opt.on(wrap("[delete! URL]     DANGER ZONE. Vanishes forever. Not in archive. Examples:\ncpee delete! http://localhost:9298/1/"))
-	opt.on("")
-  opt.on(wrap("[new DIR]         scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
-	opt.on("")
-  opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
-	opt.on("")
-  opt.on(wrap("[ui]              starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
-	opt.on("")
-  opt.on(wrap("[convert]         converts all testsets in the current directory to cpee2"))
-  opt.parse!
-}
-if (ARGV.length == 0) ||
-   (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
-   (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
-   (ARGV.length == 3  && ARGV[0] != 'archive') ||
-   (ARGV.length >  3)
-  puts ARGV.options
-  exit
-end
-command = ARGV[0]
-p1      = ARGV[1]
-p2      = ARGV[2]
-cockpit = "#{curpath}/../cockpit/"
-
-def js_libs(cockpit)
-  res = Typhoeus.get('https://cpee.org/js_libs/js_libs.zip')
-  if res.success?
-    File.write(File.join(cockpit,'js_libs.zip'),res.response_body)
-    Zip::File.open(File.join(cockpit,'js_libs.zip')) do |zip_file|
-      zip_file.each do |entry|
-        case entry.ftype
-          when :directory
-            Dir.mkdir(File.join(cockpit,entry.name)) rescue nil
-          when :file
-            File.write(File.join(cockpit,entry.name),entry.get_input_stream.read)
-          when :symlink
-            FileUtils.ln_s(File.join('.',entry.get_input_stream.read),File.join(cockpit,entry.name), force: true)
-        end
-      end
-    end
-    true
-  else
-    puts 'Internet access required to download javascript libs from "http://cpee.org/js_libs/js_libs.zip".'
-    false
-  end
-end
-
-if command == 'ui'
-  if js_libs(cockpit)
-    s = WEBrick::HTTPServer.new(:Port => 8080,  :DocumentRoot => cockpit)
-    trap("INT"){ s.shutdown }
-    s.start
-  end
-elsif command == 'cpui'
-    if !File.exists?(p1)
-      FileUtils.cp_r(cockpit,p1)
-    else
-      FileUtils.cp_r(Dir.glob(File.join(cockpit,'*')),p1,remove_destination: true)
-      puts "Directory already exists, updating ..."
-    end
-    js_libs(p1)
-elsif command == 'convert'
-  Dir['*.xml'].each do |f|
-    XML::Smart.modify(f) do |doc|
-      doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-      doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
-      doc.register_namespace 'x', 'http://cpee.org/ns/properties/2.0'
-      if doc.root.qname.name == 'testset'
-        doc.root.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
-        doc.root.namespace = nil
-
-        doc.find('//x:handlerwrapper').each do |e|
-          if e.text == 'DefaultHandlerWrapper'
-            doc.root.prepend('x:executionhandler','ruby')
-          end
-        end rescue nil
-        doc.find('//x:handlerwrapper').delete_all!
-        doc.find('//x:start_url').each do |e|
-          e.text = 'https://cpee.org/flow/start/url/'
-        end rescue nil
-        doc.find('//x:start_git').each do |e|
-          e.text = 'https://cpee.org/flow/start/git/'
-        end rescue nil
-        doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
-          if e.parent.qname.name != 'code'
-            n = e.parent
-            if (x = n.find('d:code')).any?
-              x.first.add(e)
-            else
-              n.add('d:code').add(e)
-            end
-          end
-        end rescue nil
-
-        doc.find('//p:*').each do |e|
-          e.namespaces.delete_all!
-        end rescue nil
-      end
-    end
-  end
-elsif command == 'archive'
-  p2 = File.join(p2,'*') if p2 =~ /([a-zA-Z]|\/)$/
-  base = File.dirname(p2)
-  names = []
-  if File.basename(p2) =~ /(\d+)-(\d+)/
-    names = ($1.to_i..$2.to_i).to_a
-  elsif File.basename(p2) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
-    if res.success?
-      XML::Smart.string(res.response_body) do |doc|
-        doc.find('//instance/@id').each do |ele|
-          names << ele.value
-        end
-      end
-      names.reverse!
-    else
-      exit
-    end
-  else
-    names << File.basename(p2)
-  end
-  names.each do |name|
-    print "Working on: " + name.to_s + "\r"
-    res = Typhoeus.get(File.join(base,name.to_s,'/'))
-    if res.success?
-      if res.headers['Content-Type'] =~ /^(text|application)\/xml/
-        XML::Smart.string(res.response_body) do |doc|
-          if doc.root.qname.to_s == "instances"
-            doc.root.children.each do |i|
-              if ["finished","abandoned"].include?(i.attributes['state']) || (["ready"].include?(i.attributes['state']) && Time.parse(i.attributes['changed']).to_i < Time.now-(60*60*24))
-                prop = Typhoeus.get(File.join(base,name.to_s,i.attributes['id'],'properties','/'))
-                if prop.success?
-                  File.write(File.join(p1,i.attributes['uuid'] + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
-                  Typhoeus.delete(File.join(base,name.to_s,i.attributes['id'],'/'))
-                end
-              end
-            end
-          elsif doc.root.qname.to_s == "info"
-            prop = Typhoeus.get(File.join(base,name.to_s,'properties','/'))
-            if prop.success?
-              xprop = XML::Smart::string(prop.response_body)
-              xprop.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-              if ["finished","abandoned"].include?(xprop.find("string(/p:properties/p:state)")) || (["ready"].include?(xprop.find("string(/p:properties/p:state)")) && Time.parse(xprop.find("string(/p:properties/p:state/@changed)")) < Time.now-(60*60*12))
-                uuid = xprop.find("string(/p:properties/p:attributes/p:uuid)")
-                id = name.to_s
-                File.write(File.join(p1,uuid + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
-                Typhoeus.delete(File.join(base,name.to_s,'/'))
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-  puts
-elsif command == 'abandon'
-  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
-  base = File.dirname(p1)
-  names = []
-  if File.basename(p1) =~ /(\d+)-(\d+)/
-    names = ($1.to_i..$2.to_i).to_a
-  elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
-    if res.success?
-      XML::Smart.string(res.response_body) do |doc|
-        doc.find('//instance/@id').each do |ele|
-          names << ele.value
-        end
-      end
-      names.reverse!
-    else
-      exit
-    end
-  else
-    names << File.basename(p1)
-  end
-  names.each do |name|
-    print "Working on: " + name.to_s + "\r"
-    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
-    if res1.success?
-      if res1.response_body == 'ready' || res1.response_body == 'stopped'
-        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
-      end
-    end
-  end
-  puts
-elsif command == 'start'
-  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
-  base = File.dirname(p1)
-  names = []
-  if File.basename(p1) =~ /(\d+)-(\d+)/
-    names = ($1.to_i..$2.to_i).to_a
-  elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
-    if res.success?
-      XML::Smart.string(res.response_body) do |doc|
-        doc.find('//instance/@id').each do |ele|
-          names << ele.value
-        end
-      end
-      names.reverse!
-    else
-      exit
-    end
-  else
-    names << File.basename(p1)
-  end
-  names.each do |name|
-    res = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
-    if res.success?
-      case res.response_body
-        when "stopped" then
-          keep_alive = Typhoeus.get(File.join(base,name.to_s,'properties','attributes','keep_alive','/'))
-          if keep_alive.success?
-            Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=running")
-          end
-      end
-    end
-  end
-elsif command == 'delete!'
-  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
-  base = File.dirname(p1)
-  names = []
-  if File.basename(p1) =~ /(\d+)-(\d+)/
-    names = ($1.to_i..$2.to_i).to_a
-  elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
-    if res.success?
-      XML::Smart.string(res.response_body) do |doc|
-        doc.find('//instance/@id').each do |ele|
-          names << ele.value
-        end
-      end
-      names.reverse!
-    else
-      exit
-    end
-  else
-    names << File.basename(p1)
-  end
-  names.each do |name|
-    print "Working on: " + name.to_s + "\r"
-    Typhoeus.delete(File.join(base,name.to_s,'/'))
-  end
-  puts
-elsif command == 'new'
-  if !File.exists?(p1)
-    FileUtils.cp_r("#{curpath}/server/",p1)
-    FileUtils.mkdir("#{p1}/archive") rescue nil
-    FileUtils.mkdir("#{p1}/instances") rescue nil
-    FileUtils.mkdir("#{p1}/resources") rescue nil
-    FileUtils.mkdir("#{p1}/executionhandler") rescue nil
-    Dir["#{curpath}/../systemd/*.service"].each do |f|
-      nam =  File.basename f
-      cont = File.read(f)
-      cont.gsub!(/{CPEEUSER}/,`whoami`.strip)
-      cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
-      cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
-      File.write("#{p1}/#{nam}",cont)
-    end
-  else
-    puts 'Directory already exists.'
-  end
-end