ocp_registry 0.0.1.alpha → 0.0.5.pre

data/lib/ocp_registry.rb

@@ -16,6 +16,7 @@ require "yajl"
 require "securerandom"
 require "uri"
 require "erb"
+require "json"
 
 require "ocp_registry/yaml_helper"
 require "ocp_registry/runner"

data/lib/ocp_registry/api_controller.rb

@@ -7,38 +7,39 @@ module Ocp::Registry
 
   	not_found do
       exception = request.env["sinatra.error"]
-      @logger.debug(request.path_info)
-      @logger.error(exception.message)
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
+      @logger.info(exception.message)
       do_response({:status => "not_found"}, nil)
     end
 
     error do
       exception = request.env["sinatra.error"]
-      @logger.error(exception)
+      @logger.info(exception)
       status(500)
       do_response({:status => "error"}, nil)
     end
 
     error Ocp::Registry::Error do
       error = request.env["sinatra.error"]
+      @logger.info(error.message)
       status(error.code)
       do_response({:status => "error", :message => error.message},nil)
     end
 
   	# get application list
   	get '/v1/applications' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
       email = params[:email]
       protected! unless email
-      data = []
-
-  		result = @application_manager.list(email)
-
-      result.each do |app|
-        data << app.to_hash
-      end
       if email
-  		  do_response(data, :list)
+        data = {:status => "error", :message => "Sorry, list all applications of a specific user is not supported any more since security risks"}
+  		  do_response(data)
       else
+        data = []
+        result = @application_manager.list
+        result.each do |app|
+          data << app.to_hash
+        end
         do_response(data, :list, :review => true)
       end
   	end
@@ -49,6 +50,7 @@ module Ocp::Registry
 
     # check project name 
     post '/v1/applications/check' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
       if project = params[:project] 
         result = @application_manager.existed_tenant?(project)
         do_response(!result, nil)
@@ -57,27 +59,51 @@ module Ocp::Registry
 
   	# get an application detail
   	get '/v1/applications/:id' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
       if(params[:id] == "default")
         do_response(@application_manager.default, :apply)
       else
     		application = @application_manager.show(params[:id])
         if("true" == params[:review])
           protected!
-    		  do_response(application.to_hash, :review)
+          if "true" == params[:modified]
+      		  data = application.to_hash(:lazy_load => false, :limit => 20) 
+            view = :admin_review
+          else
+            data = application.to_hash(:lazy_load => false, :limit => 10)
+            view = :admin_review
+          end
         else
-          do_response(application.to_hash, :view)
+          if "true" == params[:modified]
+            data = application.to_hash(:lazy_load => false, :limit => 20)
+            view = :applicant_review
+          else
+            data = application.to_hash(:lazy_load => false, :limit => 10)
+            view = :view
+          end
         end
+        do_response(data,view)
       end
   	end
 
   	# create an application
   	post '/v1/applications' do
       app_info = Yajl.load(request.body.read)
-      puts app_info
+
+      check_fields = ["email","project","settings"]
+      valid, fields = validate_not_null(check_fields,app_info)
+      return do_response({:status => "error", :message => "Filed [#{fields.join(", ")}] can not be null"}) unless valid
+
+      check_fields = ["email"]
+      valid, fields = validate_email(check_fields,app_info)
+      return do_response({:status => "error", :message => "Field [#{fields.join(", ")}] is not a valid email address"}) unless valid
+
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip} : #{app_info}")
+
       if app_info.kind_of?(Hash) && app_info['settings'].kind_of?(Hash)
-        default = Yajl::load(@application_manager.default[:settings])
+        default = Yajl::load(@application_manager.default[:registry_settings].first[:settings])
         settings = default.merge(app_info['settings'])
-        app_info[:settings] = json(settings) 
+        app_info["settings"] = json(settings)
       end
   		application = @application_manager.create(app_info)
       app_info = application.to_hash
@@ -87,12 +113,15 @@ module Ocp::Registry
   	# approve an application
   	post '/v1/applications/:id/approve' do
   	  protected!
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
   	  result = @application_manager.approve(params[:id])
       do_response(result.to_hash, nil)
   	end
 
   	# refuse an application
   	post '/v1/applications/:id/refuse' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
+
   	  protected!
   	  body = Yajl.load(request.body.read)
       comments = nil
@@ -101,6 +130,41 @@ module Ocp::Registry
       do_response(result.to_hash, nil)
   	end
 
+    post '/v1/applications/:id/settings' do
+      setting = Yajl.load(request.body.read)
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip} : #{setting}")
+
+      setting = {} if setting.nil?
+
+      if setting["from"] && setting["from"].strip.upcase == "ADMIN"
+        protected! 
+        setting["from"] = "ADMIN"
+      else
+        setting["from"] = "USER"
+      end
+      result = @application_manager.add_setting_for(params[:id],setting)
+      do_response(result.to_hash)
+    end
+
+    get '/v1/applications/:id/settings' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
+
+      result = @application_manager.list_settings(params[:id])
+
+      data = []
+      result.each do |setting|
+        data << setting.to_hash
+      end
+
+      do_response(data)
+    end
+
+    post '/v1/applications/:id/cancel' do
+      @logger.info("[RECEIVED] #{request.request_method} : #{request.url} - #{request.ip}")
+
+      result = @application_manager.cancel(params[:id])
+      do_response(result.to_hash)
+    end
 
   	def initialize
       super
@@ -114,8 +178,10 @@ module Ocp::Registry
 
     def do_response(data, view = nil, mark = nil)
       if request.accept?('application/json') || view.nil? || (data.is_a?(Hash)&&'error' == data[:status])
+        @logger.info("[RESPONSE] JSON : json - #{data}")
         json(data)
       else
+        @logger.info("[RESPONSE] VIEW : #{view.to_s} - #{data}")
         erb :base do 
           erb view ,:locals => {:data => data ,:mark => mark}
         end
@@ -142,5 +208,29 @@ module Ocp::Registry
       Yajl::Encoder.encode(payload)
     end
 
+    def validate_not_null(fields=[], source={})
+      validate(fields, source){|value| !value.nil? }
+    end
+
+    def validate_email(fields=[], source={})
+      validate(fields, source){|value| value =~ Ocp::Registry::Common::EMAIL_REGEX}
+    end
+
+    def validate(fields,source)
+      return true if fields.empty?
+      return false ,fields if source.empty? || !block_given?
+
+      not_pass = []
+      fields.each do |field|  
+        not_pass << field unless yield source[field]
+      end
+
+      if not_pass.empty?
+        return true, []
+      else
+        return false , not_pass
+      end
+    end
+
   end
 end

data/lib/ocp_registry/application_manager.rb

@@ -9,29 +9,163 @@ module Ocp::Registry
 			@logger = Ocp::Registry.logger
 		end
 
-		def list(email=nil)
+		def list(email = nil)
 			if email
 				results = Ocp::Registry::Models::RegistryApplication.reverse_order(:created_at).where(:email => email)
+				@logger.debug("List applications for user - #{email}")
 			else
 				results = Ocp::Registry::Models::RegistryApplication.reverse_order(:created_at).all
+				@logger.debug("List applications for ADMIN")
 			end
-		
 			results
 		end
 
+		def cancel(app_id)
+
+			app_info = get_application(app_id)
+
+			unless app_info.state == 'PENDING'
+				return {:status => "error", :message => "Application [#{app_info.project}] - [#{app_id}] has been #{app_info.state}"} 
+			end
+			
+			Ocp::Registry::Models::RegistryApplication.where(:id => app_id).update(:state => 'CANCELED', :end_at => Time.now.utc.to_s)
+
+			app_info = get_application(app_id)
+
+			@logger.debug("[CANCELED] project [#{app_info.project}] - [#{app_info.id}] at [#{app_info.end_at}]")
+
+			if @mail_manager
+				admin_msg = {
+					:app_info => app_info
+				}
+				mail = prepare_mail_properties(:cancel_admin, @mail_manager.admin_emails, admin_msg)
+				@mail_manager.send_mail(mail)
+				user_msg = {
+					:app_info => app_info
+				}
+				mail = prepare_mail_properties(:cancel_user, app_info.email, user_msg)
+				@mail_manager.send_mail(mail)
+			end
+
+			app_info
+		end
+
+		def list_settings(app_id)
+
+			Ocp::Registry::Models::RegistrySetting.reverse_order(:version).where(:registry_application_id => app_id)
+
+		end
+
 		def show(app_id)
+
 			app_info = get_application(app_id)
+
 			return {:status => "error", :message => "Application with id - [#{app_id}] is not existed"} if app_info.nil?
+
+			app_info
+		end
+
+		def add_setting_for(app_id, setting)
+
+			app_info = get_application(app_id)
+
+			last_setting = Ocp::Registry::Models::RegistrySetting.where(:registry_application_id => app_id).order_by(:version).last
+																													 
+			if last_setting.from == setting["from"]
+				wait_for = setting["from"] == "ADMIN" ?  app_info.email : "Administrator"
+				return {:status => "error", :message => "Please wait for #{wait_for} review your last updates at #{last_setting.updated_at}"}
+			end
+
+			change_set = []
+			if setting && setting["settings"]
+				src = Yajl::load(last_setting.settings)
+				dest = setting["settings"]
+				
+				merged = src.merge(dest) do |key, v1, v2|
+					if v1 != v2 
+						change = {
+							:key => key,
+							:from => v1,
+							:to => v2
+						}
+						change_set << change
+					end
+					v2
+				end
+				return {:status => "error", :message => "No changes in settings are found"} if change_set.empty?
+
+				set = Yajl::Encoder.encode(merged)
+				comments = "#{setting["comments"]}" if setting["comments"]				
+
+				@logger.info("Project [#{app_info.project}] - [#{app_info.id}] setting changed : #{change_set}")
+			else
+				set = last_setting.settings
+				comments = "ACCEPT"
+				comments += " - #{setting["comments"]}" if setting["comments"]
+
+				@logger.info("Project [#{app_info.project}] - [#{app_info.id}] setting accepted : #{set}")
+			end
+
+
+			update_time = Time.now.utc.to_s
+			last_setting.comments = comments
+			last_setting.updated_at = update_time
+			last_setting.save_changes
+
+			@logger.debug("Project [#{app_info.project}] - [#{app_info.id}] setting [#{last_setting.id}] comments - [#{comments}]")
+
+			new_setting = Ocp::Registry::Models::RegistrySetting.new(:registry_application_id => app_id,
+																														 	 :updated_at => update_time,
+																														   :settings => set,
+																														   :version => (last_setting.version + 1),
+																														   :from => setting["from"])
+			new_setting.save
+
+			@logger.info("Project [#{app_info.project}] - [#{app_info.id}] current setting is #{new_setting.id} - #{new_setting.settings}")
+
+			if @mail_manager
+				if setting["from"] == "ADMIN"
+					link = gen_app_uri(app_id, :modified => true)
+					mail_to = app_info.email
+				else
+					link = gen_app_uri(app_id, :modified => true, :review => true)
+					mail_to = @mail_manager.admin_emails
+				end
+
+				msg = {
+					:from => setting["from"] == "ADMIN" ? "Administrator" : app_info.email ,
+					:name => setting["from"] == "ADMIN" ?  "User from #{app_info.email}" : "Administrator" ,
+					:change_set => change_set ,
+					:app_info => app_info ,
+					:comments => comments , 
+					:time => update_time ,
+					:application_link => link
+				}
+ 
+				mail = prepare_mail_properties(:modify, mail_to, msg)
+				@mail_manager.send_mail(mail)	
+			end
+
 			app_info
 		end
 
 		def default 
-			@default ||= {
+			return @default if @default
+
+			settings = Yajl::Encoder.encode(@cloud_manager.default_quota)
+			default_setting = {
+				:settings => settings
+			}
+			registry_settings = [] << default_setting
+
+
+			@default = {
 				:email => "" ,
 				:project => "" ,
 				:description => "" ,
-				:settings => Yajl::Encoder.encode(@cloud_manager.default_quota)
+				:registry_settings => registry_settings
 			}
+
 		end
 
 		def approve(app_id)
@@ -41,7 +175,7 @@ module Ocp::Registry
 
 			return {:status => "error", :message => "Application [#{app_info.project}] - [#{app_id}] has been #{app_info.state}"} unless app_info.state == 'PENDING'
 
-			unless existed_tenant?(app_info.project, :find_local => false) then
+			unless existed_tenant?(app_info.project, :find_local => false)
 				# create project tenant and user
 				tenant = @cloud_manager.create_tenant(app_info.project, app_info.description)
 
@@ -68,14 +202,24 @@ module Ocp::Registry
 
 				#assign quota to project
 
-				settings = @cloud_manager.set_tenant_quota(tenant.id, Yajl.load(app_info.settings))
+				current_setting = app_info.registry_settings_dataset.order_by(:version).last
+				settings = @cloud_manager.set_tenant_quota(tenant.id, Yajl.load(current_setting.settings))
+
+				time = Time.now.utc.to_s
+
+				current_setting.comments = "APPROVED"
+				current_setting.updated_at = time
+				current_setting.save_changes
 
 				Ocp::Registry::Models::RegistryApplication.where(:id => app_id)
-																									.update(:state => 'APPROVED',
-					                                                :updated_at => Time.now.utc.to_s,
-					                                                :settings => Yajl::Encoder.encode(settings) )
+																									.update(:state => 'APPROVED', :end_at => time)
+
+				@logger.info("Project [#{app_info.project}] - [#{app_info.id}] is [APPROVED] at #{time} - setting : #{settings}")
+
 				app_info = get_application(app_id)
+
 				if @mail_manager
+
 					admin_msg = {
 						:app_info => app_info , 
 						:application_link => gen_app_uri(app_id, :review => true) ,
@@ -83,16 +227,17 @@ module Ocp::Registry
 					}
 					mail = prepare_mail_properties(:approve_admin, @mail_manager.admin_emails, admin_msg)
 					@mail_manager.send_mail(mail)
+
 					user_msg = {
 						:app_info => app_info ,
 						:application_link => gen_app_uri(app_id) ,
-						:applications_link => gen_app_uri(nil, :email => app_info.email) ,
 						:login => Ocp::Registry.cloud_login_url ,
 						:username => username ,
 						:password => password
 					}
 					mail = prepare_mail_properties(:approve_user, app_info.email, user_msg)
 					@mail_manager.send_mail(mail)
+
 				end
 				app_info
 			else
@@ -104,19 +249,36 @@ module Ocp::Registry
 
 		def refuse(app_id,comments)
 			app_info = get_application(app_id)
-			return {:status => "error", :message => "Application with id - [#{app_id}] is not existed"} if app_info.nil?
-			return {:status => "error", :message => "Application [#{app_info.project}] - #{app_id} has been #{app_info.state}"} unless app_info.state == 'PENDING'
+
+			if app_info.nil?
+				return {:status => "error", :message => "Application with id - [#{app_id}] is not existed"}
+			end
+
+			unless app_info.state == 'PENDING'
+				return {:status => "error", :message => "Application [#{app_info.project}] - #{app_id} has been #{app_info.state}"} 
+			end
 
 			comments ||= "no comments"
-			Ocp::Registry::Models::RegistryApplication.where(:id => app_id)
-																								.update(:state => 'REFUSED',
-																												:updated_at => Time.now.utc.to_s,
-																												:comments => comments)
+			time = Time.now.utc.to_s
+
+			app_info.state = 'REFUSED'
+			app_info.end_at = time
+			current_setting = app_info.registry_settings_dataset.order_by(:version).last
+			current_setting.updated_at = time
+
+			current_setting.comments = "REFUSED - #{comments}"
+
+			current_setting.save_changes
+			app_info.save_changes
+
+			@logger.info("Project [#{app_info.project}] - [#{app_info.id}] is [REFUSED] at #{time} - setting : #{current_setting.settings}")
+
 			app_info = get_application(app_id)
 
 			if @mail_manager
 				admin_msg = {
 					:app_info => app_info , 
+					:comments => current_setting.comments ,
 					:application_link => gen_app_uri(app_id, :review => true) ,
 					:applications_link => gen_app_uri
 				}
@@ -124,8 +286,8 @@ module Ocp::Registry
 				@mail_manager.send_mail(mail)
 				user_msg = {
 					:app_info => app_info , 
+					:comments => current_setting.comments ,
 					:application_link => gen_app_uri(app_id) ,
-					:applications_link => gen_app_uri(nil, :email => app_info.email) 
 				}
 				mail = prepare_mail_properties(:refuse_user, app_info.email, user_msg)
 				@mail_manager.send_mail(mail)
@@ -137,7 +299,12 @@ module Ocp::Registry
 			if existed_tenant?(app_info['project'])
 				{:status => "error", :message => "Project name [#{app_info['project']}] has been used"}
 			else
+				setting = app_info.delete("settings")
 		 		result = Ocp::Registry::Models::RegistryApplication.create(app_info)
+		 		result.add_registry_setting(:settings => setting)
+
+				@logger.info("Project [#{result.project}] - [#{result.id}] is [CREATED] - setting : #{setting}")
+
 				if @mail_manager
 					admin_msg = {
 						:app_info => result , 
@@ -149,7 +316,6 @@ module Ocp::Registry
 					user_msg = {
 						:app_info => result ,
 						:application_link => gen_app_uri(result.id) ,
-						:applications_link => gen_app_uri(nil, :email => result.email) 
 					}
 					mail = prepare_mail_properties(:request_user, result.email, user_msg)
 					@mail_manager.send_mail(mail)
@@ -165,11 +331,7 @@ module Ocp::Registry
 				return true if local_existed
 			end
 		  remote_existed = @cloud_manager.get_tenant_by_name(tenant)? true : false
-		  if remote_existed
-		  	return true
-		  else
-		  	return false
-		  end
+		  return remote_existed
 		end
 
 		private