Skip to content

fix(webdav): handle weak and quoted gzip ETags #2139

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(webdav): handle weak and quoted gzip ETags #2139

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
38 changes: 20 additions & 18 deletions library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,34 +256,41 @@ public static DavPropertyNameSet getAlbumItemPropSet() {
}

/**
* Normalizes an ETag.
*
* @param rawEtag
* @return
* @param rawEtag the raw ETag value from the HTTP response
* @return the normalized ETag, or an empty string if {@code rawEtag} is
* {@code null} or empty
*/
public static String parseEtag(String rawEtag) {
if (rawEtag == null || rawEtag.length() == 0) {
if (rawEtag == null || rawEtag.isEmpty()) {
return "";
}
if (rawEtag.endsWith("-gzip")) {
rawEtag = rawEtag.substring(0, rawEtag.length() - 5);

// https://github.com/owncloud/client/issues/3946
if (rawEtag.startsWith("W/")) {
rawEtag = rawEtag.substring(2);
}

// Remove any surrounding quotes.
if (rawEtag.length() >= 2 && rawEtag.startsWith("\"") && rawEtag.endsWith("\"")) {
rawEtag = rawEtag.substring(1, rawEtag.length() - 1);
}

// https://github.com/owncloud/client/issues/1195
if (rawEtag.endsWith("-gzip")) {
rawEtag = rawEtag.substring(0, rawEtag.length() - 5);
}

return rawEtag;
}

public static String getEtagFromResponse(HttpMethod method) {
Header eTag = method.getResponseHeader("OC-ETag");
if (eTag == null) {
eTag = method.getResponseHeader("oc-etag");
}
if (eTag == null) {
eTag = method.getResponseHeader("ETag");
}
if (eTag == null) {
eTag = method.getResponseHeader("etag");
}

String result = "";
if (eTag != null) {
result = parseEtag(eTag.getValue());
Expand All @@ -294,14 +301,9 @@ public static String getEtagFromResponse(HttpMethod method) {
public static String getEtagFromResponse(OkHttpMethodBase method) {
String eTag = method.getResponseHeader("OC-ETag");
if (eTag == null) {
eTag = method.getResponseHeader("oc-etag");
}
if (eTag == null) {
eTag = method.getResponseHeader("ETag");
}
if (eTag == null) {
eTag = method.getResponseHeader("etag");
eTag = method.getResponseHeader("Etag");
}

String result = "";
if (eTag != null) {
result = parseEtag(eTag);
Expand Down
Loading