mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Security Fixes for scan command pass 32

Browse Source
This commit is contained in:
Mark Gregory
2026-09-17 11:23:51 +01:00
parent 8f2f49e82e
commit 9eb1e46164
2 changed files with 320 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Http/Controllers/M3ErrorsDispController.php
+142 -124
View File
@@ -186,136 +186,154 @@ class M3ErrorsDispController extends Controller
// Export To Excel
public static function exporttoExcel(Request $request)
{
self::configureExportRuntime();
try {
$filters = self::exportFiltersFromRequest($request);
[$profileUser, $company, $warehouse] = self::exportUserScope($filters['user']);
$users = self::exportUsers();
[$query, $countQuery] = self::exportQueries();
self::applyExportFilters($query, $countQuery, [
'profileUser' => $profileUser,
'company' => $company,
'warehouse' => $warehouse,
'manifest' => $filters['manifest'],
'source' => $filters['source'],
'startDate' => $filters['startDate'],
'endDate' => $filters['endDate'],
'skipDates' => $filters['skipDates'],
'showErrors' => $filters['showErrors'],
]);
$limitResponse = self::validateExportCount($countQuery->count());
if ($limitResponse !== null) {
return $limitResponse;
}
$rows = self::prepareExportRows($query->get(), $users);
return app(SpreadsheetExport::class)->download(
$rows,
'transactionLog_' . $filters['startDate'] . '-' . $filters['endDate'] . '.xlsx'
);
} catch (\Throwable $th) {
Log::error($th);
return redirect()->back()->withInput()->with('message', 'Unable to export the transaction log.');
}
}
private static function configureExportRuntime(): void
{
ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
ini_set('max_input_time', Config::get('arrays.PHPTimeOut'));
ini_set('default_socket_timeout', Config::get('arrays.PHPTimeOut'));
ini_set('memory_limit', '1024M');
try {
$SHMACPKR = $request->SHMACPKR != null ? trim($request->SHMACPKR) : '';
$SHSOURCE = $request->SHSOURCE != null ? trim($request->SHSOURCE) : '';
$STARTDATE = $request->STARTDATE != null ? trim($request->STARTDATE) : today()->subDays(1)->format('Y-m-d');
$ENDDATE = $request->ENDDATE != null ? trim($request->ENDDATE) : today()->format('Y-m-d');
$SHOWERRORS = $request->SHOWERRORS != null ? trim($request->SHOWERRORS) : 'N';
$SHUSER = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
$SKIPDATES = $request->SKIPDATES != null ? trim($request->SKIPDATES) : 'N';
// Get Logged User CO & WH
// Get users from ICM428M
$ICM428M = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH')
->where('R428US', '=', $SHUSER)
->first();
$R428US = isset($ICM428M->R428US) ? $ICM428M->R428US : '';
$USERCO = isset($ICM428M->R428CO) ? $ICM428M->R428CO : '';
$USERWH = isset($ICM428M->R428WH) ? $ICM428M->R428WH : '';
// Get users from ICM428M
$ICM428MAll = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428FIRST', 'R428FAMILY')
->get();
$ICM428MCOL = collect($ICM428MAll);
$ICM428MCOL->filter(function ($value) {
return $value->R428US = trim($value->R428US);
});
$ICM428MCOL->filter(function ($value) {
return $value->R428FIRST = trim($value->R428FIRST);
});
$ICM428MCOL->filter(function ($value) {
return $value->R428FAMILY = trim($value->R428FAMILY);
});
// Merge date and time fields
$mergedDateTime = DB::raw(" ICM699M.SHDT || ' ' || ICM699M.SHTIME AS SHDATETIME");
$ICM699M = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->select(
DB::raw('COALESCE(ICM688M1.A4ONO, ICM666M.A1ONO) AS DELIVERY_NUM '),
'ICM699M.SHMACPKR',
DB::raw('COALESCE(ICM688M1.A4SHSHNM, ICM666M.A1SHSHNM) AS CUSTOMER '),
$mergedDateTime,
DB::raw("CASE WHEN ICM699M.SHERROR !='Z' THEN TRIM(ICM699M.SHERROR) ELSE 'Closed' END AS ERROR"),
'ICM699M.SHTYPE',
'ICM699M.SHSOURCE',
DB::raw("CASE WHEN ICM428M.R428FIRST IS NOT NULL THEN TRIM(ICM428M.R428FIRST) ||' '|| TRIM(ICM428M.R428FAMILY) ELSE TRIM(ICM699M.SHUSER) END AS USER"),
'ICM699M.SHCODE',
'ICM699M.SHCO',
'ICM699M.SHWHS',
DB::raw(" ICM699M.SHACKDATE ||' '||ICM699M.SHACKTIME AS ACKDATE"),
'ICM699M.SHACKUSER',
'ICM699M.SHINTBOX',
'ICM699M.SHACKNOTE',
DB::raw('SUBSTR(ICM699M.SHDATA, 1, 200)'),
)
->distinct()
->leftJoin('ICM428M', 'ICM699M.SHUSER', '=', 'ICM428M.R428US')
->leftJoin('ICM688M1', 'ICM699M.SHMACPKR', '=', 'ICM688M1.A4MACPKR')
->leftJoin('ICM666M', 'ICM699M.SHMACPKR', '=', 'ICM666M.A1DELNO');
// Get Records Count only
$ICM699MC = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m');
self::applyExportFilters($ICM699M, $ICM699MC, [
'profileUser' => $R428US, 'company' => $USERCO, 'warehouse' => $USERWH,
'manifest' => $SHMACPKR, 'source' => $SHSOURCE, 'startDate' => $STARTDATE,
'endDate' => $ENDDATE, 'skipDates' => $SKIPDATES, 'showErrors' => $SHOWERRORS,
]);
// Count records before exporting to excel : Max 20K records are allowed
$ICM699MCount = $ICM699MC->count();
// dd($ICM699MCount);
// Set Max allowed records
$maxRecords = Config::get('arrays.maxRecDL');
if ($ICM699MCount > $maxRecords) {
return redirect()->back()->withInput()->with('message', 'Maximum allowed records for Excel Download is: ' . number_format($maxRecords) .
' current records: ' . number_format($ICM699MCount) . ' , change your search criteria.');
}
// Select Records and export them to Excel
$ICM699MSel = $ICM699M->get();
$ICM699MCol = collect($ICM699MSel);
// Get Transaction Types
$transxTypes = Config::get('arrays.transxTypes');
$ICM699MCol->filter(function ($value) use ($transxTypes) {
return $value->SHSOURCE = isset($transxTypes[trim($value->SHSOURCE)]) ? $transxTypes[trim($value->SHSOURCE)] : $value->SHSOURCE;
});
// Get User Names
$ICM699MCol->filter(function ($value) use ($ICM428MCOL) {
$UserTemp = $ICM428MCOL->firstWhere('R428US', trim($value->SHACKUSER));
$SHACKUSER = isset($UserTemp->R428FIRST) ? $UserTemp->R428FIRST . ' ' . $UserTemp->R428FAMILY : trim($value->SHACKUSER);
return $value->SHACKUSER = $SHACKUSER;
});
// Prepend Header To Excel
$newItem = ['SHMACPKR' => 'Delivery Note',
'DELIVERY_NUM' => 'Order #',
'CUSTOMER' => 'Customer',
'SHDATETIME' => 'Date',
'ERROR' => 'Error',
'SHTYPE' => 'Request Type',
'SHSOURCE' => 'Source of transaction',
'USER' => 'User',
'SHCODE' => 'Request or Response Data',
'SHCO' => 'Division',
'SHWHS' => 'Warehouse',
'ACKDATE' => 'Acknowledge/Retry Date',
'SHACKUSER' => 'Acknowledged/Retried by User',
'SHINTBOX' => 'Internal Box Number',
'SHACKNOTE' => 'Note',
'SHDATA' => 'Error description',
];
$ICM699MCol->prepend($newItem);
// Download Excel File
return app(SpreadsheetExport::class)->download($ICM699MCol, 'transactionLog_' . $STARTDATE . '-' . $ENDDATE . '.xlsx');
} catch (\Throwable $th) {
Log::error($th);
}
}
private static function exportFiltersFromRequest(Request $request): array
{
return [
'manifest' => trim((string) $request->input('SHMACPKR', '')),
'source' => trim((string) $request->input('SHSOURCE', '')),
'startDate' => trim((string) $request->input('STARTDATE', today()->subDays(1)->format('Y-m-d'))),
'endDate' => trim((string) $request->input('ENDDATE', today()->format('Y-m-d'))),
'showErrors' => trim((string) $request->input('SHOWERRORS', 'N')),
'skipDates' => trim((string) $request->input('SKIPDATES', 'N')),
'user' => Str::upper(trim(m3_user())),
];
}
private static function exportUserScope(string $user): array
{
$profile = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428CO', 'R428WH')
->where('R428US', $user)
->first();
return [
trim((string) ($profile->R428US ?? '')),
trim((string) ($profile->R428CO ?? '')),
trim((string) ($profile->R428WH ?? '')),
];
}
private static function exportUsers()
{
return DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
->select('R428US', 'R428FIRST', 'R428FAMILY')
->get()
->each(function ($value): void {
$value->R428US = trim((string) $value->R428US);
$value->R428FIRST = trim((string) $value->R428FIRST);
$value->R428FAMILY = trim((string) $value->R428FAMILY);
});
}
private static function exportQueries(): array
{
$query = DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')
->select(
DB::raw('COALESCE(ICM688M1.A4ONO, ICM666M.A1ONO) AS DELIVERY_NUM '),
'ICM699M.SHMACPKR',
DB::raw('COALESCE(ICM688M1.A4SHSHNM, ICM666M.A1SHSHNM) AS CUSTOMER '),
DB::raw(" ICM699M.SHDT || ' ' || ICM699M.SHTIME AS SHDATETIME"),
DB::raw("CASE WHEN ICM699M.SHERROR !='Z' THEN TRIM(ICM699M.SHERROR) ELSE 'Closed' END AS ERROR"),
'ICM699M.SHTYPE', 'ICM699M.SHSOURCE',
DB::raw("CASE WHEN ICM428M.R428FIRST IS NOT NULL THEN TRIM(ICM428M.R428FIRST) ||' '|| TRIM(ICM428M.R428FAMILY) ELSE TRIM(ICM699M.SHUSER) END AS USER"),
'ICM699M.SHCODE', 'ICM699M.SHCO', 'ICM699M.SHWHS',
DB::raw(" ICM699M.SHACKDATE ||' '||ICM699M.SHACKTIME AS ACKDATE"),
'ICM699M.SHACKUSER', 'ICM699M.SHINTBOX', 'ICM699M.SHACKNOTE',
DB::raw('SUBSTR(ICM699M.SHDATA, 1, 200)')
)
->distinct()
->leftJoin('ICM428M', 'ICM699M.SHUSER', '=', 'ICM428M.R428US')
->leftJoin('ICM688M1', 'ICM699M.SHMACPKR', '=', 'ICM688M1.A4MACPKR')
->leftJoin('ICM666M', 'ICM699M.SHMACPKR', '=', 'ICM666M.A1DELNO');
return [$query, DB::connection(config('m3.connection', 'pgsql'))->table('icm699m')];
}
private static function validateExportCount(int $count)
{
$maxRecords = (int) Config::get('arrays.maxRecDL');
if ($count <= $maxRecords) {
return null;
}
return redirect()->back()->withInput()->with(
'message',
'Maximum allowed records for Excel Download is: ' . number_format($maxRecords)
. ' current records: ' . number_format($count) . ' , change your search criteria.'
);
}
private static function prepareExportRows($records, $users)
{
$transactionTypes = Config::get('arrays.transxTypes');
$rows = collect($records)->each(function ($value) use ($transactionTypes, $users): void {
$source = trim((string) $value->SHSOURCE);
$value->SHSOURCE = $transactionTypes[$source] ?? $source;
$user = $users->firstWhere('R428US', trim((string) $value->SHACKUSER));
$value->SHACKUSER = $user
? trim($user->R428FIRST . ' ' . $user->R428FAMILY)
: trim((string) $value->SHACKUSER);
});
$rows->prepend([
'SHMACPKR' => 'Delivery Note', 'DELIVERY_NUM' => 'Order #', 'CUSTOMER' => 'Customer',
'SHDATETIME' => 'Date', 'ERROR' => 'Error', 'SHTYPE' => 'Request Type',
'SHSOURCE' => 'Source of transaction', 'USER' => 'User', 'SHCODE' => 'Request or Response Data',
'SHCO' => 'Division', 'SHWHS' => 'Warehouse', 'ACKDATE' => 'Acknowledge/Retry Date',
'SHACKUSER' => 'Acknowledged/Retried by User', 'SHINTBOX' => 'Internal Box Number',
'SHACKNOTE' => 'Note', 'SHDATA' => 'Error description',
]);
return $rows;
}
private static function applyExportFilters($query, $countQuery, array $filters): void
{
$queries = [$query, $countQuery];