zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for configuration.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2024-02-18 22:55:19 -08:00
parent af97d51cba
commit fef33dad03
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wise-api/src/main/java/com/wisemapping/rest/UserController.java
View File

@@ -60,8 +60,11 @@ public class UserController extends BaseController {
@Autowired
private AuthenticationManager authManager;
@Value("${google.recaptcha2.enabled:false}")
private Boolean recatchaEnabled;
@Value("${app.registration.enabled:true}")
private Boolean registrationEnabled;
@Value("${app.registration.captcha.enabled:true}")
private Boolean registrationCaptchaEnabled;
@Value("${app.accounts.exclusion.domain:''}")
private String domainBanExclusion;
@@ -74,6 +77,9 @@ public class UserController extends BaseController {
public void registerUser(@RequestBody RestUserRegistration registration, @NotNull HttpServletRequest request,
@NotNull HttpServletResponse response) throws WiseMappingException, BindException {
logger.debug("Register new user:" + registration.getEmail());
if (!registrationEnabled) {
throw new WiseMappingException("Registration is disabled. You can enable it using app.registration.enabled");
}
if (registration.getPassword().length() > Account.MAX_PASSWORD_LENGTH_SIZE) {
throw new PasswordTooLongException();
@@ -85,7 +91,6 @@ public class UserController extends BaseController {
remoteIp = request.getRemoteAddr();
}
logger.debug("Remote address" + remoteIp);
verify(registration, remoteIp);
final Account user = new Account();
@@ -120,7 +125,7 @@ public class UserController extends BaseController {
validator.validate(registration, errors);
// If captcha is enabled, generate it ...
if (recatchaEnabled) {
if (registrationCaptchaEnabled) {
final String recaptcha = registration.getRecaptcha();
if (recaptcha != null) {
final String reCaptchaResponse = captchaService.verifyRecaptcha(remoteAddress, recaptcha);

10
wise-api/src/main/java/com/wisemapping/service/RecaptchaService.java
View File

@@ -47,14 +47,13 @@ public class RecaptchaService {
private final static ObjectMapper objectMapper = new ObjectMapper();
public static final String CATCH_ERROR_CODE_TIMEOUT_OR_DUPLICATE = "timeout-or-duplicate";
public static final String CATCHA_ERROR_CODE_INPUT_RESPONSE = "invalid-input-response";
@Value("${google.recaptcha2.secretKey}")
@Value("${app.registration.captcha.secretKey:''}")
private String recaptchaSecret;
@Nullable
public String verifyRecaptcha(@NotNull String ip, @NotNull String recaptcha) {
String result = StringUtils.EMPTY;
final List<NameValuePair> build = Form.form()
.add("secret", recaptchaSecret)
.add("response", recaptcha)
@@ -66,7 +65,6 @@ public class RecaptchaService {
logger.debug("Response from recaptchaSecret: " + recaptchaSecret);
logger.debug("Response from recaptcha: " + recaptcha);
String result = StringUtils.EMPTY;
try {
final byte[] body = Request
.Post(GOOGLE_RECAPTCHA_VERIFY_URL)
@@ -101,8 +99,4 @@ public class RecaptchaService {
return result;
}
public void setRecaptchaSecret(String recaptchaSecret) {
this.recaptchaSecret = recaptchaSecret;
}
}