Skip to content

Commit 674e536

Browse files
authored
Merge pull request #11 from github/oss
Updates before opensourcing
2 parents ca0ab31 + c70bf45 commit 674e536

File tree

8 files changed

+157
-7
lines changed

8 files changed

+157
-7
lines changed

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all project spaces, and it also applies when
49+
an individual is representing the project or its community in public spaces.
50+
Examples of representing a project or community include using an official
51+
project e-mail address, posting via an official social media account, or acting
52+
as an appointed representative at an online or offline event. Representation of
53+
a project may be further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [email protected]. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

CONTRIBUTING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,14 @@ Here are a few things you can do that will increase the likelihood of your pull
3333
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
3434
- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
3535
- [GitHub Help](https://help.github.com)
36+
37+
## Releasing
38+
39+
If you are the current maintainer of this gem:
40+
41+
- Merge whatever PRs are to be included in your new version into the `master` branch.
42+
- Increment the version in [`lib/ssh_data/version.rb`](lib/ssh_data/version.rb), following [SemVer](https://semver.org/).
43+
- Run `bundle install` to update the version in `Gemfile.lock`.
44+
- Make a commit with a message lik `bump version to 0.0.1` and push this to `master`.
45+
- Run `gem build ssh_data.gemspec` to build a new `ssh_data-<VERSION>.gem`.
46+
- Run `gem push ssh_data-<VERSION>.gem` to publish the new version to rubygems.org.

README.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# ssh_data
22

3-
This is a Ruby library for parsing SSH public keys and certificates.
3+
This is a Ruby library for processing SSH keys and certificates.
4+
5+
The scope of this project is limited to processing and directly using keys and certificates. It can be used to generate SSH private keys, verify signatures using public keys, sign data using private keys, issue certificates using private keys, and parse certificates and public and private keys. This library supports RSA, DSA, ECDSA, and ED25519<sup>[*](#ed25519-support)</sup> keys. This library does not offer or intend to offer functionality for SSH connectivity, processing of SSH wire protocol data, or processing of other key formats or types.
6+
7+
**Project Status:** Used by @github in production
48

59
## Installation
610

@@ -27,3 +31,31 @@ cert.key_id
2731
cert.public_key
2832
#=> <SSHData::PublicKey::RSA>
2933
```
34+
35+
## ED25519 support
36+
37+
Ruby's standard library does not include support for ED25519, though the algorithm is implemented by the [`ed25519` Gem](https://rubygems.org/gems/ed25519). This library can parse ED25519 public and private keys itself, but in order to generate keys or sign or verify messages, the calling application must load the `ed25519` Gem itself. This avoids the necessity of installing or loading this third party dependency when the calling application is only interested in parsing keys.
38+
39+
```ruby
40+
require "ssh_data"
41+
42+
key_data = File.read("~/.ssh/id_ed25519")
43+
key = SSHData::PrivateKey.parse_openssh(key_data)
44+
#=> <SSHData::PrivateKey::ED25519>
45+
46+
SSHData::PrivateKey::ED25519.generate
47+
#=> raises SSHData::AlgorithmError
48+
49+
require "ed25519"
50+
51+
SSHData::PrivateKey::ED25519.generate
52+
#=> <SSHData::PrivateKey::ED25519>
53+
```
54+
55+
## Contributions
56+
57+
This project is not currently seeking contributions for new features or functionality, though bug fixes are welcome. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information.
58+
59+
## License
60+
61+
This project is published under the MIT license. See [LICENSE.md](LICENSE.md) for mor information.

lib/ssh_data/private_key/ed25519.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class ED25519 < Base
77
#
88
# Returns a PublicKey::Base subclass instance.
99
def self.generate
10+
PublicKey::ED25519.ed25519_gem_required!
1011
from_ed25519(Ed25519::SigningKey.generate)
1112
end
1213

@@ -56,6 +57,7 @@ def initialize(algo:, pk:, sk:, comment:)
5657
#
5758
# Returns a binary String signature.
5859
def sign(signed_data, algo: nil)
60+
PublicKey::ED25519.ed25519_gem_required!
5961
algo ||= self.algo
6062
raise AlgorithmError unless algo == self.algo
6163
raw_sig = ed25519_key.sign(signed_data)

lib/ssh_data/public_key/ed25519.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ def self.enabled?
99
Object.const_defined?(:Ed25519)
1010
end
1111

12+
# Assert that the ed25519 gem has been loaded.
13+
#
14+
# Returns nothing, raises AlgorithmError.
15+
def self.ed25519_gem_required!
16+
raise AlgorithmError, "the ed25519 gem is not loaded" unless enabled?
17+
end
18+
1219
def initialize(algo:, pk:)
1320
unless algo == ALGO_ED25519
1421
raise DecodeError, "bad algorithm: #{algo.inspect}"
@@ -30,9 +37,7 @@ def initialize(algo:, pk:)
3037
#
3138
# Returns boolean.
3239
def verify(signed_data, signature)
33-
unless self.class.enabled?
34-
raise VerifyError, "the ed25519 gem isn't loadedd"
35-
end
40+
self.class.ed25519_gem_required!
3641

3742
sig_algo, raw_sig, _ = Encoding.decode_signature(signature)
3843
if sig_algo != ALGO_ED25519

spec/private_key/ed25519_spec.rb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,27 @@
7878
expect(keys.size).to eq(1)
7979
expect(keys.first).to be_an(SSHData::PrivateKey::ED25519)
8080
end
81+
82+
it "fails cleanly if the ed25519 gem hasn't been loaded" do
83+
backup = Object.send(:remove_const, :Ed25519)
84+
key = openssh_key.first
85+
86+
begin
87+
expect {
88+
expect(key.sk).not_to be_nil
89+
expect(key.pk).not_to be_nil
90+
expect(key.public_key).not_to be_nil
91+
}.not_to raise_error
92+
93+
expect {
94+
described_class.generate
95+
}.to raise_error(SSHData::AlgorithmError)
96+
97+
expect {
98+
key.sign(message)
99+
}.to raise_error(SSHData::AlgorithmError)
100+
ensure
101+
Object.const_set(:Ed25519, backup)
102+
end
103+
end
81104
end

spec/public_key/ed25519_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@
6767

6868
it "fails cleanly if the ed25519 gem hasn't been loaded" do
6969
expect(described_class.enabled?).to be(true)
70-
backup = Object.send(:remove_const, :Ed25519)
71-
expect(described_class.enabled?).to be(false)
70+
backup = Object.send(:remove_const, :Ed25519)
71+
expect(described_class.enabled?).to be(false)
7272

7373
begin
7474
expect {
7575
SSHData::Certificate.parse_openssh(fixture("rsa_leaf_for_ed25519_ca-cert.pub"),
7676
unsafe_no_verify: false
7777
)
78-
}.to raise_error(SSHData::VerifyError)
78+
}.to raise_error(SSHData::AlgorithmError)
7979
ensure
8080
Object.const_set(:Ed25519, backup)
8181
end

ssh_data.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
88
s.license = "MIT"
99
s.homepage = "https://github.com/github/ssh_data"
1010
s.authors = ["mastahyeti"]
11+
s.email = "[email protected]"
1112
s.required_ruby_version = "~> 2.3"
1213
s.files = Dir["./lib/**/*.rb"] + ["./LICENSE.md"]
1314

0 commit comments

Comments
 (0)