[tor-commits] [pyonionoo/master] Remove cookie_secret.py and related code

[karsten at torproject.org]

commit fdcf519240ebf7962653b666b3b5f53b510a566a
Author: Sathyanarayanan Gunasekaran <gsathya.ceg at gmail.com>
Date:   Sun Sep 16 12:04:21 2012 +0530

    Remove cookie_secret.py and related code
---
 pyonionoo.conf           |    4 +---
 pyonionoo/config.py      |    3 ---
 scripts/cookie_secret.py |   22 ----------------------
 3 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/pyonionoo.conf b/pyonionoo.conf
index e3b4b90..6e93de1 100644
--- a/pyonionoo.conf
+++ b/pyonionoo.conf
@@ -1,8 +1,6 @@
 [server]
 debug = true
 xheaders = false
-xsrf_cookies = false
-cookie_secret = dHDj2e0pSEetYyY6Uk9q2XniVQlCEEemlbO8m4kn9sw=
 
 [frontend]
 locale_path = frontend/locale
@@ -31,5 +29,5 @@ poolsize = 10
 debug = no
 
 [metrics]
-out_dir = /tmp/ndanner/out
+out_dir = /tmp
 
diff --git a/pyonionoo/config.py b/pyonionoo/config.py
index 5e0cdca..1de03b0 100644
--- a/pyonionoo/config.py
+++ b/pyonionoo/config.py
@@ -21,9 +21,6 @@ def parse_config(filename):
     # web server settings
     settings["debug"] = xget(cfg.getboolean, "server", "debug", False)
     settings["xheaders"] = xget(cfg.getboolean, "server", "xheaders", False)
-    settings["cookie_secret"] = cfg.get("server", "cookie_secret")
-    settings["xsrf_cookies"] = xget(cfg.getboolean, "server", "xsrf_cookies",
-                                    False)
 
     # get project's absolute path
     root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
diff --git a/scripts/cookie_secret.py b/scripts/cookie_secret.py
deleted file mode 100644
index 7ccddba..0000000
--- a/scripts/cookie_secret.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-#
-# Copyright 2012 Alexandre Fiori
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import base64
-import uuid
-
-if __name__ == "__main__":
-    print(base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes))