Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development into master #308

Merged
merged 44 commits into from
Mar 7, 2024
Merged

Merge development into master #308

merged 44 commits into from
Mar 7, 2024

Conversation

tamirGer
Copy link
Contributor

@tamirGer tamirGer commented Mar 2, 2024

No description provided.

src/app.service.ts Dismissed Show dismissed Hide dismissed
public/src/pages/main/Contact.tsx Dismissed Show dismissed Hide dismissed
public/src/pages/marketplace/Marketplace.tsx Dismissed Show dismissed Hide dismissed
src/partners/partners.service.ts Dismissed Show dismissed Hide dismissed
@tamirGer
Copy link
Contributor Author

tamirGer commented Mar 2, 2024

@rielas Can you please help with resolving the charts conflicts here?

tamirGer and others added 28 commits March 3, 2024 10:08
Restores the FPD vulnerability after changes in the exception filter
from the GQL PR have caused the application to not be vulnerable to FPD
anymore.
Add a `getCommandResult` query which executes the provided command
and returns its result, vulnerable to OSI.
Generate a separate helm chart for development version
… validation (#269)

Adds endpoint DELETE `/users/one/:id/photo?isAdmin=` which allows to
delete a user profile picture by the user ID. The `isAdmin` field is not
validated on server side, thus it's possible to set it to true, and via
ID enumeration delete any user's profile picture.
… with url params introducing iframe injection vulnerability (#274)
changing non working hook
This reverts commit 916bdd0.
**Helm Charts.**
Sometimes when running tests you may encounter problems like this:
`Service
“hmm597-7803-e2e-brokencrystals-dev-keycloak-postgres-prod-service” is
invalid: metadata.name: Invalid value:
“hmm597-7803-e2e-brokencrystals-dev-keycloak-postgres-prod-service”:
must be no more than 63 characters`
So I shortened the name suffixes and reduced the _trunc_ function
parameter to 50, which applies to part of the name.
…/latest` (#294)

Adds a `limit` URL param to `/api/products/latest` which controls the
amount of products returned via this EP. This introduces a business
constraint bypass, as this EP is used on the main page to display only
the 3 latest products, and the user must be logged in to access the
Marketplace page where they can see the full list of products via the
`/api/products` EP, which is password protected.
@rielas
Copy link
Contributor

rielas commented Mar 3, 2024

@rielas Can you please help with resolving the charts conflicts here?

Resolved

@rielas
Copy link
Contributor

rielas commented Mar 4, 2024

@tamirGer When are you going to merge development into master? It has a lot of helm-related changes

@tamirGer tamirGer changed the title Development Merge development into master Mar 7, 2024
@tamirGer tamirGer merged commit b4643b6 into master Mar 7, 2024
6 of 7 checks passed
@rielas rielas deleted the development branch March 7, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants