NC | put bucket policy invalid body error fix

Signed-off-by: Romy <35330373+romayalon@users.noreply.github.com>

src/endpoint/s3/ops/s3_put_bucket_policy.js

@@ -29,6 +29,7 @@ async function put_bucket_policy(req) {
 module.exports = {
     handler: put_bucket_policy,
     body: {
+        invalid_error: S3Error.MalformedPolicyNotAJSON,
         type: 'json',
     },
     reply: {

src/endpoint/s3/s3_errors.js

@@ -501,6 +501,14 @@ S3Error.MalformedPolicy = Object.freeze({
     http_code: 400,
     detail: '...', // will be overridden from rpc_data, see handle_error in s3_rest.js
 });
+
+S3Error.MalformedPolicyNotAJSON = Object.freeze({
+    code: 'MalformedPolicy',
+    message: 'Policies must be valid JSON and the first byte must be \'{\'',
+    http_code: 400,
+    detail: '...', // will be overridden from rpc_data, see handle_error in s3_rest.js
+});
+
 S3Error.NoSuchObjectLockConfiguration = Object.freeze({
     code: 'NoSuchObjectLockConfiguration',
     message: 'The specified object does not have a ObjectLock configuration',

src/test/unit_tests/test_s3_bucket_policy.js

@@ -1181,6 +1181,23 @@ mocha.describe('s3_bucket_policy', function() {
                 }
             }
         });
+
+        mocha.it('should not allow invalid json', async function() {
+            const self = this; // eslint-disable-line no-invalid-this
+            self.timeout(15000);
+            const s3_policy = "this is not a json";
+            try {
+                await s3_owner.putBucketPolicy({
+                    Bucket: BKT,
+                    Policy: s3_policy
+                });
+                assert.fail('Test was suppose to fail on ' + S3Error.MalformedPolicy.code);
+            } catch (err) {
+                if (err.Code !== S3Error.MalformedPolicy.code) {
+                    throw err;
+                }
+            }
+        });
     });
 
     mocha.describe('get-bucket-policy status should work', async function() {