Merge branch 'develop' into feature/README-rel-links

gugzkumar · Jan 8, 2020 · 509d075 · 509d075
2 parents f7ae6cb + b3f25e7
commit 509d075
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 7 deletions.
diff --git a/.aws-infrastructure/README.md b/.aws-infrastructure/README.md
@@ -1,3 +1,5 @@
+**This README was auto generated by AWS CDK. It is not official Documentation for the project, but it is helpful to read to understand the Infrastructure service and how to modify/improve it.**
+
 # Welcome to your CDK TypeScript project!
 
 This is a blank project for TypeScript development with CDK.

diff --git a/.utils/README.md b/.utils/README.md
@@ -0,0 +1,3 @@
+# Utilities
+
+This folder contains the utilities cli. In here are a collection of scripts to assist this project. You can install the cli with `npm install` and run it with `node main.js`.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# CHANGELOG.md
+
+## (unreleased)
+
+Bug Fixes:
+  - Prevent Sheet names from unsafe characters (based on safe characters of S3 keys)
+
+## v1.0
+
+Features:
+- First Major Release
+- Functional UI
+- Functional Api
+- Authentication
+- Functional Personal and Team Workspaces
+- Software to create Infrastructure Stack
+- Software to create Code Stack
+- Software to create Network Stack
+- Local Development
+- Continuous Deployment of Code Stack
+- Continuous Deployment of UI
+- Working Production Environment
+- Utility scripts with:
+ - Create env files
+ - Encode env file as Base64
diff --git a/api/README.md b/api/README.md
@@ -1,3 +1,5 @@
+**This README was auto generated by AWS SAM. It is not official Documentation for the project, but it is helpful to read to understand the Api service and how to modify/improve it.**
+
 # sam-app
 
 This is a sample template for sam-app - Below is a brief explanation of what we have generated for you:
@@ -98,7 +100,7 @@ aws cloudformation describe-stacks \
     --stack-name sam-app \
     --query 'Stacks[].Outputs[?OutputKey==`HelloWorldApi`]' \
     --output table
-``` 
+```
 
 ## Fetch, tail, and filter Lambda function logs
 
@@ -207,4 +209,3 @@ aws cloudformation describe-stacks \
 # Tail Lambda function Logs using Logical name defined in SAM Template
 sam logs -n HelloWorldFunction --stack-name sam-app --tail
 ```
-
diff --git a/api/requirements.txt b/api/requirements.txt
diff --git a/api/src/sheet/__init__.py b/api/src/sheet/__init__.py
@@ -1,9 +1,7 @@
 """
 API methods for /sheet
 """
-import boto3
-import json
-import datetime
+import boto3, json, datetime, re
 from boto3 import client
 s3_client = client('s3')
 from __core__.settings import AVAILABLE_FILE_TYPES, SHEET_DATA_S3_BUCKET
@@ -41,6 +39,11 @@ def post(event, context):
         # Error if sheet name exists
         return get_error_response(f'Sheet with name {event["body"]["sheetName"]} already exists')
 
+    valid_name_pattern = re.compile("[a-zA-Z0-9!\-_*]+")
+    if valid_name_pattern.fullmatch(event['body']['sheetName']) is None:
+        # Error if sheet name has invalid characters
+        return get_error_response(f'Sheet name must be alphanumeric and may contain the following characters: -, !, _, *')
+
     if 'defaultFileType' not in event['body'] or event['body']['sheetName'] is None:
         # Error if Default File type was not provided
         return get_error_response('No Default File Type was provided')

diff --git a/client-ui/README.md b/client-ui/README.md
@@ -1,3 +1,5 @@
+**This README was auto generated by Angular. It is not official Documentation for the project, but it is helpful to read to understand the Client UI service and how to modify/improve it.**
+
 # CheatSheet
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.0.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Utilities

		This folder contains the utilities cli. In here are a collection of scripts to assist this project. You can install the cli with `npm install` and run it with `node main.js`.