Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: S3 buckets' regular expression wasn't strict enough

This commit is contained in:
Régis Hanol 2016-05-13 15:09:37 +02:00
parent d7d8df7d3a
commit 545a2355a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/site_settings.yml
View File

@ -231,10 +231,10 @@ login:
default: false
twitter_consumer_key:
default: ''
regex: "^[a-zA-Z0-9_+-]+$"
regex: "^[\\w+-]+$"
twitter_consumer_secret:
default: ''
regex: "^[a-zA-Z0-9_+-]+$"
regex: "^[\\w+-]+$"
enable_instagram_logins:
client: true
default: false
@ -625,7 +625,7 @@ files:
enum: 'S3RegionSiteSetting'
s3_upload_bucket:
default: ''
regex: '^[^A-Z_.]+$' # can't use '.' when using HTTPS
regex: "^[a-z0-9-]+$" # can't use '.' when using HTTPS
s3_cdn_url:
default: ''
regex: '^https?:\/\/.+[^\/]$'
@ -930,7 +930,7 @@ backups:
shadowed_by_global: true
s3_backup_bucket:
default: ''
regex: "^[^A-Z_.]+$" # can't use '.' when using HTTPS
regex: "^[a-z0-9-]+$" # can't use '.' when using HTTPS
shadowed_by_global: true
s3_disable_cleanup:
default: false