[tor-commits] [vidalia/alpha] Check that the auth cookie size is exactly 32bytes

[chiiph at torproject.org]

commit 708ac9ccd9a1491775064f5b4680074dca8a254d
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Sat Dec 24 18:32:14 2011 -0300

    Check that the auth cookie size is exactly 32bytes
---
 changes/bug4304            |    2 ++
 src/vidalia/MainWindow.cpp |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/changes/bug4304 b/changes/bug4304
new file mode 100644
index 0000000..cc48e7e
--- /dev/null
+++ b/changes/bug4304
@@ -0,0 +1,2 @@
+  o Check that the authentication-cookie file length is exactly 32
+    bytes long. Fixes bug 4304.
\ No newline at end of file
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index 6e5c96d..183e78f 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -1289,6 +1289,11 @@ MainWindow::tryCookie(const ProtocolInfo &pi)
     cookieDir = QFileInfo(cookieDir).absolutePath();
     cookie = loadControlCookie(cookieDir);
   }
+  if(cookie.size() != 32) {
+    vWarn(QString("Cookie length has to be exactly 32 bytes long. Found %s bytes")
+          .arg(cookie.size()));
+    return false;
+  }
   vNotice("Authenticating using 'cookie' authentication.");
   return _torControl->authenticate(cookie);
 }