From 76a02dcd99b3fd9fb41db76f62f5c644f9f66aac Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Tue, 23 Apr 2024 12:47:21 +0530 Subject: [PATCH 1/3] more fixes to the download script (#776) --- README.md | 4 ++-- scripts/download.sh | 39 +++++++++++++-------------------------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index c3dbc6f23..81d377ee1 100644 --- a/README.md +++ b/README.md @@ -67,13 +67,13 @@ You can download and run the Parseable binary on your laptop. - Linux or MacOS ```bash -curl https://raw.githubusercontent.com/parseablehq/parseable/main/scripts/download.sh | bash +curl https://logg.ing/install | bash ``` - Windows ```pwsh -powershell -c "irm https://raw.githubusercontent.com/parseablehq/parseable/main/scripts/download.ps1 | iex" +powershell -c "irm https://logg.ing/install-windows | iex" ``` Once this runs successfully, you'll see dashboard at [http://localhost:8000 ↗︎](http://localhost:8000). You can login to the dashboard default credentials `admin`, `admin`. diff --git a/scripts/download.sh b/scripts/download.sh index 305080b52..98f70ada7 100755 --- a/scripts/download.sh +++ b/scripts/download.sh @@ -3,17 +3,13 @@ # supported CPU architectures and operating systems SUPPORTED_ARCH=("x86_64" "arm64") SUPPORTED_OS=("linux" "darwin") -# Associate binaries with CPU architectures and operating systems -declare -A BINARIES=( - ["x86_64-linux"]="Parseable_x86_64-unknown-linux-gnu" - ["arm64-linux"]="Parseable_aarch64-unknown-linux-gnu" - ["x86_64-darwin"]="Parseable_x86_64-apple-darwin" - ["arm64-darwin"]="Parseable_aarch64-apple-darwin" -) +DOWNLOAD_BASE_URL="parseable.gateway.scarf.sh/" + # Get the system's CPU architecture and operating system CPU_ARCH=$(uname -m) OS=$(uname -s | tr '[:upper:]' '[:lower:]') +printf "\n=========================\n" printf "Detected CPU architecture: %s\n" "$CPU_ARCH" printf "Detected operating system: %s\n" "$OS" @@ -34,38 +30,29 @@ if ! echo "${SUPPORTED_OS[@]}" | grep -q "\\b${OS}\\b"; then echo "Error: Unsupported operating system (${OS})." exit 1 fi + # Get the latest release information using GitHub API release=$(curl -s "https://api.github.com/repos/parseablehq/parseable/releases/latest") +# find the release tag +release_tag=$(echo "$release" | grep -o "\"tag_name\":\s*\"[^\"]*\"" | cut -d '"' -f 4) +printf "Found latest release version: $release_tag\n" -printf "Fetching release information for parseable...\n" - -# Loop through binaries in the release and find the appropriate one -for arch_os in "${CPU_ARCH}-${OS}"; do - binary_name="${BINARIES[$arch_os]}" - download_url=$(echo "$release" | grep -o "\"browser_download_url\":\s*\"[^\"]*${binary_name}\"" | cut -d '"' -f 4) - if [ -n "$download_url" ]; then - break - fi -done +download_url=${DOWNLOAD_BASE_URL}${CPU_ARCH}-${OS}.${release_tag} -printf "Checking for existing installation...\n" if [[ -d ${INSTALL_DIR} ]]; then printf "A Previous version of parseable already exists. Run 'parseable --version' to check the version." - printf "or consider removing that before Installing" + printf "or consider removing that before new installation\n" exit 1 - else - printf "No Previous installation found\n" - printf "Installing parseable...\n" mkdir -p ${BIN_DIR} fi - # Download the binary using curl or wget +printf "Downloading Parseable version $release_tag, for OS: $OS, CPU architecture: $CPU_ARCH\n\n" if command -v curl &>/dev/null; then - curl -L -o "${BIN_NAME}" "$download_url" 2&>> /dev/null + curl -L -o "${BIN_NAME}" "$download_url" elif command -v wget &>/dev/null; then - wget -O "${BIN_NAME}" "$download_url" 2&>> /dev/null + wget -O "${BIN_NAME}" "$download_url" else echo "Error: Neither curl nor wget found. Please install either curl or wget." exit 1 @@ -79,4 +66,4 @@ printf "Adding parseable to the path\n" PATH_STR="export PATH=${BIN_DIR}"':$PATH' echo ${PATH_STR} >> ${RC_FILE_PATH} -echo "parseable was added to the path. Please refresh the environment by sourcing the ${RC_PATH}" +echo "parseable was added to the path. Please refresh the environment by sourcing the ${RC_FILE_PATH}" From dea2be8df390095246c50569391e1d8bfde87962 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Tue, 23 Apr 2024 12:56:38 +0530 Subject: [PATCH 2/3] Update README.md Signed-off-by: Nitish Tiwari --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81d377ee1..f09958fe2 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ You can download and run the Parseable binary on your laptop. - Linux or MacOS ```bash -curl https://logg.ing/install | bash +curl -fsSL https://logg.ing/install | sh ``` - Windows From e3558580f28259357bd79799b7ce48fe5c46177c Mon Sep 17 00:00:00 2001 From: Eshan <60269431+Eshanatnight@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:25:11 +0530 Subject: [PATCH 3/3] fix: schema update where querying (#775) Refactor authorization and filter tag logic in query handler. schema getting updated for only one when query refers multiple tables --- server/src/handlers/http/query.rs | 122 ++++++++++++++++-------------- server/src/query.rs | 6 +- 2 files changed, 68 insertions(+), 60 deletions(-) diff --git a/server/src/handlers/http/query.rs b/server/src/handlers/http/query.rs index 26f29b592..49dcbc869 100644 --- a/server/src/handlers/http/query.rs +++ b/server/src/handlers/http/query.rs @@ -37,6 +37,7 @@ use crate::event::commit_schema; use crate::metrics::QUERY_EXECUTE_TIME; use crate::option::{Mode, CONFIG}; use crate::query::error::ExecuteError; +use crate::query::Query as LogicalQuery; use crate::query::{TableScanVisitor, QUERY_SESSION}; use crate::rbac::role::{Action, Permission}; use crate::rbac::Users; @@ -67,69 +68,37 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result = Users.get_permissions(&creds); - // check authorization of this query if it references physical table; - let table_name = query.table_name(); - if let Some(ref table) = table_name { - let mut authorized = false; - let mut tags = Vec::new(); - - // in permission check if user can run query on the stream. - // also while iterating add any filter tags for this stream - for permission in permissions { - match permission { - Permission::Stream(Action::All, _) => { - authorized = true; - break; - } - Permission::StreamWithTag(Action::Query, ref stream, tag) - if stream == table || stream == "*" => - { - authorized = true; - if let Some(tag) = tag { - tags.push(tag) - } - } - _ => (), - } - } - - if !authorized { - return Err(QueryError::Unauthorized); - } - - if !tags.is_empty() { - query.filter_tag = Some(tags) - } - } + let table_name = query + .first_table_name() + .ok_or_else(|| QueryError::MalformedQuery("No table name found in query".to_string()))?; + authorize_and_set_filter_tags(&mut query, permissions, &table_name)?; let time = Instant::now(); - let (records, fields) = query.execute(table_name.clone().unwrap()).await?; + let (records, fields) = query.execute(table_name.clone()).await?; let response = QueryResponse { records, fields, @@ -138,16 +107,55 @@ pub async fn query(req: HttpRequest, query_request: Query) -> Result, + table_name: &str, +) -> Result<(), QueryError> { + // check authorization of this query if it references physical table; + let mut authorized = false; + let mut tags = Vec::new(); + + // in permission check if user can run query on the stream. + // also while iterating add any filter tags for this stream + for permission in permissions { + match permission { + Permission::Stream(Action::All, _) => { + authorized = true; + break; + } + Permission::StreamWithTag(Action::Query, ref stream, tag) + if stream == table_name || stream == "*" => + { + authorized = true; + if let Some(tag) = tag { + tags.push(tag) + } + } + _ => (), + } + } + + if !authorized { + return Err(QueryError::Unauthorized); + } + + if !tags.is_empty() { + query.filter_tag = Some(tags) + } + + Ok(()) +} + impl FromRequest for Query { type Error = actix_web::Error; type Future = Pin>>>; @@ -178,7 +186,7 @@ impl FromRequest for Query { async fn into_query( query: &Query, session_state: &SessionState, -) -> Result { +) -> Result { if query.query.is_empty() { return Err(QueryError::EmptyQuery); } diff --git a/server/src/query.rs b/server/src/query.rs index c3abe3d61..a841b7c47 100644 --- a/server/src/query.rs +++ b/server/src/query.rs @@ -167,7 +167,7 @@ impl Query { } } - pub fn table_name(&self) -> Option { + pub fn first_table_name(&self) -> Option { let mut visitor = TableScanVisitor::default(); let _ = self.raw_logical_plan.visit(&mut visitor); visitor.into_inner().pop() @@ -192,7 +192,7 @@ impl TreeNodeVisitor for TableScanVisitor { match node { LogicalPlan::TableScan(table) => { self.tables.push(table.table_name.table().to_string()); - Ok(VisitRecursion::Stop) + Ok(VisitRecursion::Skip) } _ => Ok(VisitRecursion::Continue), } @@ -290,7 +290,7 @@ fn table_contains_any_time_filters( }) .any(|expr| { matches!(&*expr.left, Expr::Column(Column { name, .. }) - if ((time_partition.is_some() && name == time_partition.as_ref().unwrap()) || + if ((time_partition.is_some() && name == time_partition.as_ref().unwrap()) || (!time_partition.is_some() && name == event::DEFAULT_TIMESTAMP_KEY))) }) }