diff --git a/.github/workflows/fascan.yml b/.github/workflows/fascan.yml index 8066205f..2a3bf8c6 100644 --- a/.github/workflows/fascan.yml +++ b/.github/workflows/fascan.yml @@ -4,9 +4,27 @@ on: [push, pull_request] jobs: machineStandalone: name: machineStandalone job - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # added or changed files to the repository. + contents: write + steps: - - uses: actions/checkout@master - - uses: docker://ghcr.io/fluidattacks/makes/amd64 + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + + - name: Fluid-Attacks scan + uses: docker://ghcr.io/fluidattacks/makes/amd64 with: args: m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml + + - name: Commit and push changes + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git commit -am "Fluid-Attacks Results.csv commit" || exit 0 + git push diff --git a/HyperSQLOOo.update.xml b/HyperSQLOOo.update.xml index f85d7563..c1af8b1e 100644 --- a/HyperSQLOOo.update.xml +++ b/HyperSQLOOo.update.xml @@ -28,7 +28,7 @@ xmlns="http://openoffice.org/extensions/update/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + @@ -40,7 +40,7 @@ HyperSQLOOo - - + + diff --git a/README.md b/README.md index ce00cb33..bde5a909 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ **The use of this software subjects you to our [Terms Of Use][4].** -# version [1.1.3][5] +# version [1.1.4][5] ## Introduction: @@ -255,7 +255,13 @@ ___ - Use of the new data format implemented in version 1.1.2. As a result, if you need to open odb files created with a version lower than 1.1.2 you must first open them with version 1.1.2, otherwise an error will be thrown. -### What remains to be done for version 1.1.3: +### What has been done for version 1.1.4: + +- Updated the [Python packaging][48] package to version 24.1. +- Updated the [Python setuptools][49] package to version 72.1.0 in order to respond to the [Dependabot security alert][50]. +- The extension will ask you to install the jdbcDriverOOo extension in versions 1.4.2 minimum. + +### What remains to be done for version 1.1.4: - Add new language for internationalization... @@ -265,7 +271,7 @@ ___ [2]: [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: @@ -286,7 +292,7 @@ ___ [23]: [24]: [25]: -[26]: +[26]: [27]: [28]: [29]: @@ -308,3 +314,6 @@ ___ [45]: [46]: [47]: +[48]: +[49]: +[50]: diff --git a/README_fr.md b/README_fr.md index 08f1c065..8cb39546 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].** -# version [1.1.3][5] +# version [1.1.4][5] ## Introduction: @@ -255,7 +255,13 @@ ___ - Utilisation du nouveau format de données implémenté dans la version 1.1.2. Par conséquent, si vous devez ouvrir des fichiers odb créés avec une version inférieure à 1.1.2, vous devez d'abord les ouvrir avec la version 1.1.2, sinon une erreur sera générée. -### Que reste-t-il à faire pour la version 1.1.3: +### Ce qui a été fait pour la version 1.1.4: + +- Mise à jour du paquet [Python packaging][48] vers la version 24.1. +- Mise à jour du paquet [Python setuptools][49] vers la version 72.1.0 afin de répondre à l'[alerte de sécurité Dependabot][50]. +- L'extension vous demandera d'installer l'extensions jdbcDriverOOo en version 1.4.2 minimum. + +### Que reste-t-il à faire pour la version 1.1.4: - Ajouter de nouvelles langue pour l'internationalisation... @@ -265,7 +271,7 @@ ___ [2]: [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: @@ -286,7 +292,7 @@ ___ [23]: [24]: [25]: -[26]: +[26]: [27]: [28]: [29]: @@ -308,3 +314,6 @@ ___ [45]: [46]: [47]: +[48]: +[49]: +[50]: diff --git a/source/HyperSQLOOo/description.xml b/source/HyperSQLOOo/description.xml index ddda432d..0559e30b 100644 --- a/source/HyperSQLOOo/description.xml +++ b/source/HyperSQLOOo/description.xml @@ -25,7 +25,7 @@ ╚════════════════════════════════════════════════════════════════════════════════════╝ --> - + diff --git a/source/HyperSQLOOo/package.properties b/source/HyperSQLOOo/package.properties index 0d45185a..81cb0651 100644 --- a/source/HyperSQLOOo/package.properties +++ b/source/HyperSQLOOo/package.properties @@ -1,3 +1,3 @@ #Written by the OOEclipseIntegration #Sat Jan 13 02:30:04 CET 2024 -contents=Drivers.xcu, HyperSQLOOo, HyperSQLOOo/DialogStrings_en_US.default, HyperSQLOOo/DialogStrings_en_US.properties, HyperSQLOOo/DialogStrings_fr_FR.properties, HyperSQLOOo/HyperSQLOOo.svg, HyperSQLOOo/LogDialog.xdl, HyperSQLOOo/LogWindow.xdl, HyperSQLOOo/OptionsDialog.xdl, HyperSQLOOo/OptionsDialog_en_US.default, HyperSQLOOo/OptionsDialog_en_US.properties, HyperSQLOOo/OptionsDialog_fr_FR.properties, HyperSQLOOo/dialog.xlb, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, registration, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, requirements.txt, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/OptionsDialog_en_US.default, resource/OptionsDialog_en_US.properties, resource/OptionsDialog_fr_FR.properties, service, service/pythonpath, service/pythonpath/_distutils_hack, service/pythonpath/hypersql, service/pythonpath/hypersql/jdbcdriver, service/pythonpath/hypersql/logger, service/pythonpath/hypersql/logger/dialog, service/pythonpath/hypersql/options, service/pythonpath/hypersql/sdbc, service/pythonpath/hypersql/sdbcx, service/pythonpath/hypersql/unotool, service/pythonpath/packaging, service/pythonpath/packaging-23.2.dist-info, service/pythonpath/pkg_resources, service/pythonpath/pkg_resources/_vendor, service/pythonpath/pkg_resources/_vendor/importlib_resources, service/pythonpath/pkg_resources/_vendor/jaraco, service/pythonpath/pkg_resources/_vendor/jaraco/text, service/pythonpath/pkg_resources/_vendor/more_itertools, service/pythonpath/pkg_resources/_vendor/packaging, service/pythonpath/pkg_resources/_vendor/platformdirs, service/pythonpath/pkg_resources/extern, service/pythonpath/setuptools, service/pythonpath/setuptools/_distutils, service/pythonpath/setuptools/_distutils/command, service/pythonpath/setuptools/_vendor, service/pythonpath/setuptools/_vendor/importlib_metadata, service/pythonpath/setuptools/_vendor/importlib_resources, service/pythonpath/setuptools/_vendor/jaraco, service/pythonpath/setuptools/_vendor/jaraco/text, service/pythonpath/setuptools/_vendor/more_itertools, service/pythonpath/setuptools/_vendor/packaging, service/pythonpath/setuptools/_vendor/tomli, service/pythonpath/setuptools/command, service/pythonpath/setuptools/config, service/pythonpath/setuptools/config/_validate_pyproject, service/pythonpath/setuptools/extern, service/pythonpath/setuptools-69.0.3.dist-info, service/pythonpath/six-1.16.0.dist-info +contents=Drivers.xcu, HyperSQLOOo, HyperSQLOOo/DialogStrings_en_US.default, HyperSQLOOo/DialogStrings_en_US.properties, HyperSQLOOo/DialogStrings_fr_FR.properties, HyperSQLOOo/HyperSQLOOo.svg, HyperSQLOOo/LogDialog.xdl, HyperSQLOOo/LogWindow.xdl, HyperSQLOOo/OptionsDialog.xdl, HyperSQLOOo/OptionsDialog_en_US.default, HyperSQLOOo/OptionsDialog_en_US.properties, HyperSQLOOo/OptionsDialog_fr_FR.properties, HyperSQLOOo/dialog.xlb, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, registration, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, requirements.txt, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/OptionsDialog_en_US.default, resource/OptionsDialog_en_US.properties, resource/OptionsDialog_fr_FR.properties, service, service/* diff --git a/source/HyperSQLOOo/requirements.txt b/source/HyperSQLOOo/requirements.txt index 37950430..9532e708 100644 --- a/source/HyperSQLOOo/requirements.txt +++ b/source/HyperSQLOOo/requirements.txt @@ -1,3 +1,3 @@ -packaging==23.2 -setuptools==69.0.3 -six==1.16.0 +packaging>=24.1 +setuptools>=72.1.0 +six>=1.16.0 diff --git a/source/HyperSQLOOo/service/pythonpath/packaging-23.2.dist-info b/source/HyperSQLOOo/service/pythonpath/packaging-23.2.dist-info deleted file mode 120000 index e94fcb74..00000000 --- a/source/HyperSQLOOo/service/pythonpath/packaging-23.2.dist-info +++ /dev/null @@ -1 +0,0 @@ -../../../../uno/lib/python/packaging-23.2.dist-info \ No newline at end of file diff --git a/source/HyperSQLOOo/service/pythonpath/packaging-24.1.dist-info b/source/HyperSQLOOo/service/pythonpath/packaging-24.1.dist-info new file mode 120000 index 00000000..3c4ceca9 --- /dev/null +++ b/source/HyperSQLOOo/service/pythonpath/packaging-24.1.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/packaging-24.1.dist-info \ No newline at end of file diff --git a/source/HyperSQLOOo/service/pythonpath/setuptools-69.0.3.dist-info b/source/HyperSQLOOo/service/pythonpath/setuptools-69.0.3.dist-info deleted file mode 120000 index 31c48433..00000000 --- a/source/HyperSQLOOo/service/pythonpath/setuptools-69.0.3.dist-info +++ /dev/null @@ -1 +0,0 @@ -../../../../uno/lib/python/setuptools-69.0.3.dist-info \ No newline at end of file diff --git a/source/HyperSQLOOo/service/pythonpath/setuptools-72.1.0.dist-info b/source/HyperSQLOOo/service/pythonpath/setuptools-72.1.0.dist-info new file mode 120000 index 00000000..e7d86292 --- /dev/null +++ b/source/HyperSQLOOo/service/pythonpath/setuptools-72.1.0.dist-info @@ -0,0 +1 @@ +../../../../uno/lib/python/setuptools-72.1.0.dist-info \ No newline at end of file