google-nomulus/java/google/registry/rdap/RdapModule.java
mountford 4267fa7e48 Return proper RDAP error messages when invalid IP addresses are specified
We were relying on Dagger to validate the IP address, but that resulted in 500 errors when the IP address was not valid, which is undesirable. Instead, accept the parameters as strings, then convert them to IP addresses and throw a proper error when conversion fails.

Also fixes an improperly specified test.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173172516
2017-10-24 16:53:47 -04:00

75 lines
2.3 KiB
Java

// Copyright 2017 The Nomulus 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.rdap;
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import google.registry.request.RequestParameters;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
/** Dagger module for the RDAP package. */
@Module
public final class RdapModule {
@Provides
@Parameter("name")
static Optional<String> provideName(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "name");
}
@Provides
@Parameter("nsLdhName")
static Optional<String> provideNsLdhName(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "nsLdhName");
}
@Provides
@Parameter("nsIp")
static Optional<String> provideNsIp(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "nsIp");
}
@Provides
@Parameter("ip")
static Optional<String> provideIp(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "ip");
}
@Provides
@Parameter("fn")
static Optional<String> provideFn(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "fn");
}
@Provides
@Parameter("handle")
static Optional<String> provideHandle(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "handle");
}
@Provides
@Parameter("registrar")
static Optional<String> provideRegistrar(HttpServletRequest req) {
return RequestParameters.extractOptionalParameter(req, "registrar");
}
@Provides
@Parameter("includeDeleted")
static Optional<Boolean> provideIncludeDeleted(HttpServletRequest req) {
return RequestParameters.extractOptionalBooleanParameter(req, "includeDeleted");
}
}