starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-09 00:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: scim token and saml metadata setting in UI directly

Browse Source 
chore(main): release 1.271.0 (#3237)

* chore(main): release 1.271.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>

fix test

revert ee changes

revert ee changes
This commit is contained in:
Ruben Fiszel
2024-02-18 07:26:12 +01:00
co-authored by rubenfiszel
parent ccbb1d9305
commit 1a8285a06f
21 changed files with 137 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+13
View File
@@ -1,6 +1,19 @@
# Changelog
## [1.271.0](https://github.com/windmill-labs/windmill/compare/v1.270.3...v1.271.0) (2024-02-17)
### Features
* scim token and saml metadata setting in UI directly ([71e915a](https://github.com/windmill-labs/windmill/commit/71e915a86c4f0661bad7a0f977b015045f739d8a))
### Bug Fixes
* **mysql:** support integer with float type ([041b777](https://github.com/windmill-labs/windmill/commit/041b777fd65692d3549ba7ec64258882e108f5bf))
* pre-select resource if there is only one ([801eda1](https://github.com/windmill-labs/windmill/commit/801eda1e22298f9f55d1ea87d0a19a03e6de6a64))
## [1.270.3](https://github.com/windmill-labs/windmill/compare/v1.270.2...v1.270.3) (2024-02-16)
backend/Cargo.lock
Generated
+19 -19
View File
@@ -9119,7 +9119,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windmill"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"axum",
@@ -9155,7 +9155,7 @@ dependencies = [
[[package]]
name = "windmill-api"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"argon2",
@@ -9229,7 +9229,7 @@ dependencies = [
[[package]]
name = "windmill-api-client"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"base64 0.21.7",
"chrono",
@@ -9247,7 +9247,7 @@ dependencies = [
[[package]]
name = "windmill-audit"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"chrono",
"serde",
@@ -9260,7 +9260,7 @@ dependencies = [
[[package]]
name = "windmill-common"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"axum",
@@ -9293,7 +9293,7 @@ dependencies = [
[[package]]
name = "windmill-git-sync"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"regex",
"rsmq_async",
@@ -9308,7 +9308,7 @@ dependencies = [
[[package]]
name = "windmill-parser"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"serde",
"serde_json",
@@ -9316,7 +9316,7 @@ dependencies = [
[[package]]
name = "windmill-parser-bash"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"lazy_static",
@@ -9327,7 +9327,7 @@ dependencies = [
[[package]]
name = "windmill-parser-go"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"gosyn",
@@ -9339,7 +9339,7 @@ dependencies = [
[[package]]
name = "windmill-parser-graphql"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"lazy_static",
@@ -9350,7 +9350,7 @@ dependencies = [
[[package]]
name = "windmill-parser-py"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"itertools 0.12.1",
@@ -9361,7 +9361,7 @@ dependencies = [
[[package]]
name = "windmill-parser-py-imports"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"async-recursion",
@@ -9378,7 +9378,7 @@ dependencies = [
[[package]]
name = "windmill-parser-sql"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"lazy_static",
@@ -9389,7 +9389,7 @@ dependencies = [
[[package]]
name = "windmill-parser-ts"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@@ -9407,7 +9407,7 @@ dependencies = [
[[package]]
name = "windmill-parser-wasm"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"getrandom 0.2.12",
@@ -9425,7 +9425,7 @@ dependencies = [
[[package]]
name = "windmill-queue"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"async-recursion",
@@ -9458,7 +9458,7 @@ dependencies = [
[[package]]
name = "windmill-worker"
version = "1.270.3"
version = "1.271.0"
dependencies = [
"anyhow",
"async-recursion",
@@ -9712,9 +9712,9 @@ dependencies = [
[[package]]
name = "xxhash-rust"
version = "0.8.8"
version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61"
checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
[[package]]
name = "xz2"
backend/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "windmill"
version = "1.270.3"
version = "1.271.0"
authors.workspace = true
edition.workspace = true
@@ -22,7 +22,7 @@ members = [
]
[workspace.package]
version = "1.270.3"
version = "1.271.0"
authors = ["Ruben Fiszel <ruben@windmill.dev>"]
edition = "2021"
backend/ee-repo-ref.txt
+1 -1
View File
@@ -1 +1 @@
8ed0d6aa6218ec4f9011a60db701295e5c3a1e4a
045dc822a95f2230e4ae97ac492df0dd9f797af6
backend/src/main.rs
+12 -2
View File
@@ -28,7 +28,7 @@ use windmill_common::{
JOB_DEFAULT_TIMEOUT_SECS_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING,
NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING,
REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING,
RETENTION_PERIOD_SECS_SETTING,
RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
},
stats::schedule_stats,
utils::{rd_string, Mode},
@@ -47,7 +47,8 @@ use crate::monitor::{
monitor_db, monitor_pool, reload_base_url_setting, reload_bunfig_install_scopes_setting,
reload_extra_pip_index_url_setting, reload_job_default_timeout_setting, reload_license_key,
reload_npm_config_registry_setting, reload_pip_index_url_setting,
reload_retention_period_setting, reload_server_config, reload_worker_config,
reload_retention_period_setting, reload_scim_token_setting, reload_server_config,
reload_worker_config,
};
const GIT_VERSION: &str = git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
@@ -399,6 +400,9 @@ Windmill Community Edition {GIT_VERSION}
JOB_DEFAULT_TIMEOUT_SECS_SETTING => {
reload_job_default_timeout_setting(&db).await
},
SCIM_TOKEN_SETTING => {
reload_scim_token_setting(&db).await
},
EXTRA_PIP_INDEX_URL_SETTING => {
reload_extra_pip_index_url_setting(&db).await
},
@@ -439,6 +443,12 @@ Windmill Community Edition {GIT_VERSION}
}
}
},
SAML_METADATA_SETTING => {
tracing::info!("SAML metadata change detected, killing server expecting to be restarted");
if let Err(e) = tx.send(()) {
tracing::error!(error = %e, "Could not send killpill to server");
}
},
DISABLE_STATS_SETTING => {},
a @_ => {
tracing::info!("Unrecognized Global Setting Change Payload: {:?}", a);
backend/src/monitor.rs
+19 -2
View File
@@ -16,7 +16,7 @@ use tokio::{
use uuid::Uuid;
use windmill_api::{
oauth2_ee::{build_oauth_clients, OAuthClient},
DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT,
DEFAULT_BODY_LIMIT, IS_SECURE, OAUTH_CLIENTS, REQUEST_SIZE_LIMIT, SAML_METADATA, SCIM_TOKEN,
};
use windmill_common::{
error,
@@ -26,7 +26,7 @@ use windmill_common::{
JOB_DEFAULT_TIMEOUT_SECS_SETTING, KEEP_JOB_DIR_SETTING, LICENSE_KEY_SETTING,
NPM_CONFIG_REGISTRY_SETTING, OAUTH_SETTING, PIP_INDEX_URL_SETTING,
REQUEST_SIZE_LIMIT_SETTING, REQUIRE_PREEXISTING_USER_FOR_OAUTH_SETTING,
RETENTION_PERIOD_SECS_SETTING,
RETENTION_PERIOD_SECS_SETTING, SAML_METADATA_SETTING, SCIM_TOKEN_SETTING,
},
jobs::{JobKind, QueuedJob},
oauth2::REQUIRE_PREEXISTING_USER_FOR_OAUTH,
@@ -125,6 +125,8 @@ pub async fn initial_load(
reload_server_config(&db).await;
reload_retention_period_setting(&db).await;
reload_request_size(&db).await;
reload_saml_metadata_setting(&db).await;
reload_scim_token_setting(&db).await;
}
#[cfg(feature = "enterprise")]
@@ -317,6 +319,21 @@ pub async fn delete_expired_items(db: &DB) -> () {
}
}
pub async fn reload_scim_token_setting(db: &DB) {
reload_option_setting_with_tracing(db, SCIM_TOKEN_SETTING, "SCIM_TOKEN", SCIM_TOKEN.clone())
.await;
}
pub async fn reload_saml_metadata_setting(db: &DB) {
reload_option_setting_with_tracing(
db,
SAML_METADATA_SETTING,
"SAML_METADATA",
SAML_METADATA.clone(),
)
.await;
}
pub async fn reload_extra_pip_index_url_setting(db: &DB) {
reload_option_setting_with_tracing(
db,
backend/windmill-api/openapi.yaml
+22 -1
View File
@@ -1,7 +1,7 @@
openapi: "3.0.3"
info:
version: 1.270.3
version: 1.271.0
title: Windmill API
contact:
@@ -664,6 +664,27 @@ paths:
schema:
type: string
/saml/test_metadata:
post:
summary: test metadata
operationId: testMetadata
tags:
- setting
requestBody:
description: test metadata
required: true
content:
application/json:
schema:
type: string
responses:
"200":
description: status
content:
text/plain:
schema:
type: string
/users/email:
get:
summary: get current user email (if logged in)
backend/windmill-api/src/lib.rs
+3
View File
@@ -89,6 +89,9 @@ lazy_static::lazy_static! {
pub static ref REQUEST_SIZE_LIMIT: Arc<RwLock<usize>> = Arc::new(RwLock::new(DEFAULT_BODY_LIMIT));
pub static ref SCIM_TOKEN: Arc<RwLock<Option<String>>> = Arc::new(RwLock::new(None));
pub static ref SAML_METADATA: Arc<RwLock<Option<String>>> = Arc::new(RwLock::new(None));
pub static ref COOKIE_DOMAIN: Option<String> = std::env::var("COOKIE_DOMAIN").ok();
backend/windmill-common/src/global_settings.rs
+1 -1
View File
@@ -13,7 +13,7 @@ pub const BUNFIG_INSTALL_SCOPES_SETTING: &str = "bunfig_install_scopes";
pub const EXTRA_PIP_INDEX_URL_SETTING: &str = "pip_extra_index_url";
pub const PIP_INDEX_URL_SETTING: &str = "pip_index_url";
pub const SCIM_TOKEN_SETTING: &str = "scim_token";
pub const SAML_METADATA_SETTING: &str = "saml_token";
pub const SAML_METADATA_SETTING: &str = "saml_metadata";
pub const UNIQUE_ID_SETTING: &str = "uid";
pub const DISABLE_STATS_SETTING: &str = "disable_stats";
benchmarks/lib.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
export const VERSION = "v1.270.3";
export const VERSION = "v1.271.0";
export async function login(email: string, password: string): Promise<string> {
return await windmill.UserService.login({
cli/main.ts
+1 -1
View File
@@ -31,7 +31,7 @@ addEventListener("error", (event) => {
}
});
export const VERSION = "v1.270.3";
export const VERSION = "v1.271.0";
let command: any = new Command()
.name("wmill")
frontend/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "windmill-components",
"version": "1.270.3",
"version": "1.271.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "windmill-components",
"version": "1.270.3",
"version": "1.271.0",
"license": "AGPL-3.0",
"dependencies": {
"@aws-crypto/sha256-js": "^4.0.0",
frontend/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "windmill-components",
"version": "1.270.3",
"version": "1.271.0",
"scripts": {
"dev": "vite dev",
"build": "vite build",
frontend/src/lib/components/InstanceSettings.svelte
+13
View File
@@ -436,6 +436,19 @@
placeholder={setting.placeholder}
bind:value={values[setting.key]}
/>
{#if setting.key == 'saml_metadata'}
<div class="flex mt-2">
<Button
on:click={async (e) => {
const res = await SettingService.testMetadata({
requestBody: values[setting.key]
})
sendUserToast(`Metadata valid, see console for full content`)
console.log(`Metadata content:`, res)
}}>Test content/url</Button
>
</div>
{/if}
{:else if setting.fieldType == 'license_key'}
<div class="flex justify-between gap-2">
<textarea
frontend/src/lib/components/instanceSettings.ts
+20
View File
@@ -185,6 +185,26 @@ export const settings: Record<string, Setting[]> = {
storage: 'config'
}
],
'SCIM/SAML': [
{
label: 'SCIM Token',
description: 'Token used to authenticate requests from the IdP',
key: 'scim_token',
fieldType: 'text',
placeholder: 'mytoken',
storage: 'setting',
ee_only: ''
},
{
label: 'SAML metadata',
description: 'XML metadata url OR content for the SAML IdP',
key: 'saml_metadata',
fieldType: 'textarea',
placeholder: 'https://dev-2578259.okta.com/app/exkaell8gidiiUWrg5d7/sso/saml/metadata ',
storage: 'setting',
ee_only: ''
}
],
Debug: [
{
label: 'Keep Job Directories',
lsp/Pipfile
+2 -2
View File
@@ -4,8 +4,8 @@ verify_ssl = true
name = "pypi"
[packages]
wmill = ">=1.270.3"
wmill_pg = ">=1.270.3"
wmill = ">=1.271.0"
wmill_pg = ">=1.271.0"
sendgrid = "*"
mysql-connector-python = "*"
pymongo = "*"
openflow.openapi.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
openapi: "3.0.3"
info:
version: 1.270.3
version: 1.271.0
title: OpenFlow Spec
contact:
name: Ruben Fiszel
python-client/wmill/pyproject.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry]
name = "wmill"
version = "1.270.3"
version = "1.271.0"
description = "A client library for accessing Windmill server wrapping the Windmill client API"
license = "Apache-2.0"
homepage = "https://windmill.dev"
python-client/wmill_pg/pyproject.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry]
name = "wmill-pg"
version = "1.270.3"
version = "1.271.0"
description = "An extension client for the wmill client library focused on pg"
license = "Apache-2.0"
homepage = "https://windmill.dev"
typescript-client/package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "windmill-client",
"description": "Windmill SDK client for browsers and Node.js",
"version": "1.270.3",
"version": "1.271.0",
"author": "Ruben Fiszel",
"license": "Apache 2.0",
"devDependencies": {
version.txt
+1 -1
View File
@@ -1 +1 @@
1.270.3
1.271.0