Add p4token support for non-rednotice users

Author: dijit

java/com/google/copybara/perforce/PerforceModule.java

@@ -53,7 +53,7 @@ public PerforceModule(Options options) {
             doc =
                 "The Perforce stream to read from, e.g. <code>//stream/main</code>. The connection"
                     + " details (server, user, ticket) come from the <code>--perforce-*</code>"
-                    + " flags or the standard P4PORT/P4USER/P4PASSWD environment variables."),
+                    + " flags or the standard P4PORT/P4USER/P4PASSWD/P4TICKET environment variables."),
         @Param(
             name = "ref",
             named = true,
@@ -79,7 +79,7 @@ public PerforceOrigin origin(String stream, String ref) throws EvalException {
             doc =
                 "The Perforce stream to submit to, e.g. <code>//stream/main</code>. Connection"
                     + " details come from the <code>--perforce-*</code> flags or the standard"
-                    + " P4PORT/P4USER/P4PASSWD environment variables."),
+                    + " P4PORT/P4USER/P4PASSWD/P4TICKET environment variables."),
         @Param(
             name = "submit_as_author",
             named = true,

java/com/google/copybara/perforce/PerforceOptions.java

@@ -52,10 +52,18 @@ public class PerforceOptions implements Option {
   @Parameter(
       names = "--perforce-password",
       description =
-          "Perforce password or login ticket. Defaults to the P4PASSWD environment variable. If"
-              + " empty, an existing ticket from 'p4 login' is used.")
+          "Perforce password. Exchanged for a ticket via login. Defaults to the P4PASSWD"
+              + " environment variable. Ignored if a token is provided.")
   String password = null;
 
+  @Parameter(
+      names = "--perforce-token",
+      description =
+          "Perforce login ticket to authenticate with directly (as issued by 'p4 login -p'),"
+              + " instead of exchanging a password. Defaults to the P4TICKET environment variable."
+              + " Takes precedence over --perforce-password.")
+  String token = null;
+
   // Lazily created and cached: a migration only ever talks to one server.
   @Nullable private PerforceServer cachedServer;
 
@@ -74,6 +82,7 @@ public PerforceServer server() throws RepoException, ValidationException {
   private IOptionsServer connect() throws RepoException, ValidationException {
     String resolvedPort = firstNonEmpty(port, env("P4PORT"));
     String resolvedUser = firstNonEmpty(user, env("P4USER"));
+    String resolvedToken = firstNonEmpty(token, env("P4TICKET"));
     String resolvedPassword = firstNonEmpty(password, env("P4PASSWD"));
 
     if (Strings.isNullOrEmpty(resolvedPort)) {
@@ -87,7 +96,10 @@ private IOptionsServer connect() throws RepoException, ValidationException {
       if (!Strings.isNullOrEmpty(resolvedUser)) {
         server.setUserName(resolvedUser);
       }
-      if (!Strings.isNullOrEmpty(resolvedPassword)) {
+      if (!Strings.isNullOrEmpty(resolvedToken)) {
+        // A pre-issued ticket: use it directly, no password-for-ticket exchange.
+        server.setAuthTicket(resolvedToken);
+      } else if (!Strings.isNullOrEmpty(resolvedPassword)) {
         server.login(resolvedPassword);
       }
       return server;