Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The user DN is sent along with form fields to web service #326

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The user DN is sent along with form fields to web service #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19eb45a
The user DN is sent along with form fields to web service
watery Mar 27, 2018
040c60d
Merge branch 'master' into newuserdn-to-webservice-2
jrivard Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/password/pwm/http/servlet/newuser/NewUserServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ static PasswordUtility.PasswordCheckInfo verifyForm(
validationFlags.toArray( new FormUtility.ValidationFlag[ validationFlags.size() ] )
);

NewUserUtils.remoteVerifyFormData( pwmRequest, newUserForm );
NewUserUtils.remoteVerifyFormData( pwmRequest, newUserForm, null );

final UserInfo uiBean = UserInfoBean.builder()
.cachedPasswordRuleAttributes( FormUtility.asStringMap( formValueData ) )
Expand Down
12 changes: 9 additions & 3 deletions server/src/main/java/password/pwm/http/servlet/newuser/NewUserUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ static void createUser(
NewUserUtils.LOGGER.trace( pwmSession, () -> "new user ldap creation process complete, now authenticating user" );

// write data to remote web service
remoteWriteFormData( pwmRequest, newUserForm );
remoteWriteFormData( pwmRequest, newUserForm, newUserDN );

// authenticate the user to pwm
final UserIdentity userIdentity = new UserIdentity( newUserDN, pwmApplication.getConfig().getDefaultLdapProfile().getIdentifier() );
Expand Down Expand Up @@ -529,35 +529,40 @@ static Map<String, String> figureDisplayableProfiles( final PwmRequest pwmReques

static void remoteVerifyFormData(
final PwmRequest pwmRequest,
final NewUserForm newUserForm
final NewUserForm newUserForm,
final String userDn

)
throws PwmUnrecoverableException, PwmDataValidationException
{
remoteSendFormData(
pwmRequest,
newUserForm,
userDn,
FormDataRequestBean.Mode.verify
);
}

static void remoteWriteFormData(
final PwmRequest pwmRequest,
final NewUserForm newUserForm
final NewUserForm newUserForm,
final String userDn

)
throws PwmUnrecoverableException, PwmDataValidationException
{
remoteSendFormData(
pwmRequest,
newUserForm,
userDn,
FormDataRequestBean.Mode.write
);
}

private static void remoteSendFormData(
final PwmRequest pwmRequest,
final NewUserForm newUserForm,
final String userDn,
final FormDataRequestBean.Mode mode

)
Expand All @@ -583,6 +588,7 @@ private static void remoteSendFormData(
.formInfo( formInfo )
.formConfigurations( newUserProfile.readSettingAsForm( PwmSetting.NEWUSER_FORM ) )
.formValues( newUserForm.getFormData() )
.userDN( userDn )
.build();

final FormDataResponseBean formDataResponseBean = restFormDataClient.invoke( formDataRequestBean, pwmRequest.getLocale() );
Expand Down