PYTHON-860 - Ignore unauthorized errors for index creation in GridFs

Author: aherlihy

gridfs/__init__.py

@@ -28,8 +28,9 @@
  GridOutCursor)
 from pymongo import (ASCENDING,
  DESCENDING)
+from pymongo.common import UNAUTHORIZED_CODES
 from pymongo.database import Database
-from pymongo.errors import ConfigurationError
+from pymongo.errors import ConfigurationError, OperationFailure
 
 
 class GridFS(object):
@@ -66,16 +67,25 @@ def __init__(self, database, collection="fs"):
  def __is_secondary(self):
  return not self.__database.client._is_writable()
 
+ def __create_index(self, coll, key, **kwargs):
+ try:
+ if not self.__is_secondary():
+ coll.create_index(key, **kwargs)
+ except OperationFailure as exc:
+ if not (exc.code in UNAUTHORIZED_CODES
+ or "authorized" in str(exc)):
+ raise exc
+
+
  def __ensure_index_files_id(self):
- if not self.__is_secondary():
- self.__chunks.create_index([("files_id", ASCENDING),
- ("n", ASCENDING)],
- unique=True)
+ self.__create_index(self.__chunks,
+ [("files_id", ASCENDING), ("n", ASCENDING)],
+ unique=True)
 
  def __ensure_index_filename(self):
- if not self.__is_secondary():
- self.__files.create_index([("filename", ASCENDING),
-  ("uploadDate", DESCENDING)])
+  self.__create_index(self.__files,
+  [("filename", ASCENDING),
+ ("uploadDate", DESCENDING)])
 
  def new_file(self, **kwargs):
  """Create a new file in GridFS.

gridfs/grid_file.py

@@ -26,8 +26,11 @@
  NoFile)
 from pymongo import ASCENDING
 from pymongo.collection import Collection
+from pymongo.common import UNAUTHORIZED_CODES
 from pymongo.cursor import Cursor
-from pymongo.errors import ConfigurationError, DuplicateKeyError
+from pymongo.errors import (ConfigurationError,
+ DuplicateKeyError,
+ OperationFailure)
 from pymongo.read_preferences import ReadPreference
 
 try:
@@ -166,9 +169,14 @@ def __init__(self, root_collection, **kwargs):
 
  def _ensure_index(self):
  if not object.__getattribute__(self, "_ensured_index"):
- self._coll.chunks.create_index(
- [("files_id", ASCENDING), ("n", ASCENDING)],
- unique=True)
+ try:
+ self._coll.chunks.create_index(
+ [("files_id", ASCENDING), ("n", ASCENDING)],
+ unique=True)
+ except OperationFailure as exc:
+ if not (exc.code in UNAUTHORIZED_CODES
+ or "authorized" in str(exc)):
+ raise exc
  object.__setattr__(self, "_ensured_index", True)
 
  @property

pymongo/common.py

@@ -71,6 +71,8 @@
 # exist.
 COMMAND_NOT_FOUND_CODES = (59, 13390, None)
 
+# Error codes to ignore if GridFS calls createIndex on a secondary
+UNAUTHORIZED_CODES = (13, 16547, 16548)
 
 def partition_node(node):
  """Split a host:port string into (host, int(port)) pair."""

test/test_gridfs.py

@@ -40,7 +40,9 @@
  single_client,
  one,
  rs_client,
- rs_or_single_client)
+ rs_or_single_client,
+ rs_or_single_client_noauth,
+ remove_all_users)
 
 
 class JustWrite(threading.Thread):
@@ -514,6 +516,23 @@ def tearDown(self):
  rsc.pymongo_test.drop_collection('fs.files')
  rsc.pymongo_test.drop_collection('fs.chunks')
 
+class TestGridfsAuth(IntegrationTest):
+
+ @client_context.require_auth
+ def test_gridfs_readonly(self):
+ # "self.client" is logged in as root. Make a read-only user.
+ auth_db = self.client.test_gridfs_readonly
+ auth_db.add_user('readonly', 'pw', readOnly=True)
+ self.addCleanup(remove_all_users, auth_db)
+
+ db = rs_or_single_client_noauth().test_gridfs_readonly
+ db.authenticate('readonly', 'pw')
+
+ fs = gridfs.GridFS(db)
+ file = fs.new_file()
+ file._ensure_index()
+ fs.list()
+
 
 if __name__ == "__main__":
  unittest.main()