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

[Backport 1.3] [Manual backport 1.x] Updates NOTICE file, adds validation to GitHub CI & Corrects NOTICE f… #3596

Merged
merged 1 commit into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build_and_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ jobs:
id: linter
run: yarn lint

- name: Validate NOTICE file
id: notice-validate
run: yarn notice:validate

- name: Run unit tests with coverage
id: unit-tests
run: yarn test:jest:ci:coverage
Expand Down Expand Up @@ -138,6 +142,10 @@ jobs:
id: linter
run: yarn lint

- name: Validate NOTICE file
id: notice-validate
run: yarn notice:validate

- name: Run unit tests with coverage
id: unit-tests
run: yarn test:jest:ci:coverage
Expand Down
124 changes: 12 additions & 112 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
OpenSearch
Copyright 2021 OpenSearch Contributors
This product includes software, including Kibana source code, developed by Elasticsearch (http://www.elastic.co).
Copyright 2012-2021 Elasticsearch B.V.
OpenSearch (https://opensearch.org/)
Copyright OpenSearch Contributors

This product includes software, including Kibana source code,
developed by Elasticsearch (http://www.elastic.co).
Copyright 2009-2021 Elasticsearch B.V.

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/)

This product includes software developed by
Joda.org (http://www.joda.org/).
---
Pretty handling of logarithmic axes.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Expand Down Expand Up @@ -115,10 +123,6 @@ 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.

---
This product uses Noto fonts that are licensed under the SIL Open
Font License, Version 1.1.

---
Based on the scroll-into-view-if-necessary module from npm
https://github.com/stipsan/compute-scroll-into-view/blob/master/src/index.ts#L269-L340
Expand All @@ -145,70 +149,6 @@ 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.

---
Detection Rules
Copyright 2020 Elasticsearch B.V.

---
This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
which is available under a "MIT" license. The files based on this license are:

- defense_evasion_via_filter_manager
- discovery_process_discovery_via_tasklist_command
- persistence_priv_escalation_via_accessibility_features
- persistence_via_application_shimming
- defense_evasion_execution_via_trusted_developer_utilities

MIT License

Copyright (c) 2019 Edoardo Gerosa, Olaf Hartong

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 THE
AUTHORS OR COPYRIGHT HOLDERS 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.

---
This product bundles rules based on https://github.com/FSecureLABS/leonidas
which is available under a "MIT" license. The files based on this license are:

- credential_access_secretsmanager_getsecretvalue.toml

MIT License

Copyright (c) 2020 F-Secure LABS

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 THE
AUTHORS OR COPYRIGHT HOLDERS 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.

---
MIT License

Expand Down Expand Up @@ -306,43 +246,3 @@ 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 THIS SOFTWARE.

---
This product includes code in the function applyCubicBezierStyles that was
inspired by a public Codepen, which was available under a "MIT" license.

Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
MIT License http://www.opensource.org/licenses/mit-license

---
This product includes code that is adapted from mapbox-gl-js, which is
available under a "BSD-3-Clause" license.
https://github.com/mapbox/mapbox-gl-js/blob/master/src/util/image.js

Copyright (c) 2016, Mapbox

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 Mapbox GL JS 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.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
"test:ftr:server": "node scripts/functional_tests_server",
"test:ftr:runner": "node scripts/functional_test_runner",
"checkLicenses": "node scripts/check_licenses --dev",
"notice:validate": "node scripts/notice --validate",
"notice:generate": "node scripts/notice",
"build-platform": "node scripts/build",
"build": "node scripts/build --all-platforms",
"start": "node scripts/opensearch_dashboards --dev",
Expand Down
2 changes: 1 addition & 1 deletion src/dev/build/tasks/notice_file_task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const CreateNoticeFile: Task = {
log.info('Generating notice from source');
log.indent(4);
const noticeFromSource = await generateNoticeFromSource({
productName: 'OpenSearch',
productName: 'OpenSearch (https://opensearch.org/)',
directory: build.resolvePath(),
log,
});
Expand Down
2 changes: 1 addition & 1 deletion src/dev/notice/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if (opts.help) {
(async function run() {
const path = resolve(REPO_ROOT, 'NOTICE.txt');
const newContent = await generateNoticeFromSource({
productName: 'OpenSearch Dashboards source code',
productName: 'OpenSearch (https://opensearch.org/)',
directory: REPO_ROOT,
log,
});
Expand Down
34 changes: 18 additions & 16 deletions src/dev/notice/generate_notice_from_source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ import { ToolingLog } from '@osd/dev-utils';

const NOTICE_COMMENT_RE = /\/\*[\s\n\*]*@notice([\w\W]+?)\*\//g;
const NEWLINE_RE = /\r?\n/g;
const NOTICE_TEXT = `Copyright OpenSearch Contributors

This product includes software, including Kibana source code,
developed by Elasticsearch (http://www.elastic.co).
Copyright 2009-2021 Elasticsearch B.V.

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/)

This product includes software developed by
Joda.org (http://www.joda.org/).`;

interface Options {
/**
Expand Down Expand Up @@ -91,17 +102,10 @@ export async function generateNoticeFromSource({ productName, directory, log }:
.on('end', resolve);
});

let noticeText = '';
noticeText += `${productName}\n`;
noticeText += `Copyright ${new Date().getUTCFullYear()} OpenSearch Contributors\n\n`;
noticeText += `This product includes software developed by Elasticsearch (http://www.elastic.co).\n`;
noticeText += `Copyright 2009-2018 Elasticsearch\n\n`;
noticeText += `This product includes software developed by The Apache Software Foundation (http://www.apache.org/)\n\n`;
noticeText += `This product includes software developed by Joda.org (http://www.joda.org/).\n`;

let notice = `${productName}\n` + NOTICE_TEXT;
for (const comment of noticeComments.sort()) {
noticeText += '\n---\n';
noticeText += comment
notice += '\n---\n';
notice += comment
.split(NEWLINE_RE)
.map((line) =>
line
Expand All @@ -112,11 +116,9 @@ export async function generateNoticeFromSource({ productName, directory, log }:
)
.join('\n')
.trim();
noticeText += '\n';
notice += '\n';
}

noticeText += '\n';

log.debug(`notice text:\n\n${noticeText}`);
return noticeText;
notice += '\n';
log.debug(`notice text:\n\n${notice}`);
return notice;
}