Download as
Browse Code »

Commit bb98f1e716eb8bbcf59f0e671167d022d4163f09

Authored by Eric Menezes Noronha
1 parent 60c37fff
Exists in master

Adapatação para recepção dos dados de LDAP enviados pelo gerente.

Showing 6 changed files with 19 additions and 22 deletions   Show diff stats
MapaTesteProj/MapaCACIC.dpr
  Diff comments   View file @bb98f1e
1 -program MapaCACIC; 1 +program mapacacic;
2 2
3 uses 3 uses
4 Forms, 4 Forms,
MapaTesteProj/MapaCACIC.dproj
  Diff comments   View file @bb98f1e
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7 <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> 7 <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
8 - <DCC_DependencyCheckOutputName>..\..\Agentes_Windows_BINARIOS\MapaCACIC.exe</DCC_DependencyCheckOutputName>  
9 - <MainSource>MapaCACIC.dpr</MainSource> 8 + <DCC_DependencyCheckOutputName>..\..\Agentes_Windows_BINARIOS\mapacacic.exe</DCC_DependencyCheckOutputName>
  9 + <MainSource>mapacacic.dpr</MainSource>
10 </PropertyGroup> 10 </PropertyGroup>
11 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 11 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
12 <Version>7.0</Version> 12 <Version>7.0</Version>
@@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
24 <Borland.Personality>Delphi.Personality</Borland.Personality> 24 <Borland.Personality>Delphi.Personality</Borland.Personality>
25 <Borland.ProjectType /> 25 <Borland.ProjectType />
26 <BorlandProject> 26 <BorlandProject>
27 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">3</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.3</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">MapaCACIC.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 27 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">mapacacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
28 </ProjectExtensions> 28 </ProjectExtensions>
29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
30 <ItemGroup> 30 <ItemGroup>
31 - <DelphiCompile Include="MapaCACIC.dpr"> 31 + <DelphiCompile Include="mapacacic.dpr">
32 <MainSource>MainSource</MainSource> 32 <MainSource>MainSource</MainSource>
33 </DelphiCompile> 33 </DelphiCompile>
34 <DCCReference Include="..\CACIC_Comm.pas" /> 34 <DCCReference Include="..\CACIC_Comm.pas" />
MapaTesteProj/MapaCACIC.identcache
View file @bb98f1e
No preview for this file type
MapaTesteProj/MapaCACIC.res
View file @bb98f1e
No preview for this file type
MapaTesteProj/MapaTeste.dcu
View file @bb98f1e
No preview for this file type
MapaTesteProj/MapaTeste.pas
  Diff comments   View file @bb98f1e
@@ -146,6 +146,7 @@ implementation @@ -146,6 +146,7 @@ implementation
146 146
147 procedure TfrmMapaCacic.Sair; 147 procedure TfrmMapaCacic.Sair;
148 Begin 148 Begin
  149 + EstadoBarraTarefa(TRUE);
149 Application.Terminate; 150 Application.Terminate;
150 End; 151 End;
151 152
@@ -300,9 +301,10 @@ Begin @@ -300,9 +301,10 @@ Begin
300 301
301 if (Result <> '0') then 302 if (Result <> '0') then
302 Begin 303 Begin
  304 + objCacic.setValueToFile('Configs' ,'Patrimonio_dados_ldap', objCacic.getValueFromTags('dados_ldap' , Result), strGerColsInfFileName);
303 objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName); 305 objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName);
304 objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName); 306 objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName);
305 - objCacic.setValueToFile('Collects','Patrimonio_Last' , objCacic.getValueFromTags('Collects_Patrimonio_Last' , Result), strGerColsInfFileName); 307 +// objCacic.setValueToFile('Collects','col_patr_last' , objCacic.getValueFromTags('Collects_Patrimonio_Last' , Result), strGerColsInfFileName);
306 End 308 End
307 else 309 else
308 begin 310 begin
@@ -321,7 +323,7 @@ begin @@ -321,7 +323,7 @@ begin
321 btCombosUpdate.Enabled := false; 323 btCombosUpdate.Enabled := false;
322 324
323 strCollectsPatrimonioLast := objCacic.deCrypt( objCacic.GetValueFromFile 325 strCollectsPatrimonioLast := objCacic.deCrypt( objCacic.GetValueFromFile
324 - ('Collects','Patrimonio_Last', 326 + ('Collects','col_patr_last',
325 strGerColsInfFileName)); 327 strGerColsInfFileName));
326 328
327 if (strCollectsPatrimonioLast <> '') then 329 if (strCollectsPatrimonioLast <> '') then
@@ -390,15 +392,14 @@ if edTeInfoNome.text &lt;&gt; &#39;&#39; then @@ -390,15 +392,14 @@ if edTeInfoNome.text &lt;&gt; &#39;&#39; then
390 else 392 else
391 Begin 393 Begin
392 btGravarInformacoes.Caption := 'Informações enviadas com sucesso...'; 394 btGravarInformacoes.Caption := 'Informações enviadas com sucesso...';
393 - objCacic.setValueToFile('Collects','Patrimonio_Last' , 395 + objCacic.setValueToFile('Collects','col_patr_last' ,
394 objCacic.enCrypt(strColetaAtual), strGerColsInfFileName); 396 objCacic.enCrypt(strColetaAtual), strGerColsInfFileName);
395 - objCacic.setValueToFile('Collects','Patrimonio_exe', 's', strGerColsInfFileName); 397 + objCacic.setValueToFile('Collects','col_patr_exe', 's', strGerColsInfFileName);
396 398
397 End; 399 End;
398 objCacic.writeDebugLog(#13#10 + 'AtualizaPatrimonio: Dados Enviados ao Servidor!'); 400 objCacic.writeDebugLog(#13#10 + 'AtualizaPatrimonio: Dados Enviados ao Servidor!');
399 Application.ProcessMessages; 401 Application.ProcessMessages;
400 402
401 - EstadoBarraTarefa(TRUE);  
402 Finalizar(true); 403 Finalizar(true);
403 end 404 end
404 else 405 else
@@ -829,29 +830,25 @@ function TfrmMapaCacic.LDAPName: string; @@ -829,29 +830,25 @@ function TfrmMapaCacic.LDAPName: string;
829 var 830 var
830 ldap: TLDAPsend; 831 ldap: TLDAPsend;
831 l: TStringList; 832 l: TStringList;
832 - host, username, psswd, base, strDadosLDAP : string; 833 + host, username, psswd, base, strDadosLDAP, identificador : string;
833 begin 834 begin
834 result := ''; 835 result := '';
835 ldap := TLDAPsend.Create; 836 ldap := TLDAPsend.Create;
836 l := TStringList.Create; 837 l := TStringList.Create;
837 // PEGANDO OS DADOS DO POR MEIO DO GET/CONFIGS, ONDE SERÁ GRAVADO NO GERCOLS.INF 838 // PEGANDO OS DADOS DO POR MEIO DO GET/CONFIGS, ONDE SERÁ GRAVADO NO GERCOLS.INF
838 -// strDadosLDAP := objCacic.deCrypt(objCacic.getValueFromFile('Configs','dados_ldap',strGerColsInfFileName));  
839 - host := '10.72.160.21';  
840 -// host := objCacic.getValueFromTags('ip', strDadosLDAP);  
841 - username := 'uid=ssopgfn,ou=aplic,ou=corp,ou=pgfn,dc=mf,dc=gov,dc=br';  
842 -// username := objCacic.getValueFromTags('usuario', strDadosLDAP);  
843 - psswd := 'pgfn_2013';  
844 -// psswd := objCacic.getValueFromTags('psswd', strDadosLDAP);  
845 - base := 'ou=pgfn,dc=mf,dc=gov,dc=br';  
846 -// base := objCacic.getValueFromTags('base', strDadosLDAP);  
847 - 839 + strDadosLDAP := objCacic.deCrypt(objCacic.getValueFromFile('Configs','Patrimonio_dados_ldap',strGerColsInfFileName));
  840 + host := objCacic.getValueFromTags('ip', strDadosLDAP);
  841 + username := objCacic.getValueFromTags('usuario', strDadosLDAP);
  842 + psswd := objCacic.getValueFromTags('senha', strDadosLDAP);
  843 + base := objCacic.getValueFromTags('base', strDadosLDAP);
  844 + identificador:= objCacic.getValueFromTags('identificador', strDadosLDAP);
848 try 845 try
849 ldap.TargetHost := host; 846 ldap.TargetHost := host;
850 ldap.UserName := username; 847 ldap.UserName := username;
851 ldap.Password := psswd; 848 ldap.Password := psswd;
852 ldap.Login; //Loga no LDAP. 849 ldap.Login; //Loga no LDAP.
853 ldap.BindSasl; //Autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind) 850 ldap.BindSasl; //Autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
854 - l.Add('cn'); //Estamos pesquisando apenas o nome, então apenas 'cn' será enviado. 851 + l.Add(identificador); //Estamos pesquisando apenas o nome, então apenas 'cn' será enviado.
855 ldap.Search(base, False, 'uid=' + getUserLogon, l); //Faz a pesquisa, com o CPF repassado. 852 ldap.Search(base, False, 'uid=' + getUserLogon, l); //Faz a pesquisa, com o CPF repassado.
856 result := getLastValue(LDAPResultdump(ldap.SearchResult), #$D#$A); 853 result := getLastValue(LDAPResultdump(ldap.SearchResult), #$D#$A);
857 ldap.Logout; 854 ldap.Logout;