Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Small refactoring to signUrl code. #6078

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

Merged
JesseLovelace merged 2 commits into from
Aug 26, 2019
Merged

Small refactoring to signUrl code. #6078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
096b782
Small refactoring to signUrl code.
houglum Aug 14, 2019
ae8e312
Run `mvn com.coveo:fmt-maven-plugin:format`.
houglum Aug 16, 2019
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
10 changes: 7 additions & 3 deletions ...le-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,8 @@ public static SignUrlOption withMd5() {
* Use it if signature should include the blob's canonicalized extended headers. When used,
* users of the signed URL should include the canonicalized extended headers with their request.
*
* @see <a href="https://cloud.google.com/storage/docs/xml-api/reference-headers"></a>
* @see <a href="https://cloud.google.com/storage/docs/xml-api/reference-headers">Request
* Headers</a>
*/
public static SignUrlOption withExtHeaders(Map<String, String> extHeaders) {
return new SignUrlOption(Option.EXT_HEADERS, extHeaders);
Expand Down Expand Up @@ -986,13 +987,16 @@ public static SignUrlOption withV4Signature() {
* get it from the environment.
*
* @see <a href="https://cloud.google.com/storage/docs/authentication#service_accounts">Service
* account</a>
* Accounts</a>
*/
public static SignUrlOption signWith(ServiceAccountSigner signer) {
return new SignUrlOption(Option.SERVICE_ACCOUNT_CRED, signer);
}

/** Use a different host name than the default host name 'storage.googleapis.com' */
/**
* Use a different host name than the default host name 'https://storage.googleapis.com'. This
* must also include the scheme component of the URI.
*/
public static SignUrlOption withHostName(String hostName) {
return new SignUrlOption(Option.HOST_NAME, hostName);
}
Expand Down
52 changes: 32 additions & 20 deletions ...loud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import com.google.cloud.storage.Acl.Entity;
import com.google.cloud.storage.spi.v1.StorageRpc;
import com.google.cloud.storage.spi.v1.StorageRpc.RewriteResponse;
import com.google.common.base.CharMatcher;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
Expand Down Expand Up @@ -636,35 +637,33 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
getOptions().getClock().millisTime() + unit.toMillis(duration),
TimeUnit.MILLISECONDS);

StringBuilder stPath = new StringBuilder();
if (!blobInfo.getBucket().startsWith(PATH_DELIMITER)) {
stPath.append(PATH_DELIMITER);
String storageXmlHostName =
optionMap.get(SignUrlOption.Option.HOST_NAME) != null
? (String) optionMap.get(SignUrlOption.Option.HOST_NAME)
: STORAGE_XML_HOST_NAME;

// The bucket name itself should never contain a forward slash. However, parts already existed
// in the code to check for this, so we remove the forward slashes to be safe here.
String bucketName = CharMatcher.anyOf(PATH_DELIMITER).trimFrom(blobInfo.getBucket());
String escapedBlobName = "";
if (!Strings.isNullOrEmpty(blobInfo.getName())) {
escapedBlobName =
UrlEscapers.urlFragmentEscaper()
.escape(blobInfo.getName())
.replace("?", "%3F")
.replace(";", "%3B");
}
stPath.append(blobInfo.getBucket());
if (!blobInfo.getBucket().endsWith(PATH_DELIMITER)
&& !Strings.isNullOrEmpty(blobInfo.getName())) {
stPath.append(PATH_DELIMITER);
}
if (blobInfo.getName().startsWith(PATH_DELIMITER)) {
stPath.setLength(stPath.length() - 1);
}

String escapedName = UrlEscapers.urlFragmentEscaper().escape(blobInfo.getName());
stPath.append(escapedName.replace("?", "%3F").replace(";", "%3B"));

URI path = URI.create(stPath.toString());
String stPath = constructResourceUriPath(bucketName, escapedBlobName);
URI path = URI.create(stPath);

try {
SignatureInfo signatureInfo =
buildSignatureInfo(optionMap, blobInfo, expiration, path, credentials.getAccount());
String unsignedPayload = signatureInfo.constructUnsignedPayload();
byte[] signatureBytes = credentials.sign(unsignedPayload.getBytes(UTF_8));
StringBuilder stBuilder = new StringBuilder();
if (optionMap.get(SignUrlOption.Option.HOST_NAME) == null) {
stBuilder.append(STORAGE_XML_HOST_NAME).append(path);
} else {
stBuilder.append(optionMap.get(SignUrlOption.Option.HOST_NAME)).append(path);
}
stBuilder.append(storageXmlHostName).append(path);

if (isV4) {
BaseEncoding encoding = BaseEncoding.base16().lowerCase();
Expand All @@ -688,6 +687,19 @@ public URL signUrl(BlobInfo blobInfo, long duration, TimeUnit unit, SignUrlOptio
}
}

private String constructResourceUriPath(String slashlessBucketName, String escapedBlobName) {
StringBuilder pathBuilder = new StringBuilder();
pathBuilder.append(PATH_DELIMITER).append(slashlessBucketName);
if (Strings.isNullOrEmpty(escapedBlobName)) {
return pathBuilder.toString();
}
if (!escapedBlobName.startsWith(PATH_DELIMITER)) {
pathBuilder.append(PATH_DELIMITER);
}
pathBuilder.append(escapedBlobName);
return pathBuilder.toString();
}

/**
* Builds signature info.
*
Expand Down