Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
f08ebd5c
Commit
f08ebd5c
authored
9 years ago
by
Cam Saül
Browse files
Options
Downloads
Patches
Plain Diff
block native queries against H2 databases that don't use a non-default user
parent
0b527b3f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/metabase/driver/generic_sql.clj
+27
-18
27 additions, 18 deletions
src/metabase/driver/generic_sql.clj
src/metabase/driver/h2.clj
+28
-3
28 additions, 3 deletions
src/metabase/driver/h2.clj
src/metabase/driver/postgres.clj
+9
-2
9 additions, 2 deletions
src/metabase/driver/postgres.clj
with
64 additions
and
23 deletions
src/metabase/driver/generic_sql.clj
+
27
−
18
View file @
f08ebd5c
...
...
@@ -128,21 +128,30 @@
(
float
(
/
url-count
total-non-null-count
))))))
0.0
))
(
defn
extend-add-generic-sql-mixins
[
driver-type
]
(
extend
driver-type
IDriver
{
:can-connect?
can-connect?
:can-connect-with-details?
can-connect-with-details?
:wrap-process-query-middleware
wrap-process-query-middleware
:process-query
process-query
:sync-in-context
sync-in-context
:active-table-names
active-table-names
:active-column-names->type
active-column-names->type
:table-pks
table-pks
:field-values-lazy-seq
field-values-lazy-seq
}
ISyncDriverTableFKs
{
:table-fks
table-fks
}
ISyncDriverFieldAvgLength
{
:field-avg-length
field-avg-length
}
ISyncDriverFieldPercentUrls
{
:field-percent-urls
field-percent-urls
}))
(
def
^
:const
GenericSQLIDriverMixin
"Generic SQL implementation of the `IDriver` protocol.
(extend H2Driver
IDriver
GenericSQLIDriverMixin)"
{
:can-connect?
can-connect?
:can-connect-with-details?
can-connect-with-details?
:wrap-process-query-middleware
wrap-process-query-middleware
:process-query
process-query
:sync-in-context
sync-in-context
:active-table-names
active-table-names
:active-column-names->type
active-column-names->type
:table-pks
table-pks
:field-values-lazy-seq
field-values-lazy-seq
})
(
def
^
:const
GenericSQLISyncDriverTableFKsMixin
"Generic SQL implementation of the `ISyncDriverTableFKs` protocol."
{
:table-fks
table-fks
})
(
def
^
:const
GenericSQLISyncDriverFieldAvgLengthMixin
"Generic SQL implementation of the `ISyncDriverFieldAvgLengthMixin` protocol."
{
:field-avg-length
field-avg-length
})
(
def
^
:const
GenericSQLISyncDriverFieldPercentUrlsMixin
"Generic SQL implementation of the `ISyncDriverFieldPercentUrls` protocol."
{
:field-percent-urls
field-percent-urls
})
This diff is collapsed.
Click to expand it.
src/metabase/driver/h2.clj
+
28
−
3
View file @
f08ebd5c
...
...
@@ -3,8 +3,11 @@
[
korma.db
:as
kdb
]
[
metabase.db
:as
db
]
[
metabase.driver
:as
driver
]
[
metabase.driver.generic-sql
:as
generic-sql
]
[
metabase.driver.generic-sql.interface
:refer
:all
]))
(
metabase.driver
[
generic-sql
:as
generic-sql,
:refer
[
GenericSQLIDriverMixin
GenericSQLISyncDriverTableFKsMixin
GenericSQLISyncDriverFieldAvgLengthMixin
GenericSQLISyncDriverFieldPercentUrlsMixin
]]
[
interface
:refer
[
IDriver
ISyncDriverTableFKs
ISyncDriverFieldAvgLength
ISyncDriverFieldPercentUrls
]])
[
metabase.driver.generic-sql.interface
:refer
:all
]
[
metabase.models.database
:refer
[
Database
]]))
(
def
^
:private
^
:const
column->base-type
"Map of H2 Column types -> Field base types. (Add more mappings here as needed)"
...
...
@@ -115,7 +118,29 @@
:milliseconds
"MILLISECOND"
)
table-name
field-name
)))
(
generic-sql/extend-add-generic-sql-mixins
H2Driver
)
(
defn-
wrap-process-query-middleware
[
_
qp
]
(
fn
[{
query-type
:type,
:as
query
}]
{
:pre
[
query-type
]}
;; For :native queries check to make sure the DB in question has a NAME property specified in the connection string.
;; We don't want to allow SQL queries on DBs connected with the default H2 admin account because they have access
;; to potentially unsafe functions like FILEREAD and FILEWRITE.
;; Assume any specified non-default USER for this H2 database doesn't have admin privs
(
when
(
=
(
keyword
query-type
)
:native
)
(
let
[{
:keys
[
db
]}
(
db/sel
:one
:field
[
Database
:details
]
:id
(
:database
query
))
_
(
assert
db
)
[
_
options
]
(
connection-string->file+options
db
)
{
:strs
[
USER
]}
options
]
(
when
(
or
(
not
USER
)
(
=
USER
"sa"
))
; "sa" is the default USER
(
throw
(
Exception.
"Running SQL queries against H2 databases using the default (admin) database user is forbidden."
)))))
(
qp
query
)))
(
extend
H2Driver
;; Override the generic SQL implementation of wrap-process-query-middleware so we can block unsafe native queries (see above)
IDriver
(
assoc
GenericSQLIDriverMixin
:wrap-process-query-middleware
wrap-process-query-middleware
)
ISyncDriverTableFKs
GenericSQLISyncDriverTableFKsMixin
ISyncDriverFieldAvgLength
GenericSQLISyncDriverFieldAvgLengthMixin
ISyncDriverFieldPercentUrls
GenericSQLISyncDriverFieldPercentUrlsMixin
)
(
def
^
:const
driver
(
map->H2Driver
{
:column->base-type
column->base-type
...
...
This diff is collapsed.
Click to expand it.
src/metabase/driver/postgres.clj
+
9
−
2
View file @
f08ebd5c
...
...
@@ -8,7 +8,10 @@
[
metabase.db
:refer
[
upd
]]
[
metabase.models.field
:refer
[
Field
]]
[
metabase.driver
:as
driver
]
[
metabase.driver.interface
:refer
[
ISyncDriverSpecificSyncField
driver-specific-sync-field!
]]
(
metabase.driver
[
generic-sql
:as
generic-sql,
:refer
[
GenericSQLIDriverMixin
GenericSQLISyncDriverTableFKsMixin
GenericSQLISyncDriverFieldAvgLengthMixin
GenericSQLISyncDriverFieldPercentUrlsMixin
]]
[
interface
:refer
[
IDriver
ISyncDriverTableFKs
ISyncDriverFieldAvgLength
ISyncDriverFieldPercentUrls
ISyncDriverSpecificSyncField
driver-specific-sync-field!
]])
[
metabase.driver.generic-sql
:as
generic-sql
]
(
metabase.driver.generic-sql
[
interface
:refer
:all
]
[
util
:refer
[
with-jdbc-metadata
]])))
...
...
@@ -117,7 +120,11 @@
(
upd
Field
(
:id
field
)
:special_type
:json
)
(
assoc
field
:special_type
:json
))))))
(
generic-sql/extend-add-generic-sql-mixins
PostgresDriver
)
(
extend
PostgresDriver
IDriver
GenericSQLIDriverMixin
ISyncDriverTableFKs
GenericSQLISyncDriverTableFKsMixin
ISyncDriverFieldAvgLength
GenericSQLISyncDriverFieldAvgLengthMixin
ISyncDriverFieldPercentUrls
GenericSQLISyncDriverFieldPercentUrlsMixin
)
(
def
^
:const
driver
(
map->PostgresDriver
{
:column->base-type
column->base-type
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment