Improvement/arsn 422 support post object

lib/auth/v4/formAuthCheck.ts

@@ -0,0 +1,108 @@
+import { Logger } from 'werelogs';
+import * as constants from '../../constants';
+import errors from '../../errors';
+import { convertAmzTimeToMs } from './timeUtils';
+import { validateCredentials } from './validateInputs';
+
+/**
+ * V4 query auth check
+ * @param request - HTTP request object
+ * @param log - logging object
+ * @param data - Contain authentification params (GET or POST data)
+ */
+export function check(request: any, log: Logger, data: { [key: string]: string }) {
+    let signatureFromRequest;
+    let timestamp;
+    let expiration;
+    let credential;
+
+    if (data['x-amz-algorithm'] !== 'AWS4-HMAC-SHA256') {
+        log.debug('algorithm param incorrect', { algo: data['X-Amz-Algorithm'] });
+        return { err: errors.InvalidArgument };
+    }
+
+    signatureFromRequest = data['x-amz-signature'];
+    if (!signatureFromRequest) {
+        log.debug('missing signature');
+        return { err: errors.InvalidArgument };
+    }
+
+    timestamp = data['x-amz-date'];
+    if (!timestamp || timestamp.length !== 16) {
+        log.debug('missing or invalid timestamp', { timestamp: data['x-amz-date'] });
+        return { err: errors.InvalidArgument };
+    }
+
+    const policy = data['policy'];
+    if (policy && policy.length > 0) {
+        const decryptedPolicy = Buffer.from(policy, 'base64').toString('utf8');
+        const policyObj = JSON.parse(decryptedPolicy);
+        expiration = policyObj.expiration;
+    } else {
+        log.debug('missing or invalid policy', { policy: data['policy'] });
+        return { err: errors.InvalidArgument };
+    }
+
+    credential = data['x-amz-credential'];
+    if (credential && credential.length > 28 && credential.indexOf('/') > -1) {
+        // @ts-ignore
+        credential = credential.split('/');
+        const validationResult = validateCredentials(credential, timestamp,
+            log);
+          if (validationResult instanceof Error) {
+              log.debug('credentials in improper format', { credential,
+                  timestamp, validationResult });
+              return { err: validationResult };
+          }
+    } else {
+        log.debug('invalid credential param', { credential: data['X-Amz-Credential'] });
+        return { err: errors.InvalidArgument };
+    }
+
+    const token = data['x-amz-security-token'];
+    if (token && !constants.iamSecurityToken.pattern.test(token)) {
+        log.debug('invalid security token', { token });
+        return { err: errors.InvalidToken };
+    }
+
+    // check if the expiration date is past the current time
+    if (Date.parse(expiration) < Date.now()) {
+        return { err: errors.AccessDenied.customizeDescription('Invalid according to Policy: Policy expired.') };
+    }
+
+    const validationResult = validateCredentials(credential, timestamp,
+      log);
+    if (validationResult instanceof Error) {
+        log.debug('credentials in improper format', { credential,
+            timestamp, validationResult });
+        return { err: validationResult };
+    }
+    const accessKey = credential[0];
+    const scopeDate = credential[1];
+    const region = credential[2];
+    const service = credential[3];
+
+    // string to sign is the policy for form requests
+    const stringToSign = data['policy'];
+
+    log.trace('constructed stringToSign', { stringToSign });
+    return {
+        err: null,
+        params: {
+            version: 4,
+            data: {
+                accessKey,
+                signatureFromRequest,
+                region,
+                scopeDate,
+                stringToSign,
+                service,
+                authType: 'REST-FORM-DATA',
+                signatureVersion: 'AWS4-HMAC-SHA256',
+                signatureAge: Date.now() - convertAmzTimeToMs(timestamp),
+                timestamp,
+                securityToken: token,
+            },
+        },
+    };
+}

lib/errors/arsenalErrors.ts

@@ -247,7 +247,7 @@ export const InvalidURI: ErrorFormat = {
     description: "Couldn't parse the specified URI.",
 };
 
-export const KeyTooLong: ErrorFormat = {
+export const KeyTooLongError: ErrorFormat = {
     code: 400,
     description: 'Your key is too long.',
 };
@@ -281,10 +281,10 @@ export const MaxMessageLengthExceeded: ErrorFormat = {
     description: 'Your request was too big.',
 };
 
-export const MaxPostPreDataLengthExceededError: ErrorFormat = {
+export const MaxPostPreDataLengthExceeded: ErrorFormat = {
     code: 400,
     description:
-        'Your POST request fields preceding the upload file were too large.',
+        'Your POST request fields preceeding the upload file was too large.',
 };
 
 export const MetadataTooLarge: ErrorFormat = {

lib/policyEvaluator/utils/actionMaps.ts

@@ -137,6 +137,7 @@ const actionMonitoringMapS3 = {
     objectGetTagging: 'GetObjectTagging',
     objectHead: 'HeadObject',
     objectPut: 'PutObject',
+    objectPost: 'PostObject',
     objectPutACL: 'PutObjectAcl',
     objectPutCopyPart: 'UploadPartCopy',
     objectPutLegalHold: 'PutObjectLegalHold',

lib/s3routes/routes.ts

@@ -149,7 +149,10 @@ export type Params = {
         object: string[];
     };
     unsupportedQueries: any;
-    api: { callApiMethod: routesUtils.CallApiMethod };
+    api: { 
+        callApiMethod: routesUtils.CallApiMethod,
+        callPostObject: routesUtils.CallApiMethod,
+    };
 }
 
 /** routes - route request to appropriate method

lib/s3routes/routes/routeDELETE.ts

@@ -8,7 +8,7 @@ import * as http from 'http';
 export default function routeDELETE(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
     statsClient?: StatsClient,
 ) {

lib/s3routes/routes/routeGET.ts

@@ -8,7 +8,7 @@ import StatsClient from '../../metrics/StatsClient';
 export default function routerGET(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
     statsClient?: StatsClient,
     dataRetrievalParams?: any,

lib/s3routes/routes/routeHEAD.ts

@@ -8,7 +8,7 @@ import * as http from 'http';
 export default function routeHEAD(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
     statsClient?: StatsClient,
 ) {

lib/s3routes/routes/routeOPTIONS.ts

@@ -8,7 +8,7 @@ import StatsClient from '../../metrics/StatsClient';
 export default function routeOPTIONS(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
     statsClient?: StatsClient,
 ) {

lib/s3routes/routes/routePOST.ts

@@ -8,7 +8,7 @@ import * as http from 'http';
 export default function routePOST(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
 ) {
     log.debug('routing request', { method: 'routePOST' });
@@ -58,6 +58,15 @@ export default function routePOST(
                     corsHeaders));
     }
 
+    if (objectKey === undefined) {
+        if (Object.keys(query).length > 0) {
+            return routesUtils.responseNoBody(errors.InvalidArgument
+                .customizeDescription("Query String Parameters not allowed on POST requests."), null,
+                response, 400, log);
+        }
+        return api.callPostObject!('objectPost', request, response, log, (err, resHeaders) => routesUtils.responseNoBody(err, resHeaders, response, 204, log));
+    }
+
     return routesUtils.responseNoBody(errors.NotImplemented, null, response,
         200, log);
 }

lib/s3routes/routes/routePUT.ts

@@ -8,7 +8,7 @@ import StatsClient from '../../metrics/StatsClient';
 export default function routePUT(
     request: http.IncomingMessage,
     response: http.ServerResponse,
-    api: { callApiMethod: routesUtils.CallApiMethod },
+    api: routesUtils.ApiMethods,
     log: RequestLogger,
     statsClient?: StatsClient,
 ) {

lib/s3routes/routesUtils.ts

@@ -10,6 +10,11 @@ import * as constants from '../constants';
 import DataWrapper from '../storage/data/DataWrapper';
 import StatsClient from '../metrics/StatsClient';
 
+export type ApiMethods = {
+        callApiMethod: CallApiMethod;
+        callPostObject: CallApiMethod;
+};
+
 export type CallApiMethod = (
     methodName: string,
     request: http.IncomingMessage,