1c/OpenIntegrations
1
0
Fork 0
mirror of https://github.com/Bayselonarrend/OpenIntegrations.git synced 2025-02-05 13:25:25 +02:00
Code Issues Releases Activity

Main build (Jenkins)

Browse Source
This commit is contained in:
Vitaly the Alpaca (bot) 2024-11-29 22:05:05 +03:00
parent 443bec9e4f
commit dc38ac6660
9 changed files with 5827 additions and 5827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11506
service/dictionaries/en.json
View File

File diff suppressed because it is too large Load Diff

4
src/en/OInt/core/Modules/OPI_Dropbox.os
View File

@ -77,11 +77,11 @@ Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters);
URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Request = OPI_Tools.CreateRequest(Address, , DataType);
Connection = OPI_Tools.CreateConnection(Server, True, AppKey, AppSecret);
Connection = OPI_Tools.CreateConnection(Host, True, AppKey, AppSecret);
ParameterString = OPI_Tools.RequestParametersToString(Parameters);
Data = Right(ParameterString, StrLen(ParameterString) - 1);

10
src/en/OInt/core/Modules/OPI_S3.os
View File

@ -1215,7 +1215,7 @@ Function CreateAuthorizationHeader(Val DataStructure, Val Request, Val Connectio
CurrentDate = CurrentUniversalDate();
Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate));
Request.Headers.Insert("Host" , Connection.Server);
Request.Headers.Insert("Host" , Connection.Host);
MainParts = GetMainSignatureParts(DataStructure, Request, Connection, Method, CurrentDate);
@ -1239,10 +1239,10 @@ Function CreateURLSignature(Val DataStructure, Val Name, Val Method, Val Expire,
SplitedURL = OPI_Tools.SplitURL(URL);
Host = SplitedURL["Host"];
Domain = SplitedURL["Domain"];
Address = SplitedURL["Address"];
AdditionalHeaders = New Structure("Host", Host);
AdditionalHeaders = New Structure("Host", Domain);
AddAdditionalHeaders(Headers, AdditionalHeaders);
CurrentDate = CurrentUniversalDate();
@ -1576,12 +1576,12 @@ Function SendRequest(Val Method
URL = BasicData_["URL"];
URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Request = OPI_Tools.CreateRequest(Address);
Connection = OPI_Tools.CreateConnection(Server, Safe);
Connection = OPI_Tools.CreateConnection(Host, Safe);
If ValueIsFilled(Body) Then
SetRequestBody(Request, Body);

50
src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
View File

@ -191,7 +191,7 @@ Function CreateRequest(Val Address, Val AdditionalHeaders = "", Val DataType = "
EndFunction
Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Password = "", Val Port = "") Export
Function CreateConnection(Val Host, Val Safe = True, Val User = "", Val Password = "", Val Port = "") Export
If Not ValueIsFilled(Port) Then
Port = ?(Safe, 443, 80);
@ -200,15 +200,15 @@ Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Passwo
If Safe Then
If IsOneScript() Then
Connection = New HTTPConnection(Server, Port, User, Password, , 3000);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000);
Else
SSL = New OpenSSLSecureConnection;
Connection = New HTTPConnection(Server, Port, User, Password, , 3000, SSL);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000, SSL);
EndIf;
Else
Connection = New HTTPConnection(Server, Port, User, Password, , 3000);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000);
EndIf;
@ -229,12 +229,12 @@ Function ExecuteRequest(Val Request, Val Connection, Val View, Val ResponseFile
URL = Response.Headers["Location"];
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Request.ResourceAddress = Address;
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
@ -353,16 +353,16 @@ Function SplitURL(Val URL) Export
If StrFind(URL, "/") = 0 Then
Address = "";
Host = URL;
Domain = URL;
Else
Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1);
Host = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
Domain = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
EndIf;
If StrFind(Host, ":") <> 0 Then
If StrFind(Domain, ":") <> 0 Then
HostPort = StrSplit(Host, ":");
Host = HostPort[0];
HostPort = StrSplit(Domain, ":");
Domain = HostPort[0];
Port = HostPort[1];
OPI_TypeConversion.GetNumber(Port);
@ -374,17 +374,17 @@ Function SplitURL(Val URL) Export
EndIf;
If IsOneScript() And SecureConnection Then
Server = "https://" + Host;
Host = "https://" + Domain;
Else
Server = Host;
Host = Domain;
EndIf;
ReturnStructure = New Structure;
ReturnStructure.Insert("Server" , Server);
ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Address" , Address);
ReturnStructure.Insert("Safe" , SecureConnection);
ReturnStructure.Insert("Port" , Port);
ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Domain" , Domain);
Return ReturnStructure;
@ -1007,13 +1007,13 @@ Function ExecuteRequestWithBody(Val URL, Val View, Val Parameters = "", Val Addi
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
Return Response;
@ -1024,13 +1024,13 @@ Function ExecuteRequestWithBinaryData(Val URL, Val View, Val Data, Val Additiona
Val DataType)
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequest(Address, AdditionalHeaders, DataType);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
If Not Data.Size() = 0 Then
Request.SetBodyFromBinary(Data);
@ -1050,13 +1050,13 @@ Function ExecuteRequestWithoutBody(Val URL, Val View, Val Parameters = "", Val A
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"] + RequestParametersToString(Parameters);
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequest(Address, AdditionalHeaders);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);
@ -1076,7 +1076,7 @@ Function ExecuteMultipartRequest(Val URL, Val View, Val Parameters = "", Val Fil
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
@ -1084,7 +1084,7 @@ Function ExecuteMultipartRequest(Val URL, Val View, Val Parameters = "", Val Fil
RequestBody = GetTempFileName();
Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);
Request = Undefined;
@ -1099,7 +1099,7 @@ Function ExecuteMultipartRelatedRequest(Val URL, Val View, Val JSON = "", Val Fi
Val ResponseFile = Undefined)
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
@ -1107,7 +1107,7 @@ Function ExecuteMultipartRelatedRequest(Val URL, Val View, Val JSON = "", Val Fi
RequestBody = GetTempFileName();
Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);

4
src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl
View File

@ -77,11 +77,11 @@ Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters);
URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Request = OPI_Tools.CreateRequest(Address, , DataType);
Connection = OPI_Tools.CreateConnection(Server, True, AppKey, AppSecret);
Connection = OPI_Tools.CreateConnection(Host, True, AppKey, AppSecret);
ParameterString = OPI_Tools.RequestParametersToString(Parameters);
Data = Right(ParameterString, StrLen(ParameterString) - 1);

10
src/en/OPI/src/CommonModules/OPI_S3/Module.bsl
View File

@ -1215,7 +1215,7 @@ Function CreateAuthorizationHeader(Val DataStructure, Val Request, Val Connectio
CurrentDate = CurrentUniversalDate();
Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate));
Request.Headers.Insert("Host" , Connection.Server);
Request.Headers.Insert("Host" , Connection.Host);
MainParts = GetMainSignatureParts(DataStructure, Request, Connection, Method, CurrentDate);
@ -1239,10 +1239,10 @@ Function CreateURLSignature(Val DataStructure, Val Name, Val Method, Val Expire,
SplitedURL = OPI_Tools.SplitURL(URL);
Host = SplitedURL["Host"];
Domain = SplitedURL["Domain"];
Address = SplitedURL["Address"];
AdditionalHeaders = New Structure("Host", Host);
AdditionalHeaders = New Structure("Host", Domain);
AddAdditionalHeaders(Headers, AdditionalHeaders);
CurrentDate = CurrentUniversalDate();
@ -1576,12 +1576,12 @@ Function SendRequest(Val Method
URL = BasicData_["URL"];
URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Request = OPI_Tools.CreateRequest(Address);
Connection = OPI_Tools.CreateConnection(Server, Safe);
Connection = OPI_Tools.CreateConnection(Host, Safe);
If ValueIsFilled(Body) Then
SetRequestBody(Request, Body);

50
src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
View File

@ -191,7 +191,7 @@ Function CreateRequest(Val Address, Val AdditionalHeaders = "", Val DataType = "
EndFunction
Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Password = "", Val Port = "") Export
Function CreateConnection(Val Host, Val Safe = True, Val User = "", Val Password = "", Val Port = "") Export
If Not ValueIsFilled(Port) Then
Port = ?(Safe, 443, 80);
@ -200,15 +200,15 @@ Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Passwo
If Safe Then
If IsOneScript() Then
Connection = New HTTPConnection(Server, Port, User, Password, , 3000);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000);
Else
SSL = New OpenSSLSecureConnection;
Connection = New HTTPConnection(Server, Port, User, Password, , 3000, SSL);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000, SSL);
EndIf;
Else
Connection = New HTTPConnection(Server, Port, User, Password, , 3000);
Connection = New HTTPConnection(Host, Port, User, Password, , 3000);
EndIf;
@ -229,12 +229,12 @@ Function ExecuteRequest(Val Request, Val Connection, Val View, Val ResponseFile
URL = Response.Headers["Location"];
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Request.ResourceAddress = Address;
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
@ -353,16 +353,16 @@ Function SplitURL(Val URL) Export
If StrFind(URL, "/") = 0 Then
Address = "";
Host = URL;
Domain = URL;
Else
Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1);
Host = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
Domain = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
EndIf;
If StrFind(Host, ":") <> 0 Then
If StrFind(Domain, ":") <> 0 Then
HostPort = StrSplit(Host, ":");
Host = HostPort[0];
HostPort = StrSplit(Domain, ":");
Domain = HostPort[0];
Port = HostPort[1];
OPI_TypeConversion.GetNumber(Port);
@ -374,17 +374,17 @@ Function SplitURL(Val URL) Export
EndIf;
If IsOneScript() And SecureConnection Then
Server = "https://" + Host;
Host = "https://" + Domain;
Else
Server = Host;
Host = Domain;
EndIf;
ReturnStructure = New Structure;
ReturnStructure.Insert("Server" , Server);
ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Address" , Address);
ReturnStructure.Insert("Safe" , SecureConnection);
ReturnStructure.Insert("Port" , Port);
ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Domain" , Domain);
Return ReturnStructure;
@ -1007,13 +1007,13 @@ Function ExecuteRequestWithBody(Val URL, Val View, Val Parameters = "", Val Addi
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
Return Response;
@ -1024,13 +1024,13 @@ Function ExecuteRequestWithBinaryData(Val URL, Val View, Val Data, Val Additiona
Val DataType)
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequest(Address, AdditionalHeaders, DataType);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
If Not Data.Size() = 0 Then
Request.SetBodyFromBinaryData(Data);
@ -1050,13 +1050,13 @@ Function ExecuteRequestWithoutBody(Val URL, Val View, Val Parameters = "", Val A
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"] + RequestParametersToString(Parameters);
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
Request = CreateRequest(Address, AdditionalHeaders);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);
@ -1076,7 +1076,7 @@ Function ExecuteMultipartRequest(Val URL, Val View, Val Parameters = "", Val Fil
EndIf;
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
@ -1084,7 +1084,7 @@ Function ExecuteMultipartRequest(Val URL, Val View, Val Parameters = "", Val Fil
RequestBody = GetTempFileName();
Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);
Request = Undefined;
@ -1099,7 +1099,7 @@ Function ExecuteMultipartRelatedRequest(Val URL, Val View, Val JSON = "", Val Fi
Val ResponseFile = Undefined)
URLStructure = SplitURL(URL);
Server = URLStructure["Server"];
Host = URLStructure["Host"];
Address = URLStructure["Address"];
Safe = URLStructure["Safe"];
Port = URLStructure["Port"];
@ -1107,7 +1107,7 @@ Function ExecuteMultipartRelatedRequest(Val URL, Val View, Val JSON = "", Val Fi
RequestBody = GetTempFileName();
Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody);
Connection = CreateConnection(Server, Safe, , , Port);
Connection = CreateConnection(Host, Safe, , , Port);
Response = ExecuteRequest(Request, Connection, View, ResponseFile);

4
src/ru/OInt/core/Modules/OPI_S3.os
View File

@ -1239,10 +1239,10 @@
РазбитыйURL = OPI_Инструменты.РазбитьURL(URL);
Хост = РазбитыйURL["Хост"];
Домен = РазбитыйURL["Домен"];
Адрес = РазбитыйURL["Адрес"];
ДопЗаголовки = Новый Структура("Host", Хост);
ДопЗаголовки = Новый Структура("Host", Домен);
ДобавитьДополнительныеЗаголовки(Заголовки, ДопЗаголовки);
ТекущаяДата = ТекущаяУниверсальнаяДата();

16
src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os
View File

@ -353,16 +353,16 @@
Если СтрНайти(URL, "/") = 0 Тогда
Адрес = "";
Хост = URL;
Домен = URL;
Иначе
Адрес = Прав(URL, СтрДлина(URL) - СтрНайти(URL, "/", НаправлениеПоиска.СНачала) + 1);
Хост = Лев(URL, СтрНайти(URL, "/", НаправлениеПоиска.СНачала) - 1);
Домен = Лев(URL, СтрНайти(URL, "/", НаправлениеПоиска.СНачала) - 1);
КонецЕсли;
Если СтрНайти(Хост, ":") <> 0 Тогда
Если СтрНайти(Домен, ":") <> 0 Тогда
ХостПорт = СтрРазделить(Хост, ":");
Хост = ХостПорт[0];
ХостПорт = СтрРазделить(Домен, ":");
Домен = ХостПорт[0];
Порт = ХостПорт[1];
OPI_ПреобразованиеТипов.ПолучитьЧисло(Порт);
@ -374,9 +374,9 @@
КонецЕсли;
Если ЭтоOneScript() И ЗащищенноеСоединение Тогда
Сервер = "https://" + Хост;
Сервер = "https://" + Домен;
Иначе
Сервер = Хост;
Сервер = Домен;
КонецЕсли;
СтруктураВозврата = Новый Структура;
@ -384,7 +384,7 @@
СтруктураВозврата.Вставить("Адрес" , Адрес);
СтруктураВозврата.Вставить("Защищенное", ЗащищенноеСоединение);
СтруктураВозврата.Вставить("Порт" , Порт);
СтруктураВозврата.Вставить("Хост" , Хост);
СтруктураВозврата.Вставить("Домен" , Домен);
Возврат СтруктураВозврата;