Changeset 85

Timestamp:

01/13/06 23:35:19 (3 years ago)

Author:

edmanm

Message:

Add the ability to load authentication token information from a file. We'll
have to think about the best way to store it securely.

Location:

trunk/src/config

Files:

• vidaliasettings.cpp (modified) (3 diffs)
• vidaliasettings.h (modified) (1 diff)

trunk/src/config/vidaliasettings.cpp

@@ -32 +32 @@
 #define SETTING_CONTROL_ADDR   "Tor/ControlAddr"
 #define SETTING_CONTROL_PORT   "Tor/ControlPort"
+#define SETTING_AUTH_TOKEN     "Tor/AuthToken"
 
 /* Default Settings */
@@ -45 +46 @@
 #define DEFAULT_CONTROL_ADDR   "127.0.0.1"
 #define DEFAULT_CONTROL_PORT   9051
+#define DEFAULT_AUTH_TOKEN    ""
 
 /** Default Constructor
@@ -166 +168 @@
 }
 
+/** Get the authentication token sent by the controller to Tor. For now, this
+ * just sends the default (blank) authentication token. It is implemented as a
+ * stub here to make it easy to do real authentication in the future. */
+QByteArray
+VidaliaSettings::getAuthToken()
+{
+  return QByteArray::fromBase64(value(SETTING_AUTH_TOKEN,
+                                QByteArray(DEFAULT_AUTH_TOKEN)).toByteArray());
+}
+
+/** Set the authentication token sent by the controller to Tor. */
+void
+VidaliaSettings::setAuthToken(QByteArray token)
+{
+  setValue(SETTING_AUTH_TOKEN, token.toBase64());
+}
+

trunk/src/config/vidaliasettings.h

@@ -74 +74 @@
   quint16 getControlPort();
   void    setControlPort(quint16 port);
+
+  /* Get and set Tor's authentication information */
+  QByteArray getAuthToken();
+  void setAuthToken(QByteArray token);
 };