You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by di...@apache.org on 2023/01/25 15:31:38 UTC
[superset] branch fix/jinja-schema-auth created (now c78943f503)
This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a change to branch fix/jinja-schema-auth
in repository https://gitbox.apache.org/repos/asf/superset.git
at c78943f503 Validate rendered query
This branch includes the following new commits:
new 2ed9279f40 Merge branch 'master' of https://github.com/apache/superset into fix/jinja-schema-auth
new c78943f503 Validate rendered query
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[superset] 01/02: Merge branch 'master' of https://github.com/apache/superset into fix/jinja-schema-auth
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a commit to branch fix/jinja-schema-auth
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 2ed9279f40ae6bc61ad257973a89741f9b43cfda
Merge: 5a422b31c5 262c947273
Author: geido <di...@gmail.com>
AuthorDate: Wed Jan 25 15:24:58 2023 +0100
Merge branch 'master' of https://github.com/apache/superset into fix/jinja-schema-auth
.github/ISSUE_TEMPLATE/bug_report.md | 2 +-
.github/ISSUE_TEMPLATE/feature_request.md | 14 -
.github/ISSUE_TEMPLATE/sip.md | 4 +-
.github/workflows/docker_build_push.sh | 17 +-
.github/workflows/superset-applitool-cypress.yml | 2 +-
.github/workflows/superset-cli.yml | 2 +-
.github/workflows/superset-e2e.yml | 2 +-
.../workflows/superset-python-integrationtest.yml | 6 +-
.github/workflows/superset-python-presto-hive.yml | 4 +-
CHANGELOG.md | 36 +-
CODE_OF_CONDUCT.md | 2 +-
CONTRIBUTING.md | 17 +-
README.md | 4 +-
RESOURCES/INTHEWILD.md | 2 +
UPDATING.md | 11 +
docker-compose-non-dev.yml | 4 +-
docker-compose.yml | 2 +-
docker/.env | 1 +
docker/.env-non-dev | 1 +
docker/docker-bootstrap.sh | 2 +-
docker/pythonpath_dev/superset_config.py | 13 +-
docs/docs/contributing/contributing-page.mdx | 2 +-
docs/docs/contributing/types-of-contributions.mdx | 8 +-
docs/docs/frequently-asked-questions.mdx | 2 +-
docs/docs/installation/alerts-reports.mdx | 319 +-
docs/docs/installation/cache.mdx | 70 +-
.../installing-superset-using-docker-compose.mdx | 6 +-
docs/docs/installation/running-on-kubernetes.mdx | 25 +-
docs/docs/security.mdx | 37 +
docs/docusaurus.config.js | 2 +-
docs/src/pages/community.tsx | 2 +-
docs/src/pages/index.tsx | 6 +-
docs/static/img/dashboard.jpg | Bin 0 -> 128565 bytes
docs/static/img/dashboard3.png | Bin 728491 -> 0 bytes
docs/static/img/explore.jpg | Bin 0 -> 150805 bytes
docs/static/img/explorer5.jpg | Bin 314853 -> 0 bytes
docs/static/img/sql_lab.jpg | Bin 0 -> 117310 bytes
docs/static/img/sqllab5.jpg | Bin 345510 -> 0 bytes
docs/static/resources/openapi.json | 1258 +-
helm/superset/Chart.yaml | 2 +-
helm/superset/README.md | 17 +-
helm/superset/templates/_helpers.tpl | 6 -
helm/superset/templates/deployment-beat.yaml | 18 +-
helm/superset/templates/deployment-flower.yaml | 18 +-
helm/superset/templates/deployment-worker.yaml | 16 +-
helm/superset/templates/deployment-ws.yaml | 16 +-
helm/superset/templates/deployment.yaml | 16 +-
helm/superset/values.yaml | 25 +-
requirements/integration.txt | 2 +-
setup.cfg | 4 +-
superset-embedded-sdk/package-lock.json | 48 +-
superset-frontend/.storybook/preview.jsx | 10 +-
.../integration/alerts_and_reports/alerts.test.ts | 4 -
.../integration/alerts_and_reports/reports.test.ts | 4 -
.../chart_list/chartlist.applitools.test.ts | 1 -
.../cypress/integration/chart_list/filter.test.ts | 1 -
.../cypress/integration/chart_list/list.test.ts | 4 -
.../integration/dashboard/_skip.controls.test.ts | 1 -
.../integration/dashboard/_skip.filter.test.ts | 1 -
.../integration/dashboard/_skip.key_value.test.ts | 3 -
.../integration/dashboard/_skip.url_params.test.ts | 2 -
.../dashboard/dashboard.applitools.test.ts | 1 -
.../integration/dashboard/drilltodetail.test.ts | 1 -
.../cypress/integration/dashboard/editmode.test.ts | 4 -
.../cypress/integration/dashboard/load.test.ts | 8 -
.../integration/dashboard/nativeFilters.test.ts | 16 +-
.../cypress/integration/dashboard/tabs.test.ts | 1 -
.../dashboardlist.applitools.test.ts | 1 -
.../integration/dashboard_list/filter.test.ts | 1 -
.../integration/dashboard_list/list.test.ts | 4 -
.../cypress/integration/database/modal.test.ts | 1 -
.../integration/dataset/dataset_list.test.ts | 4 -
.../integration/explore/AdhocMetrics.test.ts | 1 -
.../integration/explore/_skip.AdhocFilters.test.ts | 1 -
.../integration/explore/advanced_analytics.test.ts | 1 -
.../integration/explore/annotations.test.ts | 1 -
.../cypress/integration/explore/chart.test.js | 2 -
.../cypress/integration/explore/control.test.ts | 9 -
.../integration/explore/explore.applitools.test.ts | 1 -
.../cypress/integration/explore/filter_box.test.js | 1 -
.../cypress/integration/explore/link.test.ts | 1 -
.../explore/visualizations/area.test.js | 1 -
.../explore/visualizations/big_number.test.js | 1 -
.../visualizations/big_number_total.test.js | 1 -
.../explore/visualizations/box_plot.test.js | 1 -
.../explore/visualizations/bubble.test.js | 1 -
.../explore/visualizations/compare.test.js | 1 -
.../explore/visualizations/dist_bar.test.js | 1 -
.../explore/visualizations/download_chart.test.js | 1 -
.../explore/visualizations/dual_line.test.js | 1 -
.../explore/visualizations/gauge.test.js | 1 -
.../explore/visualizations/graph.test.ts | 1 -
.../explore/visualizations/histogram.test.ts | 1 -
.../explore/visualizations/line.test.ts | 1 -
.../integration/explore/visualizations/pie.test.js | 1 -
.../explore/visualizations/pivot_table.test.js | 1 -
.../explore/visualizations/sankey.test.js | 1 -
.../explore/visualizations/sunburst.test.js | 1 -
.../explore/visualizations/table.test.ts | 1 -
.../explore/visualizations/time_table.js | 1 -
.../explore/visualizations/treemap.test.js | 1 -
.../explore/visualizations/world_map.test.js | 1 -
.../sqllab/_skip.sourcePanel.index.test.js | 1 -
.../cypress/integration/sqllab/query.test.ts | 1 -
.../integration/sqllab/sqllab.applitools.test.ts | 1 -
.../cypress/integration/sqllab/tabs.test.ts | 1 -
.../cypress-base/cypress/support/directories.ts | 7 +-
.../cypress-base/cypress/support/index.d.ts | 1 -
.../cypress-base/cypress/support/index.ts | 39 +-
superset-frontend/cypress-base/package-lock.json | 30 +-
superset-frontend/package-lock.json | 15858 +++++++++++-----
superset-frontend/package.json | 12 +-
.../src/images/example1.jpg | Bin 0 -> 62434 bytes
.../src/images/example2.jpg | Bin 0 -> 106374 bytes
.../src/index.js | 3 +
.../src/images/example.jpg | Bin 0 -> 44054 bytes
.../legacy-plugin-chart-partition/src/index.js | 2 +
.../src/images/example.jpg | Bin 0 -> 59676 bytes
.../legacy-plugin-chart-pivot-table/src/index.js | 2 +
.../src/Compare/images/example.jpg | Bin 0 -> 66360 bytes
.../legacy-preset-chart-nvd3/src/Compare/index.js | 2 +
.../src/MixedTimeseries/images/example.jpg | Bin 0 -> 65380 bytes
.../src/MixedTimeseries/index.ts | 2 +
.../src/Sunburst/EchartsSunburst.tsx | 126 +
.../src/Sunburst/buildQuery.ts} | 19 +-
.../src/Sunburst/controlPanel.tsx | 207 +
.../src/Sunburst/images/thumbnail.png | Bin 0 -> 5658 bytes
.../plugin-chart-echarts/src/Sunburst}/index.ts | 47 +-
.../src/Sunburst/transformProps.ts | 362 +
.../src/{Treemap => Sunburst}/types.ts | 49 +-
.../plugin-chart-echarts/src/Treemap/constants.ts | 2 +-
.../src/Treemap/transformProps.ts | 144 +-
.../plugin-chart-echarts/src/Treemap/types.ts | 7 +-
.../plugins/plugin-chart-echarts/src/index.ts | 2 +
.../plugins/plugin-chart-echarts/src/types.ts | 9 +-
.../plugin-chart-echarts/src/utils/treeBuilder.ts | 87 +
.../test/utils/treeBuilder.test.ts | 274 +
.../src/images/example.jpg | Bin 0 -> 66959 bytes
.../plugin-chart-pivot-table/src/plugin/index.ts | 2 +
.../plugin-chart-pivot-table/types/external.d.ts | 2 +
superset-frontend/src/GlobalStyles.tsx | 33 +
superset-frontend/src/SqlLab/App.jsx | 3 +-
.../SqlLabGlobalStyles.tsx} | 20 +-
superset-frontend/src/SqlLab/actions/sqlLab.js | 20 +-
.../src/SqlLab/actions/sqlLab.test.js | 59 +-
.../SqlLab/components/AceEditorWrapper/index.tsx | 26 +-
.../src/SqlLab/components/App/index.jsx | 69 +-
.../components/EstimateQueryCostButton/index.tsx | 23 +-
.../QueryStateLabel/QueryStateLabel.test.jsx | 5 +-
.../SqlLab/components/QueryStateLabel/index.tsx | 10 +-
.../src/SqlLab/components/ResultSet/index.tsx | 11 +-
.../ShareSqlLabQuery/ShareSqlLabQuery.test.tsx | 4 +-
.../src/SqlLab/components/SqlEditor/index.jsx | 62 +-
.../SqlEditorLeftBar/SqlEditorLeftBar.test.jsx | 97 +-
.../SqlLab/components/SqlEditorLeftBar/index.tsx | 20 +-
.../SqlLab/components/SqlEditorTabHeader/index.tsx | 26 +-
.../src/SqlLab/components/TabStatusIcon/index.tsx | 39 +-
.../TabbedSqlEditors/TabbedSqlEditors.test.jsx | 4 +-
.../SqlLab/components/TabbedSqlEditors/index.jsx | 10 +-
.../src/SqlLab/components/TableElement/index.tsx | 41 +-
.../src/SqlLab/hooks/useQueryEditor/index.ts | 33 +-
.../hooks/useQueryEditor/useQueryEditor.test.ts | 28 +-
superset-frontend/src/SqlLab/main.less | 491 -
superset-frontend/src/SqlLab/types.ts | 2 +-
.../src/assets/stylesheets/superset.less | 18 +-
superset-frontend/src/components/Chart/Chart.jsx | 4 +
.../Datasource/DatasourceEditor.test.jsx | 18 +-
.../FilterableTable/FilterableTable.test.tsx | 14 +-
.../src/components/FilterableTable/index.tsx | 6 +-
.../Form/LabeledErrorBoundInput.test.jsx | 4 +-
.../src/components/Form/LabeledErrorBoundInput.tsx | 16 +-
.../src/components/ListView/ListView.test.jsx | 6 +-
.../src/components/Modal/Modal.stories.tsx | 15 +
superset-frontend/src/components/Modal/Modal.tsx | 20 +-
.../HeaderReportDropdown/index.test.tsx | 6 +-
.../components/ReportModal/ReportModal.test.tsx | 6 +-
.../src/components/Select/AsyncSelect.tsx | 4 +-
.../src/components/Select/CustomTag.tsx | 21 +-
.../src/components/Select/Select.stories.tsx | 8 +
.../src/components/Select/Select.test.tsx | 232 +-
superset-frontend/src/components/Select/Select.tsx | 207 +-
superset-frontend/src/components/Select/styles.tsx | 18 +-
superset-frontend/src/components/Select/types.ts | 3 +-
superset-frontend/src/components/Select/utils.tsx | 12 +-
.../src/dashboard/components/Dashboard.jsx | 1 -
.../DashboardBuilder/DashboardBuilder.test.tsx | 4 +-
.../DashboardBuilder/DashboardBuilder.tsx | 437 +-
.../src/dashboard/components/DashboardGrid.jsx | 84 +-
.../dashboard/components/DashboardGrid.test.jsx | 7 -
.../DetailsPanel/DetailsPanel.test.tsx | 22 +-
.../components/FiltersBadge/DetailsPanel/index.tsx | 17 +-
.../FilterIndicator/FilterIndicator.test.tsx | 16 +-
.../FiltersBadge/FilterIndicator/index.tsx | 12 +-
.../HeaderActionsDropdown.test.tsx | 1 +
.../Header/HeaderActionsDropdown/index.jsx | 3 +
.../src/dashboard/components/Header/index.jsx | 2 +
.../components/SliceHeader/SliceHeader.test.tsx | 1 +
.../src/dashboard/components/SliceHeader/index.tsx | 71 +-
.../SliceHeaderControls.test.tsx | 1 +
.../components/SliceHeaderControls/index.tsx | 13 +
.../src/dashboard/components/dnd/DragDroppable.jsx | 63 +-
.../components/dnd/DragDroppable.test.jsx | 5 +-
.../components/filterscope/FilterScopeSelector.jsx | 280 +-
.../dashboard/components/gridComponents/Chart.jsx | 15 +-
.../components/gridComponents/ChartHolder.tsx | 13 +-
.../dashboard/components/gridComponents/Column.jsx | 87 +-
.../components/gridComponents/Divider.jsx | 28 +-
.../dashboard/components/gridComponents/Header.jsx | 63 +-
.../components/gridComponents/Markdown.jsx | 37 +-
.../dashboard/components/gridComponents/Row.jsx | 84 +-
.../gridComponents/new/DraggableNewComponent.jsx | 66 +-
.../new/DraggableNewComponent.test.jsx | 6 +-
.../components/menu/BackgroundStyleDropdown.tsx | 53 +-
.../dashboard/components/menu/WithPopoverMenu.tsx | 70 +-
.../FilterControls/FilterDivider.stories.tsx | 1 -
.../FilterBar/FilterSets/EditSection.tsx | 4 +-
.../FilterBar/FilterSets/FilterSetUnit.test.tsx | 2 +-
.../FilterBar/FilterSets/FilterSetUnit.tsx | 9 +-
.../FiltersConfigModal/FilterConfigurePane.tsx | 2 +-
.../FiltersConfigForm/FiltersConfigForm.tsx | 20 +
.../components/resizable/ResizableContainer.jsx | 92 +-
.../src/dashboard/containers/DashboardPage.tsx | 4 +-
superset-frontend/src/dashboard/styles.ts | 33 +
.../src/dashboard/stylesheets/builder.less | 49 -
.../dashboard/stylesheets/components/chart.less | 150 -
.../dashboard/stylesheets/components/column.less | 64 -
.../dashboard/stylesheets/components/divider.less | 42 -
.../dashboard/stylesheets/components/header.less | 87 -
.../dashboard/stylesheets/components/index.less | 25 -
.../dashboard/stylesheets/components/markdown.less | 57 -
.../stylesheets/components/new-component.less | 55 -
.../src/dashboard/stylesheets/components/row.less | 92 -
.../src/dashboard/stylesheets/dashboard.less | 164 -
.../src/dashboard/stylesheets/dnd.less | 130 -
.../stylesheets/filter-scope-selector.less | 259 -
.../src/dashboard/stylesheets/grid.less | 53 -
.../src/dashboard/stylesheets/popover-menu.less | 140 -
.../src/dashboard/stylesheets/resizable.less | 105 -
.../explore/components/ControlPanelsContainer.tsx | 97 +-
.../DatasourceControl/DatasourceControl.test.tsx | 51 +-
.../controls/DatasourceControl/index.jsx | 12 +-
.../DndColumnSelectControl/DndFilterSelect.tsx | 42 +-
.../DndMetricSelect.test.tsx | 13 +-
.../FilterControl/AdhocFilterControl/index.jsx | 31 +-
.../FilterControl/AdhocFilterEditPopover/index.jsx | 5 +-
.../AdhocFilterPopoverTrigger/index.tsx | 2 +
.../components/controls/OptionControls/index.tsx | 5 +-
.../useExploreAdditionalActionsMenu/index.jsx | 22 +-
superset-frontend/src/explore/main.less | 137 -
.../components/Select/SelectFilterPlugin.tsx | 3 -
superset-frontend/src/logger/LogUtils.ts | 5 +
superset-frontend/src/middleware/asyncEvent.ts | 2 +-
.../ChartCreation/ChartCreation.test.tsx} | 20 +-
.../ChartCreation/index.tsx} | 14 +-
.../CRUD/chart => pages/ChartList}/ChartCard.tsx | 2 +-
.../chart => pages/ChartList}/ChartList.test.jsx | 2 +-
.../ChartList.tsx => pages/ChartList/index.tsx} | 0
.../src/profile/components/RecentActivity.tsx | 10 +-
superset-frontend/src/profile/types.ts | 4 +
.../src/views/CRUD/alert/AlertReportModal.tsx | 32 +-
superset-frontend/src/views/CRUD/chart/types.ts | 28 -
.../DatabaseConnectionForm/EncryptedField.tsx | 5 +-
.../DatabaseConnectionForm/TableCatalog.tsx | 17 +-
.../data/database/DatabaseModal/SSHTunnelForm.tsx | 6 +-
.../data/database/DatabaseModal/index.test.tsx | 84 +-
.../CRUD/data/database/DatabaseModal/index.tsx | 84 +-
.../CRUD/data/database/DatabaseModal/styles.ts | 6 -
.../src/views/CRUD/data/database/types.ts | 2 +-
superset-frontend/src/views/CRUD/utils.tsx | 2 +-
.../src/views/CRUD/welcome/ActivityTable.tsx | 2 +-
.../src/views/CRUD/welcome/ChartTable.tsx | 2 +-
.../src/views/CRUD/welcome/Welcome.test.tsx | 6 +-
.../src/views/CRUD/welcome/Welcome.tsx | 4 +-
superset-frontend/src/views/components/Menu.tsx | 2 +
superset-frontend/src/views/routes.tsx | 13 +-
.../visualizations/TimeTable/images/example.jpg | Bin 0 -> 72275 bytes
.../src/visualizations/TimeTable/index.ts | 2 +
superset-websocket/package-lock.json | 1111 +-
superset-websocket/package.json | 18 +-
.../utils/client-ws-app/package-lock.json | 162 +-
.../utils/client-ws-app/package.json | 2 +-
superset/config.py | 6 +-
superset/connectors/sqla/models.py | 37 +-
superset/constants.py | 1 +
superset/databases/api.py | 2 +-
superset/databases/commands/test_connection.py | 38 +-
superset/databases/schemas.py | 1 +
superset/datasets/api.py | 3 +
superset/db_engine_specs/athena.py | 1 +
superset/db_engine_specs/base.py | 6 +-
superset/db_engine_specs/bigquery.py | 1 +
superset/db_engine_specs/databricks.py | 18 +-
superset/db_engine_specs/gsheets.py | 1 +
superset/db_engine_specs/hive.py | 41 +-
superset/db_engine_specs/impala.py | 2 +-
superset/db_engine_specs/postgres.py | 1 -
superset/db_engine_specs/presto.py | 7 +-
superset/examples/birth_names.py | 4 +-
superset/exceptions.py | 4 +
superset/extensions/ssh.py | 8 +-
superset/models/core.py | 1 +
superset/models/dashboard.py | 12 +-
superset/models/helpers.py | 7 +-
superset/models/slice.py | 10 +-
superset/queries/api.py | 78 +-
superset/queries/dao.py | 27 +
superset/queries/schemas.py | 8 +
superset/reports/commands/alert.py | 10 +-
superset/reports/notifications/slack.py | 14 +-
superset/result_set.py | 15 +-
superset/translations/ru/LC_MESSAGES/messages.json | 7595 +++++---
superset/translations/ru/LC_MESSAGES/messages.po | 18149 +++++++++++--------
superset/utils/async_query_manager.py | 5 +-
superset/utils/pandas_postprocessing/boxplot.py | 10 +-
superset/utils/pandas_postprocessing/flatten.py | 2 +-
superset/utils/pandas_postprocessing/utils.py | 2 +-
superset/utils/screenshots.py | 2 +-
superset/utils/webdriver.py | 13 +-
superset/views/core.py | 103 +-
superset/views/health.py | 17 +-
superset/views/log/api.py | 91 +-
superset/views/log/dao.py | 131 +
superset/views/log/schemas.py | 45 +
tests/integration_tests/charts/api_tests.py | 6 +-
tests/integration_tests/csv_upload_tests.py | 327 +-
tests/integration_tests/dashboard_tests.py | 27 +-
tests/integration_tests/dashboard_utils.py | 7 +-
tests/integration_tests/dashboards/api_tests.py | 2 +-
.../dashboards/security/security_dataset_tests.py | 12 +-
tests/integration_tests/databases/api_tests.py | 20 +-
.../integration_tests/databases/commands_tests.py | 4 +
tests/integration_tests/datasets/api_tests.py | 26 +-
.../db_engine_specs/hive_tests.py | 38 +
tests/integration_tests/fixtures/importexport.py | 1 +
tests/integration_tests/log_api_tests.py | 183 +-
tests/integration_tests/queries/api_tests.py | 52 +
tests/integration_tests/reports/commands_tests.py | 17 +-
tests/integration_tests/thumbnails_tests.py | 2 +-
tests/unit_tests/dao/queries_test.py | 165 +-
.../databases/commands/importers/v1/import_test.py | 10 +
.../databases/commands/test_connection_test.py | 28 +-
tests/unit_tests/datasets/commands/export_test.py | 1 +
.../unit_tests/db_engine_specs/test_databricks.py | 78 +
343 files changed, 35007 insertions(+), 19058 deletions(-)
[superset] 02/02: Validate rendered query
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
diegopucci pushed a commit to branch fix/jinja-schema-auth
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c78943f50342490b9468bd01466e2a2dcc102b4d
Author: geido <di...@gmail.com>
AuthorDate: Wed Jan 25 16:31:21 2023 +0100
Validate rendered query
---
superset/sqllab/command.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/superset/sqllab/command.py b/superset/sqllab/command.py
index 35a761fab4..79bee8ce60 100644
--- a/superset/sqllab/command.py
+++ b/superset/sqllab/command.py
@@ -142,9 +142,11 @@ class ExecuteSqlCommand(BaseCommand):
self._save_new_query(query)
try:
logger.info("Triggering query_id: %i", query.id)
- self._validate_access(query)
+
self._execution_context.set_query(query)
rendered_query = self._sql_query_render.render(self._execution_context)
+ query.sql = rendered_query
+ self._validate_access(query)
self._set_query_limit_if_required(rendered_query)
self._query_dao.update(
query, {"limit": self._execution_context.query.limit}