ETag: Allow parsing of weak tags #3946

owncloud · Oct 15, 2015 · abd6303 · abd6303
1 parent df2418d
commit abd6303
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/libsync/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h
@@ -25,7 +25,14 @@ inline QByteArray parseEtag(const char *header) {
  if (!header)
  return QByteArray();
  QByteArray arr = header;
- arr.replace("-gzip", ""); // https://github.saobby.my.eu.orgowncloud/client/issues/1195
+
+ // Weak E-Tags can appear when gzip compression is on, see #3946
+ if (arr.startsWith("W/"))
+ arr = arr.mid(2);
+
+ // https://github.com/owncloud/client/issues/1195
+ arr.replace("-gzip", "");
+
  if(arr.length() >= 2 && arr.startsWith('"') && arr.endsWith('"')) {
  arr = arr.mid(1, arr.length() - 2);
  }

diff --git a/test/testowncloudpropagator.h b/test/testowncloudpropagator.h
@@ -11,6 +11,7 @@
 #include <QDebug>
 
 #include "propagatedownload.h"
+#include "owncloudpropagator_p.h"
 
 using namespace OCC;
 namespace OCC {
@@ -64,6 +65,20 @@ private slots:
  QVERIFY( tmpFileName.length() <= 254);
  }
  }
+
+ void testParseEtag()
+ {
+ typedef QPair<const char*, const char*> Test;
+ QList<Test> tests;
+ tests.append(Test("\"abcd\"", "abcd"));
+ tests.append(Test("\"\"", ""));
+ tests.append(Test("\"fii\"-gzip", "fii"));
+ tests.append(Test("W/\"foo\"", "foo"));
+
+ foreach (const auto& test, tests) {
+ QCOMPARE(parseEtag(test.first), test.second);
+ }
+ }
 };
 
 #endif