From 57685e1be83b8efe5cf6ff38322006b6fff5686c Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 27 Sep 2011 12:31:35 +0200 Subject: [PATCH 01/20] Remove debug data --- src/ozones/Server/models/OzonesServer.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ozones/Server/models/OzonesServer.rb b/src/ozones/Server/models/OzonesServer.rb index a11e8cc132..0c38ff1a5a 100644 --- a/src/ozones/Server/models/OzonesServer.rb +++ b/src/ozones/Server/models/OzonesServer.rb @@ -278,8 +278,6 @@ class OzonesServer data = result if !OpenNebula.is_error?(result) end - puts data - resource = case kind when "vdc" then vdc_data=Hash.new From 5c788e6d467ab3943663b509c2039fdf147f4d09 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Tue, 20 Sep 2011 22:58:28 +0200 Subject: [PATCH 02/20] Change "ONE Auth" into "Oneadmin user" when creating zone (cherry picked from commit 4bf0da787fe0dcbca32c9a69a6c2ba401d9c1a48) --- src/ozones/Server/public/js/plugins/zones-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ozones/Server/public/js/plugins/zones-tab.js b/src/ozones/Server/public/js/plugins/zones-tab.js index ffdd2d0069..eb090916d3 100644 --- a/src/ozones/Server/public/js/plugins/zones-tab.js +++ b/src/ozones/Server/public/js/plugins/zones-tab.js @@ -41,7 +41,7 @@ var create_zone_tmpl =
\ \
\ - \ + \
\ \ \ From 92443f762721194fafc5530bcd637a951ac0d8b4 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Tue, 20 Sep 2011 22:59:21 +0200 Subject: [PATCH 03/20] Log to stderr VNC proxy command when starting it (cherry picked from commit 8ff6baf1090c6a3696cf6d0cd2277e9e8538a15d) --- src/sunstone/models/SunstoneServer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 02283816a4..03c73d4576 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -229,6 +229,8 @@ class SunstoneServer begin novnc_cmd = "#{config[:novnc_path]}/utils/wsproxy.py" + novnc_exec = "#{novnc_cmd} #{proxy_port} #{host}:#{vnc_port}" + $stderr.puts("Starting vnc proxy: #{novnc_exec}") pipe = IO.popen("#{novnc_cmd} #{proxy_port} #{host}:#{vnc_port}") rescue Exception => e error = Error.new(e.message) From 71160ee51c314717f150f6bcd47921ccd4efdc60 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 23 Sep 2011 20:21:24 +0200 Subject: [PATCH 04/20] Fix typo in oZones dashboard (cherry picked from commit a9535fa0f75da1c6d8b4d49abf6c02c662eb1b26) --- src/ozones/Server/public/js/plugins/dashboard-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ozones/Server/public/js/plugins/dashboard-tab.js b/src/ozones/Server/public/js/plugins/dashboard-tab.js index a0b43908e1..1d9a663522 100644 --- a/src/ozones/Server/public/js/plugins/dashboard-tab.js +++ b/src/ozones/Server/public/js/plugins/dashboard-tab.js @@ -36,7 +36,7 @@ var dashboard_tab_content = \ \
\ -

Virtual Data Center\ +

Virtual Data Centers\
\ +\
\ From 5b3350bfd6acb119ace3d27b4fbb17c5e43cfafb Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 23 Sep 2011 20:44:14 +0200 Subject: [PATCH 05/20] Ozones: Add Sunstone endpoint to zone creation dialog and info panel (cherry picked from commit a4154ebdff8c3c8f44c14b398355e6a952498899) --- src/ozones/Server/public/js/plugins/zones-tab.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ozones/Server/public/js/plugins/zones-tab.js b/src/ozones/Server/public/js/plugins/zones-tab.js index eb090916d3..80980d2945 100644 --- a/src/ozones/Server/public/js/plugins/zones-tab.js +++ b/src/ozones/Server/public/js/plugins/zones-tab.js @@ -45,6 +45,8 @@ var create_zone_tmpl =
\ \ \ + \ +
\

\ \
\ @@ -298,6 +300,10 @@ function updateZoneInfo(req,zone_json){ Endpoint\ '+zone.endpoint+'\ \ + \ + Sunstone endpoint\ + '+zone.sunsendpoint+'\ + \ \ #VDCs\ '+zone.vdcs.length+'\ @@ -544,6 +550,7 @@ function setupCreateZoneDialog(){ var endpoint = $('#endpoint',this).val(); var onename = $('#onename',this).val(); var onepass = $('#onepass',this).val(); + var sunsendpoint = $('#sunsendpoint',this).val(); if (!name.length || !endpoint.length || !onename.length || !onepass.length){ @@ -556,7 +563,8 @@ function setupCreateZoneDialog(){ "name": name, "endpoint": endpoint, "onename": onename, - "onepass": onepass + "onepass": onepass, + "sunsendpoint" : sunsendpoint } }; From 4a475ae7e534316213a02cbd2650a5b11340f392 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 26 Sep 2011 20:01:27 +0200 Subject: [PATCH 06/20] Small oZones fixes: Adjust zone name column with and hyperlink sunstone endpoint text. (cherry picked from commit 92fc3f539a55f927c369df2eb90777fc7b77b027) --- src/ozones/Server/public/js/plugins/zones-tab.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ozones/Server/public/js/plugins/zones-tab.js b/src/ozones/Server/public/js/plugins/zones-tab.js index 80980d2945..8f792209cd 100644 --- a/src/ozones/Server/public/js/plugins/zones-tab.js +++ b/src/ozones/Server/public/js/plugins/zones-tab.js @@ -302,7 +302,7 @@ function updateZoneInfo(req,zone_json){ \ \ Sunstone endpoint\ - '+zone.sunsendpoint+'\ + '+zone.sunsendpoint+'\ \ \ #VDCs\ @@ -597,7 +597,8 @@ $(document).ready(function(){ "sPaginationType": "full_numbers", "aoColumnDefs": [ { "bSortable": false, "aTargets": ["check"] }, - { "sWidth": "60px", "aTargets": [0,2] }, + { "sWidth": "60px", "aTargets": [0] }, + { "sWidth": "300px", "aTargets": [3] }, { "sWidth": "35px", "aTargets": [1] } ] }); From 5b3a0a6662bc888af6bfd71e1315ec7b2a8ef365 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Mon, 26 Sep 2011 20:05:32 +0200 Subject: [PATCH 07/20] Use the same string that was logged to launch the proxy (cherry picked from commit ab3da924718161be7b65007aeee32feadd8ecfec) --- src/sunstone/models/SunstoneServer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 03c73d4576..297bd58425 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -231,7 +231,7 @@ class SunstoneServer novnc_cmd = "#{config[:novnc_path]}/utils/wsproxy.py" novnc_exec = "#{novnc_cmd} #{proxy_port} #{host}:#{vnc_port}" $stderr.puts("Starting vnc proxy: #{novnc_exec}") - pipe = IO.popen("#{novnc_cmd} #{proxy_port} #{host}:#{vnc_port}") + pipe = IO.popen(novnc_exec) rescue Exception => e error = Error.new(e.message) return [500, error.to_json] From 51fce30e2f819dfe251e215818ffe4c6a21eb608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 23 Sep 2011 16:56:55 +0200 Subject: [PATCH 08/20] onedb: add migrator from 2.9.85 to 2.9.90(cherry picked from commit d6621dc598585eeef67db167b3a0a52f5e5d1b9a) --- install.sh | 1 + src/onedb/2.9.85_to_2.9.90.rb | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/onedb/2.9.85_to_2.9.90.rb diff --git a/install.sh b/install.sh index 72fb72b1d7..ef9069846a 100755 --- a/install.sh +++ b/install.sh @@ -652,6 +652,7 @@ IMAGE_DRIVER_FS_SCRIPTS="src/image_mad/remotes/fs/cp \ #------------------------------------------------------------------------------- ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/2.9.80_to_2.9.85.rb \ + src/onedb/2.9.85_to_2.9.90.rb \ src/onedb/onedb.rb \ src/onedb/onedb_backend.rb" diff --git a/src/onedb/2.9.85_to_2.9.90.rb b/src/onedb/2.9.85_to_2.9.90.rb new file mode 100644 index 0000000000..53a7d084ae --- /dev/null +++ b/src/onedb/2.9.85_to_2.9.90.rb @@ -0,0 +1,31 @@ +# -------------------------------------------------------------------------- * +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # +# Licensed under the Apache License, Version 2.0 (the "License"); you may * +# not use this file except in compliance with the License. You may obtain * +# a copy of the License at * +# * +# http://www.apache.org/licenses/LICENSE-2.0 * +# * +# Unless required by applicable law or agreed to in writing, software * +# distributed under the License is distributed on an "AS IS" BASIS, * +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * +# See the License for the specific language governing permissions and * +# limitations under the License. * +# -------------------------------------------------------------------------- * + +require "rexml/document" +include REXML + +module Migrator + def db_version + "2.9.90" + end + + def one_version + "OpenNebula 2.9.90" + end + + def up + return true + end +end From a2ad103ad9375ac364b950fa13321952d5d78179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 26 Sep 2011 16:31:54 +0200 Subject: [PATCH 09/20] Bug #832: Restore src/cloud/common/Configuration.rb This reverts 7a530fb77c0334d36b4b2404fc09792e1444197b (cherry picked from commit 9fc7f582e238110e2153bc9083c4345e0cb0417b) --- install.sh | 3 +- src/cloud/common/Configuration.rb | 115 ++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 src/cloud/common/Configuration.rb diff --git a/install.sh b/install.sh index ef9069846a..d187f9b443 100755 --- a/install.sh +++ b/install.sh @@ -792,7 +792,8 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/OpenNebula/Host.rb \ COMMON_CLOUD_LIB_FILES="src/cloud/common/CloudServer.rb \ src/cloud/common/CloudClient.rb \ - src/cloud/common/CloudAuth.rb" + src/cloud/common/CloudAuth.rb \ + src/cloud/common/Configuration.rb" COMMON_CLOUD_CLIENT_LIB_FILES="src/cloud/common/CloudClient.rb" diff --git a/src/cloud/common/Configuration.rb b/src/cloud/common/Configuration.rb new file mode 100644 index 0000000000..2189e4ad1a --- /dev/null +++ b/src/cloud/common/Configuration.rb @@ -0,0 +1,115 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +############################################################################### +# The Configuration Class represents a simple configuration file for the +# Cloud servers. It does not check syntax. +############################################################################### +class Configuration + + ########################################################################### + # Patterns to parse the Configuration File + ########################################################################### + + NAME_REG =/[\w\d_-]+/ + VARIABLE_REG =/\s*(#{NAME_REG})\s*=\s*/ + + SIMPLE_VARIABLE_REG =/#{VARIABLE_REG}([^\[]+?)(#.*)?/ + SINGLE_VARIABLE_REG =/^#{SIMPLE_VARIABLE_REG}$/ + ARRAY_VARIABLE_REG =/^#{VARIABLE_REG}\[(.*?)\]/m + + ########################################################################### + ########################################################################### + + def initialize(file) + @conf=parse_conf(file) + end + + def add_configuration_value(key,value) + add_value(@conf,key,value) + end + + def [](key) + @conf[key.to_s.upcase] + end + + ########################################################################### + ########################################################################### + +private + + # + # + # + def add_value(conf, key, value) + if conf[key] + if !conf[key].kind_of?(Array) + conf[key]=[conf[key]] + end + conf[key]< Date: Mon, 26 Sep 2011 17:00:08 +0200 Subject: [PATCH 10/20] onedb: Add 3.0 migrator. It changes the tm_nfs drivers to tm_shared(cherry picked from commit 980222f28eb335ef0c4d66613664f4a99d9148dc) --- install.sh | 1 + src/onedb/2.9.90_to_3.0.rb | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 src/onedb/2.9.90_to_3.0.rb diff --git a/install.sh b/install.sh index d187f9b443..e6cdb3ea0a 100755 --- a/install.sh +++ b/install.sh @@ -653,6 +653,7 @@ IMAGE_DRIVER_FS_SCRIPTS="src/image_mad/remotes/fs/cp \ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/2.9.80_to_2.9.85.rb \ src/onedb/2.9.85_to_2.9.90.rb \ + src/onedb/2.9.90_to_3.0.rb \ src/onedb/onedb.rb \ src/onedb/onedb_backend.rb" diff --git a/src/onedb/2.9.90_to_3.0.rb b/src/onedb/2.9.90_to_3.0.rb new file mode 100644 index 0000000000..8692af3bfe --- /dev/null +++ b/src/onedb/2.9.90_to_3.0.rb @@ -0,0 +1,48 @@ +# -------------------------------------------------------------------------- * +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # +# Licensed under the Apache License, Version 2.0 (the "License"); you may * +# not use this file except in compliance with the License. You may obtain * +# a copy of the License at * +# * +# http://www.apache.org/licenses/LICENSE-2.0 * +# * +# Unless required by applicable law or agreed to in writing, software * +# distributed under the License is distributed on an "AS IS" BASIS, * +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * +# See the License for the specific language governing permissions and * +# limitations under the License. * +# -------------------------------------------------------------------------- * + +require "rexml/document" +include REXML + +module Migrator + def db_version + "3.0" + end + + def one_version + "OpenNebula 3.0" + end + + def up + # The tm_nfs driver has been renamed to tm_shared + # CREATE TABLE host_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, state INTEGER, last_mon_time INTEGER, UNIQUE(name)); + + @db.fetch("SELECT * FROM host_pool") do |row| + doc = Document.new(row[:body]) + + source = nil + doc.root.each_element("TM_MAD") { |e| + if e.text.downcase == "tm_nfs" + e.text = "tm_shared" + + @db[:host_pool].filter(:oid => row[:oid]).update( + :body => doc.root.to_s) + end + } + end + + return true + end +end From 3a36b22644e4629ba617d19586abbacb123413e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 27 Sep 2011 11:41:55 +0200 Subject: [PATCH 11/20] Bug #832: Move Configuration.rb to onedb's lib location (cherry picked from commit fc6de1c4a02a3cf3dd7a1dbdbb1707dbbc141e73) --- install.sh | 6 +++--- src/{cloud/common => onedb}/Configuration.rb | 0 src/onedb/onedb.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/{cloud/common => onedb}/Configuration.rb (100%) diff --git a/install.sh b/install.sh index e6cdb3ea0a..23dc500a82 100755 --- a/install.sh +++ b/install.sh @@ -655,7 +655,8 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/2.9.85_to_2.9.90.rb \ src/onedb/2.9.90_to_3.0.rb \ src/onedb/onedb.rb \ - src/onedb/onedb_backend.rb" + src/onedb/onedb_backend.rb \ + src/onedb/Configuration.rb" #------------------------------------------------------------------------------- # Configuration files for OpenNebula, to be installed under $ETC_LOCATION @@ -793,8 +794,7 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/OpenNebula/Host.rb \ COMMON_CLOUD_LIB_FILES="src/cloud/common/CloudServer.rb \ src/cloud/common/CloudClient.rb \ - src/cloud/common/CloudAuth.rb \ - src/cloud/common/Configuration.rb" + src/cloud/common/CloudAuth.rb" COMMON_CLOUD_CLIENT_LIB_FILES="src/cloud/common/CloudClient.rb" diff --git a/src/cloud/common/Configuration.rb b/src/onedb/Configuration.rb similarity index 100% rename from src/cloud/common/Configuration.rb rename to src/onedb/Configuration.rb diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index 2d1210a55f..d528310b3b 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'cloud/Configuration' +require 'Configuration' require 'onedb_backend' class OneDB From fcb98539ce99109c4af3527415abb680cdb3556b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 27 Sep 2011 12:32:08 +0200 Subject: [PATCH 12/20] Allow user passwords with ':' characters (cherry picked from commit 6c5e90eb844e70df23e5cb0f37782e8f4b272299) --- src/authm_mad/one_auth_mad.rb | 2 +- src/um/User.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb index b1d40bcaf9..7f6a0b9f82 100755 --- a/src/authm_mad/one_auth_mad.rb +++ b/src/authm_mad/one_auth_mad.rb @@ -117,7 +117,7 @@ class AuthDriver < OpenNebulaDriver authN_path = File.join(@local_scripts_path, protocol) command = File.join(authN_path,ACTION[:authN].downcase) - command << ' ' << user << ' ' << password << ' ' << secret_attr.join(' ') + command << ' ' << user << ' ' << password << ' ' << secret_attr.join(':') local_action(command, request_id, ACTION[:authN]) end diff --git a/src/um/User.cc b/src/um/User.cc index 71b2d4cd28..c649eace68 100644 --- a/src/um/User.cc +++ b/src/um/User.cc @@ -27,7 +27,7 @@ #include "Group.h" -const string User::INVALID_CHARS = " :\t\n\v\f\r"; +const string User::INVALID_CHARS = " \t\n\v\f\r"; /* ************************************************************************** */ /* User :: Database Access Functions */ From 533539c93bf068af8f4750fe211b95be4a844bd6 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 28 Sep 2011 09:45:20 +0200 Subject: [PATCH 13/20] install_gems: Do not install xmlparser gem for ruby 1.9 --- share/install_gems/install_gems | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems index bbdf2c3a6e..f9dc603092 100755 --- a/share/install_gems/install_gems +++ b/share/install_gems/install_gems @@ -9,12 +9,16 @@ DEFAULT=%w{optional sunstone quota cloud ozones_server acct} if defined?(RUBY_VERSION) && RUBY_VERSION>="1.8.7" SQLITE='sqlite3' + + # xmlparser gem is not compatible with ruby 1.9 + OPTIONAL=%w{nokogiri} else SQLITE='sqlite3-ruby --version 1.2.0' + OPTIONAL=%w{nokogir xmlparser} end GROUPS={ - :optional => %w{nokogiri xmlparser}, + :optional => OPTIONAL, :quota => [SQLITE, 'sequel'], :sunstone => ['json', 'rack', 'sinatra', 'thin', 'sequel', SQLITE], :cloud => %w{amazon-ec2 rack sinatra thin uuid curb}, From 17509ee003be095fb4e5baa097145117b3ac7f58 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 28 Sep 2011 11:43:59 +0200 Subject: [PATCH 14/20] bug #670: let the user disable fs copy to context ISO (cherry picked from commit 291da9962c726e94dad9505606028fa09ca762d5) --- src/tm_mad/lvm/tm_context.sh | 9 ++++++++- src/tm_mad/shared/tm_context.sh | 10 ++++++++-- src/tm_mad/ssh/tm_context.sh | 10 ++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/tm_mad/lvm/tm_context.sh b/src/tm_mad/lvm/tm_context.sh index 6d6aea06ab..74061b6637 100755 --- a/src/tm_mad/lvm/tm_context.sh +++ b/src/tm_mad/lvm/tm_context.sh @@ -16,6 +16,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +CONTEXT_FILE=$1 + while (( "$#" )); do if [ "$#" == "1" ]; then DST=$1 @@ -56,7 +58,12 @@ for f in $SRC; do ;; *) - exec_and_log "cp -R $f $ISO_DIR" + if [ $SECURE_CONTEXT -eq 0 -o "$f" == "$CONTEXT_FILE" ]; then + exec_and_log "cp -R $f $ISO_DIR" \ + "Error copying $f to $ISO_DIR" + else + log "not copying potentialy dangerous file $f" + fi ;; esac done diff --git a/src/tm_mad/shared/tm_context.sh b/src/tm_mad/shared/tm_context.sh index db05f2dda0..fef2593fbe 100755 --- a/src/tm_mad/shared/tm_context.sh +++ b/src/tm_mad/shared/tm_context.sh @@ -16,6 +16,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +CONTEXT_FILE=$1 + while (( "$#" )); do if [ "$#" == "1" ]; then DST=$1 @@ -53,8 +55,12 @@ for f in $SRC; do ;; *) - exec_and_log "cp -R $f $ISO_DIR" \ - "Error copying $f to $ISO_DIR" + if [ $SECURE_CONTEXT -eq 0 -o "$f" == "$CONTEXT_FILE" ]; then + exec_and_log "cp -R $f $ISO_DIR" \ + "Error copying $f to $ISO_DIR" + else + log "not copying potentialy dangerous file $f" + fi ;; esac done diff --git a/src/tm_mad/ssh/tm_context.sh b/src/tm_mad/ssh/tm_context.sh index d5c16f6721..772b549e7f 100755 --- a/src/tm_mad/ssh/tm_context.sh +++ b/src/tm_mad/ssh/tm_context.sh @@ -16,6 +16,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +CONTEXT_FILE=$1 + while (( "$#" )); do if [ "$#" == "1" ]; then DST=$1 @@ -58,8 +60,12 @@ for f in $SRC; do ;; *) - exec_and_log "cp -R $f $ISO_DIR" \ - "Error copying $f to $ISO_DIR" + if [ $SECURE_CONTEXT -eq 0 -o "$f" == "$CONTEXT_FILE" ]; then + exec_and_log "cp -R $f $ISO_DIR" \ + "Error copying $f to $ISO_DIR" + else + log "not copying potentialy dangerous file $f" + fi ;; esac done From a10dd2f5dbc6fa9b6dc0e4c3ecc216a32aaa5578 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 28 Sep 2011 12:14:07 +0200 Subject: [PATCH 15/20] bug #670: Disable context security by default (cherry picked from commit 94b1707c423a38a8252505d70fdd71ea8c0222e9) --- src/tm_mad/lvm/tm_lvmrc | 3 +++ src/tm_mad/shared/tm_sharedrc | 4 ++++ src/tm_mad/ssh/tm_sshrc | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/src/tm_mad/lvm/tm_lvmrc b/src/tm_mad/lvm/tm_lvmrc index b3054c23e7..e01da3a0d5 100644 --- a/src/tm_mad/lvm/tm_lvmrc +++ b/src/tm_mad/lvm/tm_lvmrc @@ -22,6 +22,9 @@ VG_NAME= # Default size for logical volumes if not specified DEFAULT_LV_SIZE="1G" +# Set to 1 to disable adding files to context image other than context.sh +# itself or http url's +SECURE_CONTEXT=0 # -------------------------------------------------------------------------- # # Helper functions for the LVM plugin # diff --git a/src/tm_mad/shared/tm_sharedrc b/src/tm_mad/shared/tm_sharedrc index 52c0e6dab0..e1a1b9b0db 100644 --- a/src/tm_mad/shared/tm_sharedrc +++ b/src/tm_mad/shared/tm_sharedrc @@ -13,3 +13,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # #--------------------------------------------------------------------------- # + +# Set to 1 to disable adding files to context image other than context.sh +# itself or http url's +SECURE_CONTEXT=0 diff --git a/src/tm_mad/ssh/tm_sshrc b/src/tm_mad/ssh/tm_sshrc index 52c0e6dab0..e1a1b9b0db 100644 --- a/src/tm_mad/ssh/tm_sshrc +++ b/src/tm_mad/ssh/tm_sshrc @@ -13,3 +13,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # #--------------------------------------------------------------------------- # + +# Set to 1 to disable adding files to context image other than context.sh +# itself or http url's +SECURE_CONTEXT=0 From d07e4d42e93a92b769611dbb72a50b94c0eb6e9c Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 28 Sep 2011 12:19:05 +0200 Subject: [PATCH 16/20] Fix for wrong oZones reverse proxying for Sunstone --- src/ozones/Server/lib/OZones/ApacheWritter.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ozones/Server/lib/OZones/ApacheWritter.rb b/src/ozones/Server/lib/OZones/ApacheWritter.rb index 44119a6921..bd7c2c059f 100644 --- a/src/ozones/Server/lib/OZones/ApacheWritter.rb +++ b/src/ozones/Server/lib/OZones/ApacheWritter.rb @@ -29,8 +29,10 @@ module OZones htaccess << "RewriteRule ^#{vdc.name} " + "#{zone.endpoint} [P]\n" if zone.sunsendpoint != nil + htaccess << "RewriteRule ^sunstone_#{vdc.name}/(.+) " + + "#{zone.sunsendpoint}/$1 [P]\n" htaccess << "RewriteRule ^sunstone_#{vdc.name} " + - "#{zone.sunsendpoint} [P]\n" + "#{zone.sunsendpoint}/ [P]\n" end } } From 37618ecf45d2fdab166b4cd73a22e7adb7421323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 28 Sep 2011 12:40:40 +0200 Subject: [PATCH 17/20] Revert "Allow user passwords with ':' characters" This reverts commit fcb98539ce99109c4af3527415abb680cdb3556b. --- src/authm_mad/one_auth_mad.rb | 2 +- src/um/User.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb index 7f6a0b9f82..b1d40bcaf9 100755 --- a/src/authm_mad/one_auth_mad.rb +++ b/src/authm_mad/one_auth_mad.rb @@ -117,7 +117,7 @@ class AuthDriver < OpenNebulaDriver authN_path = File.join(@local_scripts_path, protocol) command = File.join(authN_path,ACTION[:authN].downcase) - command << ' ' << user << ' ' << password << ' ' << secret_attr.join(':') + command << ' ' << user << ' ' << password << ' ' << secret_attr.join(' ') local_action(command, request_id, ACTION[:authN]) end diff --git a/src/um/User.cc b/src/um/User.cc index c649eace68..71b2d4cd28 100644 --- a/src/um/User.cc +++ b/src/um/User.cc @@ -27,7 +27,7 @@ #include "Group.h" -const string User::INVALID_CHARS = " \t\n\v\f\r"; +const string User::INVALID_CHARS = " :\t\n\v\f\r"; /* ************************************************************************** */ /* User :: Database Access Functions */ From 69933ac673bb0b70fca2d7047b676eea1ee7a5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 28 Sep 2011 12:34:05 +0200 Subject: [PATCH 18/20] Bug #839: Add support in scheduler for auth tokens with protocol (cherry picked from commit 2bb8ce1e88d0dc3a9a9eb9de2f9c3f81aec2b07b) --- src/scheduler/include/Client.h | 2 +- src/scheduler/src/client/Client.cc | 45 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/scheduler/include/Client.h b/src/scheduler/include/Client.h index e82c10c9d8..276fd9cba2 100644 --- a/src/scheduler/include/Client.h +++ b/src/scheduler/include/Client.h @@ -96,7 +96,7 @@ private: int read_oneauth(string &secret); - int split_secret(const string secret, string& user, string& pass); + int split_secret(const string& secret); }; #endif /*ONECLIENT_H_*/ diff --git a/src/scheduler/src/client/Client.cc b/src/scheduler/src/client/Client.cc index b2bc97bc7a..5899ce9211 100644 --- a/src/scheduler/src/client/Client.cc +++ b/src/scheduler/src/client/Client.cc @@ -38,9 +38,6 @@ const int Client::MESSAGE_SIZE = 51200; void Client::set_one_auth(string secret) { - string user = ""; - string pass = ""; - int rc = 0; if( secret == "" ) @@ -50,18 +47,11 @@ void Client::set_one_auth(string secret) if ( rc == 0 ) { - rc = split_secret(secret, user, pass); + rc = split_secret(secret); - if( rc == 0 ) + if( rc != 0 ) { - string sha1_pass = SSLTools::sha1_digest(pass); - - one_auth = user + ":" + sha1_pass; - } - else - { - throw runtime_error("Wrong format for auth token, must " - "be :"); + throw runtime_error("Wrong format for auth token"); } } } @@ -132,23 +122,32 @@ int Client::read_oneauth(string &secret) return rc; } - -int Client::split_secret(const string secret, string& user, string& pass) +int Client::split_secret(const string& secret) { size_t pos; - int rc = -1; - pos=secret.find(":"); + pos = secret.find(":"); - if (pos != string::npos) + if ( pos == string::npos ) { - user = secret.substr(0,pos); - pass = secret.substr(pos+1); - - rc = 0; + return -1; } - return rc; + if ( secret.rfind(":") == pos ) + { + string user = secret.substr(0,pos); + string pass = secret.substr(pos+1); + + string sha1_pass = SSLTools::sha1_digest(pass); + + one_auth = user + ":" + sha1_pass; + } + else + { + one_auth = secret; + } + + return 0; } /* -------------------------------------------------------------------------- */ From 16f173fd44a17cdc2aba6721ee5f07f319e6badc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 28 Sep 2011 12:35:12 +0200 Subject: [PATCH 19/20] Bug #839: Add support in java oca for auth tokens with protocol (cherry picked from commit 9ee34a8b87938d440d110cfb58f3c094302093e9) --- .../src/org/opennebula/client/Client.java | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/oca/java/src/org/opennebula/client/Client.java b/src/oca/java/src/org/opennebula/client/Client.java index 6c06e92cf4..4268373780 100644 --- a/src/oca/java/src/org/opennebula/client/Client.java +++ b/src/oca/java/src/org/opennebula/client/Client.java @@ -158,31 +158,38 @@ public class Client{ String[] token = oneSecret.split(":"); - if(token.length != 2 ) + if ( token.length > 2 ) + { + oneAuth = oneSecret; + } + else if ( token.lenght == 2 ) + { + MessageDigest md = MessageDigest.getInstance("SHA-1"); + byte[] digest = md.digest(token[1].getBytes()); + + String hash = ""; + + for(byte aux : digest) + { + int b = aux & 0xff; + + if (Integer.toHexString(b).length() == 1) + { + hash += "0"; + } + + hash += Integer.toHexString(b); + } + + oneAuth = token[0] + ":" + hash; + } + else { throw new ClientConfigurationException( "Wrong format for authorization string: " + oneSecret + "\nFormat expected is user:password"); } - MessageDigest md = MessageDigest.getInstance("SHA-1"); - byte[] digest = md.digest(token[1].getBytes()); - - String hash = ""; - - for(byte aux : digest) - { - int b = aux & 0xff; - - if (Integer.toHexString(b).length() == 1) - { - hash += "0"; - } - - hash += Integer.toHexString(b); - } - - oneAuth = token[0] + ":" + hash; } catch (FileNotFoundException e) { From 820a028c9b2824cb25fcc53677d8da3dcb5a5cf7 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 28 Sep 2011 13:08:12 +0200 Subject: [PATCH 20/20] Change host multiplacement legend to VDC host sharing (cherry picked from commit b195a553fc84a4f7dd26319180af13e25739ddeb) --- src/ozones/Server/public/js/plugins/vdcs-tab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index db7e6fc211..aa35e31931 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -47,7 +47,7 @@ var create_vdc_tmpl =
\
\ - \ + \ \
Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.
\
\ @@ -75,7 +75,7 @@ var update_vdc_tmpl = \
\ - \ + \ \
Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.
\
\