Skip to content

Commit 6df3842

Browse files
committed
Move postgres-protocol in-tree
1 parent 33d45db commit 6df3842

File tree

15 files changed

+2308
-4
lines changed

15 files changed

+2308
-4
lines changed

Cargo.toml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
[workspace]
2-
members = ["codegen", "postgres", "postgres-shared", "tokio-postgres"]
2+
members = [
3+
"codegen",
4+
"postgres",
5+
"postgres-protocol",
6+
"postgres-shared",
7+
"tokio-postgres"
8+
]

postgres-protocol/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
target
2+
Cargo.lock
3+
.idea/
4+
*.iml

postgres-protocol/.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
language: rust
2+
cache: cargo
3+
rust:
4+
- nightly
5+
- 1.10.0
6+
script:
7+
- cargo test

postgres-protocol/Cargo.toml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[package]
2+
name = "postgres-protocol"
3+
version = "0.2.1"
4+
authors = ["Steven Fackler <[email protected]>"]
5+
description = "Low level Postgres protocol APIs"
6+
license = "MIT/Apache-2.0"
7+
repository = "https://github.com/sfackler/rust-postgres-protocol"
8+
documentation = "https://docs.rs/postgres-protocol/0.2.1/postgres_protocol"
9+
readme = "README.md"
10+
11+
[dependencies]
12+
byteorder = "1.0"
13+
fallible-iterator = "0.1"
14+
md5 = "0.3"
15+
memchr = "1.0"

postgres-protocol/LICENSE-APACHE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

postgres-protocol/LICENSE-MIT

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 Steven Fackler
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//! Authentication protocol support.
2+
use md5::Context;
3+
4+
/// Hashes authentication information in a way suitable for use in response
5+
/// to an `AuthenticationMd5Password` message.
6+
///
7+
/// The resulting string should be sent back to the database in a
8+
/// `PasswordMessage` message.
9+
#[inline]
10+
pub fn md5_hash(username: &[u8], password: &[u8], salt: [u8; 4]) -> String {
11+
let mut context = Context::new();
12+
context.consume(password);
13+
context.consume(username);
14+
let output = context.compute();
15+
context = Context::new();
16+
context.consume(format!("{:x}", output));
17+
context.consume(&salt);
18+
format!("md5{:x}", context.compute())
19+
}
20+
21+
#[cfg(test)]
22+
mod test {
23+
use super::*;
24+
25+
#[test]
26+
fn md5() {
27+
let username = b"md5_user";
28+
let password = b"password";
29+
let salt = [0x2a, 0x3d, 0x8f, 0xe0];
30+
31+
assert_eq!(md5_hash(username, password, salt),
32+
"md562af4dd09bbb41884907a838a3233294");
33+
}
34+
}

postgres-protocol/src/lib.rs

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
//! Low level Postgres protocol APIs.
2+
//!
3+
//! This crate implements the low level components of Postgres's communication
4+
//! protocol, including message and value serialization and deserialization.
5+
//! It is designed to be used as a building block by higher level APIs such as
6+
//! `rust-postgres`, and should not typically be used directly.
7+
//!
8+
//! # Note
9+
//!
10+
//! This library assumes that the `client_encoding` backend parameter has been
11+
//! set to `UTF8`. It will most likely not behave properly if that is not the case.
12+
#![doc(html_root_url="https://docs.rs/postgres-protocol/0.2.1")]
13+
#![warn(missing_docs)]
14+
extern crate byteorder;
15+
extern crate fallible_iterator;
16+
extern crate md5;
17+
extern crate memchr;
18+
19+
use byteorder::{BigEndian, ByteOrder};
20+
use std::io;
21+
22+
pub mod authentication;
23+
pub mod message;
24+
pub mod types;
25+
26+
/// A Postgres OID.
27+
pub type Oid = u32;
28+
29+
/// An enum indicating if a value is `NULL` or not.
30+
pub enum IsNull {
31+
/// The value is `NULL`.
32+
Yes,
33+
/// The value is not `NULL`.
34+
No,
35+
}
36+
37+
#[inline]
38+
fn write_nullable<F, E>(serializer: F, buf: &mut Vec<u8>) -> Result<(), E>
39+
where F: FnOnce(&mut Vec<u8>) -> Result<IsNull, E>,
40+
E: From<io::Error>
41+
{
42+
let base = buf.len();
43+
buf.extend_from_slice(&[0; 4]);
44+
let size = match try!(serializer(buf)) {
45+
IsNull::No => try!(i32::from_usize(buf.len() - base - 4)),
46+
IsNull::Yes => -1,
47+
};
48+
BigEndian::write_i32(&mut buf[base..], size);
49+
50+
Ok(())
51+
}
52+
53+
trait FromUsize: Sized {
54+
fn from_usize(x: usize) -> Result<Self, io::Error>;
55+
}
56+
57+
macro_rules! from_usize {
58+
($t:ty) => {
59+
impl FromUsize for $t {
60+
#[inline]
61+
fn from_usize(x: usize) -> io::Result<$t> {
62+
if x > <$t>::max_value() as usize {
63+
Err(io::Error::new(io::ErrorKind::InvalidInput, "value too large to transmit"))
64+
} else {
65+
Ok(x as $t)
66+
}
67+
}
68+
}
69+
}
70+
}
71+
72+
from_usize!(i16);
73+
from_usize!(i32);

0 commit comments

Comments
 (0)