diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000000000000000000000000000000000..2967ddff4fea3b58559a4ab78ac82c896987334e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +scripts/build-image.sh +scripts/genManifestTemplate.sh +scripts/importArtifacts.sh \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..00dcc5ce89dce889e114a02105e1856c9b814553 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.whl +*.tar.gz +*.rpm +jsonnet \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ca0892a0051b9a0e3c03286b191474c779738cc3..b6e22ec52b42cf93f44db90819395aa161483f5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/pyth RUN mkdir -p /usr/logs /licenses \ && useradd --no-log-init --create-home --shell /bin/bash appuser -COPY license.txt /licenses +COPY LICENSE /licenses RUN chown appuser:appuser -R /usr/logs @@ -48,6 +48,7 @@ RUN chown appuser:appuser -R /usr/logs # Copy required RPMs COPY *.rpm /tmp/ +COPY archive.key /tmp/ ######################################## # confluentinc/kafka-images/server @@ -67,7 +68,8 @@ ENV DOCKER_SCRIPT_DIR=/opt/caas/bin EXPOSE 8088 RUN echo "===> Installing ${COMPONENT}" \ - && dnf install --nogpgcheck -y /tmp/confluent-common-${RPM_VERSION}.noarch.rpm \ + && rpm --import /tmp/archive.key \ + && dnf install -y /tmp/confluent-common-${RPM_VERSION}.noarch.rpm \ /tmp/confluent-security-${RPM_VERSION}.noarch.rpm \ /tmp/confluent-telemetry-${RPM_VERSION}.noarch.rpm \ /tmp/confluent-hub-client-${RPM_VERSION}.noarch.rpm \ diff --git a/LICENSE b/LICENSE index e06d2081865a766a8668acc12878f98b27fc9ea0..44cfd8bdfe19d9637ff0c04ef99614acd76fe97f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - +Copyright 2020 Confluent, Inc. \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 074fc2ad524831320a5469d4ffcd11ff37e50177..9dd7b999ae9359a86efba20d3332fb26da916449 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -217,6 +217,11 @@ resources: validation: type: sha256 value: 7e2622a934f04a2e5b23a355f920473ccf0144e946b433bc619a9802c1e3785c +- filename: archive.key + url: https://packages.confluent.io/rpm/6.1/archive.key + validation: + type: sha256 + value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5 - filename: confluent-common-6.1.1-1.noarch.rpm url: https://packages.confluent.io/rpm/6.1/confluent-common-6.1.1-1.noarch.rpm validation: diff --git a/license.txt b/license.txt deleted file mode 100644 index 44cfd8bdfe19d9637ff0c04ef99614acd76fe97f..0000000000000000000000000000000000000000 --- a/license.txt +++ /dev/null @@ -1 +0,0 @@ -Copyright 2020 Confluent, Inc. \ No newline at end of file diff --git a/scripts/build-image.sh b/scripts/build-image.sh index ab22f39551ae6cc304520c5f043740960285160f..4826cb6bf141eee904b541d9eab0645db2b5e1a5 100755 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -22,6 +22,8 @@ fi BASE_REGISTRY=${BASE_REGISTRY:-'registry1.dso.mil'} MANI='hardening_manifest.yaml' +cd ../ + ## parse manifest with yq (https://github.com/mikefarah/yq) name=$(yq e '.name' $MANI) tags=( $(yq e '.tags.[]' $MANI) ) @@ -55,6 +57,8 @@ for tag in "${tags[@]}";do echo "🏷 Tagged build with $BASE_REGISTRY/$name:$tag" done +cd scripts + end=`date +%s` duration=$((end-start)) echo "🏁 Finished $CONTAINER build (${duration} seconds)" \ No newline at end of file diff --git a/scripts/genManifestTemplate.sh b/scripts/genManifestTemplate.sh new file mode 100755 index 0000000000000000000000000000000000000000..943df45ca7b175ef7add97f340e7263861063cf8 --- /dev/null +++ b/scripts/genManifestTemplate.sh @@ -0,0 +1,80 @@ +if [[ -f .env ]]; then + echo "Loading in '.env' for values ..." + export $(grep -v '^#' .env | xargs) + echo " " +fi + +VERSION=${VERSION:-'6.1.1.0'} + +SCRIPTS_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +PROJECT_HOME=${PROJECT_HOME:-'../'} +PROJECT_HOME=$(realpath $PROJECT_HOME) + +myShaRona () { + myfile=$(basename $1) + mydir=$(dirname $1) + + mkdir -p $mydir + if [ ! -e "$mydir/filelist.txt" ] ; then + touch "$mydir/filelist.txt" + fi + + if [[ "$OSTYPE" == "darwin"* ]] ; then + mySha=$(shasum -a 256 $1 | cut -d " " -f 1) + else + mySha=$(sha256sum $1 | cut -d " " -f 1) + fi + + echo -e "$myfile | $mySha" >> $mydir/filelist.txt +} + +filelist () { + rm -f $1/filelist.txt + + for filename in $1/*; do + myShaRona $filename + done +} + +if [ $# -eq 0 ]; then + echo "filelist.txt or dir path argument required " + exit 1 +fi + +# if there is not a filelist.txt, generate one +if [ -f "$1" ]; then + filefile=$(realpath $1) +elif [ -f "$1/filelist.txt" ]; then + filefile=$(realpath $1)/filelist.txt +elif [ -d "$1" ]; then + filefile=$(realpath $1)/filelist.txt +fi + +filelist $1 + +basedir=$(dirname $filefile) +cd $basedir + +if [[ $filefile == *"ironbank-files"* ]]; then + urlPrefix="https://ironbank-files.s3.amazonaws.com" +elif [[ $filefile == *"confluent"* ]]; then + urlPrefix="https://packages.confluent.io/rpm/${VERSION:0:3}" +elif [[ $filefile == *"pythonhosted"* ]]; then + echo "unsupported cause of the weird guid in the path" + exit 0 +fi + +echo "resources:" > $basedir/hardened_manifest_template.yaml + +while IFS= read -r line +do +IFS=" | " read -a parts <<< $line +cat >> $basedir/hardened_manifest_template.yaml << EOL +- filename: ${parts[0]} + url: ${urlPrefix}/${parts[0]} + validation: + type: sha256 + value: ${parts[1]} +EOL + +done < "$filefile" \ No newline at end of file diff --git a/scripts/importArtifacts.sh b/scripts/importArtifacts.sh new file mode 100755 index 0000000000000000000000000000000000000000..43dfcafbf944f43f2242456bee8e654022416d2d --- /dev/null +++ b/scripts/importArtifacts.sh @@ -0,0 +1,67 @@ + +#!/bin/bash + +start=`date +%s` + +if [[ -f .env ]]; then + echo "Loading in '.env' for values ..." + export $(grep -v '^#' .env | xargs) + echo " " +fi + +SCRIPTS_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +PROJECT_HOME=${PROJECT_HOME:-'../'} +PROJECT_HOME=$(realpath $PROJECT_HOME) +RESOURCE_HOME=${RESOURCE_HOME:-'../../resources'} +RESOURCE_HOME=$(realpath $RESOURCE_HOME) + +importArtifacts() { + + manifestPath=$1 + httpdomain=$2 + resourceDir=$3 + + echo -e "\nImporting ${httpdomain} artifacts ..." + + maniDir=$(dirname "$manifestPath") + + # (re)set the filelist.txt + mkdir -p $resourceDir + prefix="url: " + pushd $resourceDir + grep $httpdomain $manifestPath | while read -r line ; do + url=${line##*$prefix} + filename=$(basename "$url") + + if [[ ! -f "$filename" ]]; then + echo "downloading ${url} ..." + wget $url + else + echo "Using existing $filename. Run ./clean.sh if thats not desired." + fi + + if [[ ! -f "$maniDir/$filename" ]]; then + echo "copying ${filename} into ${maniDir} ..." + cp $filename $maniDir/ + fi + done + popd +} + +mani=$(realpath "../hardening_manifest.yaml") + +importArtifacts $mani 'ironbank-files.s3.amazonaws.com' "$RESOURCE_HOME/ironbank-files" +importArtifacts $mani 'packages.confluent.io' "$RESOURCE_HOME/confluent" +importArtifacts $mani 'files.pythonhosted.org' "$RESOURCE_HOME/pythonhosted" + +echo "Generating hardening_manifest_template.yaml ..." +$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/ironbank-files" +$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/confluent" +$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/pythonhosted" + +end=`date +%s` +duration=$((end-start)) +echo "#########################" +echo "All done (${duration} seconds)" +echo "#########################" +