Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99c840fce0 | ||
|
|
9941fd2dfa | ||
|
|
e0e92e326a | ||
|
|
4164f85051 | ||
|
|
b2c19745eb |
@@ -24,6 +24,14 @@ APP_DOMAIN=
|
||||
# Include all domains that can access this application
|
||||
ALLOWED_HOSTS=localhost,127.0.0.1
|
||||
|
||||
# Trusted reverse proxy IP(s), comma-separated (e.g. the Authelia/nginx proxy).
|
||||
# STRONGLY RECOMMENDED in production: Authelia forward-auth (Remote-User /
|
||||
# Remote-Groups) and forwarded client IPs are only trusted when REMOTE_ADDR is
|
||||
# in this list. Leaving it empty disables that protection (relies solely on
|
||||
# network topology) and lets anything reaching PHP directly spoof admin login.
|
||||
# Exact IP match only (no CIDR). Example: TRUSTED_PROXIES=10.10.10.27
|
||||
TRUSTED_PROXIES=
|
||||
|
||||
# Timezone (default: America/New_York)
|
||||
TIMEZONE=America/New_York
|
||||
|
||||
|
||||
@@ -35,10 +35,27 @@ jobs:
|
||||
- name: Run ESLint
|
||||
run: npx eslint assets/js/
|
||||
|
||||
requirements:
|
||||
name: PHP requirements (version + extensions)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Install PHP with required extensions
|
||||
run: |
|
||||
apt-get update -qq
|
||||
# Install the extensions declared in config/requirements.php so the
|
||||
# check verifies they are actually installable + loadable, and so this
|
||||
# build fails if a required extension can't be provided.
|
||||
apt-get install -y -qq php-cli php-ldap php-mysql php-curl php-mbstring
|
||||
|
||||
- name: Verify runtime requirements
|
||||
run: php scripts/check_requirements.php
|
||||
|
||||
deploy:
|
||||
name: Deploy
|
||||
runs-on: ubuntu-latest
|
||||
needs: [php-lint, js-lint]
|
||||
needs: [php-lint, js-lint, requirements]
|
||||
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development')
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -77,7 +94,7 @@ jobs:
|
||||
notify-failure:
|
||||
name: Notify on failure
|
||||
runs-on: ubuntu-latest
|
||||
needs: [php-lint, js-lint]
|
||||
needs: [php-lint, js-lint, requirements]
|
||||
if: failure() && github.event_name == 'push'
|
||||
steps:
|
||||
- name: Send Matrix alert
|
||||
|
||||
+5
-3
@@ -46,8 +46,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
$filters['ip_address'] = $_GET['ip_address'];
|
||||
}
|
||||
|
||||
// Get all matching logs (no limit for CSV export)
|
||||
$result = $auditLogModel->getFilteredLogs($filters, 10000, 0);
|
||||
// Get all matching logs for export. The forExport flag raises the cap
|
||||
// (model clamps to its export limit) so the CSV isn't silently truncated
|
||||
// to the 1000-row UI page limit.
|
||||
$result = $auditLogModel->getFilteredLogs($filters, PHP_INT_MAX, 0, true);
|
||||
$logs = $result['logs'];
|
||||
|
||||
// Set CSV headers
|
||||
@@ -68,7 +70,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
}
|
||||
|
||||
fputcsv($output, [
|
||||
$log['log_id'],
|
||||
$log['audit_id'] ?? ($log['log_id'] ?? ''),
|
||||
$log['created_at'],
|
||||
$log['display_name'] ?? $log['username'] ?? 'N/A',
|
||||
$log['action_type'],
|
||||
|
||||
@@ -50,12 +50,29 @@ $sql = "SELECT ticket_id, title, status, priority, created_at
|
||||
|
||||
$types = "ss" . $visFilter['types'];
|
||||
$params = array_merge([$searchTerm, $soundexTitle], $visFilter['params']);
|
||||
$stmt = $conn->prepare($sql);
|
||||
if (!empty($params)) {
|
||||
$stmt->bind_param($types, ...$params);
|
||||
|
||||
// Duplicate detection is advisory (it must not block ticket creation), so on any
|
||||
// DB error degrade gracefully to "no duplicates" rather than fataling the request.
|
||||
// mysqli may throw (default exception mode) or return false depending on config.
|
||||
try {
|
||||
$stmt = $conn->prepare($sql);
|
||||
if (!$stmt) {
|
||||
throw new RuntimeException('prepare failed: ' . $conn->error);
|
||||
}
|
||||
if (!empty($params)) {
|
||||
$stmt->bind_param($types, ...$params);
|
||||
}
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
if ($result === false) {
|
||||
// Non-exception mysqli mode: execute/get_result return false instead of
|
||||
// throwing. Treat as a query failure so we don't fatal on $result below.
|
||||
throw new RuntimeException('query failed: ' . $conn->error);
|
||||
}
|
||||
} catch (Throwable $e) {
|
||||
error_log('check_duplicates: ' . $e->getMessage());
|
||||
ResponseHelper::success(['duplicates' => []]);
|
||||
}
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
// Calculate similarity score
|
||||
|
||||
@@ -95,6 +95,40 @@ if (is_dir($rateLimitDir) && is_writable($rateLimitDir)) {
|
||||
];
|
||||
}
|
||||
|
||||
// Check 5: Required PHP extensions (catches e.g. a PHP upgrade silently
|
||||
// dropping php-ldap, which breaks avatars with no other visible error).
|
||||
$requirements = require dirname(__DIR__) . '/config/requirements.php';
|
||||
$missingExt = array_values(array_filter(
|
||||
$requirements['required_extensions'],
|
||||
fn($ext) => !extension_loaded($ext)
|
||||
));
|
||||
if (empty($missingExt)) {
|
||||
$checks['php_extensions'] = [
|
||||
'status' => 'ok',
|
||||
'message' => 'All required extensions loaded'
|
||||
];
|
||||
} else {
|
||||
$checks['php_extensions'] = [
|
||||
'status' => 'error',
|
||||
'message' => 'Missing extensions: ' . implode(', ', $missingExt)
|
||||
];
|
||||
$healthy = false;
|
||||
}
|
||||
|
||||
// Check 6: PHP version meets the declared minimum
|
||||
if (version_compare(PHP_VERSION, $requirements['min_php_version'], '>=')) {
|
||||
$checks['php_version'] = [
|
||||
'status' => 'ok',
|
||||
'message' => PHP_VERSION
|
||||
];
|
||||
} else {
|
||||
$checks['php_version'] = [
|
||||
'status' => 'error',
|
||||
'message' => sprintf('PHP %s < required %s', PHP_VERSION, $requirements['min_php_version'])
|
||||
];
|
||||
$healthy = false;
|
||||
}
|
||||
|
||||
// Calculate response time
|
||||
$responseTime = round((microtime(true) - $startTime) * 1000, 2);
|
||||
|
||||
|
||||
@@ -82,6 +82,15 @@ try {
|
||||
case 'POST':
|
||||
$data = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
$wfValid = $GLOBALS['config']['TICKET_STATUSES'] ?? ['Open', 'Pending', 'In Progress', 'Closed'];
|
||||
if (
|
||||
!in_array($data['from_status'] ?? '', $wfValid, true)
|
||||
|| !in_array($data['to_status'] ?? '', $wfValid, true)
|
||||
) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'from_status and to_status must be valid ticket statuses']);
|
||||
exit;
|
||||
}
|
||||
if (($data['from_status'] ?? '') === ($data['to_status'] ?? '')) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'From Status and To Status cannot be the same']);
|
||||
@@ -125,6 +134,15 @@ try {
|
||||
|
||||
$data = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
$wfValid = $GLOBALS['config']['TICKET_STATUSES'] ?? ['Open', 'Pending', 'In Progress', 'Closed'];
|
||||
if (
|
||||
!in_array($data['from_status'] ?? '', $wfValid, true)
|
||||
|| !in_array($data['to_status'] ?? '', $wfValid, true)
|
||||
) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'from_status and to_status must be valid ticket statuses']);
|
||||
exit;
|
||||
}
|
||||
if (($data['from_status'] ?? '') === ($data['to_status'] ?? '')) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'From Status and To Status cannot be the same']);
|
||||
|
||||
+49
-6
@@ -55,15 +55,18 @@ $assignSql = "SELECT
|
||||
AND al.entity_type = 'ticket'
|
||||
AND al.user_id != ?
|
||||
AND al.created_at >= DATE_SUB(NOW(), INTERVAL 7 DAY)
|
||||
AND al.details LIKE ?
|
||||
AND (al.details LIKE ? OR al.details LIKE ?)
|
||||
ORDER BY al.created_at DESC
|
||||
LIMIT 15";
|
||||
|
||||
// Match the exact JSON value with a trailing delimiter so user 12 doesn't also
|
||||
// match 120/123/etc. The assign detail is logged as {"assigned_to":<int>}.
|
||||
$assignLike = '%"assigned_to":' . (int)$userId . '}%';
|
||||
// match 120/123/etc. Single assigns log {"assigned_to":5} (closing brace) while
|
||||
// bulk assigns log {"assigned_to":5,"bulk_operation_id":N} (comma) — match both.
|
||||
$assignId = (int)$userId;
|
||||
$assignEnd = '%"assigned_to":' . $assignId . '}%';
|
||||
$assignMid = '%"assigned_to":' . $assignId . ',%';
|
||||
$stmt = $conn->prepare($assignSql);
|
||||
$stmt->bind_param('is', $userId, $assignLike);
|
||||
$stmt->bind_param('iss', $userId, $assignEnd, $assignMid);
|
||||
$stmt->execute();
|
||||
$assignRows = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);
|
||||
$stmt->close();
|
||||
@@ -150,10 +153,49 @@ $stmt->execute();
|
||||
$statusRows = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);
|
||||
$stmt->close();
|
||||
|
||||
// Query 4: @mentions of me (logged by add_comment.php as
|
||||
// action_type='mention', entity_type='user', entity_id=<mentioned user_id>).
|
||||
$mentionSql = "SELECT
|
||||
al.audit_id AS log_id, al.action_type, al.entity_type, al.entity_id, al.details, al.created_at,
|
||||
COALESCE(u.display_name, u.username, 'System') AS actor_name
|
||||
FROM audit_log al
|
||||
LEFT JOIN users u ON al.user_id = u.user_id
|
||||
WHERE al.action_type = 'mention'
|
||||
AND al.entity_type = 'user'
|
||||
AND al.entity_id = ?
|
||||
AND al.user_id != ?
|
||||
AND al.created_at >= DATE_SUB(NOW(), INTERVAL 7 DAY)
|
||||
ORDER BY al.created_at DESC
|
||||
LIMIT 15";
|
||||
|
||||
$mentionEntityId = (string)$userId;
|
||||
$stmt = $conn->prepare($mentionSql);
|
||||
$stmt->bind_param('si', $mentionEntityId, $userId);
|
||||
$stmt->execute();
|
||||
$mentionRows = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);
|
||||
$stmt->close();
|
||||
|
||||
// If the user owns/watches a ticket AND was @mentioned in the same comment, the
|
||||
// comment query and the mention query both produce a row for it. Prefer the more
|
||||
// specific mention and drop the duplicate comment notification for that comment.
|
||||
$mentionCommentIds = [];
|
||||
foreach ($mentionRows as $mr) {
|
||||
$md = json_decode($mr['details'] ?? '{}', true) ?? [];
|
||||
if (!empty($md['comment_id'])) {
|
||||
$mentionCommentIds[(int)$md['comment_id']] = true;
|
||||
}
|
||||
}
|
||||
if (!empty($mentionCommentIds)) {
|
||||
$commentRows = array_filter(
|
||||
$commentRows,
|
||||
fn($cr) => !isset($mentionCommentIds[(int)($cr['entity_id'] ?? 0)])
|
||||
);
|
||||
}
|
||||
|
||||
// Merge, deduplicate by log_id, sort by created_at desc
|
||||
$all = [];
|
||||
$seen = [];
|
||||
foreach (array_merge($assignRows, $commentRows, $statusRows) as $row) {
|
||||
foreach (array_merge($assignRows, $commentRows, $statusRows, $mentionRows) as $row) {
|
||||
$id = (int)$row['log_id'];
|
||||
if (isset($seen[$id])) {
|
||||
continue;
|
||||
@@ -172,7 +214,7 @@ foreach ($all as $row) {
|
||||
$actionType = ($row['action_type'] === 'create' && $row['entity_type'] === 'comment')
|
||||
? 'comment'
|
||||
: $row['action_type'];
|
||||
$ticketId = ($actionType === 'comment')
|
||||
$ticketId = ($actionType === 'comment' || $actionType === 'mention')
|
||||
? ($details['ticket_id'] ?? 0)
|
||||
: $row['entity_id'];
|
||||
$isRead = $lastSeen && $row['created_at'] <= $lastSeen;
|
||||
@@ -181,6 +223,7 @@ foreach ($all as $row) {
|
||||
$title = match ($actionType) {
|
||||
'assign' => "{$row['actor_name']} assigned ticket #{$ticketId} to you",
|
||||
'comment' => "{$row['actor_name']} commented on ticket #{$ticketId}",
|
||||
'mention' => "{$row['actor_name']} mentioned you on ticket #{$ticketId}",
|
||||
'update' => (function () use ($row, $details, $ticketId) {
|
||||
// logTicketUpdate stores delta as {"status": {"from": "Open", "to": "In Progress"}}
|
||||
$from = $details['status']['from'] ?? ($details['old_value'] ?? '?');
|
||||
|
||||
@@ -78,6 +78,17 @@ if ($ticketId <= 0) {
|
||||
exit;
|
||||
}
|
||||
|
||||
// Enforce ticket visibility before returning watch state / watcher names, so a
|
||||
// restricted ticket's watcher list and count aren't disclosed (the POST path
|
||||
// already checks this).
|
||||
$ticketModel = new TicketModel($conn);
|
||||
$ticket = $ticketModel->getTicketById($ticketId);
|
||||
if (!$ticket || !$ticketModel->canUserAccessTicket($ticket, $currentUser)) {
|
||||
http_response_code(404);
|
||||
echo json_encode(['success' => false, 'error' => 'Ticket not found']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$watchingStmt = $conn->prepare(
|
||||
"SELECT COUNT(*) as cnt FROM ticket_watchers WHERE ticket_id = ? AND user_id = ?"
|
||||
);
|
||||
|
||||
+31
-26
@@ -1142,8 +1142,10 @@ function populateKanbanCards() {
|
||||
if (cells.length < 6) return;
|
||||
|
||||
const ticketId = cells[0 + offset]?.querySelector('.ticket-link')?.textContent.trim() || '';
|
||||
const priorityEl = cells[1 + offset]?.querySelector('[class*="lt-p"]');
|
||||
const priority = priorityEl ? priorityEl.textContent.trim().replace('P','') : cells[1 + offset]?.textContent.trim() || '4';
|
||||
// The priority cell renders a "P1".."P5" badge; extract just the digit.
|
||||
// (The old [class*="lt-p"] selector never matched the lt-badge-p1 class, so
|
||||
// every card fell back to P4 regardless of real priority.)
|
||||
const priority = (cells[1 + offset]?.textContent.trim() || '').replace(/[^0-9]/g, '') || '4';
|
||||
const title = cells[2 + offset]?.textContent.trim() || '';
|
||||
const category = cells[3 + offset]?.textContent.trim() || '';
|
||||
const statusEl = cells[5 + offset]?.querySelector('.lt-status');
|
||||
@@ -1219,29 +1221,30 @@ function populateKanbanCards() {
|
||||
if (dec) dec.textContent = '(' + Math.max(0, (parseInt(dec.textContent.replace(/\D/g,''),10)||1) - 1) + ')';
|
||||
if (inc) inc.textContent = '(' + ((parseInt(inc.textContent.replace(/\D/g,''),10)||0) + 1) + ')';
|
||||
|
||||
// POST status update
|
||||
fetch('/api/update_ticket.php', {
|
||||
method: 'POST',
|
||||
credentials: 'same-origin',
|
||||
headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': window.CSRF_TOKEN || '' },
|
||||
body: JSON.stringify({ ticket_id: String(ticketId), status: newStatus })
|
||||
})
|
||||
.then(r => r.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
lt.toast.success('Ticket #' + ticketId + ' → ' + newStatus, 2500);
|
||||
movedCard.dataset.status = newStatus;
|
||||
} else {
|
||||
lt.toast.error('Status update failed: ' + (data.error || 'Unknown error'));
|
||||
// Revert: put card back in original column
|
||||
const origCol = document.getElementById(Object.keys(colStatusMap).find(k => colStatusMap[k] === oldStatus));
|
||||
if (origCol) origCol.appendChild(movedCard);
|
||||
movedCard.dataset.status = oldStatus;
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
lt.toast.error('Network error — status not saved');
|
||||
});
|
||||
// Revert the card to its original column and undo the optimistic counts.
|
||||
const revert = function () {
|
||||
const origCol = document.getElementById(Object.keys(colStatusMap).find(k => colStatusMap[k] === oldStatus));
|
||||
if (origCol) origCol.appendChild(movedCard);
|
||||
movedCard.dataset.status = oldStatus;
|
||||
if (dec) dec.textContent = '(' + ((parseInt(dec.textContent.replace(/\D/g, ''), 10) || 0) + 1) + ')';
|
||||
if (inc) inc.textContent = '(' + Math.max(0, (parseInt(inc.textContent.replace(/\D/g, ''), 10) || 1) - 1) + ')';
|
||||
};
|
||||
|
||||
// POST status update via the shared wrapper (adds CSRF + JSON, throws on non-2xx)
|
||||
lt.api.post('/api/update_ticket.php', { ticket_id: String(ticketId), status: newStatus })
|
||||
.then(function (data) {
|
||||
if (data && data.success) {
|
||||
lt.toast.success('Ticket #' + ticketId + ' → ' + newStatus, 2500);
|
||||
movedCard.dataset.status = newStatus;
|
||||
} else {
|
||||
lt.toast.error('Status update failed: ' + ((data && data.error) || 'Unknown error'));
|
||||
revert();
|
||||
}
|
||||
})
|
||||
.catch(function () {
|
||||
lt.toast.error('Status update failed — reverting');
|
||||
revert();
|
||||
});
|
||||
}
|
||||
|
||||
Object.keys(columns).forEach(status => {
|
||||
@@ -1314,7 +1317,9 @@ function showTicketPreview(event) {
|
||||
const offset = isAdmin ? 1 : 0;
|
||||
|
||||
const ticketId = link.textContent.trim();
|
||||
const priority = cells[1 + offset]?.textContent.trim() || '';
|
||||
// Cell text is already "P1".."P5"; strip the leading P so the template's
|
||||
// `P${priority}` doesn't render "PP1".
|
||||
const priority = (cells[1 + offset]?.textContent.trim() || '').replace(/^P/i, '');
|
||||
const title = cells[2 + offset]?.textContent.trim() || '';
|
||||
const category = cells[3 + offset]?.textContent.trim() || '';
|
||||
const type = cells[4 + offset]?.textContent.trim() || '';
|
||||
|
||||
+16
-7
@@ -6,6 +6,13 @@
|
||||
function parseMarkdown(markdown) {
|
||||
if (!markdown) return '';
|
||||
|
||||
// Footnote labels are captured before the HTML-escape pass, so they must be
|
||||
// sanitized to a safe slug before being interpolated into id/href attributes
|
||||
// (otherwise a label like `x"><img onerror=...>` breaks out → stored XSS).
|
||||
var fnSlug = function (label) {
|
||||
return String(label).replace(/[^a-zA-Z0-9_-]/g, '-');
|
||||
};
|
||||
|
||||
// Footnotes — collect definitions and mark references with placeholders
|
||||
// (must happen before HTML escaping so <sup> tags don't get escaped)
|
||||
const footnotes = {};
|
||||
@@ -135,18 +142,20 @@ function parseMarkdown(markdown) {
|
||||
html = html.replace(/ \n/g, '<br>');
|
||||
html = html.replace(/\n\n/g, '</p><p>');
|
||||
|
||||
// Restore code blocks and inline code
|
||||
// Restore code blocks and inline code. Use a function replacer so '$'
|
||||
// sequences in user code (e.g. $&, $$, $`, $') are inserted literally rather
|
||||
// than interpreted as String.replace replacement patterns.
|
||||
codeBlocks.forEach((block, i) => {
|
||||
html = html.replace('%%CODEBLOCK' + i + '%%', block);
|
||||
html = html.replace('%%CODEBLOCK' + i + '%%', () => block);
|
||||
});
|
||||
inlineCodes.forEach((code, i) => {
|
||||
html = html.replace('%%INLINECODE' + i + '%%', code);
|
||||
html = html.replace('%%INLINECODE' + i + '%%', () => code);
|
||||
});
|
||||
|
||||
// Restore footnote reference placeholders
|
||||
fnRefs.forEach(function(ref, i) {
|
||||
html = html.replace('%%FNREF' + i + '%%',
|
||||
'<sup class="fn-ref"><a href="#fn-' + ref.label + '" id="fnref-' + ref.label + '">[' + ref.n + ']</a></sup>');
|
||||
'<sup class="fn-ref"><a href="#fn-' + fnSlug(ref.label) + '" id="fnref-' + fnSlug(ref.label) + '">[' + ref.n + ']</a></sup>');
|
||||
});
|
||||
|
||||
// Wrap in paragraph if not already wrapped
|
||||
@@ -157,10 +166,10 @@ function parseMarkdown(markdown) {
|
||||
// Append footnote definitions block
|
||||
if (footnoteOrder.length) {
|
||||
html += '<hr class="fn-hr"><ol class="fn-list">';
|
||||
footnoteOrder.forEach(function(label, i) {
|
||||
html += '<li id="fn-' + label + '" class="fn-item">' +
|
||||
footnoteOrder.forEach(function(label) {
|
||||
html += '<li id="fn-' + fnSlug(label) + '" class="fn-item">' +
|
||||
parseMarkdown(footnotes[label]).replace(/<\/?p>/g, '') +
|
||||
' <a href="#fnref-' + label + '" class="fn-back">↩</a></li>';
|
||||
' <a href="#fnref-' + fnSlug(label) + '" class="fn-back">↩</a></li>';
|
||||
});
|
||||
html += '</ol>';
|
||||
}
|
||||
|
||||
@@ -60,6 +60,16 @@ $GLOBALS['config'] = [
|
||||
'DB_PASS' => $envVars['DB_PASS'] ?? '',
|
||||
'DB_NAME' => $envVars['DB_NAME'] ?? 'tinkertickets',
|
||||
|
||||
// Trusted reverse proxies. Authelia forward-auth (Remote-* headers) is only
|
||||
// honored when REMOTE_ADDR is in this allowlist, so the spoofable identity
|
||||
// headers can't be set by anything that reaches PHP directly. Comma-separated
|
||||
// IPs in .env (e.g. TRUSTED_PROXIES=10.10.10.27). Empty = enforcement OFF
|
||||
// (backward compatible — relies solely on network topology).
|
||||
'TRUSTED_PROXIES' => array_values(array_filter(array_map(
|
||||
'trim',
|
||||
explode(',', (string)($envVars['TRUSTED_PROXIES'] ?? ''))
|
||||
), fn($ip) => $ip !== '')),
|
||||
|
||||
// URL settings
|
||||
'BASE_URL' => '', // Empty since we're serving from document root
|
||||
'ASSETS_URL' => '/assets', // Assets URL
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Runtime requirements — single source of truth.
|
||||
*
|
||||
* Consumed by:
|
||||
* - scripts/check_requirements.php (CI: fails the build if unmet)
|
||||
* - api/health.php (production: surfaces drift to monitoring)
|
||||
*
|
||||
* This exists because a PHP upgrade once silently dropped the ldap extension,
|
||||
* which broke avatars with no visible error. Keep this list in sync with the
|
||||
* extensions the code actually relies on.
|
||||
*/
|
||||
|
||||
return [
|
||||
// Minimum supported PHP version (production runs 8.4).
|
||||
'min_php_version' => '8.2',
|
||||
|
||||
// Extensions the application requires to function.
|
||||
'required_extensions' => [
|
||||
'ldap', // api/user_avatar.php — lldap avatar lookups
|
||||
'mysqli', // helpers/Database.php — all data access
|
||||
'curl', // helpers/NotificationHelper.php, SynapseHelper.php — Matrix
|
||||
'mbstring', // multibyte string handling
|
||||
'fileinfo', // api/upload_attachment.php — MIME validation
|
||||
'json', // request/response encoding (bundled, but assert anyway)
|
||||
],
|
||||
];
|
||||
+27
-4
@@ -195,10 +195,17 @@ function generateTicketHash($data)
|
||||
'source_type' => $sourceType,
|
||||
'issue_category' => $issueCategory,
|
||||
'issue_subtype' => $issueSubtype,
|
||||
'environment_tags' => array_values(array_filter(
|
||||
explode('][', $title),
|
||||
fn($tag) => in_array($tag, ['production', 'development', 'staging', 'single-node', 'cluster-wide'])
|
||||
)),
|
||||
'environment_tags' => (function () use ($title) {
|
||||
// Extract each [bracketed] tag, then keep the known environment ones.
|
||||
// (explode('][') leaves brackets stuck to the first/last tag, so e.g.
|
||||
// "[production] ..." never matched and the env tag was dropped from the
|
||||
// dedup hash — letting prod and staging issues collide onto one ticket.)
|
||||
preg_match_all('/\[([^\]]+)\]/', $title, $m);
|
||||
return array_values(array_filter(
|
||||
$m[1],
|
||||
fn($tag) => in_array($tag, ['production', 'development', 'staging', 'single-node', 'cluster-wide'], true)
|
||||
));
|
||||
})(),
|
||||
];
|
||||
|
||||
// Manual tickets should be unique by title (so different software installs don't collide)
|
||||
@@ -231,6 +238,22 @@ $priority = $data['priority'] ?? '4';
|
||||
$category = (string)($data['category'] ?? 'General');
|
||||
$type = (string)($data['type'] ?? 'Issue');
|
||||
|
||||
// Validate externally-supplied status and priority. (category/type are free-form
|
||||
// in this schema.) A non-numeric priority would otherwise cast to 0 and escalate
|
||||
// the ticket below P1 on the dedup/update path.
|
||||
$validStatuses = $GLOBALS['config']['TICKET_STATUSES'] ?? ['Open', 'Pending', 'In Progress', 'Closed'];
|
||||
if (!in_array($status, $validStatuses, true)) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'Invalid status']);
|
||||
exit;
|
||||
}
|
||||
if (!is_numeric($priority) || (int)$priority < 1 || (int)$priority > 5) {
|
||||
http_response_code(400);
|
||||
echo json_encode(['success' => false, 'error' => 'Invalid priority (must be 1-5)']);
|
||||
exit;
|
||||
}
|
||||
$priority = (int)$priority;
|
||||
|
||||
$ticketHash = generateTicketHash($data);
|
||||
$auditLog = new AuditLogModel($conn);
|
||||
|
||||
|
||||
+13
-6
@@ -125,16 +125,23 @@ class CacheHelper
|
||||
return !file_exists($filePath) || @unlink($filePath);
|
||||
}
|
||||
|
||||
// Delete all files with this prefix
|
||||
$pattern = self::getCacheDir() . '/' . preg_replace('/[^a-zA-Z0-9_]/', '_', $prefix) . '*.json';
|
||||
$files = glob($pattern);
|
||||
// Delete all entries for this prefix. A key is either the bare prefix or
|
||||
// prefix + '_' + md5(identifier) (32 hex chars, see makeKey). Match exactly
|
||||
// that so a prefix can't clobber a different prefix that merely shares a
|
||||
// leading substring — e.g. delete('workflow') must not wipe 'workflow_rules'.
|
||||
$safePrefix = preg_replace('/[^a-zA-Z0-9_]/', '_', $prefix);
|
||||
$keyRegex = '/^' . preg_quote($safePrefix, '/') . '(_[0-9a-f]{32})?$/';
|
||||
|
||||
$files = glob(self::getCacheDir() . '/' . $safePrefix . '*.json') ?: [];
|
||||
foreach ($files as $file) {
|
||||
@unlink($file);
|
||||
if (preg_match($keyRegex, basename($file, '.json'))) {
|
||||
@unlink($file);
|
||||
}
|
||||
}
|
||||
|
||||
// Clear memory cache entries with this prefix
|
||||
// Clear matching memory cache entries
|
||||
foreach (array_keys(self::$memoryCache) as $key) {
|
||||
if (strpos($key, $prefix) === 0) {
|
||||
if (preg_match($keyRegex, $key)) {
|
||||
unset(self::$memoryCache[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,23 +164,38 @@ class NotificationHelper
|
||||
return;
|
||||
}
|
||||
|
||||
// Fetch watcher usernames, excluding the actor so they don't notify themselves
|
||||
if ($excludeUserId !== null) {
|
||||
$sql = "SELECT u.username FROM ticket_watchers tw JOIN users u ON tw.user_id = u.user_id WHERE tw.ticket_id = ? AND tw.user_id != ?";
|
||||
$stmt = $conn->prepare($sql);
|
||||
$stmt->bind_param("ii", $ticketId, $excludeUserId);
|
||||
} else {
|
||||
$sql = "SELECT u.username FROM ticket_watchers tw JOIN users u ON tw.user_id = u.user_id WHERE tw.ticket_id = ?";
|
||||
$stmt = $conn->prepare($sql);
|
||||
$stmt->bind_param("i", $ticketId);
|
||||
}
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
$stmt->close();
|
||||
|
||||
// Fetch watcher usernames, excluding the actor so they don't notify
|
||||
// themselves. Notifications are best-effort: if the watchers table is
|
||||
// absent or the query fails, skip silently rather than fataling the
|
||||
// request that already committed its DB change. mysqli may either throw
|
||||
// (default exception mode) or return false, so handle both.
|
||||
$usernames = [];
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
$usernames[] = $row['username'];
|
||||
try {
|
||||
if ($excludeUserId !== null) {
|
||||
$sql = "SELECT u.username FROM ticket_watchers tw JOIN users u ON tw.user_id = u.user_id WHERE tw.ticket_id = ? AND tw.user_id != ?";
|
||||
$stmt = $conn->prepare($sql);
|
||||
} else {
|
||||
$sql = "SELECT u.username FROM ticket_watchers tw JOIN users u ON tw.user_id = u.user_id WHERE tw.ticket_id = ?";
|
||||
$stmt = $conn->prepare($sql);
|
||||
}
|
||||
if (!$stmt) {
|
||||
return;
|
||||
}
|
||||
if ($excludeUserId !== null) {
|
||||
$stmt->bind_param("ii", $ticketId, $excludeUserId);
|
||||
} else {
|
||||
$stmt->bind_param("i", $ticketId);
|
||||
}
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
$stmt->close();
|
||||
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
$usernames[] = $row['username'];
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
error_log('NotificationHelper::notifyWatchers watcher lookup failed: ' . $e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
if (empty($usernames)) {
|
||||
|
||||
+33
-12
@@ -4,8 +4,9 @@
|
||||
* SynapseHelper
|
||||
*
|
||||
* Resolves local (SSO) usernames → Matrix user IDs by querying the
|
||||
* Synapse Admin REST API directly. No caching — every call is live
|
||||
* so results never go stale.
|
||||
* Synapse Admin REST API directly. Results are memoized per-request (not
|
||||
* across requests, so they don't go stale between requests), and a batch
|
||||
* resolve has an overall time budget to bound request latency.
|
||||
*
|
||||
* Required config (.env) keys:
|
||||
* MATRIX_DOMAIN e.g. matrix.lotusguild.org
|
||||
@@ -14,6 +15,12 @@
|
||||
*/
|
||||
class SynapseHelper
|
||||
{
|
||||
/** Per-request memo of username => Matrix ID|null, so repeat watchers are free. */
|
||||
private static array $cache = [];
|
||||
|
||||
/** Total wall-clock budget (seconds) for a single resolveUsernames() batch. */
|
||||
private const RESOLVE_BUDGET_SECONDS = 5;
|
||||
|
||||
/**
|
||||
* Resolve a local SSO username to its Matrix user ID.
|
||||
*
|
||||
@@ -29,6 +36,11 @@ class SynapseHelper
|
||||
*/
|
||||
public static function resolveUsername(string $username): ?string
|
||||
{
|
||||
// Serve from the per-request cache when we've already looked this up.
|
||||
if (array_key_exists($username, self::$cache)) {
|
||||
return self::$cache[$username];
|
||||
}
|
||||
|
||||
$baseUrl = $GLOBALS['config']['SYNAPSE_ADMIN_URL'] ?? null;
|
||||
$token = $GLOBALS['config']['SYNAPSE_ADMIN_TOKEN'] ?? null;
|
||||
$domain = $GLOBALS['config']['MATRIX_DOMAIN'] ?? null;
|
||||
@@ -49,6 +61,7 @@ class SynapseHelper
|
||||
'Accept: application/json',
|
||||
]);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2); // fail fast when Synapse is unreachable
|
||||
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
|
||||
|
||||
$body = curl_exec($ch);
|
||||
@@ -56,25 +69,24 @@ class SynapseHelper
|
||||
$curlError = curl_error($ch);
|
||||
curl_close($ch);
|
||||
|
||||
$resolved = null;
|
||||
if ($curlError) {
|
||||
error_log("SynapseHelper: cURL error resolving '{$username}': {$curlError}");
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($httpCode === 200) {
|
||||
} elseif ($httpCode === 200) {
|
||||
$data = json_decode($body, true);
|
||||
// Confirm the response contains the name we expect
|
||||
if (!empty($data['name'])) {
|
||||
return $data['name']; // e.g. "@jared:matrix.lotusguild.org"
|
||||
$resolved = $data['name']; // e.g. "@jared:matrix.lotusguild.org"
|
||||
}
|
||||
}
|
||||
|
||||
// 404 = user not found in Synapse; other codes = error
|
||||
if ($httpCode !== 404) {
|
||||
} elseif ($httpCode !== 404) {
|
||||
// 404 = user not found in Synapse; other codes = error
|
||||
error_log("SynapseHelper: unexpected HTTP {$httpCode} resolving '{$username}'");
|
||||
}
|
||||
|
||||
return null;
|
||||
// Memoize for the rest of this request (including negative results, so a
|
||||
// missing/unreachable user isn't retried within the same request).
|
||||
self::$cache[$username] = $resolved;
|
||||
return $resolved;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -87,7 +99,16 @@ class SynapseHelper
|
||||
public static function resolveUsernames(array $usernames): array
|
||||
{
|
||||
$ids = [];
|
||||
$deadline = microtime(true) + self::RESOLVE_BUDGET_SECONDS;
|
||||
foreach ($usernames as $username) {
|
||||
// Cached lookups are free and always allowed; for uncached ones, stop
|
||||
// making live calls once the batch budget is spent so a slow/unreachable
|
||||
// Synapse can't stall the request for N × per-call timeout.
|
||||
$cached = array_key_exists($username, self::$cache);
|
||||
if (!$cached && microtime(true) >= $deadline) {
|
||||
error_log('SynapseHelper: resolve budget exhausted; skipping remaining lookups');
|
||||
break;
|
||||
}
|
||||
$id = self::resolveUsername($username);
|
||||
if ($id !== null) {
|
||||
$ids[] = $id;
|
||||
|
||||
@@ -96,6 +96,12 @@ class AuthMiddleware
|
||||
}
|
||||
}
|
||||
|
||||
// Only honor Authelia forward-auth headers from a trusted reverse proxy.
|
||||
// Without this, anything that can reach PHP directly could spoof
|
||||
// Remote-User / Remote-Groups and log in (as admin). No valid session
|
||||
// exists at this point, so we are about to trust request headers.
|
||||
$this->enforceTrustedProxy();
|
||||
|
||||
// Read Authelia forward auth headers
|
||||
$username = $this->getHeader('HTTP_REMOTE_USER');
|
||||
$displayName = $this->getHeader('HTTP_REMOTE_NAME');
|
||||
@@ -136,6 +142,33 @@ class AuthMiddleware
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reject forward-auth headers that did not arrive via a trusted proxy.
|
||||
*
|
||||
* If TRUSTED_PROXIES is configured and the connecting REMOTE_ADDR is not in
|
||||
* the allowlist, the Remote-* headers cannot be trusted, so we refuse rather
|
||||
* than honor a potentially spoofed identity. Empty allowlist = disabled.
|
||||
*/
|
||||
private function enforceTrustedProxy(): void
|
||||
{
|
||||
$trusted = $GLOBALS['config']['TRUSTED_PROXIES'] ?? [];
|
||||
if (empty($trusted)) {
|
||||
return; // Enforcement disabled (no allowlist configured)
|
||||
}
|
||||
|
||||
$remoteAddr = $_SERVER['REMOTE_ADDR'] ?? '';
|
||||
if (!in_array($remoteAddr, $trusted, true)) {
|
||||
$this->logSecurityEvent('untrusted_proxy', [
|
||||
'reason' => 'Remote-* auth headers from non-allowlisted source',
|
||||
'remote_addr' => $remoteAddr ?: 'unknown'
|
||||
]);
|
||||
header('HTTP/1.1 403 Forbidden');
|
||||
header('Content-Type: text/plain; charset=utf-8');
|
||||
echo 'Forbidden: authentication headers must arrive via a trusted proxy.';
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get header value from server variables
|
||||
*
|
||||
|
||||
@@ -41,19 +41,31 @@ class RateLimitMiddleware
|
||||
*/
|
||||
private static function getClientIp(): string
|
||||
{
|
||||
// Check for forwarded IP (behind proxy/load balancer)
|
||||
$headers = ['HTTP_X_FORWARDED_FOR', 'HTTP_X_REAL_IP', 'HTTP_CLIENT_IP'];
|
||||
foreach ($headers as $header) {
|
||||
if (!empty($_SERVER[$header])) {
|
||||
// Take the first IP in a comma-separated list
|
||||
$ips = explode(',', $_SERVER[$header]);
|
||||
$ip = trim($ips[0]);
|
||||
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
|
||||
return $ip;
|
||||
}
|
||||
$remoteAddr = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1';
|
||||
|
||||
// Forwarded headers are client-controlled, so only believe them when the
|
||||
// request actually came from a trusted reverse proxy. Otherwise a client
|
||||
// could rotate X-Forwarded-For each request to escape the per-IP limit.
|
||||
$trusted = $GLOBALS['config']['TRUSTED_PROXIES'] ?? [];
|
||||
if (empty($trusted) || !in_array($remoteAddr, $trusted, true)) {
|
||||
return $remoteAddr;
|
||||
}
|
||||
|
||||
// The trusted proxy appends the connecting client to X-Forwarded-For, so
|
||||
// the RIGHTMOST entry is the IP it observed (a client-supplied prefix is
|
||||
// not trustworthy). X-Real-IP is set by the proxy itself.
|
||||
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
|
||||
$ips = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
|
||||
$ip = trim(end($ips));
|
||||
if (filter_var($ip, FILTER_VALIDATE_IP)) {
|
||||
return $ip;
|
||||
}
|
||||
}
|
||||
return $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1';
|
||||
if (!empty($_SERVER['HTTP_X_REAL_IP']) && filter_var($_SERVER['HTTP_X_REAL_IP'], FILTER_VALIDATE_IP)) {
|
||||
return trim($_SERVER['HTTP_X_REAL_IP']);
|
||||
}
|
||||
|
||||
return $remoteAddr;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -72,28 +84,43 @@ class RateLimitMiddleware
|
||||
$ipHash = hash('sha256', $ip . '_' . $type);
|
||||
$filePath = self::getRateLimitDir() . '/' . $ipHash . '.json';
|
||||
|
||||
// Load existing rate data
|
||||
// Hold an exclusive lock across the whole read-modify-write so concurrent
|
||||
// requests from the same IP can't both read the same count and each write
|
||||
// count+1 (which would undercount and let the limit be exceeded).
|
||||
$fh = @fopen($filePath, 'c+');
|
||||
if ($fh === false) {
|
||||
// Can't open the counter file — fail open (don't block legitimate traffic).
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!flock($fh, LOCK_EX)) {
|
||||
fclose($fh);
|
||||
return true;
|
||||
}
|
||||
|
||||
$content = stream_get_contents($fh);
|
||||
$rateData = ['count' => 0, 'window_start' => $now];
|
||||
if (file_exists($filePath)) {
|
||||
$content = @file_get_contents($filePath);
|
||||
if ($content !== false) {
|
||||
$decoded = json_decode($content, true);
|
||||
if (is_array($decoded)) {
|
||||
$rateData = $decoded;
|
||||
}
|
||||
if ($content !== false && $content !== '') {
|
||||
$decoded = json_decode($content, true);
|
||||
if (is_array($decoded)) {
|
||||
$rateData = $decoded;
|
||||
}
|
||||
}
|
||||
|
||||
// Check if window has expired
|
||||
if ($now - $rateData['window_start'] >= self::WINDOW_SECONDS) {
|
||||
// Reset when the window has expired
|
||||
if ($now - ($rateData['window_start'] ?? $now) >= self::WINDOW_SECONDS) {
|
||||
$rateData = ['count' => 0, 'window_start' => $now];
|
||||
}
|
||||
|
||||
// Increment count
|
||||
$rateData['count']++;
|
||||
|
||||
// Save updated data
|
||||
@file_put_contents($filePath, json_encode($rateData), LOCK_EX);
|
||||
// Rewrite the file in place while still holding the lock
|
||||
rewind($fh);
|
||||
ftruncate($fh, 0);
|
||||
fwrite($fh, json_encode($rateData));
|
||||
fflush($fh);
|
||||
flock($fh, LOCK_UN);
|
||||
fclose($fh);
|
||||
|
||||
// Check if over limit
|
||||
return $rateData['count'] <= $limit;
|
||||
|
||||
@@ -10,6 +10,9 @@ class AuditLogModel
|
||||
/** @var int Maximum allowed limit for pagination */
|
||||
private const MAX_LIMIT = 1000;
|
||||
|
||||
/** @var int Maximum rows for a CSV/forensic export (higher than the UI cap) */
|
||||
private const EXPORT_LIMIT = 100000;
|
||||
|
||||
/** @var int Default limit for pagination */
|
||||
private const DEFAULT_LIMIT = 100;
|
||||
|
||||
@@ -36,12 +39,12 @@ class AuditLogModel
|
||||
* @param int $limit Requested limit
|
||||
* @return int Validated limit
|
||||
*/
|
||||
private function validateLimit(int $limit): int
|
||||
private function validateLimit(int $limit, int $max = self::MAX_LIMIT): int
|
||||
{
|
||||
if ($limit < 1) {
|
||||
return self::DEFAULT_LIMIT;
|
||||
}
|
||||
return min($limit, self::MAX_LIMIT);
|
||||
return min($limit, $max);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -534,7 +537,7 @@ class AuditLogModel
|
||||
FROM audit_log al
|
||||
LEFT JOIN users u ON al.user_id = u.user_id
|
||||
WHERE (al.entity_type = 'ticket' AND al.entity_id = ?)
|
||||
OR (al.entity_type = 'comment' AND JSON_EXTRACT(al.details, '$.ticket_id') = ?)
|
||||
OR (al.entity_type = 'comment' AND JSON_UNQUOTE(JSON_EXTRACT(al.details, '$.ticket_id')) = ?)
|
||||
ORDER BY al.created_at DESC"
|
||||
);
|
||||
$stmt->bind_param("ss", $ticketId, $ticketId);
|
||||
@@ -561,10 +564,11 @@ class AuditLogModel
|
||||
* @param int $offset Offset for pagination
|
||||
* @return array Array containing logs and total count
|
||||
*/
|
||||
public function getFilteredLogs($filters = [], $limit = 50, $offset = 0)
|
||||
public function getFilteredLogs($filters = [], $limit = 50, $offset = 0, $forExport = false)
|
||||
{
|
||||
// Validate pagination parameters
|
||||
$limit = $this->validateLimit((int)$limit);
|
||||
// Validate pagination parameters. Exports allow a much higher cap so a
|
||||
// forensic/compliance CSV isn't silently truncated to the UI page limit.
|
||||
$limit = $this->validateLimit((int)$limit, $forExport ? self::EXPORT_LIMIT : self::MAX_LIMIT);
|
||||
$offset = $this->validateOffset((int)$offset);
|
||||
|
||||
$whereConditions = [];
|
||||
|
||||
@@ -104,6 +104,11 @@ class BulkOperationsModel
|
||||
$success = false;
|
||||
|
||||
try {
|
||||
// NOTE: bulk_status / bulk_close intentionally do NOT run
|
||||
// WorkflowModel::isTransitionAllowed(). Bulk operations are an
|
||||
// admin-only escape hatch for forcing ticket states (e.g. mass
|
||||
// re-opening), so they bypass the workflow transition rules that
|
||||
// the single-ticket update path enforces. This is by design.
|
||||
switch ($operation['operation_type']) {
|
||||
case 'bulk_close':
|
||||
// Get current ticket from pre-loaded batch
|
||||
|
||||
+34
-20
@@ -176,27 +176,41 @@ class CommentModel
|
||||
return [];
|
||||
}
|
||||
|
||||
// All replies for these root comments (up to 3 levels deep)
|
||||
$placeholders = implode(',', array_fill(0, count($rootIds), '?'));
|
||||
$replySql = "SELECT tc.*, u.display_name, u.username
|
||||
FROM ticket_comments tc
|
||||
LEFT JOIN users u ON tc.user_id = u.user_id
|
||||
WHERE tc.ticket_id = ?
|
||||
AND tc.parent_comment_id IN ($placeholders)
|
||||
AND tc.parent_comment_id IS NOT NULL
|
||||
ORDER BY tc.created_at ASC";
|
||||
$replyStmt = $this->conn->prepare($replySql);
|
||||
$types = 'i' . str_repeat('i', count($rootIds));
|
||||
$replyStmt->bind_param($types, $ticketId, ...$rootIds);
|
||||
$replyStmt->execute();
|
||||
$replyResult = $replyStmt->get_result();
|
||||
$replyStmt->close();
|
||||
// Load replies level-by-level under this page's roots. A single
|
||||
// "parent_comment_id IN (rootIds)" only fetches DIRECT children, so
|
||||
// grandchildren/great-grandchildren (addComment allows up to depth 3)
|
||||
// would be missing from the map and dropped by buildCommentThread.
|
||||
// Expand iteratively until no new replies (bounded by max depth 3).
|
||||
$parentIds = $rootIds;
|
||||
$depth = 0;
|
||||
while (!empty($parentIds) && $depth < 3) {
|
||||
$placeholders = implode(',', array_fill(0, count($parentIds), '?'));
|
||||
$replySql = "SELECT tc.*, u.display_name, u.username
|
||||
FROM ticket_comments tc
|
||||
LEFT JOIN users u ON tc.user_id = u.user_id
|
||||
WHERE tc.ticket_id = ?
|
||||
AND tc.parent_comment_id IN ($placeholders)
|
||||
ORDER BY tc.created_at ASC";
|
||||
$replyStmt = $this->conn->prepare($replySql);
|
||||
$types = 'i' . str_repeat('i', count($parentIds));
|
||||
$replyStmt->bind_param($types, $ticketId, ...$parentIds);
|
||||
$replyStmt->execute();
|
||||
$replyResult = $replyStmt->get_result();
|
||||
$replyStmt->close();
|
||||
|
||||
while ($row = $replyResult->fetch_assoc()) {
|
||||
$row['display_name_formatted'] = $row['display_name'] ?: ($row['user_name'] ?? 'Unknown User');
|
||||
$row['replies'] = [];
|
||||
$row['thread_depth'] = $row['thread_depth'] ?? 1;
|
||||
$commentMap[$row['comment_id']] = $row;
|
||||
$nextParentIds = [];
|
||||
while ($row = $replyResult->fetch_assoc()) {
|
||||
if (isset($commentMap[$row['comment_id']])) {
|
||||
continue; // guard against cycles / duplicates
|
||||
}
|
||||
$row['display_name_formatted'] = $row['display_name'] ?: ($row['user_name'] ?? 'Unknown User');
|
||||
$row['replies'] = [];
|
||||
$row['thread_depth'] = $depth + 1;
|
||||
$commentMap[$row['comment_id']] = $row;
|
||||
$nextParentIds[] = $row['comment_id'];
|
||||
}
|
||||
$parentIds = $nextParentIds;
|
||||
$depth++;
|
||||
}
|
||||
|
||||
$rootComments = [];
|
||||
|
||||
@@ -190,14 +190,25 @@ class DependencyModel
|
||||
*/
|
||||
private function wouldCreateCycle($ticketId, $dependsOnId, $type): bool
|
||||
{
|
||||
// Only check for cycles in blocking relationships
|
||||
// Only blocking relationships impose an ordering that can form a cycle.
|
||||
if (!in_array($type, ['blocks', 'blocked_by'])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if dependsOnId already has ticketId in its dependency chain
|
||||
// Normalize the new row to a precedence edge "from must finish before to":
|
||||
// (t, d, 'blocks') => t blocks d => edge t -> d
|
||||
// (t, d, 'blocked_by') => t blocked_by d => edge d -> t
|
||||
if ($type === 'blocks') {
|
||||
$from = $ticketId;
|
||||
$to = $dependsOnId;
|
||||
} else { // blocked_by
|
||||
$from = $dependsOnId;
|
||||
$to = $ticketId;
|
||||
}
|
||||
|
||||
// Adding edge from->to creates a cycle iff a path to ->* from already exists.
|
||||
$visited = [];
|
||||
return $this->hasDependencyPath($dependsOnId, $ticketId, $visited, 0);
|
||||
return $this->hasDependencyPath($to, $from, $visited, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -236,15 +247,22 @@ class DependencyModel
|
||||
|
||||
$visited[] = $source;
|
||||
|
||||
$sql = "SELECT depends_on_id FROM ticket_dependencies
|
||||
WHERE ticket_id = ? AND dependency_type IN ('blocks', 'blocked_by')";
|
||||
// Walk the unified precedence graph forward from $source. Both directions
|
||||
// of expression contribute an outgoing edge "$source must finish before X":
|
||||
// blocks rows where ticket_id=$source -> X = depends_on_id
|
||||
// blocked_by rows where depends_on_id=$source -> X = ticket_id
|
||||
$sql = "SELECT depends_on_id AS next_id FROM ticket_dependencies
|
||||
WHERE ticket_id = ? AND dependency_type = 'blocks'
|
||||
UNION
|
||||
SELECT ticket_id AS next_id FROM ticket_dependencies
|
||||
WHERE depends_on_id = ? AND dependency_type = 'blocked_by'";
|
||||
$stmt = $this->conn->prepare($sql);
|
||||
$stmt->bind_param("s", $source);
|
||||
$stmt->bind_param("ss", $source, $source);
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
|
||||
while ($row = $result->fetch_assoc()) {
|
||||
if ($this->hasDependencyPath($row['depends_on_id'], $target, $visited, $depth + 1)) {
|
||||
if ($this->hasDependencyPath($row['next_id'], $target, $visited, $depth + 1)) {
|
||||
$stmt->close();
|
||||
return true;
|
||||
}
|
||||
|
||||
+23
-8
@@ -28,8 +28,14 @@ class StatsModel
|
||||
/**
|
||||
* Get tickets by assignee (top 5)
|
||||
*/
|
||||
public function getTicketsByAssignee(int $limit = 8): array
|
||||
public function getTicketsByAssignee(int $limit = 8, array $visFilter = []): array
|
||||
{
|
||||
// Apply the same visibility filter as the rest of the stats so a non-admin's
|
||||
// assignee widget doesn't count (and thereby leak) confidential tickets.
|
||||
$visSQL = $visFilter['sql'] ?? '';
|
||||
$visParams = $visFilter['params'] ?? [];
|
||||
$visTypes = $visFilter['types'] ?? '';
|
||||
|
||||
$sql = "SELECT
|
||||
u.user_id,
|
||||
u.display_name,
|
||||
@@ -37,12 +43,20 @@ class StatsModel
|
||||
COUNT(t.ticket_id) as open_count
|
||||
FROM tickets t
|
||||
LEFT JOIN users u ON t.assigned_to = u.user_id
|
||||
WHERE t.status != 'Closed' AND t.assigned_to IS NOT NULL
|
||||
GROUP BY t.assigned_to
|
||||
ORDER BY open_count DESC
|
||||
LIMIT ?";
|
||||
WHERE t.status != 'Closed' AND t.assigned_to IS NOT NULL";
|
||||
if ($visSQL !== '') {
|
||||
$sql .= " AND ($visSQL)";
|
||||
}
|
||||
$sql .= " GROUP BY t.assigned_to
|
||||
ORDER BY open_count DESC
|
||||
LIMIT ?";
|
||||
|
||||
$params = $visParams;
|
||||
$params[] = $limit;
|
||||
$types = $visTypes . 'i';
|
||||
|
||||
$stmt = $this->conn->prepare($sql);
|
||||
$stmt->bind_param('i', $limit);
|
||||
$stmt->bind_param($types, ...$params);
|
||||
$stmt->execute();
|
||||
$result = $stmt->get_result();
|
||||
$data = [];
|
||||
@@ -173,8 +187,9 @@ class StatsModel
|
||||
// Sort priority keys
|
||||
ksort($byPriority);
|
||||
|
||||
// Query 3: Get assignee stats (requires JOIN, kept separate)
|
||||
$byAssignee = $this->getTicketsByAssignee();
|
||||
// Query 3: Get assignee stats (requires JOIN, kept separate). Pass the same
|
||||
// visibility filter so confidential tickets aren't counted for non-admins.
|
||||
$byAssignee = $this->getTicketsByAssignee(8, $visFilter);
|
||||
|
||||
return [
|
||||
'open_tickets' => (int)($counts['open_tickets'] ?? 0),
|
||||
|
||||
@@ -208,6 +208,11 @@ class TicketModel
|
||||
ORDER BY $sortExpression $sortDirection
|
||||
LIMIT ? OFFSET ?";
|
||||
|
||||
// Keep a copy of the filter params (without LIMIT/OFFSET) for the
|
||||
// fallback COUNT below.
|
||||
$countParams = $params;
|
||||
$countParamTypes = $paramTypes;
|
||||
|
||||
$params[] = $limit;
|
||||
$params[] = $offset;
|
||||
$paramTypes .= 'ii';
|
||||
@@ -228,6 +233,24 @@ class TicketModel
|
||||
}
|
||||
$stmt->close();
|
||||
|
||||
// COUNT(*) OVER() rides on returned rows, so a page past the last row
|
||||
// yields zero rows and a bogus total of 0. Fall back to a direct COUNT
|
||||
// so the total/pages stay correct for stale or over-range page links.
|
||||
if ($totalTickets === 0 && $offset > 0) {
|
||||
$countSql = "SELECT COUNT(*) AS c
|
||||
FROM tickets t
|
||||
LEFT JOIN users u_created ON t.created_by = u_created.user_id
|
||||
LEFT JOIN users u_assigned ON t.assigned_to = u_assigned.user_id
|
||||
$whereClause";
|
||||
$countStmt = $this->conn->prepare($countSql);
|
||||
if (!empty($countParams)) {
|
||||
$countStmt->bind_param($countParamTypes, ...$countParams);
|
||||
}
|
||||
$countStmt->execute();
|
||||
$totalTickets = (int)($countStmt->get_result()->fetch_assoc()['c'] ?? 0);
|
||||
$countStmt->close();
|
||||
}
|
||||
|
||||
return [
|
||||
'tickets' => $tickets,
|
||||
'total' => $totalTickets,
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Verify the running PHP environment meets the declared runtime requirements.
|
||||
*
|
||||
* Reads config/requirements.php and checks the PHP version and that every
|
||||
* required extension is loaded. Exits non-zero (failing CI) on any miss.
|
||||
*
|
||||
* Usage: php scripts/check_requirements.php
|
||||
*/
|
||||
|
||||
$req = require __DIR__ . '/../config/requirements.php';
|
||||
|
||||
$errors = [];
|
||||
|
||||
// PHP version
|
||||
$minPhp = $req['min_php_version'];
|
||||
if (version_compare(PHP_VERSION, $minPhp, '<')) {
|
||||
$errors[] = sprintf('PHP %s is below the required minimum %s', PHP_VERSION, $minPhp);
|
||||
}
|
||||
|
||||
// Required extensions
|
||||
foreach ($req['required_extensions'] as $ext) {
|
||||
if (!extension_loaded($ext)) {
|
||||
$errors[] = sprintf('Missing required PHP extension: %s', $ext);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($errors)) {
|
||||
fwrite(STDERR, "Requirement check FAILED:\n");
|
||||
foreach ($errors as $err) {
|
||||
fwrite(STDERR, ' - ' . $err . "\n");
|
||||
}
|
||||
exit(1);
|
||||
}
|
||||
|
||||
printf(
|
||||
"Requirement check passed: PHP %s (>= %s); extensions: %s\n",
|
||||
PHP_VERSION,
|
||||
$minPhp,
|
||||
implode(', ', $req['required_extensions'])
|
||||
);
|
||||
exit(0);
|
||||
@@ -48,14 +48,14 @@ if (!empty($_GET['priority'])) {
|
||||
}
|
||||
}
|
||||
if (!empty($_GET['category'])) {
|
||||
$activeFilters[] = ['type' => 'category', 'value' => $_GET['category'], 'label' => 'Category: ' . htmlspecialchars($_GET['category'])];
|
||||
$activeFilters[] = ['type' => 'category', 'value' => $_GET['category'], 'label' => 'Category: ' . $_GET['category']];
|
||||
}
|
||||
if (!empty($_GET['type'])) {
|
||||
$activeFilters[] = ['type' => 'type', 'value' => $_GET['type'], 'label' => 'Type: ' . htmlspecialchars($_GET['type'])];
|
||||
$activeFilters[] = ['type' => 'type', 'value' => $_GET['type'], 'label' => 'Type: ' . $_GET['type']];
|
||||
}
|
||||
if (!empty($_GET['assigned_to'])) {
|
||||
$label = match ($_GET['assigned_to']) {
|
||||
'unassigned' => 'Unassigned', 'me' => 'Me', default => 'User #' . htmlspecialchars($_GET['assigned_to'])
|
||||
'unassigned' => 'Unassigned', 'me' => 'Me', default => 'User #' . $_GET['assigned_to']
|
||||
};
|
||||
$activeFilters[] = ['type' => 'assigned_to', 'value' => $_GET['assigned_to'], 'label' => 'Assigned: ' . $label];
|
||||
}
|
||||
@@ -1342,7 +1342,7 @@ if (advForm) advForm.addEventListener('submit', function(e) {
|
||||
var o = hasCheckbox ? 1 : 0; // column offset for checkbox col
|
||||
|
||||
var priority = cells[1 + o] ? cells[1 + o].textContent.trim() : '';
|
||||
var title = cells[2 + o] ? cells[2 + o].querySelector('.ticket-link')?.textContent.trim() || '' : '';
|
||||
var title = cells[2 + o] ? cells[2 + o].textContent.trim() : '';
|
||||
var category = cells[3 + o] ? cells[3 + o].textContent.trim() : '';
|
||||
var typeVal = cells[4 + o] ? cells[4 + o].textContent.trim() : '';
|
||||
var status = cells[5 + o] ? cells[5 + o].textContent.trim().replace(/^\s*●\s*/, '') : '';
|
||||
|
||||
Reference in New Issue
Block a user