Context Navigation

Ticket #7554: 7554.patch

File 7554.patch, 3.8 KB (added by FunkyBob, 13 years ago)
As requested, the patch now adds a "--insecure" switch to dbshell command so you must choose to permit it.

diff --git a/django/core/management/commands/dbshell.py b/django/core/management/commands/dbshell.py
index 7465920..610fcd4 100644

                class Command(BaseCommand):
         make_option('--database', action='store', dest='database',
             default=DEFAULT_DB_ALIAS, help='Nominates a database onto which to '
                 'open a shell.  Defaults to the "default" database.'),
+        make_option('--insecure', action='store_true', dest='insecure',
+            default=False, help='Allow insecure passing of password via environment'
+        ),
+    )
     requires_model_validation = False
-…
+               class Command(BaseCommand):
     def handle(self, **options):
         connection = connections[options.get('database')]
         try:
             connection.client.runshell()
+            connection.client.runshell(insecure=options.get('insecure'))
         except OSError:
             # Note that we're assuming OSError means that the client program
             # isn't installed. There's a possibility OSError would be raised

diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py
index 1cf8cee..b9b5702 100644

                from django.db.backends import BaseDatabaseClient
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'mysql'
     def runshell(self):
+    def runshell(self, *args, **kwargs):
         settings_dict = self.connection.settings_dict
         args = [self.executable_name]
         db = settings_dict['OPTIONS'].get('db', settings_dict['NAME'])

diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py
index ccc64eb..8f89964 100644

                from django.db.backends import BaseDatabaseClient
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'sqlplus'
     def runshell(self):
+    def runshell(self, *args, **kwargs):
         conn_string = self.connection._connect_string()
         args = [self.executable_name, "-L", conn_string]
         if os.name == 'nt':

diff --git a/django/db/backends/postgresql_psycopg2/client.py b/django/db/backends/postgresql_psycopg2/client.py
index a5c0296..d0082cf 100644

                from django.db.backends import BaseDatabaseClient
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'psql'
     def runshell(self):
+    def runshell(self, insecure=False, **kwargs):
         settings_dict = self.connection.settings_dict
         args = [self.executable_name]
         if settings_dict['USER']:
-…
+               class DatabaseClient(BaseDatabaseClient):
             args.extend(["-h", settings_dict['HOST']])
         if settings_dict['PORT']:
             args.extend(["-p", str(settings_dict['PORT'])])
+        if insecure and settings_dict['PASSWORD']:
+            os.environ['PGPASSWORD'] = settings_dict['PASSWORD']
         args += [settings_dict['NAME']]
         if os.name == 'nt':
             sys.exit(os.system(" ".join(args)))

diff --git a/django/db/backends/sqlite3/client.py b/django/db/backends/sqlite3/client.py
index 5b5b732..fa2d887 100644

                from django.db.backends import BaseDatabaseClient
 class DatabaseClient(BaseDatabaseClient):
     executable_name = 'sqlite3'
     def runshell(self):
+    def runshell(self, *args, **kwargs):
         args = [self.executable_name,
                 self.connection.settings_dict['NAME']]
         if os.name == 'nt':