wakame-vdc-webui 10.11.0 → 10.12.0

data/app/api/auth_server.rb

@@ -0,0 +1,28 @@
+module DcmgrGui
+  class AuthServer < Sinatra::Base
+    use Rack::MethodOverride
+
+    def protected!
+      unless authorized?
+        response['WWW-Authenticate'] = %(Basic realm="Wakame dcmgr authorization.")
+        throw(:halt, [401, "Not authorized.\n"])
+      end
+    end
+
+    def authorized?
+      @auth ||= Rack::Auth::Basic::Request.new(request.env)
+      (@auth.provided? && @auth.basic? && credentials = @auth.credentials) || ( return FALSE )
+
+      User.authenticate(credentials[0], credentials[1])
+    end
+
+    # Neither nginx nor this server removes '..' from the path...
+    get '/auth/*' do
+      protected!
+      command = /\/auth\/(.*)/.match(request.path_info)[1]
+      headers 'X-Accel-Redirect' => "/dcmgr_cmd/#{command}"
+
+      "auth response to '#{command}'"
+    end
+  end
+end

data/app/views/instances/index.html.erb

@@ -12,7 +12,6 @@ jQuery(function($){
 		<div class="controller clearfix">
 		  <div id="instanceaction">Instance Actions</div>
       <ul id="actionlist">
-        <li id="actionparent">Instance Actions</li>
 				<ul id="instanceaction">
 					<li class="terminate_instances"><a href="javascript:void(0);">Terminate</a></li>
 					<li class="reboot_instances" ><a href="javascript:void(0);">Reboot</a></li>

data/app/views/volumes/index.html.erb

@@ -21,7 +21,6 @@ jQuery(function($){
 		  <a href="javascript:void(0);" class="create_volume">Create Volume</a>
 		  <div id="volumeaction">Volume Actions</div>
     		  <ul id="volumelist">
-      		    <li><a href="javascript:void(0);">Volume Actions</a></li>
 		    <li class="attach_volume"><a href="javascript:void(0);">Attach Volume</a></li>
 		    <li class="detach_volume"><a href="javascript:void(0);">Detach Volume</a></li>
 	  	  </ul>

data/config/application-api.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../boot', __FILE__)
+
+Bundler.require(:default, ENV['RACK_ENV']) if defined?(Bundler)
+
+require 'app/models/schema'
+
+# Clean up...
+#require 'config/initializers/dcmgr_gui'
+@dcmgr_config = YAML::load(ERB.new(IO.read(File.join(Dir.getwd, 'config', 'database.yml'))).result)[ENV['RACK_ENV']]
+Schema.connect "#{@dcmgr_config['adapter']}://#{@dcmgr_config['host']}/#{@dcmgr_config['database']}?user=#{@dcmgr_config['user']}&password=#{@dcmgr_config['password']}"
+
+require 'app/models/base_new'
+require 'app/models/user'
+
+require 'app/api/auth_server'
+
+module DcmgrGui
+
+  # We need this in order to set 'DcmgrGui::Application.config.secret_token' used in 'user.rb'.
+  class ConfigHack
+    attr_accessor :secret_token
+  end
+
+  # Temp workaround:
+  class Application
+    def self.config
+      @config ||= ConfigHack.new
+    end
+  end
+end

data/config/environment-api.rb

@@ -0,0 +1,4 @@
+# Load the rails application
+require File.expand_path('../application-api', __FILE__)
+
+require File.expand_path('../initializers/secret_token', __FILE__)

data/config/initializers/dcmgr_gui.rb

@@ -7,8 +7,9 @@ ActiveResource::Connection.class_eval do
 end
 
 ActiveResource::Base.class_eval do 
-  self.site = 'http://your.dcmgr.api.server/'
+  #self.site = 'http://your.dcmgr.api.server/'
+  self.site = 'http://localhost:9001/'
 end
 
 @dcmgr_config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'database.yml'))).result)[Rails.env]
-Schema.connect "#{@dcmgr_config['adapter']}://#{@dcmgr_config['host']}/#{@dcmgr_config['database']}?user=#{@dcmgr_config['user']}&password=#{@dcmgr_config['password']}"
+Schema.connect "#{@dcmgr_config['adapter']}://#{@dcmgr_config['host']}/#{@dcmgr_config['database']}?user=#{@dcmgr_config['user']}&password=#{@dcmgr_config['password']}"

data/lib/tasks/dcmgr_api.rake

@@ -0,0 +1,32 @@
+namespace :api do
+  desc 'Create proxy configuration file.'
+  task :create_proxy_config => :environment do |t,args|
+    base_dir = Dir.getwd
+    filename = "./tmp/proxy.conf"
+
+    config_file = ERB.new File.new("./app/api/proxy_nginx.conf", "r").read
+    File.open(filename, "w+") { |f| f.write(config_file.result(binding)) }
+
+    puts "Created new proxy configuration file: '#{filename}'."
+  end
+
+  desc 'Start proxy server'
+  task :start_proxy => :environment do |t,args|
+    exec "sudo -u #{DcmgrGui::Application.config.proxy_root_user} nginx -c #{Dir.getwd}/tmp/proxy.conf"
+
+    puts "Nginx proxy server up and running."
+  end
+
+  desc 'Stop proxy server'
+  task :stop_proxy => :environment do |t,args|
+    exec "sudo -u #{DcmgrGui::Application.config.proxy_root_user} nginx -s stop -c #{Dir.getwd}/tmp/proxy.conf"
+
+    puts "Nginx proxy server shut down."
+  end
+  
+  task :start_auth => :environment do |t,args|
+    exec "rackup -o localhost -p 8081 config-api.ru"
+    
+    puts "Auth server up and runing"
+  end
+end

data/public/javascripts/dcmgr_gui/core.js

@@ -53,6 +53,7 @@ DcmgrGUI.Converter.fromMBtoGB = function(data){
 
 DcmgrGUI.Pagenate = DcmgrGUI.Class.create({
   initialize: function(params) {
+    var self = this;
     this.element = $('#pagenate');
     this.view = $("#viewPagenate").text();
     this.total = params.total;
@@ -61,8 +62,48 @@ DcmgrGUI.Pagenate = DcmgrGUI.Class.create({
     this.row = params['row'];
     this.start = this.getStartCount();
     this.offset = this.getOffsetCount();
-    $('.prev').bind("click",{obj: this},this.updatePage);
-    $('.next').bind("click",{obj: this},this.updatePage);
+    this.prev = DcmgrGUI.Util.createUIButton(this.element.find('.prev'),{
+      disabled : true,
+      text : false
+    });
+    
+    this.next = DcmgrGUI.Util.createUIButton(this.element.find('.next'),{
+      text : false
+    });
+    
+    this.prev.bind("click",{obj: this},function(event){
+      var self = event.data.obj;
+      if (self.prev.button("option","disabled")) { 
+        return false 
+      };
+
+      self.updatePage.call(this,event);
+
+      if (self.current_page === 1) {
+        self.prev.button("option", "disabled", true);
+        self.next.button("option", "disabled", false);
+      } else {
+        self.prev.button("option", "disabled", false);
+        self.next.button("option", "disabled", false);
+      }
+    });
+    
+    this.next.bind("click",{obj: this},function(event){
+      var self = event.data.obj;
+      if (self.next.button("option","disabled")) { 
+        return false 
+      };
+      
+      self.updatePage.call(this,event);
+      
+      if (self.current_page === self.page_count) {
+        self.prev.button("option", "disabled", false);
+        self.next.button("option", "disabled", true);
+      } else {
+        self.prev.button("option", "disabled", false);
+        self.next.button("option", "disabled", false);
+      }
+    });
 
     this.renderPagenate();
   },
@@ -81,10 +122,9 @@ DcmgrGUI.Pagenate = DcmgrGUI.Class.create({
     $("#viewPagenate").html(html+' '+this.view);    
   },
   updatePage: function(event){
-
     var self = event.data.obj;
-    var name = $(this).attr('class');
-    
+    var name = $(this).attr('class').split(' ')[0];
+
     if(self.current_page >= 1 && self.current_page < self.page_count) {
       if(name === 'next'){
         self.next_page = self.current_page +1;
@@ -268,6 +308,20 @@ DcmgrGUI.Util.getPagenateData = function(start,limit){
   return "start=" + start + "&" + "limit=" + limit;
 }
 
+DcmgrGUI.Util.createUIButton = function(element,options){
+  return element
+          .button(options)
+          .removeClass("ui-state-default")
+          .removeClass("ui-button")
+          .removeClass("ui-corner-all")
+          .hover(function(){
+            element.removeClass("ui-state-hover");
+          })
+          .focus(function(){
+            element.removeClass("ui-state-focus");
+          });
+}
+
 DcmgrGUI.List = DcmgrGUI.Class.create(DcmgrGUI.ContentBase, {
   initialize: function(params){
     DcmgrGUI.ContentBase.prototype.initialize(params);

data/public/javascripts/dcmgr_gui/security_group_panel.js

@@ -81,8 +81,6 @@ DcmgrGUI.prototype.securityGroupPanel = function(){
         bt_edit_security_group.open({"ids":[uuid]});
       }
       c_list.checkRadioButton(uuid);
-      $('#detail').html('');
-      return false;
     });
   });
   

data/public/stylesheets/common.css

@@ -467,7 +467,7 @@ body{
 }
 
 #content #mainarea_wide ul#actionlist{
-	position: fixed;
+	position: absolute;
 	margin: 26px 0 0 7px;
   /margin: 32px 0 0 -552px;
 	padding: 0;
@@ -1106,7 +1106,7 @@ body{
 }
 
 #content #mainarea_wide ul#volumelist{
-	position: fixed;
+	position: absolute;
 	margin: 26px 0 0 126px;
 	/margin: 32px 0 0 -552px;
 	padding: 0;

data/public/stylesheets/jquery-ui-1.8.4.custom.css

@@ -70,7 +70,7 @@
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; }
 .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #327e04; background: #67b021 url(../images/ui-bg_highlight-soft_25_67b021_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #d4ccb0; background: #fafaf4 url(../images/ui-bg_highlight-hard_100_fafaf4_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #459e00; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { background: #fafaf4 url(../images/ui-bg_highlight-hard_100_fafaf4_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #459e00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #459e00; text-decoration: none; }
 .ui-widget :active { outline: none; }
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 10
-  - 11
+  - 12
   - 0
-  version: 10.11.0
+  version: 10.12.0
 platform: ruby
 authors: 
 - axsh Ltd.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +09:00
+date: 2010-12-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - app/helpers/users_helper.rb
 - app/helpers/storage_pools_helper.rb
 - app/helpers/keypairs_helper.rb
+- app/api/auth_server.rb
 - app/models/information.rb
 - app/models/user.rb
 - app/models/schema.rb
@@ -171,6 +172,8 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/environment-api.rb
+- config/application-api.rb
 - config/boot.rb
 - config/environment.rb
 - config/routes.rb
@@ -326,6 +329,7 @@ files:
 - public/stylesheets/jquery-ui-1.8.4.custom.css
 - public/favicon.ico
 - lib/tasks/dcmgr_gui.rake
+- lib/tasks/dcmgr_api.rake
 - test/unit/helpers/security_groups_helper_test.rb
 - test/unit/helpers/snapshots_helper_test.rb
 - test/unit/helpers/images_helper_test.rb