IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Vashchuk Nikita 2022-04-08 13:44:18 +03:00
parent 3b6b4f15b2
commit 7f155066cf
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/ASC.ActiveDirectory/Base/Settings/LdapSettings.cs
View File

@ -21,16 +21,13 @@ namespace ASC.ActiveDirectory.Base.Settings;
[DataContract]
public class LdapSettings : ISettings, ICloneable
{
private readonly SettingsManager _settingsManager;
public Guid ID
{
get { return new Guid("{197149b3-fbc9-44c2-b42a-232f7e729c16}"); }
}
public LdapSettings(
SettingsManager settingsManager)
public LdapSettings()
{
_settingsManager = settingsManager;
LdapMapping = new Dictionary<MappingFields, string>();
AccessRights = new Dictionary<AccessRight, string>();
}
@ -79,7 +76,7 @@ public class LdapSettings : ISettings, ICloneable
{
var isMono = WorkContext.IsMono;
var settings = new LdapSettings(_settingsManager)
var settings = new LdapSettings()
{
Server = "",
UserDN = "",
@ -119,8 +116,6 @@ public class LdapSettings : ISettings, ICloneable
return settings;
}
public List<MappingFields> GetImportedFields { get { return _settingsManager.Load<LdapSettings>().LdapMapping.Keys.ToList(); } }
public override bool Equals(object obj)
{
var settings = obj as LdapSettings;

59
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -36,6 +36,7 @@ using System.Net.Mail;
using System.Security;
using System.ServiceModel.Security;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using System.Web;
@ -3103,10 +3104,25 @@ namespace ASC.Api.Settings
/// <category>LDAP</category>
/// <param name="cron">Cron expression</param>
[Create("ldap/cron")]
public void SetLdapCronSettings(string cron)
[Consumes("application/x-www-form-urlencoded")]
public void SetLdapCronSettingsFromForm([FromForm]LdapCronModel model)
{
SetLdapCronSettings(model);
}
[Create("ldap/cron")]
public void SetLdapCronSettingsFromBody([FromBody] LdapCronModel model)
{
SetLdapCronSettings(model);
}
private void SetLdapCronSettings(LdapCronModel model)
{
CheckLdapPermissions();
var cron = model.Cron;
if (!string.IsNullOrEmpty(cron))
{
new CronExpression(cron); // validate
@ -3239,7 +3255,20 @@ namespace ASC.Api.Settings
/// <param name="acceptCertificate">Specifies if the errors of checking certificates are allowed (true) or not (false)</param>
/// <returns>Operation status</returns>
[Create("ldap")]
public LdapOperationStatus SaveLdapSettings(string settings, bool acceptCertificate)
[Consumes("application/x-www-form-urlencoded")]
public LdapOperationStatus SaveLdapSettingsFromForm([FromForm]LdapSettingsModel model)
{
return SaveLdapSettings(model);
}
[Create("ldap")]
public LdapOperationStatus SaveLdapSettingsFromBody([FromBody] LdapSettingsModel model)
{
return SaveLdapSettings(model);
}
private LdapOperationStatus SaveLdapSettings(LdapSettingsModel model)
{
CheckLdapPermissions();
@ -3251,13 +3280,13 @@ namespace ASC.Api.Settings
return GetStartProcessError();
}
var ldapSettings = JsonSerializer.Deserialize<LdapSettings>(settings);
var ldapSettings = JsonSerializer.Deserialize<LdapSettings>(model.Settings);
ldapSettings.AcceptCertificate = acceptCertificate;
ldapSettings.AcceptCertificate = model.AcceptCertificate;
if (!ldapSettings.EnableLdapAuthentication)
{
SetLdapCronSettings(null);
SetLdapCronSettingsFromBody(null);
}
//ToDo
@ -3287,7 +3316,19 @@ namespace ASC.Api.Settings
/// <param name="acceptCertificate">Specifies if the errors of checking certificates are allowed (true) or not (false)</param>
/// <returns>Operation status</returns>
[Create("ldap/save/test")]
public LdapOperationStatus TestLdapSave(string settings, bool acceptCertificate)
[Consumes("application/x-www-form-urlencoded")]
public LdapOperationStatus TestLdapSaveFromForm([FromForm]LdapSettingsModel model)
{
return TestLdapSave(model);
}
[Create("ldap/save/test")]
public LdapOperationStatus TestLdapSaveFromBody([FromBody] LdapSettingsModel model)
{
return TestLdapSave(model);
}
private LdapOperationStatus TestLdapSave(LdapSettingsModel model)
{
CheckLdapPermissions();
@ -3313,9 +3354,9 @@ namespace ASC.Api.Settings
return GetStartProcessError();
}
var ldapSettings = JsonSerializer.Deserialize<LdapSettings>(settings);
var ldapSettings = JsonSerializer.Deserialize<LdapSettings>(model.Settings);
ldapSettings.AcceptCertificate = acceptCertificate;
ldapSettings.AcceptCertificate = model.AcceptCertificate;
LdapLocalization.Init(Resource.ResourceManager);
@ -3397,7 +3438,7 @@ namespace ASC.Api.Settings
CertificateConfirmRequest = certificateConfirmRequest,
Source = operation.GetProperty<string>(LdapOperation.SOURCE),
OperationType = Enum.GetName(typeof(LdapOperationType),
(LdapOperationType)Convert.ToInt32(operation.GetProperty<string>(LdapOperation.OPERATION_TYPE))),
(LdapOperationType)operation.GetProperty<int>(LdapOperation.OPERATION_TYPE)),
Warning = operation.GetProperty<string>(LdapOperation.WARNING)
};