Conversation
The if statement used the wrong operator to determine if the allocation status was changed to "Denied" or "Revoked" Signed-off-by: Quan Pham <qmpham2019@gmail.com>
Signed-off-by: David Simpson <David Simpson>
Signed-off-by: Matthew Kusz <Matt52@roadrunner.com>
Signed-off-by: Quan Pham <qmpham2019@gmail.com>
docs: Add note about django ldap auth and certs to config.md
Signed-off-by: Sajid Ali <sajidsyed2021@u.northwestern.edu> modified: coldfront/config/plugins/openid.py modified: coldfront/config/plugins/openid.py
OIDC config: set `MOKEY_OIDC_PI_GROUP` from env var
Fixes the bug in ubccr#647
Update mkdocs and fix broken links.
Signed-off-by: Connor Brock <BrockC2@cardiff.ac.uk>
Signed-off-by: Matthew Kusz <Matt52@roadrunner.com>
Adds allocation limits for a resource
…reated_signal Added a signal for when allocation change requests are created
Fixed a bug that prevented allocations from being disabled even after it has been denied or revoked
Adding ProjectCreateView fields into dedicated form class.
Fixes coldfront#599 Fixes coldfront#600 Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
Use email sender for account upgrade notifications.
Signed-off-by: David Simpson <David Simpson>
Add project signals to core/project views.py , signals.py
add token regeneration feature, improve token display add api Signed-off-by: geistling <34081638+geistling@users.noreply.github.com> update testing module Update api.py fix viewed_user/request.user comparison remove unnecessary variable declaration add django-oauth-toolkit to setup.py add labels to mislabeled filters fix typo fix fulfilled boolean filter add projectuser/allocation data optionality to project api query remove oauth from requirements Signed-off-by: geistling <34081638+geistling@users.noreply.github.com>
…management commands, docs, templates adjusted. Signed-off-by: Connor Brock <brockc2@cardiff.ac.uk>
Contiguous Internal Project ID; Closes coldfront#634
commit ede2d714d20d58750bd50ca75732a6ac71cb54a8 Merge: 2fa1ee2 8e555c1 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 10:44:57 2025 -0500 Merge branch 'main' into add_eula_enforcement Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 2fa1ee2 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 10:12:22 2025 -0500 add option to include eula in email. fix link Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 9a50502 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 10:02:39 2025 -0500 add cc option to send email template Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 123ec0f Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 09:55:35 2025 -0500 put appropriate blocks in for getting user status needed commit 4743341 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 09:52:07 2025 -0500 add user allocation status to portal home commit 61d4f25 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 09:44:59 2025 -0500 show pending eula in allocation bar on portal home commit 7c62ff0 Author: John LaGrone <jlagrone@gmail.com> Date: Thu Apr 24 09:36:23 2025 -0500 fix default values Signed-off-by: John LaGrone <jlagrone@gmail.com> commit c231c39 Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 23 14:24:18 2025 -0500 add docs for new config variables commit 2c62474 Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 23 11:30:42 2025 -0500 add templates for eula acceptance / decline commit 2481a4d Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 23 11:22:00 2025 -0500 add logic to send eula accepted / declined messages commit 63a3965 Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 23 10:51:21 2025 -0500 update allocation reminders to to allow for email notification settings to be ignored and only send to active project users commit 7565fe2 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 11:02:52 2025 -0500 add back checked default Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 9d8861e Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 10:57:46 2025 -0500 set allocation enable to false by default commit b9d74fb Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 10:57:02 2025 -0500 set email reminders to false by default commit f017b29 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 10:20:54 2025 -0500 remove unused code Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 4eb9375 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 09:22:15 2025 -0500 conditionally include eula url Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 32c43bc Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 09:19:57 2025 -0500 add missing , Signed-off-by: John LaGrone <jlagrone@gmail.com> commit 8a95483 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 09:19:01 2025 -0500 re-add email notification check Signed-off-by: John LaGrone <jlagrone@gmail.com> commit c2f27e4 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 09:15:00 2025 -0500 Only check some eula stuff if enabled Signed-off-by: John LaGrone <jlagrone@gmail.com> commit bed8aa7 Author: John LaGrone <jlagrone@gmail.com> Date: Mon Apr 21 08:58:17 2025 -0500 Change config names for EULAs Signed-off-by: John LaGrone <jlagrone@gmail.com> commit db0283e Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 2 08:59:54 2025 -0500 activate user when they accept eula commit 4e1ddad Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 2 08:58:11 2025 -0500 only send activate if eula is active commit 731d52d Merge: a4d5ac5 7aeded9 Author: John LaGrone <jlagrone@gmail.com> Date: Wed Apr 2 08:53:21 2025 -0500 Merge branch 'main' into add_eula_enforcement commit a4d5ac5 Author: John LaGrone <jlagrone@gmail.com> Date: Fri May 10 13:12:19 2024 -0500 remove site specific .gitignore commit 5545cd3 Author: John LaGrone <jlagrone@gmail.com> Date: Fri May 10 12:50:01 2024 -0500 remove white space commit 8b458f9 Author: John LaGrone <jlagrone@gmail.com> Date: Tue Apr 30 10:40:47 2024 -0500 only get user status if user is in allocation commit b248fed Author: John <jlagrone@gmail.com> Date: Fri Apr 12 10:57:16 2024 -0500 remove import of unused form commit 7980662 Author: John <jlagrone@gmail.com> Date: Fri Apr 12 10:42:28 2024 -0500 fix some links and remove unused form commit 0a43c0d Author: John <jlagrone@gmail.com> Date: Fri Apr 12 10:32:53 2024 -0500 finish moving EULA acceptance /review to it's own page commit 3546808 Author: John <jlagrone@gmail.com> Date: Fri Apr 12 08:49:54 2024 -0500 start breaking out some eula logic to it's own page commit 8556e5a Author: John <jlagrone@gmail.com> Date: Fri Apr 12 07:27:17 2024 -0500 remove debugging / handle reject eula better commit 1d55c0b Author: John <jlagrone@gmail.com> Date: Thu Apr 11 17:53:09 2024 -0500 remove debug prints commit 0b363b1 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 17:50:39 2024 -0500 add more helpful messaging and links for pending allocations commit 3d44d76 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 16:24:46 2024 -0500 remove another instance of get_eula def commit bf9ee30 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 15:53:22 2024 -0500 default new users on allocations to pending eula not active commit a6334f0 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 14:59:01 2024 -0500 remove unused pending allocations commit dca5baa Author: John <jlagrone@gmail.com> Date: Thu Apr 11 14:45:33 2024 -0500 refactor to not redfine the same function many times commit ca141eb Author: John <jlagrone@gmail.com> Date: Thu Apr 11 14:07:45 2024 -0500 don't default to users being active. They may not have agreed to the EULA commit da0d7f5 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 13:40:22 2024 -0500 remove more PI prompts to accept user EULA commit 6a6ed57 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 13:36:27 2024 -0500 don't ask a PI to accept EULA for user commit c7caf60 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 13:21:35 2024 -0500 fix user in allocation check commit 7be2046 Author: John <jlagrone@gmail.com> Date: Thu Apr 11 10:13:43 2024 -0500 handled pending eula differently than other cases commit d35f8f3 Author: John <jlagrone@gmail.com> Date: Wed Apr 10 13:06:20 2024 -0500 only show eula approval to current user commit a79ba7f Author: John <jlagrone@gmail.com> Date: Wed Apr 10 10:01:42 2024 -0500 change denied -> deniedeula for clarity commit 679e261 Author: John <jlagrone@gmail.com> Date: Wed Apr 10 09:58:13 2024 -0500 changing pending -> pendingeula for clarity commit db0f320 Author: John <jlagrone@gmail.com> Date: Wed Apr 10 09:10:55 2024 -0500 add EULA_AGREEMENT to resource view commit 76d1d98 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 14:53:14 2023 -0400 fixed html side of bug commit 6627fe8 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 14:52:24 2023 -0400 fixed bug in eula display commit 709e8c1 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 11:55:26 2023 -0400 code cleanup commit 67f62a6 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Mon Jun 26 11:48:59 2023 -0400 fixed checkbox functionality commit 131b361 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Sun Jun 18 14:21:20 2023 -0400 fixed display for allocations without eula commit a78cb0f Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Sun Jun 18 14:11:58 2023 -0400 fixed functionality when adding 0 users to allocation commit ae2cb8f Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Sun Jun 18 14:01:09 2023 -0400 fixed formatting and removed comments commit 3f47066 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Sun Jun 18 13:58:51 2023 -0400 done commit d23c4be Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Sun Jun 18 12:47:03 2023 -0400 commit with comments commit 6ed7dd4 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jun 14 18:01:44 2023 -0400 added ability to prompt users when adding to allocation and have eula show up on allocation detail page commit 8aec097 Author: Ria Gupta <74742605+rg663@users.noreply.github.com> Date: Thu Jul 27 14:13:20 2023 -0400 Update add_allocation_defaults.py commit 40beb99 Author: Ria Gupta <74742605+rg663@users.noreply.github.com> Date: Thu Jul 27 14:12:46 2023 -0400 Update add_allocation_defaults.py commit fcc451c Author: Ria Gupta <74742605+rg663@users.noreply.github.com> Date: Tue Jul 25 15:41:53 2023 -0400 Update .gitignore commit d314048 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Thu Jul 13 15:18:41 2023 -0400 refactored eula reminder emails commit 5a32cf4 Author: Ria Gupta <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 20:28:56 2023 -0400 Update allocation_agree_to_eula.txt commit 2c1b66e Author: Ria Gupta <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 20:15:03 2023 -0400 Update add_scheduled_tasks.py commit 6d40263 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 20:03:15 2023 -0400 small fixes commit 850a223 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 14:41:01 2023 -0400 config fix commit e023f7e Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 14:32:51 2023 -0400 email updates commit 99825f4 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Fri Jul 7 14:21:46 2023 -0400 emails work commit a8c1667 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Thu Jul 6 14:03:07 2023 -0400 bug fix commit 9a3dd2d Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Thu Jul 6 13:58:27 2023 -0400 fixed functionality for when config is false commit 4a8a14f Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 20:47:53 2023 -0400 email functionality almost done commit edd4d13 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 19:03:51 2023 -0400 functionality near complete commit 2701732 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 18:56:25 2023 -0400 email functionality close to working commit 913594b Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 17:20:46 2023 -0400 code cleanup commit 2e9c468 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 16:25:23 2023 -0400 fixed email commit 019d7a5 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 16:05:27 2023 -0400 small change commit e21f12a Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 15:23:09 2023 -0400 users can now accept/decline eulas commit ba9ccf0 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Wed Jul 5 14:51:32 2023 -0400 working on agree button commit a7f6c7c Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Fri Jun 30 22:04:32 2023 -0400 started selection functionality commit 1ca566d Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Thu Jun 29 15:34:18 2023 -0400 enabling checkbox functionality commit 6f26dcf Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Thu Jun 29 13:54:19 2023 -0400 working through user statuses commit 0c361d2 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 17:33:06 2023 -0400 add config variable check to each part commit 47f2f3f Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 17:18:17 2023 -0400 line deletion commit d9f6bf3 Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 17:17:24 2023 -0400 added email functionality commit 90d9b5e Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 14:59:23 2023 -0400 made it so user status is pending when allocation has eula commit cb60d7c Author: riathetechie@gmail.com <74742605+rg663@users.noreply.github.com> Date: Tue Jun 27 12:34:14 2023 -0400 started eula user functionality Signed-off-by: John LaGrone <jlagrone@gmail.com>
Coldfront REST API
Signed-off-by: David Simpson <David Simpson>
…gnal Reposition project_new signal (to end) in core/views.py
(including suggestions from aebruno)
This PR should address concerns of coldfront#631
Basically:
1) Adds new config parameter LDAP_USER_SEARCH_CERT_VALIDATE_MODE
which is passed to the ldap3.Tls constructor as validate.
Accepts as values:
'required' : Certs are required and must validate
'optional' : Certs are optional, but must validate if provided
'none' (or None): Certs are ignored.
The default is None
2) The LDAP_USER_SEARCH_CERT_VALIDATE_MODE is passed as the validate
field to the ldap3.Tls constructor
3) If LDAP_USE_TLS is set, we pass the connection parameter 'auto_bind'
as ldap3.AUTO_BIND_TLS_BEFORE_BIND instead of simply True
Inspection of ldap3 code shows that when this parameter is set
to True (a value which is no longer listed in docs as valid) it
is treated as AUTO_BIND_NO_TLS, so the previous before of leaving
this as True was not doing TLS despite claiming to do TLS.
This fix should change that.
Signed-off-by: Tom Payerle <payerle@umd.edu>
Updates to support TLS in ldap_user_search plugin
Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
- Remove default_app_config (has been deprecated since 3.2) - Fix admin.action descriptions Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
Upgrade to Django 5.2
Batch commands when syncing FreeIPA.
This allows for center directors to configure which Project fields project managers are able to edit. Signed-off-by: Cecilia Lau <cecilialau6776@gmail.com>
…ds_setting add coldfront core setting for PROJECT_UPDATE_FIELDS
Squashed commits: - fix project notifs - fix allocation change detail page button spacing - fix allocation change request edit button visibility - add request change button to allocation change requests section - formatting - make test pass - Add title for grant/research output pagees - Add "Creating/updating grant/research output for project: <project>" to the appropriate pages. - Update button icons - Add space between folder icon and project title on home page - Fix select all for add user to project - Merge branch 'main' into ui_fixes - fix allocation change detail button margins Signed-off-by: Cecilia Lau <cecilialau6776@gmail.com>
Squashed commits: - add emails for user added to a project/allocation - set default sender for emails to EMAIL_SENDER - remove redundant EMAIL_ENABLED checks, set default email sender to EMAIL_SENDER - add project archived email - add get_user_emails method for Project and Allocation - fix missing redirect, remove redundant CENTER_NAME from ctx Signed-off-by: Cecilia Lau <cecilialau6776@gmail.com>
…roject-access-tests Add additional access checks for existing project tests and fix comments
…lp-text Add slurm help text on the home page and allocation page
Signed-off-by: Simon Leary <simon.leary42@proton.me>
fix HTML linter errors
Signed-off-by: Matthew Kusz <kuszm646@gmail.com>
make use of f-strings
…lurm-doc Add new Slurm config options to documentation
…cations Add more email notifs + cleanup email code
…odelform Update AllocationCreateView
…r-boilerplate remove attribute validation boilerplate, add tests, improve tests
…re-run-ci-action-on-demand add workflow_dispatch to CI action so that it can be easily run on ot…
add test for managers viewing allocations without being an allocationuser Signed-off-by: Sajid Ali <sajidsyed2021@u.northwestern.edu> modified: coldfront/core/project/views.py modified: coldfront/core/project/tests/test_views.py modified: coldfront/core/project/views.py
Allow project managers to view allocations associated with the project
- This commit strives to not change existing functionality - Dependencies (bootstrap, datatables, jquery, etc) are now managed using npm - Use vite to bundle javascript/css assets - Start refactoring to typescript and removing duplicated code - Start moving javascript out from templates - Add ci to check with eslint/prettier - Add htmx - Fix LogoutView which now requires POST request as of Django5 Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
Refactor frontend css/javascript assets
- Remove c3 in favor of chart.js. - Refactor center summary page - Refactor allocation gauge charts Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
Refactor center summary and update charting libs
Gauge chart should show the used amount plus the remaining amount. Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
- Update templates to bootstrap5, fix breaking changes Signed-off-by: Andrew E. Bruno <aebruno2@buffalo.edu>
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| python-version: ["3.10", "3.11", "3.12", "3.13"] | ||
| node-version: ["24.x"] | ||
| env: | ||
| PLUGIN_API: true | ||
| DJANGO_VITE_DEV_MODE: true | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Install uv and set the python version | ||
| uses: astral-sh/setup-uv@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Install Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
|
|
||
| - name: Install the project | ||
| run: uv sync --locked --dev | ||
|
|
||
| - name: Install frontend packages | ||
| run: npm --prefix coldfront/static install | ||
|
|
||
| - name: Check for lint violations | ||
| run: uv run ruff check | ||
|
|
||
| - name: Check formatting | ||
| run: uv run ruff format --check | ||
|
|
||
| - name: Check frontend with eslint and prettier | ||
| run: npm --prefix coldfront/static run check | ||
|
|
||
| - name: Compile and bundle frontend static assets | ||
| run: npm --prefix coldfront/static run build | ||
|
|
||
| - name: Check bundled frontend static assets have been commited | ||
| run: | | ||
| if [[ `git status --porcelain` ]]; then | ||
| echo "Error: pre-compiled bundled frontend static assets have not been committed" | ||
| git status | ||
| exit 1 | ||
| else | ||
| echo "Bundled frontend static assets check passed." | ||
| fi | ||
|
|
||
| - name: Check licence with reuse | ||
| run: uv run reuse lint | ||
|
|
||
| - name: Run tests | ||
| run: uv run coldfront test | ||
|
|
||
| - name: Check for migrations | ||
| run: uv run coldfront makemigrations --check |
Check warning
Code scanning / CodeQL
Workflow does not contain permissions Medium
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI 7 days ago
In general, you fix this by explicitly defining a permissions block in the workflow (root level, applying to all jobs) or on the specific job, setting it to the least privilege necessary. For a typical CI job that only checks out and reads code, contents: read is sufficient.
For this specific workflow in .github/workflows/ci.yml, the simplest, non‑breaking fix is to add a root‑level permissions block directly under the workflow name: (before on:). This will apply to all jobs (here: build) that do not define their own permissions. Set it to:
permissions:
contents: readNo other changes are required: all existing steps (checkout, installs, tests, builds, git status) work with read-only contents permissions because they do not attempt to write to the repository or modify GitHub resources.
| @@ -1,5 +1,8 @@ | ||
| name: CI | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: |
No description provided.