diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b5e085..8d70e93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,27 @@ All notable changes to this project will be documented in this file. -## [1.1.0] - 2024-07-24 +## [1.2.0] - 2024-08-15 + +### 🚀 Features + +- Reduce Docker image size by 86% (from 677 MB (240.53 MB compressed) -> 95.7 MB (36.47 MB compressed)) by using multi-stage builds with Alpine images for Golang (Go) and Python as base images, combining RUN commands, installing necessary packages only and using no cache options for package installers to reduce installation size. + +### 🐛 Bug Fixes + +- Add no cache options for package installers to reduce installation size. + +### 📚 Documentation -[1.1.0]: https://github.com/abdullahkhawer/find-and-report-secrets-in-code/releases/tag/v1.1.0 +- Update README.md with reference screenshots +- Update README to add license description and update founder reference. +- Update Docker README to add 'Quick Reference', 'Supported Tags', and license description and update founder reference. + +### ⚙️ Miscellaneous Tasks + +- Add Apache License for Docker image. + +## [1.1.0] - 2024-07-24 ### 🚀 Features @@ -23,8 +41,6 @@ All notable changes to this project will be documented in this file. ## [1.0.1] - 2024-07-03 -[1.0.1]: https://github.com/abdullahkhawer/find-and-report-secrets-in-code/releases/tag/v1.0.1 - ### 🐛 Bug Fixes - Update code to use gitleaks v8.18.4 instead of latest and update the READMEs accordingly. @@ -33,13 +49,15 @@ All notable changes to this project will be documented in this file. ### ⚙️ Miscellaneous Tasks - Update .gitleaks.toml file to remove unnecessary paths from the 'allowlist'. +- Add cliff.toml to be able to update CHANGELOG.md using git-cliff. +- *(release)* Prepare Release for v1.0.1 +- Remove cliff.toml - Update print command to fix a word. - ## [1.0.0] - 2024-06-06 -[1.0.0]: https://github.com/abdullahkhawer/find-and-report-secrets-in-code/releases/tag/v1.0.0 - ### 🚀 Features - [**breaking**] Develop a solution which can be executed on any macOS or Linux system either locally or on a remote server or via a CI/CD pipeline that finds secrets in a git repository using Gitleaks, generates a JSON report based on the findings from Gitleaks by extracting only the relevant information, finds the commit id and commit author for each finding, updates an Atlassian Confluence page with the secrets found based on that generated report and finally sends an alert on Slack. + + diff --git a/README.md b/README.md index c1cff1e..179b80d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Find and Report Secrets in Code -- Founder: Abdullah Khawer (LinkedIn: https://www.linkedin.com/in/abdullah-khawer/) +- Founder: [Abdullah Khawer - LinkedIn](https://www.linkedin.com/in/abdullah-khawer) # Introduction @@ -186,4 +186,8 @@ The image used is publicly available here: https://hub.docker.com/r/abdullahkhaw - A sample Gitleaks configuration file can be found here if interested in using it: `.gitleaks.toml` - The Atlassian user should have access to the Confluence app, the `View` and `Add` permissions in the space on it and the `Can edit` permission on the page in that space. Also, you need to create an API token as the password won't work. +## License + +This project is licensed under the Apache License - see the [LICENSE](LICENSE) file for details. + #### Any contributions, improvements and suggestions will be highly appreciated. 😊 diff --git a/VERSION b/VERSION index 795460f..79127d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.1.0 +v1.2.0 diff --git a/ci/.gitlab-ci.yml b/ci/.gitlab-ci.yml index ffc4fe4..8005244 100644 --- a/ci/.gitlab-ci.yml +++ b/ci/.gitlab-ci.yml @@ -25,7 +25,7 @@ stage: scan extends: - .find-secrets:variables - image: abdullahkhawer/find-and-report-secrets-in-code:1.1.0 + image: abdullahkhawer/find-and-report-secrets-in-code:1.2.0 before_script: - | if [ -n "$CONFLUENCE_ENABLED" ] && [ "$CONFLUENCE_ENABLED" -eq 1 ]; then diff --git a/docker/Dockerfile b/docker/Dockerfile index 651f367..c0e53b8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,21 @@ -FROM --platform=linux/amd64 alpine:3.20.0 +# build stage +FROM golang:1.23.0-alpine3.20 AS build -COPY installation/linux_install_packages.sh .gitleaks.toml gitleaks.sh main.py ./find-and-report-secrets-in-code/ +RUN apk add --no-cache git make \ + && git clone https://github.com/gitleaks/gitleaks.git /usr/local/gitleaks \ + && cd /usr/local/gitleaks \ + && git config --global --add safe.directory /usr/local/gitleaks \ + && git checkout tags/v8.18.4 \ + && make build -RUN sh ./find-and-report-secrets-in-code/linux_install_packages.sh +# final stage +FROM python:3.12.5-alpine3.20 + +COPY --from=build /usr/local/gitleaks/gitleaks /usr/local/gitleaks/gitleaks + +COPY .gitleaks.toml gitleaks.sh main.py ./find-and-report-secrets-in-code/ + +RUN apk add --no-cache git bash jq \ + && pip install --no-cache-dir atlassian-python-api pytz requests + +CMD ["sh"] diff --git a/docker/LICENSE b/docker/LICENSE new file mode 100644 index 0000000..f49a4e1 --- /dev/null +++ b/docker/LICENSE @@ -0,0 +1,201 @@ + 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. \ No newline at end of file diff --git a/docker/README.md b/docker/README.md index 26a9e08..c5b3d3f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,6 +1,19 @@ -# Find and Report Secrets in Code +# Quick Reference + +- **Maintained by**: + [Abdullah Khawer - LinkedIn](https://www.linkedin.com/in/abdullah-khawer) + +- **Maintained at**: + [find-and-report-secrets-in-code - GitHub](https://github.com/abdullahkhawer/find-and-report-secrets-in-code) -- Founder: Abdullah Khawer (LinkedIn: https://www.linkedin.com/in/abdullah-khawer/) +- **Where to file issues**: + [https://github.com/abdullahkhawer/find-and-report-secrets-in-code/issues](https://github.com/abdullahkhawer/find-and-report-secrets-in-code/issues) + +# Supported tags and respective `Dockerfile` links + +- [`1.2.0`, `latest`](https://github.com/abdullahkhawer/find-and-report-secrets-in-code/blob/v1.2.0/docker/Dockerfile) + +# Find and Report Secrets in Code # Introduction @@ -143,18 +156,18 @@ In the `rules` section, you specify rules for execution as `if` conditions. In t The variables referred using `$` are supposed to be created on the repository under `CI/CD Settings` page. -The image used in this GitLab CI job is built using the Dockerfile that is present in a repository here: `https://github.com/abdullahkhawer/find-and-report-secrets-in-code/blob/master/docker/Dockerfile` - An example of build command is below: `docker buildx build --platform linux/amd64 -t "abdullahkhawer/find-and-report-secrets-in-code:latest" --no-cache -f ./docker/Dockerfile .` -The image used is this one which is publicly available. - ## Notes - A sample Gitleaks configuration file can be found here if interested in using it: `https://github.com/abdullahkhawer/find-and-report-secrets-in-code/blob/master/.gitleaks.toml` - The Atlassian user should have access to the Confluence app, the `View` and `Add` permissions in the space on it and the `Can edit` permission on the page in that space. Also, you need to create an API token as the password won't work. -For more details, check the following repository on GitHub: https://github.com/abdullahkhawer/find-and-report-secrets-in-code/ +For more details, check out the following repository on GitHub: https://github.com/abdullahkhawer/find-and-report-secrets-in-code/ + +## License + +This project is licensed under the Apache License - see the [LICENSE](LICENSE) file for details. #### Any contributions, improvements and suggestions will be highly appreciated. 😊 diff --git a/installation/linux_install_packages.sh b/installation/linux_install_packages.sh index 06ffcd4..c2eb233 100755 --- a/installation/linux_install_packages.sh +++ b/installation/linux_install_packages.sh @@ -1,15 +1,12 @@ #!/bin/bash set -ex -# update package lists -apk update - # install Git, jq, Bash, Make, wget, Python3, pip, Go (Golang) -apk add git jq bash make wget python3 py3-pip go +apk add --no-cache git jq bash make wget python3 py3-pip go git --version && jq --version && bash --version && make --version && wget --version && python3 --version && pip --version && go version # install "Python Atlassian REST API Wrapper", "World timezone definitions, modern and historical" and "Requests" Python libraries -pip install atlassian-python-api pytz requests --break-system-packages +pip install --no-cache-dir atlassian-python-api pytz requests || pip install atlassian-python-api pytz requests --break-system-packages # install Gitleaks rm -rf /usr/local/gitleaks && git clone https://github.com/gitleaks/gitleaks.git /usr/local/gitleaks diff --git a/installation/macos_install_packages.sh b/installation/macos_install_packages.sh index f4f2698..d5f9cc2 100755 --- a/installation/macos_install_packages.sh +++ b/installation/macos_install_packages.sh @@ -6,7 +6,7 @@ brew install git jq bash python python@3 git --version && jq --version && bash --version && pip --version && python3 --version # install "Python Atlassian REST API Wrapper", "World timezone definitions, modern and historical" and "Requests" Python libraries -pip install atlassian-python-api pytz requests || pip install atlassian-python-api pytz requests --break-system-packages +pip install --no-cache-dir atlassian-python-api pytz requests || pip install atlassian-python-api pytz requests --break-system-packages # install Gitleaks sudo rm -rf /usr/local/gitleaks && sudo git clone https://github.com/gitleaks/gitleaks.git /usr/local/gitleaks