fix(gbase8s): make view source saves safer
This commit is contained in:
25 files changed
+1343
-129
No files matched your search
@@ -2,11 +2,13 @@ package com.dbx.agent.gbase8s;
|
||||
|
||||
import com.dbx.agent.ConfiguredJdbcAgent;
|
||||
import com.dbx.agent.ConnectParams;
|
||||
import com.dbx.agent.ColumnInfo;
|
||||
import com.dbx.agent.DatabaseInfo;
|
||||
import com.dbx.agent.ExecuteQueryOptions;
|
||||
import com.dbx.agent.JdbcAgentProfile;
|
||||
import com.dbx.agent.JsonRpcServer;
|
||||
import com.dbx.agent.MetadataListConstraints;
|
||||
import com.dbx.agent.ObjectSource;
|
||||
import com.dbx.agent.QueryResult;
|
||||
import com.dbx.agent.TableInfo;
|
||||
import java.sql.Connection;
|
||||
@@ -15,6 +17,7 @@ import java.sql.ResultSet;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
@@ -195,6 +198,73 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
|
||||
return queryConstrainedTables(schema, normalized);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ColumnInfo> getColumns(String schema, String table) {
|
||||
try {
|
||||
Connection conn = requireConnection();
|
||||
String owner = trim(schema);
|
||||
Set<Integer> primaryKeyColumns = getPrimaryKeyColumnNumbers(conn, owner, table);
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(table);
|
||||
StringBuilder sql = new StringBuilder("""
|
||||
SELECT c.colname, c.coltype, c.colno, c.collength
|
||||
FROM syscolumns c
|
||||
JOIN systables t ON t.tabid = c.tabid
|
||||
WHERE t.tabid >= 100 AND t.tabname = ?
|
||||
""".stripIndent().trim());
|
||||
if (!owner.isEmpty()) {
|
||||
sql.append(" AND t.owner = ?");
|
||||
args.add(owner);
|
||||
}
|
||||
sql.append(" ORDER BY c.colno");
|
||||
|
||||
List<ColumnInfo> result = new ArrayList<>();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
|
||||
bind(stmt, args);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
String name = trim(rs.getString("colname"));
|
||||
int coltype = rs.getInt("coltype");
|
||||
int baseType = baseColType(coltype);
|
||||
int length = rs.getInt("collength");
|
||||
result.add(new ColumnInfo(
|
||||
name,
|
||||
mapColType(baseType),
|
||||
(coltype & 256) == 0,
|
||||
null,
|
||||
primaryKeyColumns.contains(rs.getInt("colno")),
|
||||
null,
|
||||
null,
|
||||
numericPrecision(baseType, length),
|
||||
numericScale(baseType, length),
|
||||
characterMaximumLength(baseType, length)
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ObjectSource getObjectSource(String schema, String name, String objectType) {
|
||||
String normalizedType = objectType == null ? "" : objectType.trim().toUpperCase(Locale.ROOT);
|
||||
if (!"VIEW".equals(normalizedType)) {
|
||||
throw new UnsupportedOperationException("Object source is not supported");
|
||||
}
|
||||
return new ObjectSource(name, "VIEW", emptyToNull(trim(schema)), viewSource(schema, name), isEditableView(schema, name));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTableDdl(String schema, String table) {
|
||||
if ("VIEW".equals(tableType(schema, table))) {
|
||||
return viewSource(schema, table);
|
||||
}
|
||||
return super.getTableDdl(schema, table);
|
||||
}
|
||||
|
||||
private List<TableInfo> queryConstrainedTables(String schema, MetadataListConstraints constraints) {
|
||||
if (!constraints.includesTableLikeTypes()) {
|
||||
return List.of();
|
||||
@@ -336,6 +406,211 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
|
||||
return "V".equalsIgnoreCase(trim(tabtype)) ? "VIEW" : "TABLE";
|
||||
}
|
||||
|
||||
private String tableType(String schema, String table) {
|
||||
try {
|
||||
String owner = trim(schema);
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(table);
|
||||
StringBuilder sql = new StringBuilder("SELECT tabtype FROM systables WHERE tabid >= 100 AND tabname = ?");
|
||||
if (!owner.isEmpty()) {
|
||||
sql.append(" AND owner = ?");
|
||||
args.add(owner);
|
||||
}
|
||||
try (PreparedStatement stmt = requireConnection().prepareStatement(sql.toString())) {
|
||||
bind(stmt, args);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
return rs.next() ? tableType(rs.getString("tabtype")) : "";
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private String viewSource(String schema, String name) {
|
||||
try {
|
||||
String owner = trim(schema);
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(name);
|
||||
StringBuilder sql = new StringBuilder("""
|
||||
SELECT v.viewtext
|
||||
FROM sysviews v
|
||||
JOIN systables t ON t.tabid = v.tabid
|
||||
WHERE t.tabname = ?
|
||||
""".stripIndent().trim());
|
||||
if (!owner.isEmpty()) {
|
||||
sql.append(" AND t.owner = ?");
|
||||
args.add(owner);
|
||||
}
|
||||
sql.append(" ORDER BY v.seqno");
|
||||
StringBuilder source = new StringBuilder();
|
||||
try (PreparedStatement stmt = requireConnection().prepareStatement(sql.toString())) {
|
||||
bind(stmt, args);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
String chunk = rs.getString("viewtext");
|
||||
source.append(chunk == null ? "" : chunk);
|
||||
}
|
||||
}
|
||||
}
|
||||
String result = stripTrailing(source.toString());
|
||||
if (result.isEmpty()) {
|
||||
throw new IllegalArgumentException("View source not found: " + name);
|
||||
}
|
||||
return result;
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isEditableView(String schema, String name) {
|
||||
try {
|
||||
String owner = trim(schema);
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(name);
|
||||
StringBuilder sql = new StringBuilder("""
|
||||
SELECT t.tabid, t.owner,
|
||||
(SELECT v.tabid FROM systables v WHERE UPPER(TRIM(v.tabname)) = 'VERSION') AS system_boundary_tabid
|
||||
FROM systables t
|
||||
WHERE t.tabtype = 'V' AND t.tabname = ?
|
||||
""".stripIndent().trim());
|
||||
if (!owner.isEmpty()) {
|
||||
sql.append(" AND t.owner = ?");
|
||||
args.add(owner);
|
||||
}
|
||||
try (PreparedStatement stmt = requireConnection().prepareStatement(sql.toString())) {
|
||||
bind(stmt, args);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
if (!rs.next()) {
|
||||
return true;
|
||||
}
|
||||
int systemBoundaryTabid = rs.getInt("system_boundary_tabid");
|
||||
Integer boundary = rs.wasNull() ? null : systemBoundaryTabid;
|
||||
return !isSystemCatalogView(rs.getInt("tabid"), rs.getString("owner"), boundary);
|
||||
}
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isSystemCatalogView(int tabid, String owner, Integer systemBoundaryTabid) {
|
||||
if (!"gbasedbt".equalsIgnoreCase(trim(owner))) {
|
||||
return false;
|
||||
}
|
||||
// GBase 8s marks system catalog tables before/at VERSION; avoid a fixed tabid threshold
|
||||
// so ordinary gbasedbt-owned user views are still editable.
|
||||
if (systemBoundaryTabid != null && systemBoundaryTabid > 0) {
|
||||
return tabid <= systemBoundaryTabid;
|
||||
}
|
||||
return tabid < 100;
|
||||
}
|
||||
|
||||
public static String mapColType(int coltype) {
|
||||
return switch (baseColType(coltype)) {
|
||||
case 0 -> "CHAR";
|
||||
case 1 -> "SMALLINT";
|
||||
case 2 -> "INTEGER";
|
||||
case 3 -> "FLOAT";
|
||||
case 4 -> "SMALLFLOAT";
|
||||
case 5 -> "DECIMAL";
|
||||
case 6 -> "SERIAL";
|
||||
case 7 -> "DATE";
|
||||
case 8 -> "MONEY";
|
||||
case 9 -> "NULL";
|
||||
case 10 -> "DATETIME";
|
||||
case 11 -> "BYTE";
|
||||
case 12 -> "TEXT";
|
||||
case 13 -> "VARCHAR";
|
||||
case 14 -> "INTERVAL";
|
||||
case 15 -> "NCHAR";
|
||||
case 16 -> "NVARCHAR";
|
||||
case 17 -> "INT8";
|
||||
case 18 -> "SERIAL8";
|
||||
case 19 -> "SET";
|
||||
case 20 -> "MULTISET";
|
||||
case 21 -> "LIST";
|
||||
case 22 -> "ROW";
|
||||
case 23 -> "COLLECTION";
|
||||
case 40 -> "LVARCHAR";
|
||||
case 41 -> "BOOLEAN";
|
||||
case 43, 52 -> "BIGINT";
|
||||
case 44, 53 -> "BIGSERIAL";
|
||||
default -> "UNKNOWN(" + baseColType(coltype) + ")";
|
||||
};
|
||||
}
|
||||
|
||||
public static Set<Integer> primaryKeyColumnNumbers(List<Integer> parts) {
|
||||
Set<Integer> result = new HashSet<>();
|
||||
for (Integer part : parts) {
|
||||
if (part == null) {
|
||||
continue;
|
||||
}
|
||||
int value = Math.abs(part);
|
||||
if (value > 0) {
|
||||
result.add(value);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private Set<Integer> getPrimaryKeyColumnNumbers(Connection conn, String owner, String table) throws Exception {
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(table);
|
||||
StringBuilder sql = new StringBuilder("""
|
||||
SELECT i.part1, i.part2, i.part3, i.part4, i.part5, i.part6, i.part7, i.part8,
|
||||
i.part9, i.part10, i.part11, i.part12, i.part13, i.part14, i.part15, i.part16
|
||||
FROM sysconstraints c
|
||||
JOIN sysindexes i ON i.idxname = c.idxname AND i.tabid = c.tabid
|
||||
JOIN systables t ON t.tabid = c.tabid
|
||||
WHERE t.tabname = ? AND c.constrtype = 'P'
|
||||
""".stripIndent().trim());
|
||||
if (!owner.isEmpty()) {
|
||||
sql.append(" AND t.owner = ?");
|
||||
args.add(owner);
|
||||
}
|
||||
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
|
||||
bind(stmt, args);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
if (!rs.next()) {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
List<Integer> parts = new ArrayList<>();
|
||||
for (int index = 1; index <= 16; index += 1) {
|
||||
int value = rs.getInt(index);
|
||||
parts.add(rs.wasNull() ? null : value);
|
||||
}
|
||||
return primaryKeyColumnNumbers(parts);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static int baseColType(int coltype) {
|
||||
return coltype % 256;
|
||||
}
|
||||
|
||||
private static Integer numericPrecision(int baseType, int length) {
|
||||
if (baseType == 5 || baseType == 8) {
|
||||
return (length >> 8) & 0xff;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Integer numericScale(int baseType, int length) {
|
||||
if (baseType == 5 || baseType == 8) {
|
||||
return length & 0xff;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Integer characterMaximumLength(int baseType, int length) {
|
||||
return switch (baseType) {
|
||||
case 0, 13, 15, 16, 40 -> length;
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
private static void appendGbase8sTableTypePredicate(StringBuilder sql, MetadataListConstraints constraints) {
|
||||
if (!constraints.hasObjectTypes()) {
|
||||
sql.append(" AND tabtype IN ('T', 'V')");
|
||||
@@ -372,6 +647,14 @@ public final class Gbase8sAgent extends ConfiguredJdbcAgent {
|
||||
return value == null ? "" : value.trim();
|
||||
}
|
||||
|
||||
private static String emptyToNull(String value) {
|
||||
return value.isEmpty() ? null : value;
|
||||
}
|
||||
|
||||
private static String stripTrailing(String value) {
|
||||
return value == null ? "" : value.stripTrailing();
|
||||
}
|
||||
|
||||
private String currentCatalog() {
|
||||
try {
|
||||
return trim(requireConnection().getCatalog());
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package com.dbx.agent.gbase8s;
|
||||
|
||||
import com.dbx.agent.ConnectParams;
|
||||
import com.dbx.agent.ColumnInfo;
|
||||
import com.dbx.agent.MetadataListConstraints;
|
||||
import com.dbx.agent.ObjectSource;
|
||||
import com.dbx.agent.TableInfo;
|
||||
import com.dbx.agent.test.TestSupport;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
@@ -14,7 +16,9 @@ import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
class Gbase8sAgentTest {
|
||||
@Test
|
||||
@@ -131,10 +135,149 @@ class Gbase8sAgentTest {
|
||||
Assertions.assertTrue(sql.get(0).contains("UPPER(tabname) LIKE ?"), sql.get(0));
|
||||
}
|
||||
|
||||
private static Connection preparedConnection(List<String> sql, ResultSet resultSet) {
|
||||
@Test
|
||||
void extractsPrimaryKeyColumnNumbersFromGbase8sIndexParts() {
|
||||
Assertions.assertEquals(
|
||||
Set.of(1, 3, 5),
|
||||
Gbase8sAgent.primaryKeyColumnNumbers(Arrays.asList(1, -3, 0, 5, null))
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void getColumnsUsesGbase8sSystemCatalog() {
|
||||
List<String> sql = new ArrayList<>();
|
||||
Gbase8sAgent agent = new Gbase8sAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(
|
||||
sql,
|
||||
resultSet(
|
||||
new String[]{"part1", "part2", "part3", "part4", "part5", "part6", "part7", "part8", "part9", "part10", "part11", "part12", "part13", "part14", "part15", "part16"},
|
||||
new Object[][]{
|
||||
{1, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, null}
|
||||
}
|
||||
),
|
||||
resultSet(
|
||||
new String[]{"colname", "coltype", "colno", "collength"},
|
||||
new Object[][]{
|
||||
{"product_id", 258, 1, 4},
|
||||
{"sku", 13, 2, 40},
|
||||
{"price", 5, 3, 3074}
|
||||
}
|
||||
)
|
||||
));
|
||||
|
||||
List<ColumnInfo> columns = agent.getColumns("root", "products");
|
||||
|
||||
Assertions.assertEquals(2, sql.size());
|
||||
Assertions.assertTrue(sql.get(0).contains("FROM sysconstraints"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(0).contains("t.owner = ?"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(1).contains("FROM syscolumns"), sql.get(1));
|
||||
Assertions.assertTrue(sql.get(1).contains("t.owner = ?"), sql.get(1));
|
||||
Assertions.assertEquals(3, columns.size());
|
||||
Assertions.assertEquals("product_id", columns.get(0).getName());
|
||||
Assertions.assertEquals("INTEGER", columns.get(0).getData_type());
|
||||
Assertions.assertFalse(columns.get(0).getIs_nullable());
|
||||
Assertions.assertTrue(columns.get(0).getIs_primary_key());
|
||||
Assertions.assertEquals("VARCHAR", columns.get(1).getData_type());
|
||||
Assertions.assertEquals(40, columns.get(1).getCharacter_maximum_length());
|
||||
Assertions.assertEquals("DECIMAL", columns.get(2).getData_type());
|
||||
Assertions.assertEquals(12, columns.get(2).getNumeric_precision());
|
||||
Assertions.assertEquals(2, columns.get(2).getNumeric_scale());
|
||||
}
|
||||
|
||||
@Test
|
||||
void getObjectSourceUsesGbase8sViewCatalog() {
|
||||
List<String> sql = new ArrayList<>();
|
||||
Gbase8sAgent agent = new Gbase8sAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(
|
||||
sql,
|
||||
resultSet(
|
||||
new String[]{"viewtext"},
|
||||
new Object[][]{
|
||||
{"create view \"gbasedbt\".demo_view as select "},
|
||||
{"* from products; "}
|
||||
}
|
||||
),
|
||||
resultSet(
|
||||
new String[]{"tabid", "owner", "system_boundary_tabid"},
|
||||
new Object[][]{
|
||||
{1000, "gbasedbt", 614}
|
||||
}
|
||||
)
|
||||
));
|
||||
|
||||
ObjectSource source = agent.getObjectSource("gbasedbt", "demo_view", "VIEW");
|
||||
|
||||
Assertions.assertEquals("demo_view", source.getName());
|
||||
Assertions.assertEquals("VIEW", source.getObject_type());
|
||||
Assertions.assertEquals("gbasedbt", source.getSchema());
|
||||
Assertions.assertEquals("create view \"gbasedbt\".demo_view as select * from products;", source.getSource());
|
||||
Assertions.assertTrue(source.isEditable());
|
||||
Assertions.assertEquals(2, sql.size());
|
||||
Assertions.assertTrue(sql.get(0).contains("FROM sysviews"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(0).contains("t.owner = ?"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(0).contains("ORDER BY v.seqno"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(1).contains("system_boundary_tabid"), sql.get(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
void getObjectSourceMarksGbase8sSystemViewsReadOnly() {
|
||||
Gbase8sAgent agent = new Gbase8sAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(
|
||||
new ArrayList<>(),
|
||||
resultSet(
|
||||
new String[]{"viewtext"},
|
||||
new Object[][]{
|
||||
{"create view \"gbasedbt\".dba_db_links as select * from user_db_links;"}
|
||||
}
|
||||
),
|
||||
resultSet(
|
||||
new String[]{"tabid", "owner", "system_boundary_tabid"},
|
||||
new Object[][]{
|
||||
{614, "gbasedbt", 614}
|
||||
}
|
||||
)
|
||||
));
|
||||
|
||||
ObjectSource source = agent.getObjectSource("gbasedbt", "dba_db_links", "VIEW");
|
||||
|
||||
Assertions.assertFalse(source.isEditable());
|
||||
}
|
||||
|
||||
@Test
|
||||
void getTableDdlReturnsViewSourceForGbase8sViews() {
|
||||
List<String> sql = new ArrayList<>();
|
||||
Gbase8sAgent agent = new Gbase8sAgent();
|
||||
TestSupport.setPrivateConnection(agent, preparedConnection(
|
||||
sql,
|
||||
resultSet(
|
||||
new String[]{"tabtype"},
|
||||
new Object[][]{
|
||||
{"V"}
|
||||
}
|
||||
),
|
||||
resultSet(
|
||||
new String[]{"viewtext"},
|
||||
new Object[][]{
|
||||
{"create view demo_view as select 1 as id; "}
|
||||
}
|
||||
)
|
||||
));
|
||||
|
||||
String ddl = agent.getTableDdl("gbasedbt", "demo_view");
|
||||
|
||||
Assertions.assertEquals("create view demo_view as select 1 as id;", ddl);
|
||||
Assertions.assertEquals(2, sql.size());
|
||||
Assertions.assertTrue(sql.get(0).contains("SELECT tabtype FROM systables"), sql.get(0));
|
||||
Assertions.assertTrue(sql.get(1).contains("FROM sysviews"), sql.get(1));
|
||||
}
|
||||
|
||||
private static Connection preparedConnection(List<String> sql, ResultSet... resultSets) {
|
||||
int[] resultIndex = {0};
|
||||
PreparedStatement statement = proxy(PreparedStatement.class, (method, args) -> {
|
||||
if ("executeQuery".equals(method.getName())) {
|
||||
return resultSet;
|
||||
int index = Math.min(resultIndex[0], resultSets.length - 1);
|
||||
resultIndex[0] += 1;
|
||||
return resultSets[index];
|
||||
}
|
||||
if ("setString".equals(method.getName()) || "close".equals(method.getName())) {
|
||||
return null;
|
||||
@@ -158,6 +301,7 @@ class Gbase8sAgentTest {
|
||||
|
||||
private static ResultSet resultSet(String[] columns, Object[][] rows) {
|
||||
int[] index = {-1};
|
||||
Object[] lastValue = {null};
|
||||
return proxy(ResultSet.class, (method, args) -> {
|
||||
switch (method.getName()) {
|
||||
case "next":
|
||||
@@ -165,7 +309,20 @@ class Gbase8sAgentTest {
|
||||
return index[0] < rows.length;
|
||||
case "getString":
|
||||
Object value = columnValue(columns, rows[index[0]], args[0]);
|
||||
lastValue[0] = value;
|
||||
return value == null ? null : String.valueOf(value);
|
||||
case "getInt":
|
||||
Object intValue = columnValue(columns, rows[index[0]], args[0]);
|
||||
lastValue[0] = intValue;
|
||||
if (intValue == null) {
|
||||
return 0;
|
||||
}
|
||||
if (intValue instanceof Number) {
|
||||
return ((Number) intValue).intValue();
|
||||
}
|
||||
return Integer.parseInt(String.valueOf(intValue));
|
||||
case "wasNull":
|
||||
return lastValue[0] == null;
|
||||
case "close":
|
||||
return null;
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user