mirror of
https://github.com/google/nomulus.git
synced 2025-04-30 03:57:51 +02:00
ceb5c2117e
This disentangles GaeUserCredentials and UserService, which lets us remove a bunch of hacky and brittle code from LoginFlowViaConsoleTest. Previously, GaeUserCredentials was constructed for a user, but then was still directly calling UserService to check if the user was an admin. UserService can be adjusted in tests (via AppEngineRule / LocalServiceTestHelper) but it's a pain, especially to do dynamically within a single test file. The hacky code in LoginFlowViaConsoleTest was working around that restriction. With this CL, you can pass into GaeUserCredentials whether the user is an admin or not (for testing) or construct one directly from a UserService object (for production, and for convenience in tests using an AppEngineRule user). Note that I also changed EppConsoleAction to @Inject UserService. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=132696391
50 lines
1.7 KiB
Java
50 lines
1.7 KiB
Java
// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
|
|
//
|
|
// 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.
|
|
|
|
package google.registry.flows;
|
|
|
|
import com.google.appengine.api.users.UserService;
|
|
import google.registry.request.Action;
|
|
import google.registry.request.Action.Method;
|
|
import google.registry.request.Payload;
|
|
import javax.inject.Inject;
|
|
import javax.servlet.http.HttpSession;
|
|
|
|
/** Runs EPP from the console and requires GAE user authentication. */
|
|
@Action(
|
|
path = "/registrar-xhr",
|
|
xsrfProtection = true,
|
|
xsrfScope = EppConsoleAction.XSRF_SCOPE,
|
|
method = Method.POST)
|
|
public class EppConsoleAction implements Runnable {
|
|
|
|
public static final String XSRF_SCOPE = "console";
|
|
|
|
@Inject @Payload byte[] inputXmlBytes;
|
|
@Inject HttpSession session;
|
|
@Inject EppRequestHandler eppRequestHandler;
|
|
@Inject UserService userService;
|
|
@Inject EppConsoleAction() {}
|
|
|
|
@Override
|
|
public void run() {
|
|
eppRequestHandler.executeEpp(
|
|
new HttpSessionMetadata(session),
|
|
GaeUserCredentials.forCurrentUser(userService),
|
|
EppRequestSource.CONSOLE,
|
|
false, // This endpoint is never a dry run.
|
|
false, // This endpoint is never a superuser.
|
|
inputXmlBytes);
|
|
}
|
|
}
|