From 6ef1dcf1dc3cf85a325f7f9c0e7ce1e489669672 Mon Sep 17 00:00:00 2001 From: Dragos0000 Date: Sun, 11 Aug 2024 15:03:07 +0100 Subject: [PATCH 1/3] added libraries and new docker image for alpine linux --- .gitattributes | 1 + .gitignore | 3 +- dags/pipelines/notice_processor_pipelines.py | 3 +- infra/alpine/Dockerfile | 19 + libraries/.limes/limes.jar | 3 + libraries/.rmlmapper/rmlmapper.jar | 3 + libraries/.saxon/lib/jline-2.14.6.jar | 3 + libraries/.saxon/lib/xml-resolver-1.2.jar | 3 + libraries/.saxon/notices/JAMESCLARK.txt | 31 ++ libraries/.saxon/notices/JLINE2.txt | 39 ++ libraries/.saxon/notices/LICENSE.txt | 377 +++++++++++++++++++ libraries/.saxon/notices/THAI.txt | 39 ++ libraries/.saxon/notices/UNICODE.txt | 38 ++ libraries/.saxon/saxon-he-10.9.jar | 3 + libraries/.saxon/saxon-he-test-10.9.jar | 3 + libraries/.saxon/saxon-he-xqj-10.9.jar | 3 + 16 files changed, 569 insertions(+), 2 deletions(-) create mode 100644 .gitattributes create mode 100644 infra/alpine/Dockerfile create mode 100644 libraries/.limes/limes.jar create mode 100644 libraries/.rmlmapper/rmlmapper.jar create mode 100644 libraries/.saxon/lib/jline-2.14.6.jar create mode 100644 libraries/.saxon/lib/xml-resolver-1.2.jar create mode 100644 libraries/.saxon/notices/JAMESCLARK.txt create mode 100644 libraries/.saxon/notices/JLINE2.txt create mode 100644 libraries/.saxon/notices/LICENSE.txt create mode 100644 libraries/.saxon/notices/THAI.txt create mode 100644 libraries/.saxon/notices/UNICODE.txt create mode 100644 libraries/.saxon/saxon-he-10.9.jar create mode 100644 libraries/.saxon/saxon-he-test-10.9.jar create mode 100644 libraries/.saxon/saxon-he-xqj-10.9.jar diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..7c32d5f7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.jar filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index b0aa54c5..6ad409a8 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,5 @@ package.json .limes/* *.ser .DS_Store -.scannerwork/* \ No newline at end of file +.scannerwork/* +/infra/alpine/libraries/ diff --git a/dags/pipelines/notice_processor_pipelines.py b/dags/pipelines/notice_processor_pipelines.py index 5975976d..f93f7a90 100644 --- a/dags/pipelines/notice_processor_pipelines.py +++ b/dags/pipelines/notice_processor_pipelines.py @@ -38,7 +38,8 @@ def notice_transformation_pipeline(notice: Notice, mongodb_client: MongoClient) message=f"This notice {notice.ted_id} is not eligible for transformation. Notice info: " f"form_number=[{notice.normalised_metadata.form_number}]," f" eform_subtype=[{notice.normalised_metadata.eforms_subtype}], " - f"xsd_version=[{notice.normalised_metadata.xsd_version}]. Check mapping suites!", + f"xsd_version=[{notice.normalised_metadata.xsd_version}], " + f"eform_sdk_version=[{notice.normalised_metadata.eform_sdk_version}]. Check mapping suites!", notice_id=notice.ted_id, domain_action=notice_transformation_pipeline.__name__, notice_status=notice.status, notice_form_number=notice.normalised_metadata.form_number, notice_eforms_subtype=notice.normalised_metadata.eforms_subtype) diff --git a/infra/alpine/Dockerfile b/infra/alpine/Dockerfile new file mode 100644 index 00000000..4b971d86 --- /dev/null +++ b/infra/alpine/Dockerfile @@ -0,0 +1,19 @@ +# Use the official Alpine Linux image +FROM alpine:3.20 + +# Update the package list and install sudo and shadow (which includes useradd) +RUN apk --no-cache add sudo=1.9.15_p5-r0 shadow=4.15.1-r0 + +# Create a new non-root user and set a home directory +RUN useradd -m newuser + +RUN echo "newuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +# Switch to the non-root user +USER newuser + +# Set the working directory to the new user's home directory +WORKDIR /home/newuser +COPY libraries . +# Default command to execute when running the container +CMD ["/bin/sh"] \ No newline at end of file diff --git a/libraries/.limes/limes.jar b/libraries/.limes/limes.jar new file mode 100644 index 00000000..43e03b03 --- /dev/null +++ b/libraries/.limes/limes.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88363c8d83f41d7a6dec9ea9b66cb4a72dd2f022343f58ec03dfb814722b43b6 +size 128740593 diff --git a/libraries/.rmlmapper/rmlmapper.jar b/libraries/.rmlmapper/rmlmapper.jar new file mode 100644 index 00000000..5ca4ff53 --- /dev/null +++ b/libraries/.rmlmapper/rmlmapper.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28b3e1b6b5718768e9465ddddee204d127889ddd02db5736913d959009e765d0 +size 77468637 diff --git a/libraries/.saxon/lib/jline-2.14.6.jar b/libraries/.saxon/lib/jline-2.14.6.jar new file mode 100644 index 00000000..98b576f3 --- /dev/null +++ b/libraries/.saxon/lib/jline-2.14.6.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d1acaac82409be42e622d7a54d3ae9d08517e8aefdea3d2ba9791150c2f02d +size 268780 diff --git a/libraries/.saxon/lib/xml-resolver-1.2.jar b/libraries/.saxon/lib/xml-resolver-1.2.jar new file mode 100644 index 00000000..103e89ac --- /dev/null +++ b/libraries/.saxon/lib/xml-resolver-1.2.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47dcde8986019314ef78ae7280a94973a21d2ed95075a40a000b42da956429e1 +size 84091 diff --git a/libraries/.saxon/notices/JAMESCLARK.txt b/libraries/.saxon/notices/JAMESCLARK.txt new file mode 100644 index 00000000..85647575 --- /dev/null +++ b/libraries/.saxon/notices/JAMESCLARK.txt @@ -0,0 +1,31 @@ + +(This notice is included in the Saxon distribution because Saxon's XPath parser +was originally derived from an XPath parser written by James Clark and made available +under this license. The Saxon XPath parser has since diverged very substantially, but +there are traces of the original code still present.) + +Copyright (c) 1998, 1999 James Clark + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of James Clark shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from James Clark. diff --git a/libraries/.saxon/notices/JLINE2.txt b/libraries/.saxon/notices/JLINE2.txt new file mode 100644 index 00000000..befab560 --- /dev/null +++ b/libraries/.saxon/notices/JLINE2.txt @@ -0,0 +1,39 @@ +(This notice is included in the Saxon distribution because the JLine2 +library is included, unmodified, in the Saxon distribution. It is used +to support interactive command line editing, autocompletion, and session +history by the Gizmo utility.) + +Copyright (c) 2002-2016, the original author or authors. +All rights reserved. + +http://www.opensource.org/licenses/bsd-license.php + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with +the distribution. + +Neither the name of JLine nor the names of its contributors +may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/libraries/.saxon/notices/LICENSE.txt b/libraries/.saxon/notices/LICENSE.txt new file mode 100644 index 00000000..fd4ab84d --- /dev/null +++ b/libraries/.saxon/notices/LICENSE.txt @@ -0,0 +1,377 @@ +Most of the open source code in the Saxon product is governed by the Mozilla Public +License version 2.0, which is reproduced below. + + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/libraries/.saxon/notices/THAI.txt b/libraries/.saxon/notices/THAI.txt new file mode 100644 index 00000000..19c22fe2 --- /dev/null +++ b/libraries/.saxon/notices/THAI.txt @@ -0,0 +1,39 @@ + +(This notice is included in the Saxon distribution because Saxon +uses code for conversion of XML Schema Regular expressions to +Java/.NET regular expressions that was originally written by James +Clark and made available under this license. The Saxon version of +the code has been enhanced in various ways but is still recognizably +based on the original.) + +Copyright (c) 2001-2003 Thai Open Source Software Center Ltd +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + Neither the name of the Thai Open Source Software Center Ltd nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libraries/.saxon/notices/UNICODE.txt b/libraries/.saxon/notices/UNICODE.txt new file mode 100644 index 00000000..0bea7a62 --- /dev/null +++ b/libraries/.saxon/notices/UNICODE.txt @@ -0,0 +1,38 @@ + +(This notice is included in the Saxon distribution because Saxon +uses code performing Unicode Normalization that was originally written by Mark +Davis and made available under this license. The Saxon version of the +code has been enhanced in various minor ways but is still recognizably +based on the original. For details of modifications, see the comments in +the source code.) + + +COPYRIGHT AND PERMISSION NOTICE +Copyright © 1991-2007 Unicode, Inc. All rights reserved. Distributed under the Terms of Use +in http://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode +data files and any associated documentation (the "Data Files") or Unicode software and any +associated documentation (the "Software") to deal in the Data Files or Software without +restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, +and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or +Software are furnished to do so, provided that (a) the above copyright notice(s) and this +permission notice appear with all copies of the Data Files or Software, (b) both the above +copyright notice(s) and this permission notice appear in associated documentation, and +(c) there is clear notice in each modified Data File or in the Software as well as in the +documentation associated with the Data File(s) or Software that the data or software has +been modified. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall not be used +in advertising or otherwise to promote the sale, use or other dealings in these +Data Files or Software without prior written authorization of the copyright holder. diff --git a/libraries/.saxon/saxon-he-10.9.jar b/libraries/.saxon/saxon-he-10.9.jar new file mode 100644 index 00000000..0d266eff --- /dev/null +++ b/libraries/.saxon/saxon-he-10.9.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c121b5a52b3efa01157c7c039d3fae0798923f8eb0daa8f72025d3edd4226f +size 5754948 diff --git a/libraries/.saxon/saxon-he-test-10.9.jar b/libraries/.saxon/saxon-he-test-10.9.jar new file mode 100644 index 00000000..9330d548 --- /dev/null +++ b/libraries/.saxon/saxon-he-test-10.9.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e3f0b86f01e9ae8d1aa703b17f4b6673fb01ba6d6d77ee516e584ee208b966 +size 128298 diff --git a/libraries/.saxon/saxon-he-xqj-10.9.jar b/libraries/.saxon/saxon-he-xqj-10.9.jar new file mode 100644 index 00000000..bdc51c90 --- /dev/null +++ b/libraries/.saxon/saxon-he-xqj-10.9.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eaa432efebc5759cb53cc0559d49f273a0c3a471b907b9ac19b39d87a08ad46 +size 115312 From ca528ae6fddd7d7f4343d3d2692ffc7e97651a11 Mon Sep 17 00:00:00 2001 From: Dragos0000 Date: Mon, 12 Aug 2024 09:20:17 +0100 Subject: [PATCH 2/3] changed GitHub actions script --- .github/workflows/unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index bb345b24..0e644ca5 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -25,6 +25,7 @@ jobs: python-version: 3.8 - name: Install dependencies run: | + sudo apt-get update sudo apt-get install -y libssl-dev libcurl4-openssl-dev python -m pip install --upgrade setuptools pip wheel make install From 5ae9c662ff8afccda96bcf6c7353022b8c2de887 Mon Sep 17 00:00:00 2001 From: Dragos0000 Date: Wed, 14 Aug 2024 12:29:18 +0100 Subject: [PATCH 3/3] changed airflow image and added filters for security scanning --- Makefile | 1 + filters/fortify-exclusion.properties | 1 + filters/odc-exclusion.properties | 1 + infra/airflow-cluster/Dockerfile | 2 ++ infra/airflow/Dockerfile | 2 ++ infra/alpine/Dockerfile | 19 ------------------- 6 files changed, 7 insertions(+), 19 deletions(-) create mode 100644 filters/fortify-exclusion.properties create mode 100644 filters/odc-exclusion.properties delete mode 100644 infra/alpine/Dockerfile diff --git a/Makefile b/Makefile index 6a03d248..a902a3b6 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,7 @@ create-env-airflow: @ cp requirements.txt ./infra/airflow/ @ cp -r ted_sws ./infra/airflow/ @ cp -r dags ./infra/airflow/ + @ cp -r libraries ./infra/airflow/ build-airflow: guard-ENVIRONMENT create-env-airflow build-externals diff --git a/filters/fortify-exclusion.properties b/filters/fortify-exclusion.properties new file mode 100644 index 00000000..78dadff6 --- /dev/null +++ b/filters/fortify-exclusion.properties @@ -0,0 +1 @@ +excludePatterns=**/src/docs/**/*,**/src/tests/**/* \ No newline at end of file diff --git a/filters/odc-exclusion.properties b/filters/odc-exclusion.properties new file mode 100644 index 00000000..78dadff6 --- /dev/null +++ b/filters/odc-exclusion.properties @@ -0,0 +1 @@ +excludePatterns=**/src/docs/**/*,**/src/tests/**/* \ No newline at end of file diff --git a/infra/airflow-cluster/Dockerfile b/infra/airflow-cluster/Dockerfile index 3ec9fbca..7bba0efb 100644 --- a/infra/airflow-cluster/Dockerfile +++ b/infra/airflow-cluster/Dockerfile @@ -15,6 +15,8 @@ RUN apt-get update && apt-get install -y \ # back to normal user USER airflow +COPY libraries /home/airflow + # requirements.txt shall be made availble from the **ted-sws** GitHub repository COPY requirements.txt /opt/airflow diff --git a/infra/airflow/Dockerfile b/infra/airflow/Dockerfile index 3ec9fbca..f91cf4c5 100644 --- a/infra/airflow/Dockerfile +++ b/infra/airflow/Dockerfile @@ -15,11 +15,13 @@ RUN apt-get update && apt-get install -y \ # back to normal user USER airflow +COPY libraries /home/airflow # requirements.txt shall be made availble from the **ted-sws** GitHub repository COPY requirements.txt /opt/airflow # working in the /opt/airflow WORKDIR /opt/airflow + RUN mkdir -p ./dags ./ted_sws diff --git a/infra/alpine/Dockerfile b/infra/alpine/Dockerfile deleted file mode 100644 index 4b971d86..00000000 --- a/infra/alpine/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# Use the official Alpine Linux image -FROM alpine:3.20 - -# Update the package list and install sudo and shadow (which includes useradd) -RUN apk --no-cache add sudo=1.9.15_p5-r0 shadow=4.15.1-r0 - -# Create a new non-root user and set a home directory -RUN useradd -m newuser - -RUN echo "newuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - -# Switch to the non-root user -USER newuser - -# Set the working directory to the new user's home directory -WORKDIR /home/newuser -COPY libraries . -# Default command to execute when running the container -CMD ["/bin/sh"] \ No newline at end of file