conjur-cli 6.2.2 → 6.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +10 -0
- data/.github/ISSUE_TEMPLATE/bug.md +16 -1
- data/.github/PULL_REQUEST_TEMPLATE.md +21 -0
- data/CHANGELOG.md +8 -1
- data/Jenkinsfile +13 -12
- data/NOTICES.txt +421 -0
- data/README.md +298 -1
- data/SECURITY.md +42 -0
- data/VERSION +1 -1
- data/build-standalone +12 -11
- data/conjur-cli.gemspec +4 -4
- data/lib/conjur/command/hosts.rb +1 -1
- data/lib/conjur/command/rspec/mock_services.rb +7 -1
- data/lib/conjur/command/users.rb +5 -1
- data/lib/conjur/version.rb +1 -1
- data/push-image +14 -6
- data/spec/command/hosts_spec.rb +23 -3
- data/spec/command/init_spec.rb +37 -40
- data/spec/command/users_spec.rb +13 -0
- metadata +11 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2f9205266f63971061682c1413768e43adcaef56cb4c26e644182cdb005d4e77
|
4
|
+
data.tar.gz: a186291efd20d3b04d4ff670b490879a9c8839ac0a1d24672cc924286878137e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a8cc5db1bd5c26343ea8cdce5c17f945a6ce27fb13e2acec3234461e6d5abe4a5e22ab990e4162dbf768a8ce738753b5e3131a3d5d4dc4f00eb693451a2cbea8
|
7
|
+
data.tar.gz: 6eadbec2ee56021b5f84d1a4f0e47352034f7a70295d75dff6cbde8dbe879d80283f856fc6792f6d3080311647b845ac53ae02e5b9c15be824eb7f3c8a29b3d7
|
data/.github/CODEOWNERS
ADDED
@@ -0,0 +1,10 @@
|
|
1
|
+
* @cyberark/community-and-integrations-team @conjurinc/community-and-integrations-team @conjurdemos/community-and-integrations-team
|
2
|
+
|
3
|
+
# Changes to .trivyignore require Security Architect approval
|
4
|
+
.trivyignore @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects
|
5
|
+
|
6
|
+
# Changes to .codeclimate.yml require Quality Architect approval
|
7
|
+
.codeclimate.yml @cyberark/quality-architects @conjurinc/quality-architects @conjurdemos/quality-architects
|
8
|
+
|
9
|
+
# Changes to SECURITY.md require Security Architect approval
|
10
|
+
SECURITY.md @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects
|
@@ -23,5 +23,20 @@ A clear and concise description of what you expected to happen.
|
|
23
23
|
## Actual Results (including error logs, if applicable)
|
24
24
|
A clear and concise description of what actually did happen.
|
25
25
|
|
26
|
+
## Reproducible
|
27
|
+
* [ ] Always
|
28
|
+
* [ ] Sometimes
|
29
|
+
* [ ] Non-Reproducible
|
30
|
+
|
31
|
+
## Version/Tag number
|
32
|
+
What version of the product are you running? Any version info that you can share is helpful.
|
33
|
+
For example, you might give the version from Docker logs, the Docker tag, a specific download URL,
|
34
|
+
the output of the `/info` route, etc.
|
35
|
+
|
36
|
+
## Environment setup
|
37
|
+
Can you describe the environment in which this product is running? Is it running on a VM / in a container / in a cloud?
|
38
|
+
Which cloud provider? Which container orchestrator (including version)?
|
39
|
+
The more info you can share about your runtime environment, the better we may be able to reproduce the issue.
|
40
|
+
|
26
41
|
## Additional Information
|
27
|
-
Add any other context about the problem here.
|
42
|
+
Add any other context about the problem here.
|
@@ -0,0 +1,21 @@
|
|
1
|
+
### What does this PR do?
|
2
|
+
- _What's changed? Why were these changes made?_
|
3
|
+
- _How should the reviewer approach this PR, especially if manual tests are required?_
|
4
|
+
- _Are there relevant screenshots you can add to the PR description?_
|
5
|
+
|
6
|
+
### What ticket does this PR close?
|
7
|
+
Resolves #[relevant GitHub issues, eg 76]
|
8
|
+
|
9
|
+
### Checklists
|
10
|
+
|
11
|
+
#### Change log
|
12
|
+
- [ ] The CHANGELOG has been updated, or
|
13
|
+
- [ ] This PR does not include user-facing changes and doesn't require a CHANGELOG update
|
14
|
+
|
15
|
+
#### Test coverage
|
16
|
+
- [ ] This PR includes new unit and integration tests to go with the code changes, or
|
17
|
+
- [ ] The changes in this PR do not require tests
|
18
|
+
|
19
|
+
#### Documentation
|
20
|
+
- [ ] Docs (e.g. `README`s) were updated in this PR, and/or there is a follow-on issue to update docs, or
|
21
|
+
- [ ] This PR does not require updating any documentation
|
data/CHANGELOG.md
CHANGED
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
6
6
|
|
7
7
|
## [Unreleased]
|
8
8
|
|
9
|
+
## [6.2.3] - 2020-12-22
|
10
|
+
### Fixed
|
11
|
+
- The Conjur CLI now raises a proper error when trying to rotate a non-existing
|
12
|
+
user's API key.
|
13
|
+
[cyberark/conjur#979](https://github.com/cyberark/conjur/issues/979)
|
14
|
+
|
9
15
|
## [6.2.2] - 2020-04-02
|
10
16
|
### Changed
|
11
17
|
- Docker image updated to flatten to a single layer and reduce the image
|
@@ -48,7 +54,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
48
54
|
- **Codebase forked: for changes to the 5.x (API [v4](https://github.com/cyberark/conjur-cli/tree/v4)) series, see
|
49
55
|
[CHANGELOG in `v4` branch][v4-changelog](https://github.com/cyberark/conjur-cli/blob/v4/CHANGELOG.md)**
|
50
56
|
|
51
|
-
[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.
|
57
|
+
[Unreleased]: https://github.com/cyberark/conjur-cli/compare/v6.2.3...HEAD
|
58
|
+
[6.2.3]: https://github.com/cyberark/conjur-cli/compare/v6.2.2...v6.2.3
|
52
59
|
[6.2.2]: https://github.com/cyberark/conjur-cli/compare/v6.2.1...v6.2.2
|
53
60
|
[6.2.1]: https://github.com/cyberark/conjur-cli/compare/v6.2.0...v6.2.1
|
54
61
|
[6.1.0]: https://github.com/cyberark/conjur-cli/compare/v6.0.1...v6.1.0
|
data/Jenkinsfile
CHANGED
@@ -94,15 +94,22 @@ pipeline {
|
|
94
94
|
}
|
95
95
|
|
96
96
|
stage('Scan Docker image') {
|
97
|
-
|
98
|
-
|
97
|
+
parallel {
|
98
|
+
stage('Scan Docker image for fixable vulns') {
|
99
|
+
steps {
|
100
|
+
scanAndReport("cyberark/conjur-cli:latest", "HIGH", false)
|
101
|
+
}
|
102
|
+
}
|
103
|
+
stage('Scan Docker image for total vulns') {
|
104
|
+
steps {
|
105
|
+
scanAndReport("cyberark/conjur-cli:latest", "NONE", true)
|
106
|
+
}
|
107
|
+
}
|
99
108
|
}
|
100
109
|
}
|
101
110
|
|
102
111
|
stage('Push standalone image to DockerHub') {
|
103
|
-
when {
|
104
|
-
branch 'master'
|
105
|
-
}
|
112
|
+
when { tag "v*" }
|
106
113
|
|
107
114
|
steps {
|
108
115
|
sh './push-image'
|
@@ -112,15 +119,9 @@ pipeline {
|
|
112
119
|
// Only publish to RubyGems if the HEAD is
|
113
120
|
// tagged with the same version as in version.rb
|
114
121
|
stage('Publish to RubyGems') {
|
115
|
-
agent { label 'releaser-v2' }
|
116
|
-
|
117
122
|
when {
|
118
123
|
expression { currentBuild.resultIsBetterOrEqualTo('SUCCESS') }
|
119
|
-
|
120
|
-
expression {
|
121
|
-
def exitCode = sh returnStatus: true, script: './needs-publishing'
|
122
|
-
return exitCode == 0
|
123
|
-
}
|
124
|
+
tag "v*"
|
124
125
|
}
|
125
126
|
|
126
127
|
steps {
|
data/NOTICES.txt
ADDED
@@ -0,0 +1,421 @@
|
|
1
|
+
=============== TABLE OF CONTENTS =============================
|
2
|
+
|
3
|
+
The following is a listing of the Conjur Service Broker open source components detailed
|
4
|
+
in this document. This list is provided for your convenience; please read
|
5
|
+
further if you wish to review the copyright notice(s) and the full text
|
6
|
+
of the license associated with each component.
|
7
|
+
|
8
|
+
|
9
|
+
SECTION 1: Apache-2.0
|
10
|
+
|
11
|
+
>>> https://rubygems.org/gems/conjur-api/versions/5.3.4
|
12
|
+
>>> https://rubygems.org/gems/gli/versions/2.19.2
|
13
|
+
|
14
|
+
SECTION 2: BSD-2-Clause
|
15
|
+
|
16
|
+
>>> https://rubygems.org/gems/highline/versions/1.7.10
|
17
|
+
>>> https://rubygems.org/gems/xdg/versions/2.2.3
|
18
|
+
|
19
|
+
SECTION 3: MIT
|
20
|
+
|
21
|
+
>>> https://rubygems.org/gems/activesupport/versions/5.2.4.4
|
22
|
+
>>> https://rubygems.org/gems/deep_merge/versions/1.0.1
|
23
|
+
>>> https://rubygems.org/gems/netrc/versions/0.10.3
|
24
|
+
>>> https://rubygems.org/gems/table_print/versions/1.5.7
|
25
|
+
|
26
|
+
APPENDIX: Standard License Files and Templates
|
27
|
+
|
28
|
+
>>> Apache-2.0
|
29
|
+
|
30
|
+
>>> BSD-2-Clause
|
31
|
+
|
32
|
+
>>> MIT
|
33
|
+
|
34
|
+
--------------- SECTION 1: Apache-2.0 ----------
|
35
|
+
|
36
|
+
Apache-2.0 License is applicable to the following component(s).
|
37
|
+
|
38
|
+
>>> https://rubygems.org/gems/conjur-api/versions/5.3.4
|
39
|
+
|
40
|
+
Copyright (c) 2020 CyberArk Software Ltd. All rights reserved.'
|
41
|
+
|
42
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
43
|
+
you may not use this file except in compliance with the License.
|
44
|
+
You may obtain a copy of the License at
|
45
|
+
|
46
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
47
|
+
|
48
|
+
Unless required by applicable law or agreed to in writing, software
|
49
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
50
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
51
|
+
See the License for the specific language governing permissions and
|
52
|
+
limitations under the License.
|
53
|
+
|
54
|
+
>>> https://rubygems.org/gems/gli/versions/2.19.2
|
55
|
+
|
56
|
+
Copyright (c) 2010 by Dave Copeland
|
57
|
+
|
58
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
59
|
+
you may not use this file except in compliance with the License.
|
60
|
+
You may obtain a copy of the License at
|
61
|
+
|
62
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
63
|
+
|
64
|
+
Unless required by applicable law or agreed to in writing, software
|
65
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
66
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
67
|
+
See the License for the specific language governing permissions and
|
68
|
+
limitations under the License.
|
69
|
+
|
70
|
+
--------------- SECTION 2: BSD-2-Clause ----------
|
71
|
+
|
72
|
+
>>> https://rubygems.org/gems/highline/versions/1.7.10
|
73
|
+
|
74
|
+
Copyright 2005 Gray Productions. All rights reserved.
|
75
|
+
|
76
|
+
>>> https://rubygems.org/gems/xdg/versions/2.2.3
|
77
|
+
|
78
|
+
Redistribution and use in source and binary forms, with or without
|
79
|
+
modification, are permitted provided that the following conditions are met:
|
80
|
+
|
81
|
+
1. Redistributions of source code must retain the above copyright notice,
|
82
|
+
this list of conditions and the following disclaimer.
|
83
|
+
|
84
|
+
2. Redistributions in binary form must reproduce the above copyright
|
85
|
+
notice, this list of conditions and the following disclaimer in the
|
86
|
+
documentation and/or other materials provided with the distribution.
|
87
|
+
|
88
|
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
89
|
+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
90
|
+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
91
|
+
COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
92
|
+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
93
|
+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
94
|
+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
95
|
+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
96
|
+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
|
97
|
+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
98
|
+
|
99
|
+
--------------- SECTION 3: MIT ----------
|
100
|
+
|
101
|
+
MIT License is applicable to the following component(s).
|
102
|
+
|
103
|
+
>>> https://rubygems.org/gems/activesupport/versions/5.2.4.4
|
104
|
+
|
105
|
+
Copyright (c) 2005-2018 David Heinemeier Hansson'
|
106
|
+
|
107
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
108
|
+
of this software and associated documentation files (the "Software"), to deal
|
109
|
+
in the Software without restriction, including without limitation the rights
|
110
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
111
|
+
copies of the Software, and to permit persons to whom the Software is
|
112
|
+
furnished to do so, subject to the following conditions:
|
113
|
+
|
114
|
+
The above copyright notice and this permission notice shall be included in all
|
115
|
+
copies or substantial portions of the Software.
|
116
|
+
|
117
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
118
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
119
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
120
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
121
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
122
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
123
|
+
SOFTWARE.
|
124
|
+
|
125
|
+
|
126
|
+
>>> https://rubygems.org/gems/deep_merge/versions/1.0.1
|
127
|
+
|
128
|
+
Copyright (c) 2008-2104 Steve Midgley, Daniel DeLeo
|
129
|
+
|
130
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
131
|
+
of this software and associated documentation files (the "Software"), to deal
|
132
|
+
in the Software without restriction, including without limitation the rights
|
133
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
134
|
+
copies of the Software, and to permit persons to whom the Software is
|
135
|
+
furnished to do so, subject to the following conditions:
|
136
|
+
|
137
|
+
The above copyright notice and this permission notice shall be included in
|
138
|
+
all copies or substantial portions of the Software.
|
139
|
+
|
140
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
141
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
142
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
143
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
144
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
145
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
146
|
+
THE SOFTWARE.
|
147
|
+
|
148
|
+
>>> https://rubygems.org/gems/netrc/versions/0.10.3
|
149
|
+
|
150
|
+
Copyright (c) 2011-2014 CONTRIBUTORS.md
|
151
|
+
|
152
|
+
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:
|
153
|
+
|
154
|
+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
155
|
+
|
156
|
+
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.
|
157
|
+
|
158
|
+
>>> https://rubygems.org/gems/table_print/versions/1.5.7
|
159
|
+
|
160
|
+
Copyright (c) 2012-2016 Chris Doyle
|
161
|
+
|
162
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
163
|
+
a copy of this software and associated documentation files (the
|
164
|
+
"Software"), to deal in the Software without restriction, including
|
165
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
166
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
167
|
+
permit persons to whom the Software is furnished to do so, subject to
|
168
|
+
the following conditions:
|
169
|
+
|
170
|
+
The above copyright notice and this permission notice shall be
|
171
|
+
included in all copies or substantial portions of the Software.
|
172
|
+
|
173
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
174
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
175
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
176
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
177
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
178
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
179
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
180
|
+
|
181
|
+
=============== APPENDIX: License Files and Templates ==============
|
182
|
+
|
183
|
+
|
184
|
+
|
185
|
+
--------------- APPENDIX 1: Apache-2.0 License (Template) -----------
|
186
|
+
|
187
|
+
Apache License
|
188
|
+
Version 2.0, January 2004
|
189
|
+
http://www.apache.org/licenses/
|
190
|
+
|
191
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
192
|
+
|
193
|
+
1. Definitions.
|
194
|
+
|
195
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
196
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
197
|
+
|
198
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
199
|
+
the copyright owner that is granting the License.
|
200
|
+
|
201
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
202
|
+
other entities that control, are controlled by, or are under common
|
203
|
+
control with that entity. For the purposes of this definition,
|
204
|
+
"control" means (i) the power, direct or indirect, to cause the
|
205
|
+
direction or management of such entity, whether by contract or
|
206
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
207
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
208
|
+
|
209
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
210
|
+
exercising permissions granted by this License.
|
211
|
+
|
212
|
+
"Source" form shall mean the preferred form for making modifications,
|
213
|
+
including but not limited to software source code, documentation
|
214
|
+
source, and configuration files.
|
215
|
+
|
216
|
+
"Object" form shall mean any form resulting from mechanical
|
217
|
+
transformation or translation of a Source form, including but
|
218
|
+
not limited to compiled object code, generated documentation,
|
219
|
+
and conversions to other media types.
|
220
|
+
|
221
|
+
"Work" shall mean the work of authorship, whether in Source or
|
222
|
+
Object form, made available under the License, as indicated by a
|
223
|
+
copyright notice that is included in or attached to the work
|
224
|
+
(an example is provided in the Appendix below).
|
225
|
+
|
226
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
227
|
+
form, that is based on (or derived from) the Work and for which the
|
228
|
+
editorial revisions, annotations, elaborations, or other modifications
|
229
|
+
represent, as a whole, an original work of authorship. For the purposes
|
230
|
+
of this License, Derivative Works shall not include works that remain
|
231
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
232
|
+
the Work and Derivative Works thereof.
|
233
|
+
|
234
|
+
"Contribution" shall mean any work of authorship, including
|
235
|
+
the original version of the Work and any modifications or additions
|
236
|
+
to that Work or Derivative Works thereof, that is intentionally
|
237
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
238
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
239
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
240
|
+
means any form of electronic, verbal, or written communication sent
|
241
|
+
to the Licensor or its representatives, including but not limited to
|
242
|
+
communication on electronic mailing lists, source code control systems,
|
243
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
244
|
+
Licensor for the purpose of discussing and improving the Work, but
|
245
|
+
excluding communication that is conspicuously marked or otherwise
|
246
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
247
|
+
|
248
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
249
|
+
on behalf of whom a Contribution has been received by Licensor and
|
250
|
+
subsequently incorporated within the Work.
|
251
|
+
|
252
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
253
|
+
this License, each Contributor hereby grants to You a perpetual,
|
254
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
255
|
+
copyright license to reproduce, prepare Derivative Works of,
|
256
|
+
publicly display, publicly perform, sublicense, and distribute the
|
257
|
+
Work and such Derivative Works in Source or Object form.
|
258
|
+
|
259
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
260
|
+
this License, each Contributor hereby grants to You a perpetual,
|
261
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
262
|
+
(except as stated in this section) patent license to make, have made,
|
263
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
264
|
+
where such license applies only to those patent claims licensable
|
265
|
+
by such Contributor that are necessarily infringed by their
|
266
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
267
|
+
with the Work to which such Contribution(s) was submitted. If You
|
268
|
+
institute patent litigation against any entity (including a
|
269
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
270
|
+
or a Contribution incorporated within the Work constitutes direct
|
271
|
+
or contributory patent infringement, then any patent licenses
|
272
|
+
granted to You under this License for that Work shall terminate
|
273
|
+
as of the date such litigation is filed.
|
274
|
+
|
275
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
276
|
+
Work or Derivative Works thereof in any medium, with or without
|
277
|
+
modifications, and in Source or Object form, provided that You
|
278
|
+
meet the following conditions:
|
279
|
+
|
280
|
+
(a) You must give any other recipients of the Work or
|
281
|
+
Derivative Works a copy of this License; and
|
282
|
+
|
283
|
+
(b) You must cause any modified files to carry prominent notices
|
284
|
+
stating that You changed the files; and
|
285
|
+
|
286
|
+
(c) You must retain, in the Source form of any Derivative Works
|
287
|
+
that You distribute, all copyright, patent, trademark, and
|
288
|
+
attribution notices from the Source form of the Work,
|
289
|
+
excluding those notices that do not pertain to any part of
|
290
|
+
the Derivative Works; and
|
291
|
+
|
292
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
293
|
+
distribution, then any Derivative Works that You distribute must
|
294
|
+
include a readable copy of the attribution notices contained
|
295
|
+
within such NOTICE file, excluding those notices that do not
|
296
|
+
pertain to any part of the Derivative Works, in at least one
|
297
|
+
of the following places: within a NOTICE text file distributed
|
298
|
+
as part of the Derivative Works; within the Source form or
|
299
|
+
documentation, if provided along with the Derivative Works; or,
|
300
|
+
within a display generated by the Derivative Works, if and
|
301
|
+
wherever such third-party notices normally appear. The contents
|
302
|
+
of the NOTICE file are for informational purposes only and
|
303
|
+
do not modify the License. You may add Your own attribution
|
304
|
+
notices within Derivative Works that You distribute, alongside
|
305
|
+
or as an addendum to the NOTICE text from the Work, provided
|
306
|
+
that such additional attribution notices cannot be construed
|
307
|
+
as modifying the License.
|
308
|
+
|
309
|
+
You may add Your own copyright statement to Your modifications and
|
310
|
+
may provide additional or different license terms and conditions
|
311
|
+
for use, reproduction, or distribution of Your modifications, or
|
312
|
+
for any such Derivative Works as a whole, provided Your use,
|
313
|
+
reproduction, and distribution of the Work otherwise complies with
|
314
|
+
the conditions stated in this License.
|
315
|
+
|
316
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
317
|
+
any Contribution intentionally submitted for inclusion in the Work
|
318
|
+
by You to the Licensor shall be under the terms and conditions of
|
319
|
+
this License, without any additional terms or conditions.
|
320
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
321
|
+
the terms of any separate license agreement you may have executed
|
322
|
+
with Licensor regarding such Contributions.
|
323
|
+
|
324
|
+
6. Trademarks. This License does not grant permission to use the trade
|
325
|
+
names, trademarks, service marks, or product names of the Licensor,
|
326
|
+
except as required for reasonable and customary use in describing the
|
327
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
328
|
+
|
329
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
330
|
+
agreed to in writing, Licensor provides the Work (and each
|
331
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
332
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
333
|
+
implied, including, without limitation, any warranties or conditions
|
334
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
335
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
336
|
+
appropriateness of using or redistributing the Work and assume any
|
337
|
+
risks associated with Your exercise of permissions under this License.
|
338
|
+
|
339
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
340
|
+
whether in tort (including negligence), contract, or otherwise,
|
341
|
+
unless required by applicable law (such as deliberate and grossly
|
342
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
343
|
+
liable to You for damages, including any direct, indirect, special,
|
344
|
+
incidental, or consequential damages of any character arising as a
|
345
|
+
result of this License or out of the use or inability to use the
|
346
|
+
Work (including but not limited to damages for loss of goodwill,
|
347
|
+
work stoppage, computer failure or malfunction, or any and all
|
348
|
+
other commercial damages or losses), even if such Contributor
|
349
|
+
has been advised of the possibility of such damages.
|
350
|
+
|
351
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
352
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
353
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
354
|
+
or other liability obligations and/or rights consistent with this
|
355
|
+
License. However, in accepting such obligations, You may act only
|
356
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
357
|
+
of any other Contributor, and only if You agree to indemnify,
|
358
|
+
defend, and hold each Contributor harmless for any liability
|
359
|
+
incurred by, or claims asserted against, such Contributor by reason
|
360
|
+
of your accepting any such warranty or additional liability.
|
361
|
+
|
362
|
+
END OF TERMS AND CONDITIONS
|
363
|
+
|
364
|
+
APPENDIX: How to apply the Apache License to your work.
|
365
|
+
|
366
|
+
To apply the Apache License to your work, attach the following
|
367
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
368
|
+
replaced with your own identifying information. (Don't include
|
369
|
+
the brackets!) The text should be enclosed in the appropriate
|
370
|
+
comment syntax for the file format. We also recommend that a
|
371
|
+
file or class name and description of purpose be included on the
|
372
|
+
same "printed page" as the copyright notice for easier
|
373
|
+
identification within third-party archives.
|
374
|
+
|
375
|
+
Copyright <YEAR> <COPYRIGHT HOLDER>
|
376
|
+
|
377
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
378
|
+
you may not use this file except in compliance with the License.
|
379
|
+
You may obtain a copy of the License at
|
380
|
+
|
381
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
382
|
+
|
383
|
+
Unless required by applicable law or agreed to in writing, software
|
384
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
385
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
386
|
+
See the License for the specific language governing permissions and
|
387
|
+
limitations under the License.
|
388
|
+
|
389
|
+
--------------- APPENDIX 2: BSD-2-Clause License (Template) -----------
|
390
|
+
|
391
|
+
Copyright <YEAR> <COPYRIGHT HOLDER>
|
392
|
+
|
393
|
+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
394
|
+
|
395
|
+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
396
|
+
|
397
|
+
2. 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.
|
398
|
+
|
399
|
+
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 HOLDER 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.
|
400
|
+
|
401
|
+
--------------- APPENDIX 3: MIT License (Template) -----------
|
402
|
+
|
403
|
+
Copyright <YEAR> <COPYRIGHT HOLDER>
|
404
|
+
|
405
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
406
|
+
of this software and associated documentation files (the "Software"), to deal
|
407
|
+
in the Software without restriction, including without limitation the rights
|
408
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
409
|
+
copies of the Software, and to permit persons to whom the Software is
|
410
|
+
furnished to do so, subject to the following conditions:
|
411
|
+
|
412
|
+
The above copyright notice and this permission notice shall be included in all
|
413
|
+
copies or substantial portions of the Software.
|
414
|
+
|
415
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
416
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
417
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
418
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
419
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
420
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
421
|
+
SOFTWARE.
|