Merge lp:~canonical-isd-hackers/canonical-identity-provider/flag-file-mode into lp:~canonical-isd-hackers/canonical-identity-provider/readonly-improvements

[Anthony Lenton]

This branch implements a fix for bug #550881.

Flag files are now created with g+rw permissions, so that losas can handle them easily.

The MP is against the readonly-improvements branch which is already reviewed and ready for merging with 2.x-trunk once approved by QA.

[Ricardo Kirkner (ricardokirkner)]

works beautifully :)

review: Approve

=== modified file 'identityprovider/readonly.py'
--- identityprovider/readonly.py	2010-05-05 14:50:36 +0000
+++ identityprovider/readonly.py	2010-05-05 17:52:34 +0000
@@ -2,6 +2,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import os
+import stat
 from django.conf import settings
 from django.db import connection
 
@@ -32,6 +33,9 @@
         settings.READ_ONLY_MODE = True
         if not os.path.exists(self.readonly_marker_file):
             open(self.readonly_marker_file, 'a').close()
+            mode = os.stat(self.readonly_marker_file)[stat.ST_MODE]
+            os.chmod(self.readonly_marker_file,
+                     mode | stat.S_IRGRP | stat.S_IWGRP)
 
     def clear_readonly(self):
         """Clear the marker file to leave readonly mode."""
@@ -60,6 +64,8 @@
         filename = self.marker_file_pattern % dbname
         if not os.path.exists(filename):
             open(filename, 'a').close()
+            mode = os.stat(filename)[stat.ST_MODE]
+            os.chmod(filename, mode | stat.S_IRGRP | stat.S_IWGRP)
         if dbname == self.master_dbid():
             self.set_readonly()
 

=== modified file 'identityprovider/tests/test_readonly.py'
--- identityprovider/tests/test_readonly.py	2010-05-05 16:26:28 +0000
+++ identityprovider/tests/test_readonly.py	2010-05-05 17:52:34 +0000
@@ -1,6 +1,10 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+import os
+import stat
+import shutil
+import tempfile
 import socket
 import urllib2
 from StringIO import StringIO
@@ -92,7 +96,8 @@
         self.assertEquals(self.host, self.req.get_host())
         self.restore_orig_urlopen()
 
-class ReadOnlyDataTest(SQLCachedTestCase):
+class ReadOnlyBackUp(SQLCachedTestCase):
+    """A base TestCase for backing up and restoring our readonly settings"""
     def setUp(self):
         self.orig_readonly_secret = settings.READONLY_SECRET
         settings.READONLY_SECRET = 'test secret'
@@ -105,14 +110,39 @@
                                     'DATABASE_HOST': 'dbhost2',
                                     'DATABASE_NAME': 'slavedb',
                                    }]
+        self._DBFAILOVER_FLAG_DIR = getattr(settings, 'DBFAILOVER_FLAG_DIR',
+                                            None)
+        settings.DBFAILOVER_FLAG_DIR = tempfile.mkdtemp()
 
     def tearDown(self):
+        shutil.rmtree(settings.DBFAILOVER_FLAG_DIR, True)
+        settings.DBFAILOVER_FLAG_DIR = self._DBFAILOVER_FLAG_DIR
         settings.READONLY_SECRET = self.orig_readonly_secret
         settings.DB_CONNECTIONS = self.orig_db_connections
         readonly_manager.clear_readonly()
         readonly_manager.clear_failed('master')
         readonly_manager.set_db(settings.DB_CONNECTIONS[0])
 
+class ReadOnlyFlagFilesTest(ReadOnlyBackUp):
+    def test_flag_files_in_right_directory(self):
+        readonly_manager.set_readonly()
+        flags = os.listdir(settings.DBFAILOVER_FLAG_DIR)
+        self.assertTrue('db.readonly' in flags)
+
+    def test_readonly_flag_files_have_right_mode(self):
+        readonly_manager.set_readonly()
+        mode = os.stat(readonly_manager.readonly_marker_file)[stat.ST_MODE]
+        self.assertTrue(mode & stat.S_IRGRP)
+        self.assertTrue(mode & stat.S_IWGRP)
+
+    def test_dbfail_flag_files_have_right_mode(self):
+        readonly_manager.mark_failed('foo')
+        flagfile = readonly_manager.marker_file_pattern % 'foo'
+        mode = os.stat(flagfile)[stat.ST_MODE]
+        self.assertTrue(mode & stat.S_IRGRP)
+        self.assertTrue(mode & stat.S_IWGRP)
+
+class ReadOnlyDataTest(ReadOnlyBackUp):
     def test_readonly_returns_404_for_get(self):
         response = self.client.get('/readonlydata')
         self.assertEquals(404, response.status_code)