Skip to content
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

Jump to bottom

Run scanner tool directly, not via Composer/shell #7

Merged
merged 3 commits into from
Apr 27, 2023
Merged

Run scanner tool directly, not via Composer/shell #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2098aae
Run scanner tool directly, not via Composer
fredden Apr 26, 2023
f1b8303
Use Magento's dependency framework instead
fredden Apr 26, 2023
54822e3
Use Sansec PackageVerdict Naming Convention
pykettk Apr 27, 2023
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
18 changes: 0 additions & 18 deletions Enum/IntegrityCheckerArrayKeys.php
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions Model/IntegrityResultsRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

namespace Element119\SansecComposerIntegrityChecker\Model;

use Element119\SansecComposerIntegrityChecker\Enum\IntegrityCheckerArrayKeys;
use Element119\SansecComposerIntegrityChecker\Scope\Config;
use Exception;
use Hyva\Admin\Api\HyvaGridArrayProviderInterface;
Expand Down Expand Up @@ -71,7 +70,9 @@ public function getFailedMatches(array $packages = []): array
$threshold = $this->moduleConfig->getSansecComposerIntegrityMatchThreshold();

foreach ($packages ?: $this->getLastResults() as $package) {
if ((int)$package[IntegrityCheckerArrayKeys::Percentage->value] < $threshold) {
$package = (array)$package;

if ((int)$package['percentage'] < $threshold) {
$failures[] = $package;
}
}
Expand Down
46 changes: 18 additions & 28 deletions Service/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,33 @@

use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Exception\FileSystemException;
use Symfony\Component\Process\Process;
use Sansec\Integrity\PackageResolver\LockReaderStrategyFactory;
use Sansec\Integrity\PackageSubmitterFactory;
use Symfony\Component\Console\Output\NullOutputFactory;

class Scanner
{
public function __construct(private readonly DirectoryList $directoryList) {}
public function __construct(
private readonly DirectoryList $directoryList,
private readonly LockReaderStrategyFactory $lockReaderFactory,
private readonly NullOutputFactory $nullOutputFactory,
private readonly PackageSubmitterFactory $scannerFactory,
) {}

/**
* @return array
* @throws FileSystemException
*/
public function scan(): array
{
$output = '';
$process = new Process($this->getCommandOptionsArray());
$process->run();

foreach ($process as $data) {
$output .= $data;
}

$output = substr($output, 0, strpos($output, ']') + 1); // json output only

return json_decode($output, true);
}

/**
* @throws FileSystemException
*/
public function getCommandOptionsArray(): array
{
return [
'composer',
'integrity',
'--json',
'--no-ansi',
'--no-interaction',
sprintf('--working-dir=%s', $this->directoryList->getPath(DirectoryList::ROOT)),
];
$lockReader = $this->lockReaderFactory->create([
'rootDirectory' => $this->directoryList->getPath(DirectoryList::ROOT),
]);
$scanner = $this->scannerFactory->create([
'packageResolverStrategy' => $lockReader,
]);
$output = $this->nullOutputFactory->create();

return $scanner->getPackageVerdicts($output);
}
}
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"hyva-themes/module-magento2-admin": "^1.1.20",
"sansec/composer-integrity-plugin": "^0.1.4"
"sansec/composer-integrity-plugin": "^0.2.0"
},
"autoload": {
"psr-4": {
Expand Down
14 changes: 7 additions & 7 deletions view/adminhtml/hyva-grid/sansec-composer-integrity-results-grid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
</source>
<columns>
<include>
<column name="package"/>
<column name="name"/>
<column name="version"/>
<column name="status"/>
<column name="verdict"/>
<column name="percentage"/>
<column name="checksum"/>
<column name="package_id"/>
<column name="id"/>
</include>
</columns>
<navigation>
Expand All @@ -27,19 +27,19 @@
<export type="xlsx" label="Export as XLSX"/>
</exports>
<filters>
<filter column="package"/>
<filter column="name"/>
<filter column="version"/>
<filter column="status"/>
<filter column="verdict"/>
<filter column="percentage"/>
<filter column="checksum"/>
<filter column="package_id"/>
<filter column="id"/>
</filters>
<pager>
<defaultPageSize>20</defaultPageSize>
<pageSizes>20,30,50,100,200</pageSizes>
</pager>
<sorting>
<defaultSortByColumn>package</defaultSortByColumn>
<defaultSortByColumn>name</defaultSortByColumn>
<defaultSortDirection>asc</defaultSortDirection>
</sorting>
</navigation>
Expand Down
73 changes: 12 additions & 61 deletions view/adminhtml/templates/email/failure-list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
declare(strict_types=1);

use Element119\SansecComposerIntegrityChecker\Enum\IntegrityCheckerArrayKeys;
use Magento\Framework\Escaper;
use Magento\Framework\View\Element\Template;

Expand All @@ -16,71 +15,23 @@ use Magento\Framework\View\Element\Template;
<table>
<thead>
<tr>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Package->value)))
); ?>
</strong>
</th>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Version->value)))
); ?>
</strong>
</th>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Status->value)))
); ?>
</strong>
</th>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Percentage->value)))
); ?>
</strong>
</th>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Checksum->value)))
); ?>
</strong>
</th>
<th>
<strong>
<?= $escaper->escapeHtml(
__(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::PackageId->value)))
); ?>
</strong>
</th>
<th><strong><?= $escaper->escapeHtml(__('Package')); ?></strong></th>
<th><strong><?= $escaper->escapeHtml(__('Version')); ?></strong></th>
<th><strong><?= $escaper->escapeHtml(__('Verdict')); ?></strong></th>
<th><strong><?= $escaper->escapeHtml(__('Percentage')); ?></strong></th>
<th><strong><?= $escaper->escapeHtml(__('Checksum')); ?></strong></th>
<th><strong><?= $escaper->escapeHtml(__('Package ID')); ?></strong></th>
</tr>
</thead>
<tbody>
<?php foreach ($packageData as $data): ?>
<tr>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Package->value]); ?>
</td>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Version->value]); ?>
</td>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Status->value]); ?>
</td>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Percentage->value]); ?>
</td>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Checksum->value]); ?>
</td>
<td style="padding: 10px;">
<?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::PackageId->value]); ?>
</td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['name']); ?></td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['version']); ?></td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['verdict']); ?></td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['percentage']); ?></td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['checksum']); ?></td>
<td style="padding: 10px;"><?= $escaper->escapeHtml($data['id']); ?></td>
</tr>
<?php endforeach; ?>
</tbody>
Expand Down