alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now only registered websites can update via update manager

This commit is contained in:
Harry Bomrah 2014-11-24 18:21:00 +08:00
parent 466f08d4f6
commit 0623541d94
6 changed files with 96 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/admin/sites_controller.rb
View File

@ -55,9 +55,6 @@ class Admin::SitesController < OrbitAdminController
def preference
end
def update_manager
end
def update_orbit
end
@ -80,6 +77,7 @@ class Admin::SitesController < OrbitAdminController
end
def update_manager
@store_permissions = check_store_permissions
end
def get_update_history
@ -94,21 +92,26 @@ class Admin::SitesController < OrbitAdminController
end
def update_orbit
result = ""
need_stash = %x(git diff).blank?
%x(git stash) unless need_stash
%x(git fetch origin)
pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch})
%x(git stash pop) unless need_stash
store_permissions = check_store_permissions
if store_permissions["permission_granted"]
result = ""
need_stash = %x(git diff).blank?
%x(git stash) unless need_stash
%x(git fetch origin)
pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch})
%x(git stash pop) unless need_stash
if pull_result.include? "fatal: Not possible to fast-forward, aborting."
result = "failed"
if pull_result.include? "fatal: Not possible to fast-forward, aborting."
result = "failed"
else
result = "success"
Bundler.with_clean_env { `cd #{Rails.root} && bundle install` }
end
render :text => result
else
result = "success"
Bundler.with_clean_env { `cd #{Rails.root} && bundle install` }
render :json => store_permissions.to_json
end
render :text => result
end
def restart_server

2
app/controllers/admin/store_controller.rb
View File

@ -63,7 +63,7 @@ class Admin::StoreController < OrbitAdminController
private
def store_url
@store_url = "http://store.tp.rulingcom.com"
@store_url = OrbitStore::URL
# @store_url = "http://localhost:3000"
end
end

1
app/controllers/orbit_admin_controller.rb
View File

@ -81,5 +81,4 @@ class OrbitAdminController < ApplicationController
@current_user_is_sub_manager = current_user.is_sub_manager?(@module_app) rescue false
end
end

33
app/helpers/orbit_backend_helper.rb
View File

@ -1,3 +1,5 @@
require "uri"
require "net/http"
module OrbitBackendHelper
def self.included(base)
@ -152,6 +154,37 @@ module OrbitBackendHelper
@user_has_privileges
end
def check_store_permissions #checks with the store if it has proper access and rights to access store
store_permission = {}
store_token = current_site.store_token rescue nil
if !store_token.nil?
params_to_send = {'store_token' => current_site.store_token}
uri = URI.parse(OrbitStore::URL)
http = Net::HTTP.new(uri.host,uri.port)
request = Net::HTTP::Get.new("/site/permissions")
request.body = params_to_send.to_query
response = http.request(request)
data = JSON.parse(response.body)
if !data["success"]
case data["error"]
when "INVALID_SITE_TOKEN"
current_site.store_token = nil
current_site.save
end
store_permission["permission_granted"] = false
store_permission["error"] = data["error"]
store_permission["message"] = data["message"]
else
store_permission["permission_granted"] = true
end
else
store_permission["permission_granted"] = false
store_permission["error"] = "SITE_NOT_REGISTERED"
store_permission["message"] = "Site not registered."
end
store_permission
end
def render_401
render "public/401"
end

3
app/models/orbit_store.rb Normal file
View File

@ -0,0 +1,3 @@
class OrbitStore
URL = "http://store.tp.rulingcom.com"
end

41
app/views/admin/sites/update_manager.erb
View File

@ -94,6 +94,25 @@
<span class="break"></span>
<span class="panel-title"><%= t("update_manager_.available_updates") %></span>
<span id="num_new_updates" class="badge badge-important pull-right"></span>
<% if !@store_permissions["permission_granted"] %>
<span class="break pull-right"></span>
<small class="pull-right text-error">
<% if @store_permissions["message"].size > 30 %>
<a class="tooltipalert text-error" href="#"
onclick="return false;" title="<%= @store_permissions["message"] %>"><%= @store_permissions["message"][0..17] + "..." %></a>
<script type="text/javascript">
$('.tooltipalert').tooltip({
position: {
my: "center bottom-4",
at: "center top"
}
});
</script>
<% else %>
<%= @store_permissions["message"] %>
<% end %>
</small>
<% end %>
</div>
<div class="pannel-body">
<table class="table table-striped">
@ -104,7 +123,11 @@
</div>
</div>
<div style="height: 55px;">
<% if @store_permissions["permission_granted"] %>
<button id="update_btn" class="btn btn-primary pull-right" style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.system_update") %></button>
<% else %>
<a href="/<%= I18n.locale.to_s %>/admin/designs" class="pull-right">Please register here.</a>
<% end %>
</div>
</div>
<div id="update_status">
@ -113,6 +136,24 @@
<i class="icon-info-sign"></i>
<span class="break"></span>
<span class="panel-title"><%= t("update_manager_.update_status") %></span>
<% if !@store_permissions["permission_granted"] %>
<small class="pull-right text-error">
<% if @store_permissions["message"].size > 30 %>
<a class="tooltipalert text-error" href="#"
onclick="return false;" title="<%= @store_permissions["message"] %>"><%= @store_permissions["message"][0..17] + "..." %></a>
<script type="text/javascript">
$('.tooltipalert').tooltip({
position: {
my: "center bottom-4",
at: "center top"
}
});
</script>
<% else %>
<%= @store_permissions["message"] %>
<% end %>
</small>
<% end %>
</div>
<div class="pannel-body">
<div id="update_done" class="alert alert-success" style="font-size: 16px; text-align: center; margin: 0px;">