cellect-server 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c22c0c9de05b34f0da9f19778ffc5cb89faf2f
-  data.tar.gz: 6018574d21d7b9c74a67419bfff573153bdfcf9c
+  metadata.gz: ad603f50ab4f1cb53a8d2f67792f1acae0484d14
+  data.tar.gz: 8c9c4df72fbddd0e1ae3f357f14dc6c3bac2c384
 SHA512:
-  metadata.gz: 47f439777229098490e256db315e66e9bb20f285262f2a1bf72cbeca3ecac88c2c7055e9bf3b05a2a6aef685084e0d7c860f745301e0372d957361afb2cd01da
-  data.tar.gz: b73b3f427c2329dd3ef7b7e2d0697cabf09fc07624f2d33f2d994f74cff8578b7ccc9ba9b9daacaa2e7e7d6e8b002a7f1b739c788a2bea2bc6e901c12564b75b
+  metadata.gz: 49c3dbb9447b9f12920b49c8af8350e536b7318c2225228a8b1f64b8dc5e33fe6a2515d8dc8d0a2b2c63a39b2f16af844d2e1b94d5935c9c8abd978339a94dcd
+  data.tar.gz: 1e772e5a66f80a5557be992a73460e46b132c6bbe2ccca8786988f56db0467bb531f288bad6d1dfdde97b501c9d3d1a980236db78f406c927e607810c7ef9555

data/lib/cellect/server/api/helpers.rb

@@ -10,6 +10,28 @@ module Cellect
           error! 'Not Found', 404
         end
 
+        def bad_request
+          error! 'Bad Request', 400
+        end
+
+        def validate_param(hash, key, expect: nil)
+          hash[key] && hash[key].is_a?(expect)
+        end
+
+        def valid_subject_id_update?
+          validate_param update_params, :subject_id, expect: Fixnum
+        end
+
+        def valid_group_id_update?
+          return true unless workflow.grouped?
+          validate_param update_params, :group_id, expect: Fixnum
+        end
+
+        def valid_priority_update?
+          return true unless workflow.prioritized?
+          validate_param update_params, :priority, expect: Numeric
+        end
+
         def selector_params
           {
             limit: param_to_int(:limit, default: 5),

data/lib/cellect/server/api/sets.rb

@@ -23,6 +23,9 @@ module Cellect
         #   priority: float, required if prioritized
         put :add do
           return four_oh_four unless workflow
+          return bad_request unless valid_subject_id_update?
+          return bad_request unless valid_group_id_update?
+          return bad_request unless valid_priority_update?
           workflow.add(update_params)
           nil
         end
@@ -35,6 +38,8 @@ module Cellect
         #   group_id: integer, required if grouped
         put :remove do
           return four_oh_four unless workflow
+          return bad_request unless valid_subject_id_update?
+          return bad_request unless valid_group_id_update?
           workflow.remove(update_params)
           nil
         end

data/lib/cellect/server/api/users.rb

@@ -11,6 +11,7 @@ module Cellect
             #   subject_id: integer, required
             put :add_seen do
               return four_oh_four unless workflow
+              return bad_request unless valid_subject_id_update?
               user_id = param_to_int :user_id
               subject_id = param_to_int :subject_id
 

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/spec/server/api/add_seen_spec.rb

@@ -19,6 +19,12 @@ module Cellect::Server
             put "/workflows/#{ workflow_type }/users/123/add_seen", subject_id: 123
             expect(last_response.status).to eq 200
           end
+
+          it 'should handle invalid params' do
+            put "/workflows/#{ workflow_type }/users/123/add_seen", subject_id: '%(*ERRRR)'
+            expect(last_response.status).to eql 400
+            expect(last_response.body).to match /Bad Request/
+          end
         end
       end
     end

data/spec/server/api/add_spec.rb

@@ -33,6 +33,38 @@ module Cellect::Server
             put "/workflows/#{ workflow_type }/add", opts
             expect(last_response.status).to eq 200
           end
+
+          it 'should handle invalid subject_ids' do
+            bad_opts = opts.merge subject_id: '%(*ERRRR)'
+            put "/workflows/#{ workflow_type }/add", bad_opts
+            expect(last_response.status).to eql 400
+            expect(last_response.body).to match /Bad Request/
+          end
+
+          it 'should handle invalid group_ids' do
+            if workflow.grouped?
+              bad_opts = opts.merge group_id: '%(*ERRRR)'
+              put "/workflows/#{ workflow_type }/add", bad_opts
+              expect(last_response.status).to eql 400
+              expect(last_response.body).to match /Bad Request/
+            else
+              put "/workflows/#{ workflow_type }/add", opts
+              expect(last_response).to be_ok
+            end
+          end
+
+          it 'should handle invalid priorities' do
+            bad_opts = opts.merge priority: '%(*ERRRR)'
+
+            if workflow.prioritized?
+              put "/workflows/#{ workflow_type }/add", bad_opts
+              expect(last_response.status).to eql 400
+              expect(last_response.body).to match /Bad Request/
+            else
+              put "/workflows/#{ workflow_type }/add", bad_opts
+              expect(last_response).to be_ok
+            end
+          end
         end
       end
     end

data/spec/server/api/remove_spec.rb

@@ -28,6 +28,25 @@ module Cellect::Server
             put "/workflows/#{ workflow_type }/remove", opts
             expect(last_response.status).to eq 200
           end
+
+          it 'should handle invalid subject_ids' do
+            bad_opts = opts.merge subject_id: '%(*ERRRR)'
+            put "/workflows/#{ workflow_type }/remove", bad_opts
+            expect(last_response.status).to eql 400
+            expect(last_response.body).to match /Bad Request/
+          end
+
+          it 'should handle invalid group_ids' do
+            if workflow.grouped?
+              bad_opts = opts.merge group_id: '%(*ERRRR)'
+              put "/workflows/#{ workflow_type }/remove", bad_opts
+              expect(last_response.status).to eql 400
+              expect(last_response.body).to match /Bad Request/
+            else
+              put "/workflows/#{ workflow_type }/remove", opts
+              expect(last_response).to be_ok
+            end
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Michael Parrish