Skip to content

Refatorar o tratamento de SSL e o suporte a conjuntos de caracteres FPC. #420

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

Closed
Ronierys2 wants to merge 6 commits into from
Closed

Refatorar o tratamento de SSL e o suporte a conjuntos de caracteres FPC. #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c61d8dd
Refatorar o tratamento de SSL e o suporte a conjuntos de caracteres FPC.
Ronierys2 May 12, 2026
2f3f51f
Merge branch 'master' into dev
Ronierys2 May 12, 2026
5da377f
Update uRESTDWBasicTypes.pas
Ronierys2 May 12, 2026
fa82b7e
Remove TaurusTLS installation from lazarustestLinux.yml
Ronierys2 May 12, 2026
5b5422a
Remove TaurusTLS package installation and build steps
Ronierys2 May 12, 2026
10ba16d
Merge branch 'master' into dev
Ronierys2 May 12, 2026
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
7 changes: 3 additions & 4 deletions CORE/Source/Basic/uRESTDWBasic.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ TRESTDWServerIpVersionConfig = class(TPersistent)
vFailOverReplaceDefaults,
vEncodeStrings,
vDatacompress,
vUseSSL,
vAuthentication : Boolean;
{$IFDEF FPC}
vDatabaseCharSet : TDatabaseCharSet;
{$ENDIF}
vFailOverConnections : TFailOverConnections;
aSSLMethod : TRESTDWSSLVersion;
vSSLVersions : TRESTDWSSLVersions;
Function SendEvent (EventData : String) : String;Overload;
Procedure SetDataRoute (Value : String);
Expand Down Expand Up @@ -272,14 +272,14 @@ TRESTDWServerIpVersionConfig = class(TPersistent)
Property OnBeforeExecute : TOnBeforeExecute Read vOnBeforeExecute Write vOnBeforeExecute;
Property OnBeforeGetToken : TOnBeforeGetToken Read vOnBeforeGetToken Write vOnBeforeGetToken;
Property FailOver : Boolean Read vFailOver Write vFailOver;
Property UseSSL : Boolean Read vUseSSL Write vUseSSL;
Property SSLMethod : TRESTDWSSLVersion Read aSSLMethod Write aSSLMethod;
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
Property FailOverConnections : TFailOverConnections Read vFailOverConnections Write vFailOverConnections;
Property FailOverReplaceDefaults : Boolean Read vFailOverReplaceDefaults Write vFailOverReplaceDefaults;
Property BinaryRequest : Boolean Read vBinaryRequest Write vBinaryRequest;
Property CriptOptions : TCripto Read vCripto Write vCripto;
Property UserAgent : String Read vUserAgent Write vUserAgent;
Property PoolerNotFoundMessage : String Read vPoolerNotFoundMessage Write vPoolerNotFoundMessage;
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
{$IFDEF FPC}
Property DatabaseCharSet : TDatabaseCharSet Read vDatabaseCharSet Write vDatabaseCharSet;
{$ENDIF}
Expand Down Expand Up @@ -1530,7 +1530,6 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
vFailOver := False;
vFailOverReplaceDefaults := False;
vPropThreadRequest := False;
vUseSSL := False;
vFailOverConnections := TFailOverConnections.Create(Self, TRESTDWConnectionServerCP);
vPoolerNotFoundMessage := cPoolerNotFound;
vClientIpVersion := civIPv4;
Expand Down
196 changes: 117 additions & 79 deletions CORE/Source/Basic/uRESTDWBasicDB.pas
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions CORE/Source/Basic/uRESTDWBasicDbTypes.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@
Function GetDataset : TDataset;
Function GetBlob (RecNo, Index : Integer) : PMemBlobData;
Procedure Loaded;
{$IFDEF FPC}
Function GetDatabaseCharSet : TDatabaseCharSet;
{$ENDIF}
End;
Type
TConnectionDefs = Class(TPersistent)
Expand Down
4 changes: 2 additions & 2 deletions CORE/Source/Basic/uRESTDWBasicTypes.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,7 @@
vBinaryLoadRequest : Boolean;
vOnWriterProcess : TOnWriterProcess;
Function OnEditingState : Boolean;
Public
Property BinaryCompatibleMode : Boolean Read vBinaryCompatibleMode;
Public
Procedure BaseOpen;
Procedure BaseClose;
Procedure ForceInternalCalc;
Expand All @@ -269,6 +268,7 @@
Procedure PrepareDetailsNew; Virtual;Abstract;
Procedure PrepareDetails(ActiveMode : Boolean); Virtual;Abstract;
Constructor Create(AOwner: TComponent);Override;
Property BinaryCompatibleMode : Boolean Read vBinaryCompatibleMode;
Property InLoadFromStream : Boolean Read vLoadFromStream;
Property BinaryLoadRequest : Boolean Read vBinaryLoadRequest;
Property OnLoadStream : Boolean Read vOnLoadStream Write vOnLoadStream;
Expand Down
6 changes: 4 additions & 2 deletions CORE/Source/Basic/uRESTDWPoolermethod.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
vRedirectMaximum : Integer;
vOnBeforeGetToken : TOnBeforeGetToken;
vActualClientPoolerExec : TRESTClientPoolerBase;
aSSLMethod : TRESTDWSSLVersion;
vSSLVersions : TRESTDWSSLVersions;
Procedure SetOnWork (Value : TOnWork);
Procedure SetOnWorkBegin(Value : TOnWork);
Expand Down Expand Up @@ -384,10 +385,11 @@
Property CriptOptions : TCripto Read vCripto Write vCripto;
Property UserAgent : String Read vUserAgent Write vUserAgent;
Property DataRoute : String Read vDataRoute Write vDataRoute;
Property AuthenticationOptions : TRESTDWClientAuthOptionParams Read vAuthOptionParams Write SetAuthOptionParams;
Property AuthenticationOptions : TRESTDWClientAuthOptionParams Read vAuthOptionParams Write SetAuthOptionParams;
Property OnBeforeGetToken : TOnBeforeGetToken Read vOnBeforeGetToken Write vOnBeforeGetToken;
Property PoolerNotFoundMessage : String Read vPoolerNotFoundMessage Write vPoolerNotFoundMessage;
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
Property SSLMethod : TRESTDWSSLVersion Read aSSLMethod Write aSSLMethod;
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
End;

implementation
Expand Down
8 changes: 4 additions & 4 deletions CORE/Source/Basic/uRESTDWStorageBin.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,8 @@ interface
{$IFDEF FPC}
stream.Read(Pointer(vString)^, vInt64);
If EncodeStrs Then
vString := DecodeStrings(vString, Dataset.GetDatabaseCharSet);
vString := GetStringEncode(vString, Dataset.GetDatabaseCharSet);
vString := DecodeStrings(vString, csUndefined);
vString := GetStringEncode(vString, csUndefined);
vInt64 := (Length(vString) + 1) * SizeOf(WideChar);
If aField <> Nil Then
Move(Pointer(WideString(vString))^, PData^, vInt64);
Expand Down Expand Up @@ -689,8 +689,8 @@ interface
{$IFDEF FPC}
stream.Read(Pointer(vString)^, vInt64);
If EncodeStrs Then
vString := DecodeStrings(vString, Dataset.GetDatabaseCharSet);
vString := GetStringEncode(vString, Dataset.GetDatabaseCharSet);
vString := DecodeStrings(vString, csUndefined);
vString := GetStringEncode(vString, csUndefined);
If aField <> Nil Then
Move(Pointer(vString)^, pData^, vInt64);
{$ELSE}
Expand Down
4 changes: 2 additions & 2 deletions CORE/Source/Database_Drivers/FireDACPhysLink/FireDAC.Phys.RESTDWBase.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ TFDPhysRDWCommand = class(TFDPhysCommand)
protected
procedure InternalPrepare; override;
procedure InternalUnprepare; override;
function InternalOpen{$IFDEF DELPHI11UP}(var ACount: TFDCounter){$ENDIF}: Boolean; override;
function InternalOpen(var ACount: TFDCounter): Boolean; override;
function InternalNextRecordSet: Boolean; override;
procedure InternalClose; override;
procedure InternalExecute(ATimes, AOffset: integer;
Expand Down Expand Up @@ -537,7 +537,7 @@ function TFDPhysRDWCommand.InternalNextRecordSet: Boolean;
Result := False;
end;

function TFDPhysRDWCommand.InternalOpen{$IFDEF DELPHI11UP}(var ACount: TFDCounter){$ENDIF}: Boolean;
function TFDPhysRDWCommand.InternalOpen(var ACount: TFDCounter): Boolean;
begin
{$IFDEF DELPHI11UP}
ACount := -1;
Expand Down
30 changes: 7 additions & 23 deletions CORE/Source/Database_Drivers/uRESTDWZeosDriver.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,13 +530,9 @@ procedure TRESTDWZeosQuery.SaveToStream(stream: TStream);
qry := TZQuery(Self.Owner);
memtable := TZMemTable.Create(nil);
try
{$IFDEF ZMEMTABLE_ENABLE_STREAM_EXPORT_IMPORT}
memtable.AssignDataFrom(qry);
{$ELSE}
memtable.Assign(qry);
{$ENDIF}
memtable.AssignDataFrom(qry);
//TODO SaveTostream
// memtable.SaveToStream(stream);
memtable.SaveToStream(stream);
stream.Position := 0;
finally
FreeAndNil(memtable);
Expand Down Expand Up @@ -579,25 +575,13 @@ procedure TRESTDWZeosTable.LoadFromStreamParam(IParam: integer; stream: TStream;
procedure TRESTDWZeosTable.SaveToStream(stream: TStream);
var
qry : TZTable;
{$IFDEF ZMEMTABLE_ENABLE_STREAM_EXPORT_IMPORT}
memtable : TZMemTable;
{$ELSE}
memtable : TRESTDWMemtable;
{$ENDIF}
memtable : TZMemTable;
begin
qry := TZTable(Self.Owner);
{$IFDEF ZMEMTABLE_ENABLE_STREAM_EXPORT_IMPORT}
memtable := TZMemTable.Create(nil);
{$ELSE}
memtable := TRESTDWMemtable.Create(nil);
{$ENDIF}
qry := TZTable.Create(Self.Owner);
memtable := TZMemTable.Create(nil);
try
{$IFDEF ZMEMTABLE_ENABLE_STREAM_EXPORT_IMPORT}
memtable.AssignDataFrom(qry);
{$ELSE}
memtable.Assign(qry);
{$ENDIF}
memtable.SaveToStream(stream);
memtable.Assign(qry);
memtable .SaveToStream(stream);
stream.Position := 0;
finally
FreeAndNil(memtable);
Expand Down
4 changes: 2 additions & 2 deletions CORE/Source/Includes/uRESTDW.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
{.$DEFINE USE_TAURUS_TLS}
{$IFEND}
{$ELSE}
//For Lazarus
{$DEFINE RESTDWMEMTABLE}
{.$DEFINE RESTDWMEMTABLE}
{$DEFINE RESTFDMEMTABLE}
{.$DEFINE UNIDACMEM}
{.$DEFINE ZEOSMEM}
{.$DEFINE USE_TAURUS_TLS}
Expand Down
23 changes: 2 additions & 21 deletions CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,8 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex)
FLastID : Integer;
FBlobs : TMemBlobArray;
FRecords : TRecordList;
{$IFDEF FPC}
vDatabaseCharSet : TDatabaseCharSet;
Procedure SetDatabaseCharSet(Value : TDatabaseCharSet);
Function GetDatabaseCharSet : TDatabaseCharSet;
{$ELSE}
FFilterExpression : TRDWABExprParser;
{$IFNDEF FPC}
FFilterExpression : TRDWABExprParser;
{$ENDIF}
Constructor Create(AOwner : TComponent);Override;
Destructor Destroy;Override;
Expand Down Expand Up @@ -692,9 +688,6 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex)
{$IFNDEF FPC}
Property ObjectView default False;
{$ENDIF}
{$IFDEF FPC}
Property DatabaseCharSet : TDatabaseCharSet Read GetDatabaseCharSet Write SetDatabaseCharSet;
{$ENDIF}
Property DatasetClosed : Boolean Read FDataSetClosed Write FDataSetClosed Default False;
Property KeyFieldNames : String Read FKeyFieldNames Write FKeyFieldNames;
Property LoadStructure : Boolean Read FLoadStructure Write FLoadStructure Default False;
Expand Down Expand Up @@ -6110,18 +6103,6 @@ function TRESTDWMemTable.IsSequenced: Boolean;
Result := not Filtered;
End;

{$IFDEF FPC}
function TRESTDWMemTable.GetDatabaseCharSet: TDatabaseCharSet;
Begin
Result := vDatabaseCharSet;
End;

procedure TRESTDWMemTable.SetDatabaseCharSet(Value: TDatabaseCharSet);
Begin
vDatabaseCharSet := Value;
End;
{$ENDIF}

function TRESTDWMemTable.Locate(const KeyFields: String;
const KeyValues: Variant; Options: TLocateOptions): Boolean;
Begin
Expand Down
Loading
Loading