conjur-api 6.1.0 → 6.2.0.pre.775
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +3 -6
- data/CHANGELOG.md +7 -2
- data/Jenkinsfile +10 -12
- data/VERSION +1 -1
- data/features/step_definitions/policy_steps.rb +0 -3
- data/features/step_definitions/result_steps.rb +0 -4
- data/features/support/env.rb +4 -4
- data/lib/conjur/api/pubkeys.rb +5 -0
- data/test.sh +1 -1
- metadata +3 -8
- data/features/public_keys.feature +0 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d7e5263ffd35addba191a8b31beab91dd83c0171d72817939c250e3e546a534a
|
|
4
|
+
data.tar.gz: 3046e0183be1302a29632910174ff494ab1696ec1e60f8c2bb64567739ba0f9d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 75e8b641fe074d409d830607f9aeac962494392d80531eb25718c2f70e3d7f4e3336b0884994651027e0a24325b449b202e427b05b447cfb48dc5e133b50c032
|
|
7
|
+
data.tar.gz: 422e91ebeb651a8b754b5a2fc44898388faefb2a66b3410629a32c5d25c0d2e0f436c3cfc24371e0cb9996108617282a0b7059fd0bdb1de0bfb7c3ee5878069a
|
data/.github/CODEOWNERS
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
* @
|
|
2
|
-
|
|
3
|
-
# Changes to .trivyignore require Security Architect approval
|
|
4
|
-
.trivyignore @cyberark/security-architects @conjurinc/security-architects @conjurdemos/security-architects @conjur-enterprise/conjur-security
|
|
1
|
+
* @conjur-enterprise/r-d-developers @conjur-enterprise/transition-tech
|
|
5
2
|
|
|
6
3
|
# Changes to .codeclimate.yml require Quality Architect approval
|
|
7
|
-
.codeclimate.yml @
|
|
4
|
+
.codeclimate.yml @conjur-enterprise/conjur-quality
|
|
8
5
|
|
|
9
6
|
# Changes to SECURITY.md require Security Architect approval
|
|
10
|
-
SECURITY.md @
|
|
7
|
+
SECURITY.md @conjur-enterprise/conjur-security
|
data/CHANGELOG.md
CHANGED
|
@@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
|
6
6
|
|
|
7
7
|
## Unreleased
|
|
8
8
|
### Changed
|
|
9
|
-
-
|
|
10
|
-
(
|
|
9
|
+
- CI uses Conjur Enterprise 1.27.0+, which removed the `GET /public_keys` endpoint
|
|
10
|
+
(CNJR-11339). Dropped the Cucumber scenario that exercised that API; the client
|
|
11
|
+
method remains for open-source Conjur.
|
|
12
|
+
- Retrieve the Cucumber admin API key via `conjurctl` in `test.sh` instead of rake,
|
|
13
|
+
avoiding Rails boot output corrupting the key on current Conjur images.
|
|
14
|
+
|
|
15
|
+
## [6.2.0] - 2026-06-05
|
|
11
16
|
|
|
12
17
|
## [6.1.0] - 2025-12-10
|
|
13
18
|
|
data/Jenkinsfile
CHANGED
|
@@ -141,18 +141,16 @@ pipeline {
|
|
|
141
141
|
}
|
|
142
142
|
unstash 'coverage'
|
|
143
143
|
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
sourceEncoding: 'ASCII',
|
|
155
|
-
zoomCoverageChart: false
|
|
144
|
+
recordCoverage(
|
|
145
|
+
tools: [[parser: 'COBERTURA', pattern: 'coverage/coverage.xml']],
|
|
146
|
+
sourceCodeEncoding: 'ASCII',
|
|
147
|
+
qualityGates: [
|
|
148
|
+
[threshold: 70.0, metric: 'LINE', baseline: 'PROJECT', unstable: true],
|
|
149
|
+
[threshold: 70.0, metric: 'BRANCH', baseline: 'PROJECT', unstable: true],
|
|
150
|
+
[threshold: 70.0, metric: 'METHOD', baseline: 'PROJECT', unstable: true]
|
|
151
|
+
],
|
|
152
|
+
skipPublishingChecks: false
|
|
153
|
+
)
|
|
156
154
|
|
|
157
155
|
publishHTML([reportDir: 'coverage', reportFiles: 'index.html', reportName: 'Coverage Report', reportTitles: '',
|
|
158
156
|
allowMissing: false, alwaysLinkToLastBuild: true, keepAll: true])
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
6.
|
|
1
|
+
6.2.0-775
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
Given(/^a new user$/) do
|
|
2
2
|
@user_id = "user-#{random_hex}"
|
|
3
|
-
@public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDd/PAcCL9rW/zAS7DRns/KYiAvRAEKxBu/0IF32z7x6YiMFcA2hmH4DMYaIY45Xlj7L9uTZamUlRZNjSS9Xm6Lhh7XGceIX2067/MDnH+or9xh5LZs6gb3x7QVtNz26Au5h5kP0xoJ+wpVxvY707BeSax/WQZI8akqd0fD1IqOoafWkcX0ucu5iIgDh08R7zq3vrDHEK7+SoYo9ncHfmOUJ5lmImGiU/WMqM0OzN3RsgxJi/aaHjW1IASTY8TmAtTtjEsxbQXxRVUCAP9vWUZg7p3aqIB6sEP8skgncCUtHBQxUtE1XN8Q8NeFOzau6+9sQTXlPl8c/L4Jc4K96C75 #{@user_id}@example.com"
|
|
4
3
|
response = $conjur.load_policy 'root', <<-POLICY
|
|
5
4
|
- !user
|
|
6
5
|
id: #{@user_id}
|
|
7
6
|
uidnumber: 1000
|
|
8
|
-
public_keys:
|
|
9
|
-
- #{@public_key}
|
|
10
7
|
POLICY
|
|
11
8
|
@user = $conjur.resource("cucumber:user:#{@user_id}")
|
|
12
9
|
@user_api_key = response.created_roles["cucumber:user:#{@user_id}"]['api_key']
|
|
@@ -2,10 +2,6 @@ Then(/^the result should be "([^"]+)"$/) do |expected|
|
|
|
2
2
|
expect(@result.to_s).to eq(expected.to_s)
|
|
3
3
|
end
|
|
4
4
|
|
|
5
|
-
Then(/^the result should be the public key$/) do
|
|
6
|
-
expect(@result).to eq(@public_key + "\n")
|
|
7
|
-
end
|
|
8
|
-
|
|
9
5
|
Then(/^the providers list contains service id "([^"]+)"$/) do |service_id|
|
|
10
6
|
expect(@result.map{ |x| x["service_id"]}).to include(service_id)
|
|
11
7
|
end
|
data/features/support/env.rb
CHANGED
|
@@ -17,7 +17,7 @@ Conjur.configuration.account = ENV['CONJUR_ACCOUNT'] || 'cucumber'
|
|
|
17
17
|
Conjur.configuration.authn_local_socket = "/run/authn-local/.socket"
|
|
18
18
|
|
|
19
19
|
$username = ENV['CONJUR_AUTHN_LOGIN'] || 'admin'
|
|
20
|
-
$
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
$conjur = Conjur::API.new_from_key $username, $api_key
|
|
20
|
+
$api_key = (ENV['CONJUR_AUTHN_API_KEY'] && !ENV['CONJUR_AUTHN_API_KEY'].empty?) \
|
|
21
|
+
? ENV['CONJUR_AUTHN_API_KEY'] \
|
|
22
|
+
: Conjur::API.login($username, 'secret')
|
|
23
|
+
$conjur = Conjur::API.new_from_key $username, $api_key
|
data/lib/conjur/api/pubkeys.rb
CHANGED
|
@@ -35,6 +35,11 @@ module Conjur
|
|
|
35
35
|
# ## Permissions
|
|
36
36
|
# You do not need any special permissions to call this method, since public keys are, well, public.
|
|
37
37
|
#
|
|
38
|
+
# ## Conjur Enterprise
|
|
39
|
+
# Conjur Enterprise 1.27.0 and later removed the +GET /public_keys+ endpoint
|
|
40
|
+
# (CNJR-11339). Calls against those servers return 404. Store SSH keys with
|
|
41
|
+
# +POST /secrets/:account/public_key/...+, or use your LDAP sync workflow.
|
|
42
|
+
#
|
|
38
43
|
#
|
|
39
44
|
# @example
|
|
40
45
|
# puts api.public_keys('jon')
|
data/test.sh
CHANGED
|
@@ -52,7 +52,7 @@ function runTests() {
|
|
|
52
52
|
echo 'Waiting for Conjur to come up, and configuring it...'
|
|
53
53
|
./ci/configure.sh
|
|
54
54
|
|
|
55
|
-
local api_key=$(docker compose exec -T conjur
|
|
55
|
+
local api_key=$(docker compose exec -T conjur conjurctl role retrieve-key cucumber:user:admin | tr -d '\r\n')
|
|
56
56
|
|
|
57
57
|
echo 'Running tests'
|
|
58
58
|
echo '-----'
|
metadata
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: conjur-api
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.
|
|
4
|
+
version: 6.2.0.pre.775
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- CyberArk Maintainers
|
|
8
|
-
autorequire:
|
|
9
8
|
bindir: bin
|
|
10
9
|
cert_chain: []
|
|
11
|
-
date:
|
|
10
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
12
11
|
dependencies:
|
|
13
12
|
- !ruby/object:Gem::Dependency
|
|
14
13
|
name: rest-client
|
|
@@ -319,7 +318,6 @@ files:
|
|
|
319
318
|
- features/new_api.feature
|
|
320
319
|
- features/permitted.feature
|
|
321
320
|
- features/permitted_roles.feature
|
|
322
|
-
- features/public_keys.feature
|
|
323
321
|
- features/resource_fields.feature
|
|
324
322
|
- features/role_fields.feature
|
|
325
323
|
- features/rotate_api_key.feature
|
|
@@ -411,7 +409,6 @@ homepage: https://github.com/cyberark/conjur-api-ruby/
|
|
|
411
409
|
licenses:
|
|
412
410
|
- Apache-2.0
|
|
413
411
|
metadata: {}
|
|
414
|
-
post_install_message:
|
|
415
412
|
rdoc_options: []
|
|
416
413
|
require_paths:
|
|
417
414
|
- lib
|
|
@@ -426,8 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
426
423
|
- !ruby/object:Gem::Version
|
|
427
424
|
version: '0'
|
|
428
425
|
requirements: []
|
|
429
|
-
rubygems_version: 3.
|
|
430
|
-
signing_key:
|
|
426
|
+
rubygems_version: 3.6.9
|
|
431
427
|
specification_version: 4
|
|
432
428
|
summary: Conjur API
|
|
433
429
|
test_files:
|
|
@@ -444,7 +440,6 @@ test_files:
|
|
|
444
440
|
- features/new_api.feature
|
|
445
441
|
- features/permitted.feature
|
|
446
442
|
- features/permitted_roles.feature
|
|
447
|
-
- features/public_keys.feature
|
|
448
443
|
- features/resource_fields.feature
|
|
449
444
|
- features/role_fields.feature
|
|
450
445
|
- features/rotate_api_key.feature
|