Download as
Browse Code »

Commit b0915fe9d9d19a6bc4b3588814305d7c31a4e90b

Authored by Eduardo Santos
1 parent e63d51ce
Exists in master

Versáo do agente que implementa a coleta de software 

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@1441 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 2 changed files with 37 additions and 8 deletions   Show diff stats
Grupo_CACIC.groupproj
  Diff comments   View file @b0915fe
... ... @@ -73,13 +73,22 @@
73 73 <Target Name="CacicVersionsAndHashes:Make">
74 74 <MSBuild Projects="CacicVersionsAndHashes\CacicVersionsAndHashes.dproj" Targets="Make" />
75 75 </Target>
  76 + <Target Name="TesteSoftware">
  77 + <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="" />
  78 + </Target>
  79 + <Target Name="TesteSoftware:Clean">
  80 + <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Clean" />
  81 + </Target>
  82 + <Target Name="TesteSoftware:Make">
  83 + <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Make" />
  84 + </Target>
76 85 <Target Name="Build">
77   - <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACIC;CacicVersionsAndHashes" />
  86 + <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACIC;CacicVersionsAndHashes;TesteSoftware" />
78 87 </Target>
79 88 <Target Name="Clean">
80   - <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACIC:Clean;CacicVersionsAndHashes:Clean" />
  89 + <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACIC:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean" />
81 90 </Target>
82 91 <Target Name="Make">
83   - <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACIC:Make;CacicVersionsAndHashes:Make" />
  92 + <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACIC:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make" />
84 93 </Target>
85 94 </Project>
86 95 \ No newline at end of file
... ...
gercols/gercols.dpr
  Diff comments   View file @b0915fe
... ... @@ -617,7 +617,8 @@ begin
617 617 Try
618 618 Registry.GetKeyNames(SubKeys);
619 619 // Abre a tag com o nome da chave
620   - saida := '[SoftwareList]';
  620 + //saida := '[SoftwareList]';
  621 + saida := '';
621 622  
622 623 // Adiciona o pai
623 624 SubRegistry.RootKey := HKEY_LOCAL_MACHINE;
... ... @@ -650,7 +651,7 @@ begin
650 651 end;
651 652  
652 653 // Fecha a tag do software
653   - saida := saida + '[/SoftwareList]';
  654 + //saida := saida + '[/SoftwareList]';
654 655 Finally
655 656 SubKeys.Free;
656 657 End;
... ... @@ -933,6 +934,13 @@ Begin
933 934 '[ActivityStatus]' + Trim(strInAtivo) + '[/ActivityStatus]',',','[[COMMA]]',[rfReplaceAll]);
934 935  
935 936 strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',AntiVirus=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(strColetaAtual));
  937 +
  938 + objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
  939 + tstrColetaSoftware := SoftwareList;
  940 +
  941 + // Adiciona variáveis da coleta de software na requisição
  942 + strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
  943 +
936 944 Except
937 945 on E : Exception do
938 946 Begin
... ... @@ -1393,6 +1401,14 @@ Begin
1393 1401 strColetaAtual := StringReplace(strColetaAtual,',','[[COMMA]]',[rfReplaceAll]);
1394 1402  
1395 1403 strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',MonitoredProfiles=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(strColetaAtual));
  1404 +
  1405 + // Adiciona coleta de software
  1406 + objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
  1407 + tstrColetaSoftware := SoftwareList;
  1408 +
  1409 + // Adiciona variáveis da coleta de software na requisição
  1410 + strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
  1411 +
1396 1412 Except
1397 1413 Begin
1398 1414 objCacic.setValueToFile('Collects',tstringsActions[intLoopActions] + '_End' ,'99999999', strGerColsInfFileName);
... ... @@ -1424,9 +1440,6 @@ Begin
1424 1440 Inc(intTotalExecutedCollects);
1425 1441 strClassesAndProperties := objCacic.getValueFromTags('ClassesAndProperties',strActionDefinition);
1426 1442  
1427   - objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
1428   - tstrColetaSoftware := SoftwareList;
1429   -
1430 1443 objCacic.writeDebugLog('executeGerCols: strClassesAndProperties -> "' + strClassesAndProperties + '"');
1431 1444 tstringsClasses := objCacic.explode(objCacic.getValueFromTags('Classes',strClassesAndProperties),',');
1432 1445  
... ... @@ -1436,6 +1449,13 @@ Begin
1436 1449 strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',' + tstringsClasses[intLoopClasses] + '=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(fetchWmiValues('Win32_' + tstringsClasses[intLoopClasses],objCacic.getLocalFolderName, objCacic.getValueFromTags(tstringsClasses[intLoopClasses] + '.Properties',strClassesAndProperties),objCacic.getValueFromTags(tstringsClasses[intLoopClasses] + '.WhereClause',strClassesAndProperties)))));
1437 1450 End;
1438 1451  
  1452 + // Adiciona coleta de software
  1453 + objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
  1454 + tstrColetaSoftware := SoftwareList;
  1455 +
  1456 + // Adiciona variáveis da coleta de software na requisição
  1457 + strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
  1458 +
1439 1459 strColetaAtual := strFieldsAndValuesToRequest;
1440 1460 Except
1441 1461 on E : Exception do
... ...