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

Watermark Sichtbare Wasserzeichen #529

Open
wants to merge 552 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
552 commits
Select commit Hold shift + click to select a range
7b55667
check if smtp instance is connected when getting the mailer object fo…
cyriltata Aug 31, 2021
35baa3c
truncate result data to fit in column
cyriltata Aug 31, 2021
6a46247
initiate mailer before sending emails
cyriltata Aug 31, 2021
f0e1bf7
retrofix patch
rubenarslan Sep 1, 2021
73d45dc
let external save results in unit_sessions table, give run access to …
rubenarslan Sep 1, 2021
00d46d3
respect higher limit
rubenarslan Sep 1, 2021
c030c75
try resending email once if the connection broke
rubenarslan Sep 2, 2021
f879051
pass mailer to sendMail() function to enture that attached files are …
cyriltata Sep 2, 2021
906ba98
call getSMTPConnection() within the loop to get a new mailer if it wa…
cyriltata Sep 2, 2021
8ad4370
Merge branch 'hotfix/v0.19.8'
rubenarslan Sep 2, 2021
03faff1
Merge tag 'v0.19.8' into develop
rubenarslan Sep 2, 2021
5b84966
Merge commit 'e314f7e67aec7d570010f670b5c1f53f9b95ec24'
rubenarslan Sep 2, 2021
62e87fc
refactor Page Unit
cyriltata Sep 6, 2021
708bfae
refactor adding Page Unit in run
cyriltata Sep 6, 2021
f12224a
refactor creating a Shuffle unit in admin
cyriltata Sep 6, 2021
9b920c7
refactor adding Pause and Wait modules in admin
cyriltata Sep 6, 2021
7442d8d
refactor Branches
cyriltata Sep 6, 2021
f6617ce
refactor study survey creation and assigning a study to a survey unit
cyriltata Sep 13, 2021
d71823c
move Pagination file to lib
cyriltata Sep 13, 2021
7510782
refactor testing survey and implement execution of unit sessions in r…
cyriltata Sep 13, 2021
f563024
refactor execution of run session by adding and looping over unit ses…
cyriltata Sep 15, 2021
b12e9e6
add button to restart new run session after logout
cyriltata Sep 15, 2021
295835d
complete survey execution and moving on
cyriltata Sep 15, 2021
55ef847
remove comment
cyriltata Sep 15, 2021
ab4b062
refactor execution of unit session on Pause and Branches
cyriltata Sep 16, 2021
83d67b9
refactor executing the unitSession on the Email unit
cyriltata Sep 16, 2021
2b5f186
refactor execution of unitsession over External and Shuffle
cyriltata Sep 16, 2021
263b405
fix queues
cyriltata Sep 16, 2021
54e8476
fix run import
cyriltata Sep 17, 2021
b07e519
move computation of surver items to renderer
cyriltata Sep 17, 2021
c3dcf30
move processing of survey items to render and add method to get outpu…
cyriltata Sep 17, 2021
797624c
queue fixes
cyriltata Sep 17, 2021
c755066
fix syntax error
cyriltata Sep 17, 2021
c733c9e
remove unit not needed class
cyriltata Sep 17, 2021
bee41c4
make intepretation of run session easier
cyriltata Sep 17, 2021
c567ef2
group files
cyriltata Sep 17, 2021
acf62ab
implement new renderer for pages study
cyriltata Sep 17, 2021
583575e
check emptyness
cyriltata Sep 17, 2021
d29e224
move item class
cyriltata Sep 17, 2021
8f3bb9e
move site class
cyriltata Sep 18, 2021
55bfcd1
don't show system messages to users unless one is debugging
cyriltata Sep 18, 2021
8df6eef
refactor tests for run units
cyriltata Sep 18, 2021
1b99852
fix basic functionality for paged surveys
cyriltata Sep 18, 2021
86a3924
Fix argument type error
cyriltata Sep 19, 2021
8833129
Do logging of unit sesion execution only when enabled
cyriltata Sep 19, 2021
123c04b
add spam protection: end run session if it loops over 20 units withou…
cyriltata Sep 20, 2021
e057b1c
get rid of unecessary class property
cyriltata Sep 21, 2021
996f19d
bake in recent patches
rubenarslan Jan 15, 2022
9282272
default to utf8mb4 charset
rubenarslan Jan 16, 2022
04a2ade
Merge branch 'feature/refactor-session-execution' into develop
rubenarslan Jan 16, 2022
0b3a3b2
make mysql charset configurable
rubenarslan Jan 16, 2022
236491b
domain for studies on subdomains configurable
rubenarslan Jan 16, 2022
a9e996f
make encoding configurable
rubenarslan Jan 16, 2022
402660b
used inconsistent word
rubenarslan Jan 16, 2022
ceb0cbe
ugh
rubenarslan Jan 16, 2022
800eb43
missing default arg
rubenarslan Jan 16, 2022
4ebfb1f
remove reference to fdb
rubenarslan Jan 16, 2022
bc8bc88
remove auto_incs
rubenarslan Jan 16, 2022
7bb580e
more admin levels prep
rubenarslan Jan 16, 2022
e09cc3b
allow changing brand name
rubenarslan Jan 16, 2022
b2db092
remove matthias
rubenarslan Jan 17, 2022
fba8182
rm matthias pci
rubenarslan Jan 17, 2022
91478a9
Fix typo
fkohrt Jan 21, 2022
fe1d5d9
log uncessarily only in DEBUG mode
cyriltata Jan 31, 2022
74a3888
avoid stripping slashes on all requests. Function should be called on…
cyriltata Jan 31, 2022
df567b0
Merge branch 'hotfix/v0.19.9'
cyriltata Jan 31, 2022
7aac9ed
Merge branch 'hotfix/v0.19.9' into develop
cyriltata Jan 31, 2022
70f4136
update version
cyriltata Jan 31, 2022
85389e2
Merge branch 'hotfix/v0.19.10'
cyriltata Jan 31, 2022
bb9a959
Merge branch 'hotfix/v0.19.10' into develop
cyriltata Jan 31, 2022
1dcba9f
assign right extension to survey name
cyriltata Mar 29, 2022
ec735b5
Bump async from 2.6.3 to 2.6.4 in /webroot/assets
dependabot[bot] Apr 29, 2022
2f51ca7
Bump grunt from 1.4.0 to 1.5.3 in /webroot/assets
dependabot[bot] May 26, 2022
ee6e207
Merge branch 'feature/configurability' into develop
cyriltata Jun 14, 2022
d4709a5
assign address from right option
cyriltata Jun 14, 2022
f811ac8
upgrade to PHP 8
cyriltata Jun 14, 2022
47b296b
fix PHP 8 warnings
cyriltata Jun 14, 2022
131ef32
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/webroot/…
cyriltata Jun 14, 2022
cd05705
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/webroot/…
cyriltata Jun 14, 2022
086cd2c
fix deprecation notices
cyriltata Jun 14, 2022
9b56e44
fix php8.1 deprecation warnings
cyriltata Jul 6, 2022
d01e4f6
Closes #476
cyriltata Jul 7, 2022
c017b65
process automatic items with errors again to avoid infilnite loops
cyriltata Jul 7, 2022
ada04da
use another cookie for admins to avoid conflict when testing
cyriltata Jul 7, 2022
2b90804
Merge branch 'feature/php8-compatibility' into develop
cyriltata Aug 30, 2022
d907ebe
do not destroy admin sessin when ending study
cyriltata Aug 30, 2022
4f57608
save new google id if link changed
cyriltata Aug 30, 2022
6396d73
fix null deprecation warnings
cyriltata Aug 30, 2022
7d65e98
move repository links to footer
cyriltata Aug 30, 2022
e0edccb
fix deprecation warnings
cyriltata Aug 30, 2022
5ea5a68
configure content settings and show/hide menu items
cyriltata Aug 30, 2022
ee0e0f2
add setting to disable / enable signups
cyriltata Aug 30, 2022
69aa6de
use the right settings in the footer
cyriltata Aug 30, 2022
f6e254d
use old settings name for publications
cyriltata Aug 31, 2022
a3c00af
hide content if logo not present
cyriltata Aug 31, 2022
7bfbe37
specify ip addresses that can still access application during mainten…
cyriltata Aug 31, 2022
6a2e8e3
fix settings name
cyriltata Aug 31, 2022
2bece0f
redirect when filling out a survey and you are queueingg
cyriltata Sep 2, 2022
b3e67b1
add meaning ful error message for compulsory get items
cyriltata Sep 2, 2022
6e279ba
conffigure to overriding curl options for opencpu requests
cyriltata Sep 3, 2022
a0b92e3
Release v0.20.0
cyriltata Sep 3, 2022
0c61584
Merge branch 'release/v0.20.0'
cyriltata Sep 3, 2022
6f5ed96
Merge branch 'release/v0.20.0' into develop
cyriltata Sep 3, 2022
46ca284
use valid array concatenation to preserve keys
cyriltata Sep 3, 2022
ef412a9
Release v0.20.1
cyriltata Sep 3, 2022
64576c0
Merge branch 'hotfix/v0.20.1'
cyriltata Sep 3, 2022
3e6d6fe
Merge branch 'hotfix/v0.20.1' into develop
cyriltata Sep 3, 2022
3d5fe19
fix deprecation warninngs
cyriltata Sep 3, 2022
be68e76
for ended run sessions in queue, end the corresponding unit session a…
cyriltata Sep 3, 2022
9bdbdd0
fix deprecation notices
cyriltata Sep 3, 2022
082d56b
Fix deprecation warnings
cyriltata Sep 4, 2022
3ee19f9
Merge branch 'hotfix/v0.20.2'
cyriltata Sep 4, 2022
cbbf79c
Merge branch 'hotfix/v0.20.2' into develop
cyriltata Sep 4, 2022
5b1e5f7
reset survey expiry once participant starts filling
cyriltata Sep 7, 2022
0ea3868
check expiration before checking if unit session is ended, check runT…
cyriltata Sep 7, 2022
2983c93
fix deprecation warnings
cyriltata Sep 7, 2022
f227cc2
Merge branch 'hotfix/v0.20.3'
cyriltata Sep 7, 2022
f9fbd3f
Merge branch 'hotfix/v0.20.3' into develop
cyriltata Sep 7, 2022
b88418d
develop version
cyriltata Sep 7, 2022
7aa72a4
retry transaction in case of deadlock or lock wait timeout
cyriltata Sep 13, 2022
ea8dd71
use survey context to generate feedback, fix deprecation warnings
cyriltata Sep 13, 2022
7f44a5b
get IP address behind a proxy
cyriltata Sep 13, 2022
663fa2d
check if unit sessions and run unit indeed exists before execution (q…
cyriltata Sep 13, 2022
784cc2e
Release v0.20.4
cyriltata Sep 13, 2022
fb539a1
Merge branch 'release/v0.20.4'
cyriltata Sep 13, 2022
47291d5
Merge branch 'release/v0.20.4' into develop
cyriltata Sep 13, 2022
d953d6d
check existence of study before reusing ID
cyriltata Sep 13, 2022
4b71566
fix bug to get email subject
cyriltata Oct 13, 2022
c5a92c1
add search form to user management, include max for random item
cyriltata Oct 20, 2022
e7d441f
add button to delete user and associated data in admin
cyriltata Oct 20, 2022
87e8ee8
JS minify
cyriltata Oct 20, 2022
3a41347
log statement only after retries have failed
cyriltata Oct 21, 2022
836dff4
Bump version
cyriltata Oct 21, 2022
ad40d8f
Merge branch 'release/v0.20.5'
cyriltata Oct 21, 2022
ab97b62
Display warning message for orphan run units
cyriltata May 2, 2023
a8604e5
version bump
cyriltata May 2, 2023
e307658
Merge branch 'hotfix/v0.20.6'
cyriltata May 2, 2023
e5de6be
Set allowed_classes to only 'User' class in unserialize call
Jun 27, 2023
919c699
fix: the variable name check is not doing what the error message tell…
red-freak Aug 29, 2023
406c339
Merge pull request #504 from red-freak/master
rubenarslan Aug 29, 2023
891defd
Merge pull request #502 from DeSerFix-bot/master
rubenarslan Aug 31, 2023
a275dec
Merge pull request #478 from fkohrt/patch-1
rubenarslan Aug 31, 2023
80e0bd9
Added docker files
Epd02 Nov 8, 2023
c62c4ed
Merge pull request #1 from timed-and-secured-assets/gruppe-1
Epd02 Nov 8, 2023
204ff4f
removed credentials
Epd02 Nov 8, 2023
d6650fe
Merge pull request #2 from timed-and-secured-assets/gruppe-1
Epd02 Nov 8, 2023
d8328c0
fixed gitignore not ignoring database files
Epd02 Nov 22, 2023
18f39f6
Added Filetype check for uploading surveys
Epd02 Nov 22, 2023
2a3aa45
Merge branch 'upload' of github.com:timed-and-secured-assets/formr.or…
Epd02 Nov 22, 2023
179b681
Create formr-docker-image.yaml
eliasheithecker Nov 24, 2023
7b7c29b
Create opencpu-docker-image.yaml
eliasheithecker Nov 24, 2023
39b7d2a
Update opencpu-docker-image.yaml
eliasheithecker Nov 24, 2023
2f9493c
feat: use data uri scheme for img src
l4zs Nov 30, 2023
4fa8868
Merge pull request #4 from timed-and-secured-assets/upload
Epd02 Dec 15, 2023
a497aee
Added placeholder button and confirm mechanism for deleting accounts
Epd02 Dec 16, 2023
011eec5
ADD: Delete Full RUN:
eliasheithecker Dec 16, 2023
bbbf380
ADD: Run Expires On Column
eliasheithecker Dec 16, 2023
bcfd58e
Merge remote-tracking branch 'origin/auto-delete' into feature/timest…
olekomo Dec 16, 2023
a013bb1
ADD: Cron Job
eliasheithecker Dec 17, 2023
3b8a354
ADD: Fix Cron - Job
eliasheithecker Dec 17, 2023
4cec04b
expiresOn Felder hinzugefügt
olekomo Dec 17, 2023
ff2a949
timestamp aus Datenbank lesen und schreiben
olekomo Dec 17, 2023
d0823fd
push
olekomo Dec 17, 2023
a76923a
Merge remote-tracking branch 'origin/feature/timestamp/front-end' int…
eliasheithecker Dec 17, 2023
d7bfd01
Fix: Don't save invalid Expiration-Date
eliasheithecker Dec 17, 2023
b41f3d4
Extracted User deletion to User.php
Epd02 Jan 6, 2024
a0bdfac
Added deletion mechanism to placeholder button
Epd02 Jan 6, 2024
b63f11d
Fixed user deletion UI
Jan 13, 2024
ef7190c
Added 2FA library to composer and fixed Dockerfile not handling chang…
Epd02 Jan 13, 2024
0b1e5ec
fix: deny accessing uploaded images
l4zs Jan 17, 2024
9d123fc
feat: image viewer for run uploaded images
l4zs Jan 17, 2024
41027dc
Merge branch 'master' into feature/no-ref/img-data-uri
Jan 18, 2024
d4607e6
remove unnecessary require
l4zs Jan 18, 2024
3f8870b
Added 2FA interface for login
EliasAhlers Jan 21, 2024
a8f1226
Added check if user has 2fa enabled
EliasAhlers Jan 21, 2024
96794c4
Added 2FA setup page & used 2FA library
EliasAhlers Jan 21, 2024
ba03589
Added QR code for 2FA code setup
EliasAhlers Jan 21, 2024
64a3040
Added full flow for 2FA setup including QR code and code confirmation
EliasAhlers Jan 21, 2024
6c0a5b2
feat: add privacy run unit
l4zs Jan 21, 2024
6bc8c0a
fix: return $output when privacy accepted
l4zs Jan 21, 2024
f38acbc
Merge pull request #3 from timed-and-secured-assets/feature/pipeline
eliasheithecker Jan 22, 2024
74c44b5
feat: add tos and imprint to privacy unit; create pages for privacy p…
l4zs Jan 23, 2024
184fe7a
Added Backend for 2FA
Epd02 Jan 25, 2024
094f8c6
refactor: move privacy texts to run settings; add sql patch;
l4zs Jan 25, 2024
1fc4a3c
refactor: add log messages; add info to set privacy texts when not se…
l4zs Jan 25, 2024
7040a23
Added 2FA code reset (With confirmation prompt)
EliasAhlers Jan 28, 2024
2e4fc7c
fix: privacy text preview url
l4zs Jan 30, 2024
ccb3a85
refactor: add info texts for privacy settings
l4zs Jan 31, 2024
f9ded43
feat: add confirmation on privacy unit removal
l4zs Jan 31, 2024
e185696
feat: add warning when setting privacy texts but no unit present
l4zs Jan 31, 2024
9a922ba
feat: require privacy and imprint when run publicness > 0
l4zs Jan 31, 2024
ca90ee1
Added more information to qr code to improve UX in 2FA app
EliasAhlers Feb 10, 2024
ffc8fe5
Added 2FA backup_codes to database schema
EliasAhlers Feb 10, 2024
d0ee6bb
Added 2FA backup code generation
EliasAhlers Feb 10, 2024
95b771f
Added 2FA backup codes to code verification
EliasAhlers Feb 10, 2024
50a02bf
Refactor file saving to add watermarking functionality via python cli
EliasAhlers Feb 11, 2024
e8f6c12
Added settings Ui for watermarking
EliasAhlers Feb 11, 2024
236a6c2
Overwrite original file with watermarked file
EliasAhlers Feb 12, 2024
9e78ea3
Made watermark settings persistent in DB
EliasAhlers Feb 12, 2024
dc0c7ca
Generate watermark according to settings
EliasAhlers Feb 12, 2024
57a59db
Save additional watermarking data to accompanying file
EliasAhlers Feb 12, 2024
6f0a3d4
RunExpiresOnCron.php now uses Email-Templates
eliasheithecker Feb 14, 2024
3b73f79
Init
eliasheithecker Feb 14, 2024
06b2c4a
Merge pull request #15 from timed-and-secured-assets/user-dashboard
EliasAhlers Feb 15, 2024
e5896fd
Merge pull request #14 from timed-and-secured-assets/feature/no-ref/i…
Epd02 Feb 15, 2024
98284de
Rename patch
l4zs Feb 15, 2024
9ff1b93
Merge pull request #16 from timed-and-secured-assets/feature/issue-11…
Epd02 Feb 15, 2024
bef2f69
Anleitung: Configuration
eliasheithecker Feb 16, 2024
27c8fb9
Merge remote-tracking branch 'origin/master' into auto-delete
eliasheithecker Feb 16, 2024
a29179f
Solved Merge Conflicts
eliasheithecker Feb 16, 2024
01d41bc
Merge pull request #5 from timed-and-secured-assets/auto-delete
eliasheithecker Feb 16, 2024
ed8147e
Merge remote-tracking branch 'origin/master' into feature/anleitung
eliasheithecker Feb 16, 2024
912c271
Vorbereitung fuer Install-Script: Neue Ordner & Datein
eliasheithecker Feb 16, 2024
356f1b7
Generic Docker Compose mit Image Parameter
eliasheithecker Feb 16, 2024
153ab63
* Docker Build Multiple-Plattforms
eliasheithecker Feb 16, 2024
cecf5f2
* Install Script - Done
eliasheithecker Feb 16, 2024
8da04b2
Pipeline Image Tag Fix
eliasheithecker Feb 16, 2024
56a8731
Pipeline Fix: Set up
eliasheithecker Feb 16, 2024
815750b
Pipeline Fix: Push
eliasheithecker Feb 16, 2024
fe9d851
Skript: Jetzt auch opencpu & Db außerhalb von docker moeglich
eliasheithecker Feb 17, 2024
a4a6530
Added python dep install to docker-compose
EliasAhlers Feb 18, 2024
1004c63
Changed python script path
EliasAhlers Feb 18, 2024
1c93c55
added .idea/ to gitignore
majortomts Feb 18, 2024
3cabfad
added Python watermark script
majortomts Feb 18, 2024
c7fce9e
Fixed watermarking method
EliasAhlers Feb 18, 2024
f46760c
Fixed watermarking error message
EliasAhlers Feb 18, 2024
2151f42
Merge branch 'master' into watermark
majortomts Feb 18, 2024
7ced56d
Pipeline - Nun auch mit release.yaml
eliasheithecker Feb 18, 2024
14ec9a7
Pipeline - Faster Builds for Staging
eliasheithecker Feb 18, 2024
a24de49
renamed sql patch
majortomts Feb 18, 2024
7738ef4
fixed new_file_path if the image was watermarked
majortomts Feb 18, 2024
9d2abb6
added explanatory texts to upload and settings pages, added watermark…
majortomts Feb 18, 2024
3b3e4c7
Release Pipeline & Anleitung
eliasheithecker Feb 18, 2024
d1f090a
added note to sift character restriction
majortomts Feb 18, 2024
82f54c9
Typos & Skript: Datei-Quellen
eliasheithecker Feb 18, 2024
945b595
Add Snapshot Suffix
eliasheithecker Feb 18, 2024
2fdd644
updated watermark embedding (only sift and blind)
majortomts Feb 18, 2024
eb28c87
Merge pull request #19 from timed-and-secured-assets/feature/anleitung
eliasheithecker Feb 18, 2024
a4fecc4
Rename 040_add_watermark_settings.sql to 039_add_watermark_settings.sql
Epd02 Feb 18, 2024
0b4465c
Merge pull request #17 from timed-and-secured-assets/watermark
eliasheithecker Feb 18, 2024
2a2f27b
Links in README und INSTALL.md
eliasheithecker Feb 18, 2024
f9a03c9
Pipeline Code Scanning - Image Name Fix
eliasheithecker Feb 18, 2024
59c1df5
Email <br> entfernt
eliasheithecker Feb 18, 2024
fca7ae0
';' Fehler in schema.sql
eliasheithecker Feb 18, 2024
ec3ffd6
Delete docker dir
eliasheithecker Feb 18, 2024
4862fa5
Update README.md
eliasheithecker Feb 18, 2024
a50ad29
Merge pull request #20 from timed-and-secured-assets/final
Epd02 Feb 18, 2024
4079011
Update INSTALL.md
eliasheithecker Feb 18, 2024
f3dbc68
visible Watermark:
tobiasjutzi Feb 26, 2024
bcb4293
Merge remote-tracking branch 'origin/master' into watermark
tobiasjutzi Mar 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
89 changes: 89 additions & 0 deletions .github/workflows/formr-docker-image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: Formr Docker Image CI

on:
push:
branches: [ "*" ]
paths-ignore:
- 'docker/**'
- '.github/workflows/opencpu-docker-image.yaml'
workflow_dispatch:

env:
REGISTRY: ghcr.io
NAME: ${{ github.repository }}

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Environment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME:${GITHUB_REF##*/}-snapshot" >> "$GITHUB_ENV"

- name: Cache Packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Docker Build
run: docker image build . -f ./Dockerfile --tag $IMAGE_TAG

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Docker Push
run: docker push $IMAGE_TAG

scout:
needs: [build]
name: Dependency Analysis

runs-on: ubuntu-latest

steps:

- name: Setup Enviroment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME:${GITHUB_REF##*/}-snapshot" >> "$GITHUB_ENV"

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Docker Pull
run: docker pull $IMAGE_TAG

- name: Login to docker.io # Needed for docker scout
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}

- name: Analyze for critical and high CVEs
id: docker-scout-cves
uses: docker/scout-action@v1
with:
command: cves
image: ${{ env.IMAGE_TAG }}
sarif-file: sarif.output.json
summary: true

- name: Upload SARIF result
id: upload-sarif
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: sarif.output.json
category: Formr
82 changes: 82 additions & 0 deletions .github/workflows/opencpu-docker-image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: OpenCPU Docker Image CI

on:
push:
branches: [ "*" ]
paths:
- 'docker/opencpu'
- '.github/workflows/opencpu-docker-image.yaml'
workflow_dispatch:

env:
REGISTRY: ghcr.io
NAME: timed-and-secured-assets/opencpu

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup Environment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME:${GITHUB_REF##*/}-snapshot" >> "$GITHUB_ENV"

- name: Cache Packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Docker Build
run: docker image build . -f ./opencpu/Dockerfile --tag $IMAGE_TAG

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Docker Push
run: docker push $IMAGE_TAG

scout:
needs: [build]
name: Dependency Analysis

runs-on: ubuntu-latest

steps:

- name: Setup Enviroment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME:${GITHUB_REF##*/}-snapshot" >> "$GITHUB_ENV"

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Docker Pull
run: docker pull $IMAGE_TAG

- name: Login to docker.io # Needed for docker scout
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{secrets.DOCKER_USERNAME}}
password: ${{secrets.DOCKER_PASSWORD}}

- name: Analyze for critical and high CVEs
id: docker-scout-cves
uses: docker/scout-action@v1
with:
command: cves
image: ${{ env.IMAGE_TAG }}
sarif-file: sarif.output.json
summary: true
86 changes: 86 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Release Workflow

on:
release:
types: [published]
env:
REGISTRY: ghcr.io
NAME: ${{ github.repository }}
NAME_OPENCPU: timed-and-secured-assets/opencpu

jobs:
build-formr:
name: Build Formr
runs-on: ubuntu-latest
steps:
- name: Setup Environment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME:${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"

- uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Cache Packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Build and Push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ env.IMAGE_TAG }}

build-opencpu:
name: Build Open-CPU
runs-on: ubuntu-latest
steps:
- name: Setup Environment
run: |
echo "IMAGE_TAG=$REGISTRY/$NAME_OPENCPU:${GITHUB_REF#refs/tags/}" >> "$GITHUB_ENV"

- uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Cache Packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: Build and Push
uses: docker/build-push-action@v5
with:
context: ./opencpu
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ env.IMAGE_TAG }}
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ formr-package/man
webroot/assets/img
tests/test.php
nohup.out
webroot/*.html
webroot/assets/*.mp4
webroot/assets/*.html

webroot/assets/bower_components
webroot/assets/lib/bower_components

/bin/migra.php
/*.key
docker/db/*
.idea/
Loading