From 5313ca58d6f454b697e3a84e306ee4c21754e6df Mon Sep 17 00:00:00 2001 From: jianglai Date: Mon, 8 May 2017 19:18:32 -0700 Subject: [PATCH] Setup auth settings in PublishDetailReports @Action to support tool access ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155459413 --- java/google/registry/export/BUILD | 4 +--- .../registry/export/PublishDetailReportAction.java | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD index f7eb03d28..a333ef32c 100644 --- a/java/google/registry/export/BUILD +++ b/java/google/registry/export/BUILD @@ -16,11 +16,11 @@ java_library( "//java/google/registry/mapreduce/inputs", "//java/google/registry/model", "//java/google/registry/request", + "//java/google/registry/request/auth", "//java/google/registry/storage/drive", "//java/google/registry/util", "//third_party/java/objectify:objectify-v4_1", "@com_google_api_client", - "@com_google_api_client_appengine", "@com_google_apis_google_api_services_bigquery", "@com_google_apis_google_api_services_drive", "@com_google_appengine_api_1_0_sdk", @@ -30,8 +30,6 @@ java_library( "@com_google_dagger", "@com_google_guava", "@com_google_http_client", - "@com_google_http_client_appengine", - "@com_google_http_client_jackson2", "@com_googlecode_json_simple", "@javax_servlet_api", "@joda_time", diff --git a/java/google/registry/export/PublishDetailReportAction.java b/java/google/registry/export/PublishDetailReportAction.java index 0006720cc..8f863f8b2 100644 --- a/java/google/registry/export/PublishDetailReportAction.java +++ b/java/google/registry/export/PublishDetailReportAction.java @@ -28,6 +28,10 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; +import google.registry.request.auth.Auth; +import google.registry.request.auth.Auth.AuthMethod; +import google.registry.request.auth.Auth.UserPolicy; +import google.registry.request.auth.AuthLevel; import google.registry.storage.drive.DriveConnection; import google.registry.util.FormattingLogger; import java.io.FileNotFoundException; @@ -39,6 +43,11 @@ import javax.inject.Inject; @Action( path = PublishDetailReportAction.PATH, method = Action.Method.POST, + auth = @Auth( + methods = {AuthMethod.INTERNAL, Auth.AuthMethod.API}, + minimumLevel = AuthLevel.APP, + userPolicy = UserPolicy.ADMIN + ), xsrfProtection = true, xsrfScope = "admin") public final class PublishDetailReportAction implements Runnable, JsonAction {