oneis 2.0.2-java → 2.0.3-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b68f3277dbcaef02ed9fb1386d07890d556d5fa1
+  data.tar.gz: 9829008f1daebd4bc1dba87dde7d89adb2f29753
+SHA512:
+  metadata.gz: c22f7f5300f2919e7b8b15f1715dc2c284cf3438edfb062fd2080201ddd80a67f3df21ebf4d4723fb9a05c20a3ea069c989d701055d75002d1d18df1eb3d3c89
+  data.tar.gz: 7c19c276060296924d354f26569d46a0fcd59164d6816172a46987b2005e0f8f621f3b9d008b66d4533d129beb76b75eead8f8a4c04f099009095c10e4a9d077

data/bin/oneis-plugin

@@ -1,38 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'java'
-
-require 'digest/sha1'
-require 'net/http'
-require 'net/https'
-require 'getoptlong'
-require 'fileutils'
-require 'thread'
-
-require 'rubygems'
-gem 'json'
-require 'json'
-
-ONEIS_PLUGIN_ROOT_DIR = "#{File.dirname(__FILE__)}/.."
-
-JS_JAR = "#{ONEIS_PLUGIN_ROOT_DIR}/lib/js.jar"
-unless File.exists? JS_JAR
-  puts "Can't find JavaScript interpreter .jar file"
-  exit 1
-end
-require JS_JAR
-
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/hmac.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/local_config.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/manifest.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/auth.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/server.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/syntax_checking.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/notifications.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/plugin.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/new_plugin.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/misc.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/watchers.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/minimise.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/check.rb"
-require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/plugin_tool.rb"
+load "#{File.dirname(__FILE__)}/../lib/run.rb"

data/lib/custom.rb

@@ -0,0 +1,73 @@
+
+module PluginTool
+
+  LOCAL_CUSTOM_BEHAVIOUR_FILENAME = "server.behaviour.rb"
+
+  # Digests of trusted code are stored outside the source code repo, so it can't be written by the repo contents
+  TRUSTED_CODE_DIGESTS_FILENAME = "~/.haplo-plugin-tool-trusted.json"
+
+  class CustomBehaviour
+    def start(plugins, command, options, is_local_command)
+    end
+    def server_ready(plugins, command, options)
+    end
+  end
+
+  @@custom = CustomBehaviour.new
+
+  def self.set_custom_behaviour(custom)
+    @@custom = custom
+  end
+
+  def self.custom_behaviour
+    @@custom
+  end
+
+  def self.try_load_custom
+    return unless File.exist?(LOCAL_CUSTOM_BEHAVIOUR_FILENAME)
+
+    trusted_code = nil
+    untrusted_code = File.open(LOCAL_CUSTOM_BEHAVIOUR_FILENAME) { |f| f.read }
+    untrusted_code_digest = Digest::SHA256.hexdigest(untrusted_code)
+
+    trusted_code_digests = {"trust" => []}
+    trusted_code_filename = File.expand_path(TRUSTED_CODE_DIGESTS_FILENAME)
+    if File.exist?(trusted_code_filename)
+      trusted_code_digests = JSON.parse(File.open(trusted_code_filename) { |f| f.read })
+    end
+
+    unless trusted_code_digests["trust"].include?(untrusted_code_digest)
+      # Make sure the user wants to run this code. Otherwise running the plugin tool in a repo you've just
+      # downloaded could unexpectedly execute code on your local machine.
+      if ARGV.length == 2 && ARGV[0] == 'trust' && ARGV[1] =~ /\A[0-9a-z]{64}\z/ && ARGV[1] == untrusted_code_digest
+        trusted_code_digests["trust"].push(untrusted_code_digest)
+        File.open(trusted_code_filename,"w") { |f| f.write JSON.pretty_generate(trusted_code_digests) }
+        puts "Stored trust for #{LOCAL_CUSTOM_BEHAVIOUR_FILENAME} with contents #{untrusted_code_digest}."
+        exit 0
+      else
+        puts
+        puts "-------------------------------------------------------------------------------------------"
+        puts "  Do you trust the code in #{LOCAL_CUSTOM_BEHAVIOUR_FILENAME} to be run every time you run the"
+        puts "  plugin tool? If yes, run"
+        puts "      oneis-plugin trust #{untrusted_code_digest}"
+        puts "  to permanently trust this version of #{LOCAL_CUSTOM_BEHAVIOUR_FILENAME}"
+        puts "-------------------------------------------------------------------------------------------"
+        puts
+        PluginTool.beep
+        exit 1
+      end
+    end
+
+    if ARGV.length > 0 && ARGV[0] == "trust"
+      puts "Unexpected trust command."
+      exit 1
+    end
+
+    # User trusts the code, run it
+    # There is a race condition here, but we're trying to protect against code in repositories, not
+    # against software running on the local machine.
+    load LOCAL_CUSTOM_BEHAVIOUR_FILENAME
+
+  end
+
+end

data/lib/plugin_tool.rb

@@ -8,6 +8,8 @@ File.open("#{File.dirname(__FILE__)}/version.txt") do |f|
   puts "ONEIS Plugin Tool (#{f.read.chomp})"
 end
 
+PluginTool.try_load_custom
+
 PluginTool::LocalConfig.load
 
 # Commands not needing server
@@ -122,6 +124,9 @@ plugins.sort! do |a,b|
 end
 plugins.each { |p| p.print_banner }
 
+# Custom behaviour for this repo?
+PluginTool.custom_behaviour.start(plugins, PLUGIN_TOOL_COMMAND, options, LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND])
+
 # Special handling for some commands
 case PLUGIN_TOOL_COMMAND
 when 'pack'
@@ -137,6 +142,8 @@ unless LOCAL_ONLY_COMMANDS[PLUGIN_TOOL_COMMAND]
   PluginTool.setup_auth(options)
   PluginTool.check_for_certificate_file
 
+  PluginTool.custom_behaviour.server_ready(plugins, PLUGIN_TOOL_COMMAND, options)
+
   if automatic_plugin_exclusion
     exclusions = PluginTool::LocalConfig.get_list("exclude")
     plugins = plugins.select do |plugin|

data/lib/run.rb

@@ -0,0 +1,38 @@
+
+require 'java'
+
+require 'digest/sha1'
+require 'net/http'
+require 'net/https'
+require 'getoptlong'
+require 'fileutils'
+require 'thread'
+
+require 'rubygems'
+gem 'json'
+require 'json'
+
+ONEIS_PLUGIN_ROOT_DIR = "#{File.dirname(__FILE__)}/.."
+
+JS_JAR = "#{ONEIS_PLUGIN_ROOT_DIR}/lib/js.jar"
+unless File.exists? JS_JAR
+  puts "Can't find JavaScript interpreter .jar file"
+  exit 1
+end
+require JS_JAR
+
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/hmac.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/local_config.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/manifest.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/auth.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/server.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/syntax_checking.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/notifications.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/plugin.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/new_plugin.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/misc.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/watchers.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/minimise.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/check.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/custom.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/plugin_tool.rb"

data/lib/server.rb

@@ -136,4 +136,8 @@ EOF
     r
   end
 
+  def self.get_application_info
+    @@server_application_info ||= JSON.parse(get("/api/development-plugin-loader/application-info"))
+  end
+
 end

data/lib/version.txt

@@ -1 +1 @@
-0aa65198b7
+6be56b5a02

data/oneis.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'oneis'
-  s.version     = '2.0.2'
-  s.date        = '2015-01-09'
+  s.version     = '2.0.3'
+  s.date        = '2015-02-20'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]

metadata

@@ -1,102 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oneis
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.0.2
+version: !ruby/object:Gem::Version
+  version: 2.0.3
 platform: java
-authors: 
-  - ONEIS
-autorequire: 
+authors:
+- ONEIS
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2015-01-09 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.8.7
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: json
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.7.7
-    type: :runtime
-    version_requirements: *id002
+date: 2015-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  prerelease: false
+  type: :runtime
 description: ONEIS Developer Tools
 email: client.services@oneis.co.uk
-executables: 
-  - oneis-plugin
+executables:
+- oneis-plugin
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - oneis.gemspec
-  - README.txt
-  - lib/auth.rb
-  - lib/CertificateBundle.pem
-  - lib/check.rb
-  - lib/hmac.rb
-  - lib/js.jar
-  - lib/js_min.js
-  - lib/js_syntax_test.js
-  - lib/jshint.js
-  - lib/local_config.rb
-  - lib/manifest.rb
-  - lib/minimise.rb
-  - lib/misc.rb
-  - lib/new_plugin.rb
-  - lib/notifications.rb
-  - lib/packing.rb
-  - lib/plugin.rb
-  - lib/plugin_tool.rb
-  - lib/server.rb
-  - lib/syntax_checking.rb
-  - lib/usage.txt
-  - lib/version.txt
-  - lib/watchers.rb
-  - lib/uglifyjs/parse-js.js
-  - lib/uglifyjs/process.js
-  - lib/uglifyjs/squeeze-more.js
-  - bin/oneis-plugin
+files:
+- README.txt
+- bin/oneis-plugin
+- lib/CertificateBundle.pem
+- lib/auth.rb
+- lib/check.rb
+- lib/custom.rb
+- lib/hmac.rb
+- lib/js.jar
+- lib/js_min.js
+- lib/js_syntax_test.js
+- lib/jshint.js
+- lib/local_config.rb
+- lib/manifest.rb
+- lib/minimise.rb
+- lib/misc.rb
+- lib/new_plugin.rb
+- lib/notifications.rb
+- lib/packing.rb
+- lib/plugin.rb
+- lib/plugin_tool.rb
+- lib/run.rb
+- lib/server.rb
+- lib/syntax_checking.rb
+- lib/uglifyjs/parse-js.js
+- lib/uglifyjs/process.js
+- lib/uglifyjs/squeeze-more.js
+- lib/usage.txt
+- lib/version.txt
+- lib/watchers.rb
+- oneis.gemspec
 homepage: http://docs.oneis.co.uk/dev/tool/plugin
 licenses: []
-
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
+specification_version: 4
 summary: ONEIS Tools
 test_files: []
-