cyclid-ui 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6a99f9802100c3fe15f93e3803c624106d7c62
-  data.tar.gz: 83257bb0735724017e9f6f6276e34a359ecd9d72
+  metadata.gz: 858197a4f94db4bbeb1e4960410c1fda2605918e
+  data.tar.gz: 7d97dd2d8908244cfd2243d0e180f4fa4818c72d
 SHA512:
-  metadata.gz: 3d0377e09d764eaa4faca71fbc86667d25f854581bf3c7866392f17d81c97531fe5d760b81a5c0e6cc258b82d28cb42e01bcc328d8c1ea3e9be003285063848e
-  data.tar.gz: e547570fe202d684e48be60f3dc36f79835c18c76c89f192bc54c76f3ac5ff18da8ad03cd337ec42b9904afecc43bba6105ef03cf1a93f8230b7dba32dad9c5e
+  metadata.gz: 448e078b6f05216fb65078bdd758b4ebf430b9a7851a659f194fccc03c90ab757f66566aceba5cc232c22e611ed791fffb0176e61575e460db313190ff347bd8
+  data.tar.gz: 7af9088a91c768294cc16a41840f60dcd30faf40bb79f0915bc047fe0258c9a3b819234ef4010b50b4e3aea3e0dc0bdc89f3a333da398b2e65181cd89bb3fc91

data/app/cyclid_ui.rb

@@ -55,16 +55,24 @@ module Cyclid
     # Sinatra application
     class App < Sinatra::Application
       use Rack::Deflater
-      use Rack::Session::Pool,
+      use Rack::Session::Cookie,
           expire_after: 31_557_600,
-          secret: ENV['COOKIE_SECRET'] || '8f54749dcb0ae0843cdd9669b797d311'
+          secret: ENV['COOKIE_SECRET'] || '8f54749dcb0ae0843cdd9669b797d311',
+          domain: Cyclid.config.domain
       use Rack::Csrf,
           raise: true,
           skip: ['POST:/login',
-                 'POST:/unauthenticated']
+                 'POST:/unauthenticated',
+                 'POST:/user/.*/invalidate']
 
       helpers Helpers
 
+      if production?
+        error do
+          redirect to '/'
+        end
+      end
+
       register Sinatra::Flash
 
       configure do
@@ -145,6 +153,11 @@ module Cyclid
       use Controllers::User
       use Controllers::Health
       use Controllers::Default
+
+      # Catch-all route
+      get '*' do
+        redirect to '/'
+      end
     end
   end
 end

data/app/cyclid_ui/config.rb

@@ -20,7 +20,7 @@ module Cyclid
   module UI
     # Cyclid UI configuration
     class Config
-      attr_reader :memcached, :log, :server_api, :client_api, :signup
+      attr_reader :memcached, :log, :server_api, :client_api, :signup, :domain
 
       def initialize(path)
         # Try to load the configuration file. If it can't be loaded, we'll
@@ -58,6 +58,9 @@ module Cyclid
 
         # URL of the signup link, if one is defined
         @signup = manage['signup'] || nil
+
+        # Our domain; used when setting cookies
+        @domain = manage['domain'] || nil
       rescue StandardError => ex
         abort "Failed to load configuration file #{path}: #{ex}"
       end

data/app/cyclid_ui/controllers/auth.rb

@@ -65,6 +65,7 @@ module Cyclid
           response.set_cookie('cyclid.token',
                               value: token_data['token'],
                               expires: Time.now + 21_600_000, # +6 hours
+                              domain: Cyclid.config.domain,
                               path: '/',
                               http_only: false) # Must be available for AJAX
 

data/app/cyclid_ui/controllers/user.rb

@@ -13,11 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'sinatra/cross_origin'
+
 module Cyclid
   module UI
     module Controllers
       # Sinatra controller for user related endpoints
       class User < Base
+        register Sinatra::CrossOrigin
+
         get '/user/:username' do
           authenticate!
 
@@ -37,6 +41,20 @@ module Cyclid
           mustache :user
         end
 
+        post '/user/:username/invalidate' do
+          cross_origin
+
+          username = params[:username]
+
+          payload = parse_request_body
+          token = payload['token']
+
+          # Ensure the User is removed from Memcached
+          Models::User.invalidate(username: username, token: token)
+
+          200
+        end
+
         get '/user/:username/intro' do
           authenticate!
 

data/app/cyclid_ui/helpers.rb

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'oj'
+
 module Cyclid
   module UI
     # Various helper methods for Sinatra controllers
@@ -32,6 +34,31 @@ module Cyclid
         flash[:login_error] = 'Invalid username or password'
         halt 401, flash.now[:login_error]
       end
+
+      # Safely parse & validate the request body
+      def parse_request_body
+        # Parse the the request
+        begin
+          request.body.rewind
+
+          if request.content_type == 'application/json' or \
+             request.content_type == 'text/json'
+
+            data = Oj.load request.body.read
+          else
+            halt(415, "unsupported content type #{request.content_type}")
+          end
+        rescue Oj::ParseError, YAML::Exception => ex
+          Cyclid.logger.debug ex.message
+          halt(400, ex.message)
+        end
+
+        # Sanity check the request
+        halt(400, 'request body can not be empty') if data.nil?
+        halt(400, 'request body is invalid') unless data.is_a?(Hash)
+
+        return data
+      end
     end
 
     # Sinatra Warden AuthN/AuthZ helpers

data/app/cyclid_ui/models/user.rb

@@ -90,6 +90,20 @@ module Cyclid
 
           user_data
         end
+
+        def self.invalidate(args)
+          username = args[:username] || args['username']
+          memcache = Memcache.new(server: Cyclid.config.memcached)
+          begin
+            user_fetch(args)
+            memcache.expire(username)
+          rescue Memcached::ServerIsMarkedDead => ex
+            Cyclid.logger.fatal "cannot connect to memcached: #{ex}"
+            # If Memcache is down there is nothing to expire
+          rescue StandardError => ex
+            Cyclid.logger.debug "user invalidate failed: #{ex}"
+          end
+        end
       end
     end
   end

data/app/cyclid_ui/templates/intro.mustache

@@ -3,7 +3,7 @@
     <div class="col-md-8">
       <h1>Welcome to Cyclid!</h1>
       <p><span style="font-size:140%;">You currently don't belong to any organizations. Without an organization, you won't be able to run any jobs!</span></p>
-      <p>You can either <a href="{{signup}}/organization">create a new organization</a>, or ask someone to add you to an existing organization.</p>
+      <p>You can either <a href="{{signup}}/manage/{{username}}">create a new organization</a>, or ask someone to add you to an existing organization.</p>
       <hr>
       <p>While you're here, there are some useful links which can help you get the most from Cyclid:</p>
       <ul style="line-height: 1.75;">

data/app/cyclid_ui/templates/layout.mustache

@@ -51,7 +51,7 @@
                   {{#organization}}
                   <li role="separator" class="divider"></li>
                   {{/organization}}
-                  <li><a href="{{signup}}/organization" target="_blank">Create a new Organization</a></li>
+                  <li><a href="{{signup}}/manage/{{username}}" target="_blank">Manage your Organizations</a></li>
                   {{/signup}}
                 </ul>
               </li>

data/app/cyclid_ui/templates/user.mustache

@@ -24,7 +24,7 @@
             <dt>Email</dt><dd id="user_email"></dd>
             <dt>Organizations</dt><dd id="user_org_list"></dd>
             {{#signup}}
-            <dd><a href="{{signup}}/organization" target="_blank">Create a new Organization</a></dd>
+            <dd><a href="{{signup}}/manage/{{username}}" target="_blank">Manage your Organizations</a></dd>
             {{/signup}}
           </div>
         </div>

data/lib/cyclid_ui/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module UI
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

data/public/js/job.js

@@ -179,7 +179,7 @@ function ji_get_failed(xhr) {
   // the worst (cyclid.token is invalid) and force re-authentication, too.
   if(xhr.status == 401 || xhr.status == 0){
     console.log(`Failed to retrieve job list: status was ${xhr.status}`);
-    window.location = '/login';
+    window.location = '/';
   } else {
     var failure_message = `<p>
                              <h2>Failed to retrieve job</h2><br>

data/public/js/organization.js

@@ -76,7 +76,7 @@ function org_job_list_failed(xhr) {
   // the worst (cyclid.token is invalid) and force re-authentication, too.
   if(xhr.status == 401 || xhr.status == 0){
     console.log(`Failed to retrieve job list: status was ${xhr.status}`);
-    window.location = '/login';
+    window.location = '/';
   } else {
     var failure_message = `Failed to retrieve job list<br>
                            <strong>${xhr.status}:</strong> ${xhr.responseText}`;

data/public/js/user.js

@@ -10,7 +10,7 @@ function user_get_failed(xhr){
   // the worst (cyclid.token is invalid) and force re-authentication, too.
   if(xhr.status == 401 || xhr.status == 0){
     console.log(`Failed to retrieve job list: status was ${xhr.status}`);
-    window.location = '/login';
+    window.location = '/';
   } else {
     var failure_message = `Failed to retrieve user details<br>
                            <strong>${xhr.status}:</strong> ${xhr.responseText}`;
@@ -41,7 +41,7 @@ function user_update_details(user){
       config_org.click(function(e) {
         var org = $(this).data('org');
 
-        var config = `server: ${gblAPIURL}\n` +
+        var config = `url: ${gblAPIURL}\n` +
                      `organization: ${org}\n` +
                      `username: ${user.username}\n` +
                      `secret: ${user.secret}\n`;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all