Check to ensure the number of primary key fields supplied does not

exceed the total number of non-dropped source table fields for
dblink_build_sql_*(). Addresses bug report from Rushabh Lathia.

Backpatch all the way to the 7.3 branch.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 609126b74bcae4b5fa71834eda02ffb359559835..d46c2c5174638381be1338b4ad10f401589ead91 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -8,7 +8,7 @@
  * Darko Prenosil <[email protected]>
  * Shridhar Daithankar <[email protected]>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.60.2.4 2009/01/03 19:58:10 joe Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.60.2.5 2010/02/03 23:01:47 joe Exp $
  * Copyright (c) 2001-2006, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -92,6 +92,7 @@ static Oid    get_relid_from_relname(text *relname_text);
 static char *generate_relation_name(Oid relid);
 static char *connstr_strip_password(const char *connstr);
 static void dblink_security_check(PGconn *conn, remoteConn *rconn, const char *connstr);
+static int get_nondropped_natts(Oid relid);
 
 /* Global */
 static remoteConn *pconn = NULL;
@@ -1388,6 +1389,7 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
    int         src_nitems;
    int         tgt_nitems;
    char       *sql;
+   int         nondropped_natts;
 
    /*
     * Convert relname to rel OID.
@@ -1415,6 +1417,15 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS)
                 errmsg("input for number of primary key " \
                        "attributes too large")));
 
+   /*
+    * ensure we don't ask for more pk attributes than we have
+    * non-dropped columns
+    */
+   nondropped_natts = get_nondropped_natts(relid);
+   if (pknumatts > nondropped_natts)
+       ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR),
+               errmsg("number of primary key fields exceeds number of specified relation attributes")));
+
    /*
     * Source array is made up of key values that will be used to locate the
     * tuple of interest from the local system.
@@ -1480,6 +1491,7 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS)
    int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1);
    int32       pknumatts_tmp = PG_GETARG_INT32(2);
    ArrayType  *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
+   int         nondropped_natts;
    Oid         relid;
    int16       pknumatts = 0;
    char      **tgt_pkattvals;
@@ -1512,6 +1524,15 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS)
                 errmsg("input for number of primary key " \
                        "attributes too large")));
 
+   /*
+    * ensure we don't ask for more pk attributes than we have
+    * non-dropped columns
+    */
+   nondropped_natts = get_nondropped_natts(relid);
+   if (pknumatts > nondropped_natts)
+       ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR),
+               errmsg("number of primary key fields exceeds number of specified relation attributes")));
+
    /*
     * Target array is made up of key values that will be used to build the
     * SQL string for use on the remote system.
@@ -1567,6 +1588,7 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
    int32       pknumatts_tmp = PG_GETARG_INT32(2);
    ArrayType  *src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3);
    ArrayType  *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4);
+   int         nondropped_natts;
    Oid         relid;
    int16       pknumatts = 0;
    char      **src_pkattvals;
@@ -1601,6 +1623,15 @@ dblink_build_sql_update(PG_FUNCTION_ARGS)
                 errmsg("input for number of primary key " \
                        "attributes too large")));
 
+   /*
+    * ensure we don't ask for more pk attributes than we have
+    * non-dropped columns
+    */
+   nondropped_natts = get_nondropped_natts(relid);
+   if (pknumatts > nondropped_natts)
+       ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR),
+               errmsg("number of primary key fields exceeds number of specified relation attributes")));
+
    /*
     * Source array is made up of key values that will be used to locate the
     * tuple of interest from the local system.
@@ -2441,3 +2472,28 @@ dblink_security_check(PGconn *conn, remoteConn *rconn, const char *connstr)
            PQfinish(conn);
    }
 }
+
+static int
+get_nondropped_natts(Oid relid)
+{
+   int         nondropped_natts = 0;
+   TupleDesc   tupdesc;
+   Relation    rel;
+   int         natts;
+   int         i;
+
+   rel = relation_open(relid, AccessShareLock);
+   tupdesc = rel->rd_att;
+   natts = tupdesc->natts;
+
+   for (i = 0; i < natts; i++)
+   {
+       if (tupdesc->attrs[i]->attisdropped)
+           continue;
+       nondropped_natts++;
+   }
+
+   relation_close(rel, AccessShareLock);
+   return nondropped_natts;
+}
+

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 67c7194e93ba4c52fa8ba1450a5afdc4581491cf..6a08581ec8fb65c4a8d144b163a8f99cda90e662 100644 (file)
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -44,6 +44,9 @@ SELECT dblink_build_sql_insert('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
  INSERT INTO foo(f1,f2,f3) VALUES('99','xyz','{a0,b0,c0}')
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_insert('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
+ERROR:  number of primary key fields exceeds number of specified relation attributes
 -- build an update statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
@@ -52,6 +55,9 @@ SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
  UPDATE foo SET f1 = '99', f2 = 'xyz', f3 = '{a0,b0,c0}' WHERE f1 = '99' AND f2 = 'xyz'
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_update('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
+ERROR:  number of primary key fields exceeds number of specified relation attributes
 -- build a delete statement based on a local tuple,
 SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
            dblink_build_sql_delete           
@@ -59,6 +65,9 @@ SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
  DELETE FROM foo WHERE f1 = '0' AND f2 = 'a'
 (1 row)
 
+-- too many pk fields, should fail
+SELECT dblink_build_sql_delete('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}');
+ERROR:  number of primary key fields exceeds number of specified relation attributes
 -- retest using a quoted and schema qualified table
 CREATE SCHEMA "MySchema";
 CREATE TABLE "MySchema"."Foo"(f1 int, f2 text, f3 text[], primary key (f1,f2));

diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index c2d093323ab63de4c72579d0060c5a2d8ac145a6..8572787d2b556fe25a659ded00b7fceff5bf0ede 100644 (file)
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -35,13 +35,19 @@ FROM dblink_get_pkey('foo');
 -- build an insert statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_insert('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_insert('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
 
 -- build an update statement based on a local tuple,
 -- replacing the primary key values with new ones
 SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_update('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}');
 
 -- build a delete statement based on a local tuple,
 SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}');
+-- too many pk fields, should fail
+SELECT dblink_build_sql_delete('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}');
 
 -- retest using a quoted and schema qualified table
 CREATE SCHEMA "MySchema";