diff options
10 files changed, 242 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 5d5d91a..15cca73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - 3.4 - 3.5 - 3.6 -- pypy matrix: include: - python: 3.7 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2013 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/google-compute-engine-oslogin/Makefile b/packages/google-compute-engine-oslogin/Makefile index d9dd026..97d351f 100644 --- a/packages/google-compute-engine-oslogin/Makefile +++ b/packages/google-compute-engine-oslogin/Makefile @@ -4,7 +4,7 @@ BASENAME = oslogin NAME = google-compute-engine-$(BASENAME) MAJOR = 1 MINOR = 5 -REVISION = 0 +REVISION = 1 LIBNSS_CACHE_OSLOGIN = libnss_cache_$(BASENAME) LIBNSS_CACHE_OSLOGIN_NAME = libnss_cache_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so diff --git a/packages/google-compute-engine-oslogin/bin/google_oslogin_control b/packages/google-compute-engine-oslogin/bin/google_oslogin_control index 468ef96..75d43bf 100644 --- a/packages/google-compute-engine-oslogin/bin/google_oslogin_control +++ b/packages/google-compute-engine-oslogin/bin/google_oslogin_control @@ -37,7 +37,7 @@ modify_nsswitch_conf() { $sed -i"" '/^passwd:/ s/$/ cache_oslogin oslogin/' "$nss_config" fi - if is_freebsd && grep -q '^passwd:.*compat'; then + if is_freebsd && grep -q '^passwd:.*compat' "$nss_config"; then $sed -i"" '/^passwd:/ s/compat/files/' "$nss_config" fi } @@ -61,6 +61,11 @@ modify_sshd_conf() ( local sshd_auth_methods="AuthenticationMethods publickey,keyboard-interactive" local sshd_challenge="ChallengeResponseAuthentication yes" + # Update google_authorized_keys path in FreeBSD. + if is_freebsd; then + sshd_auth_keys_command="AuthorizedKeysCommand /usr/local/bin/google_authorized_keys" + fi + # Update directives for EL 6. if grep -qs "release 6" /etc/redhat-release; then sshd_auth_keys_command_user="AuthorizedKeysCommandRunAs root" diff --git a/packages/google-compute-engine-oslogin/packaging/debian/changelog b/packages/google-compute-engine-oslogin/packaging/debian/changelog index 044d7fc..37e87b2 100644 --- a/packages/google-compute-engine-oslogin/packaging/debian/changelog +++ b/packages/google-compute-engine-oslogin/packaging/debian/changelog @@ -1,3 +1,9 @@ +google-compute-engine-oslogin (1.5.1-1) unstable; urgency=low + + * Fix two factor auth action name. + + -- Google Cloud Team <gc-team@google.com> Tue, 13 Mar 2019 12:00:00 -0700 + google-compute-engine-oslogin (1.5.0-1) unstable; urgency=low * Support Google prompt for two factor authentication. diff --git a/packages/google-compute-engine-oslogin/packaging/setup_deb.sh b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh index 4885117..d5fee1f 100755 --- a/packages/google-compute-engine-oslogin/packaging/setup_deb.sh +++ b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh @@ -14,7 +14,7 @@ # limitations under the License. NAME="google-compute-engine-oslogin" -VERSION="1.5.0" +VERSION="1.5.1" working_dir=${PWD} if [[ $(basename "$working_dir") != $NAME ]]; then diff --git a/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh index 93858ad..b7b53bf 100755 --- a/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh +++ b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh @@ -15,7 +15,7 @@ NAME="google-compute-engine-oslogin" -VERSION="1.5.0" +VERSION="1.5.1" rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION} working_dir=${PWD} diff --git a/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc index dd1b1bd..4969567 100644 --- a/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc +++ b/packages/google-compute-engine-oslogin/pam_module/pam_oslogin_login.cc @@ -218,6 +218,16 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh, int flags, challenge = challenges[0]; } + if (challenge.status != "READY") { + // Call continueSession with the START_ALTERNATE flag. + if (!ContinueSession(true, email, "", session_id, challenge, &response)) { + PAM_SYSLOG(pamh, LOG_ERR, + "Bad response from two-factor continue session request: %s", + response.empty() ? "empty response" : response.c_str()); + return PAM_PERM_DENIED; + } + } + char* user_token = NULL; if (challenge.type == INTERNAL_TWO_FACTOR) { if (pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &user_token, @@ -247,7 +257,8 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh, int flags, return PAM_PERM_DENIED; } - if (!ContinueSession(email, user_token, session_id, challenge, &response)) { + if (!ContinueSession(false, email, user_token, session_id, challenge, + &response)) { PAM_SYSLOG(pamh, LOG_ERR, "Bad response from two-factor continue session request: %s", response.empty() ? "empty response" : response.c_str()); diff --git a/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc b/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc index 819bd30..0ec4c8b 100644 --- a/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc +++ b/packages/google-compute-engine-oslogin/utils/oslogin_utils.cc @@ -612,7 +612,7 @@ bool StartSession(const string& email, string* response) { return ret; } -bool ContinueSession(const string& email, const string& user_token, +bool ContinueSession(bool alt, const string& email, const string& user_token, const string& session_id, const Challenge& challenge, string* response) { bool ret = true; @@ -623,18 +623,22 @@ bool ContinueSession(const string& email, const string& user_token, json_object_object_add(jobj, "challengeId", json_object_new_int(challenge.id)); - if (challenge.type != AUTHZEN) { + if (alt) { + json_object_object_add(jobj, "action", + json_object_new_string("START_ALTERNATE")); + } else { + json_object_object_add(jobj, "action", + json_object_new_string("RESPOND")); + } + + // AUTHZEN type and START_ALTERNATE action don't provide credentials. + if (challenge.type != AUTHZEN && !alt) { jresp = json_object_new_object(); json_object_object_add(jresp, "credential", json_object_new_string(user_token.c_str())); json_object_object_add(jobj, "proposalResponse", jresp); } - if (challenge.status != "READY") { - json_object_object_add(jobj, "action", - json_object_new_string("startAlternate")); - } - const char* data = NULL; data = json_object_to_json_string_ext(jobj, JSON_C_TO_STRING_PLAIN); @@ -648,7 +652,8 @@ bool ContinueSession(const string& email, const string& user_token, } json_object_put(jobj); - if (challenge.type != AUTHZEN) { + // Match condition where we created this to avoid double-free. + if (challenge.type != AUTHZEN && !alt) { json_object_put(jresp); } diff --git a/packages/google-compute-engine-oslogin/utils/oslogin_utils.h b/packages/google-compute-engine-oslogin/utils/oslogin_utils.h index 3788521..6cd2024 100644 --- a/packages/google-compute-engine-oslogin/utils/oslogin_utils.h +++ b/packages/google-compute-engine-oslogin/utils/oslogin_utils.h @@ -193,7 +193,7 @@ bool ParseJsonToChallenges(const string& json, vector<Challenge> *challenges); bool StartSession(const string& email, string* response); // Calls the continueSession API. -bool ContinueSession(const string& email, const string& user_token, +bool ContinueSession(bool alt, const string& email, const string& user_token, const string& session_id, const Challenge& challenge, string* response); |