Skip to content

added code to deal with bucket names that have a period in them with ssl #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

added code to deal with bucket names that have a period in them with ssl #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
added code to deal with bucket names that have a period in them with ssl
  • Loading branch information
Harry Pottash committed Jan 16, 2015
commit 78e7fa6645730c11782ec6ff113162fd1f67aca2
3 changes: 3 additions & 0 deletions S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2292,6 +2292,9 @@ private function __responseWriteCallback(&$curl, &$data)
private function __dnsBucketName($bucket)
{
if (strlen($bucket) > 63 || preg_match("/[^a-z0-9\.-]/", $bucket) > 0) return false;
if(S3::$useSSL){ //using SSL, certs aren't valid for subdomains in new libcurl3
Copy link

@jbgo jbgo Mar 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might I recommend matching the style of the rest of this method?

if (S3::$useSSL && strstr($bucket, '.') !== false) return false;

if (strstr($bucket, '.') !== false) return false;
}
if (strstr($bucket, '-.') !== false) return false;
if (strstr($bucket, '..') !== false) return false;
if (!preg_match("/^[0-9a-z]/", $bucket)) return false;
Expand Down