Skip to content

v3.5.0 #55

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

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Daily Tests

on:
schedule:
- cron: '0 0 * * *' # Runs at 00:00 UTC every day

jobs:
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit

notify:
needs: [ tests ]
runs-on: ubuntu-24.04
if: ${{ always() }}
steps:
- name: Slack Notifications
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: boxlang-cron
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_ICON_EMOJI: ":bell:"
SLACK_MESSAGE: '${{ github.repository }} weekly tests'
SLACK_TITLE: ${{ github.repository }} Tests results
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
7 changes: 3 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@ on:
- "main"
- "master"
- "development"
- "releases/v*"
pull_request:
branches:
- "releases/v*"
- development

jobs:
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit

formatCheck:
# Format PR
format_check:
name: Checks Source Code Formatting
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down
50 changes: 41 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,26 @@ on:
default: false
type: boolean

# Manual Trigger
workflow_dispatch:
env:
MODULE_ID: cbsecurity
MODULE_ID: ${{ github.event.repository.name }}
JDK: 21
SNAPSHOT: ${{ inputs.snapshot || false }}
BUILD_ID: ${{ github.run_number }}

jobs:
##########################################################################################
# Build & Publish
##########################################################################################
build:
name: Build & Publish
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -36,6 +45,12 @@ jobs:
with:
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: ${{ env.JDK }}

- name: "Setup Environment Variables For Build Process"
id: current_version
run: |
Expand All @@ -50,7 +65,7 @@ jobs:
fi

- name: Update changelog [unreleased] with latest version
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
if: env.SNAPSHOT == 'false'
with:
changelogPath: ./changelog.md
Expand All @@ -61,10 +76,10 @@ jobs:
npm install -g markdownlint-cli
markdownlint changelog.md --fix
box install commandbox-docbox
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}

- name: Commit Changelog To Master
uses: EndBug/add-and-commit@v9.1.3
- name: Commit Changelog [unreleased] with latest version
uses: EndBug/add-and-commit@v9.1.4
if: env.SNAPSHOT == 'false'
with:
author_name: Github Actions
Expand Down Expand Up @@ -118,7 +133,7 @@ jobs:
box forgebox publish --force

- name: Create Github Release
uses: taiki-e/create-gh-release-action@v1.8.0
uses: taiki-e/create-gh-release-action@v1.8.2
continue-on-error: true
if: env.SNAPSHOT == 'false'
with:
Expand All @@ -127,14 +142,31 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: refs/tags/v${{ env.VERSION }}

- name: Inform Slack
if: ${{ always() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: coding
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_ICON_EMOJI: ":bell:"
SLACK_MESSAGE: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

##########################################################################################
# Prep Next Release
##########################################################################################
prep_next_release:
name: Prep Next Release
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [ build ]
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
# Checkout development
- name: Checkout Repository
Expand Down Expand Up @@ -165,7 +197,7 @@ jobs:

# Commit it back to development
- name: Commit Version Bump
uses: EndBug/add-and-commit@v9.1.3
uses: EndBug/add-and-commit@v9.1.4
with:
author_name: Github Actions
author_email: info@ortussolutions.com
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ on:
branches:
- 'development'

workflow_dispatch:

# Unique group name per workflow-branch/tag combo
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
##########################################################################################
# Module Tests
Expand All @@ -18,7 +25,10 @@ jobs:
##########################################################################################
format:
name: Code Auto-Formatting
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
permissions:
contents: write
checks: write
steps:
- uses: actions/checkout@v4

Expand All @@ -28,7 +38,7 @@ jobs:
cmd: run-script format

- name: Commit Format Changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Apply cfformat changes

Expand All @@ -39,5 +49,10 @@ jobs:
uses: ./.github/workflows/release.yml
needs: [ tests, format ]
secrets: inherit
permissions:
checks: write
pull-requests: write
contents: write
issues: write
with:
snapshot: true
26 changes: 14 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,38 @@ on:
jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
DB_USER: root
DB_PASSWORD: root
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^7.0.0" ]
experimental: [ false ]
# Here we tests all engines against ColdBox@BE
# Experimental: ColdBox BE vs All Engines
include:
- coldboxVersion: "be"
cfengine: "lucee@5"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2018"
cfengine: "lucee@6"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2021"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2023"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@1"
experimental: true
steps:
- name: Checkout Repository
uses: actions/checkout@v4


- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "11"

- name: Setup Database and Fixtures
run: |
sudo systemctl start mysql.service
Expand All @@ -54,6 +50,12 @@ jobs:
# Import Database
mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/cbsecurity.sql

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "21"

- name: Setup Environment For Testing Process
run: |
# Setup .env
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"no-multiple-blanks": {
"maximum": 2
},
"no-duplicate-heading" : false,
"no-duplicate-header" : {
"siblings_only" : true
},
"no-duplicate-heading" : false,
"no-inline-html" : false
}
15 changes: 4 additions & 11 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"ColdBox Security",
"version":"3.4.3",
"version":"3.5.0",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/cbsecurity-@build.version@.zip",
"author":"Ortus Solutions.com <info@ortussolutions.com>",
"slug":"cbsecurity",
Expand Down Expand Up @@ -28,10 +28,9 @@
"cbcsrf":"^3.0.0"
},
"devDependencies":{
"commandbox-boxlang":"*",
"commandbox-cfformat":"*",
"commandbox-docbox":"*",
"commandbox-dotenv":"*",
"commandbox-cfconfig":"*"
"commandbox-docbox":"*"
},
"ignore":[
"**/.*",
Expand All @@ -48,18 +47,12 @@
"format":"cfformat run handlers/,interceptors/,models/,test-harness/tests/specs,ModuleConfig.cfc --overwrite",
"format:watch":"cfformat watch handlers/,interceptors/,models/,test-harness/tests/specs,ModuleConfig.cfc ./.cfformat.json",
"format:check":"cfformat check handlers/,interceptors/,models/,test-harness/tests/specs,ModuleConfig.cfc",
"install:dependencies":"install && cd test-harness && install",
"install:dependencies":"install --force && cd test-harness && install --force",
"start:lucee":"server start serverConfigFile=server-lucee@5.json",
"start:2018":"server start serverConfigFile=server-adobe@2018.json",
"start:2021":"server start serverConfigFile=server-adobe@2021.json",
"start:2023":"server start serverConfigFile=server-adobe@2023.json",
"stop:lucee":"server stop serverConfigFile=server-lucee@5.json",
"stop:2018":"server stop serverConfigFile=server-adobe@2018.json",
"stop:2021":"server stop serverConfigFile=server-adobe@2021.json",
"stop:2023":"server stop serverConfigFile=server-adobe@2023.json",
"logs:lucee":"server log serverConfigFile=server-lucee@5.json --follow",
"logs:2018":"server log serverConfigFile=server-adobe@2018.json --follow",
"logs:2021":"server log serverConfigFile=server-adobe@2021.json --follow",
"logs:2023":"server log serverConfigFile=server-adobe@2023.json --follow"
},
"installPaths":{
Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- BoxLang certification
- Github Actions updates

## [3.4.3] - 2024-05-09

## [3.4.2] - 2024-01-10
Expand Down Expand Up @@ -387,6 +392,9 @@ settings = {

[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.3...HEAD

[3.4.3]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.2...v3.4.3
[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.3...HEAD

[3.4.3]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.2...v3.4.3

[3.4.2]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.1...v3.4.2
Expand Down
6 changes: 3 additions & 3 deletions models/jwt/JwtService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ component accessors="true" singleton threadsafe {
// Announce the invalid claims
variables.interceptorService.announce(
"cbSecurity_onJWTInvalidClaims",
{ token : arguments.token, payload : decodedToken }
{ token : token, payload : decodedToken }
);

throw(
Expand Down Expand Up @@ -652,7 +652,7 @@ component accessors="true" singleton threadsafe {
function toEpoch( required target ){
return dateDiff(
"s",
dateConvert( "utc2local", "January 1 1970 00:00" ),
dateConvert( "utc2local", "1970-01-01T00:00:00Z" ),
arguments.target
);
}
Expand All @@ -666,7 +666,7 @@ component accessors="true" singleton threadsafe {
return dateAdd(
"s",
arguments.target, // should be in utc
dateConvert( "utc2local", "January 1 1970 00:00" )
dateConvert( "utc2local", "1970-01-01T00:00:00Z" )
);
}

Expand Down
3 changes: 2 additions & 1 deletion server-adobe@2021.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
}
},
"jvm":{
"heapSize":"1024"
"heapSize":"1024",
"javaVersion":"openjdk11_jre"
},
"openBrowser":"false",
"cfconfig":{
Expand Down
Loading
Loading