Compare commits

...
4 Commits
11 changed files with 27570 additions and 4 deletions
+2 -1
View File
@@ -11,7 +11,8 @@ if git diff --cached --quiet -- CHANGELOG.md; then
fi fi
if git diff --cached --unified=0 -- . ':(exclude)CHANGELOG.md' | if git diff --cached --unified=0 -- . ':(exclude)CHANGELOG.md' |
grep -E '^\+[^+].*(rcon_password|sv_licenseKey|mysql_connection_string|webhook_url|discord_webhook|api[_-]?key|access[_-]?token)([[:space:]]*[:=][[:space:]]*|[[:space:]]+)[^[:space:]"]+' >/dev/null; then grep -E '^\+[^+].*(rcon_password|sv_licenseKey|mysql_connection_string|webhook_url|discord_webhook|api[_-]?key|access[_-]?token)([[:space:]]*[:=][[:space:]]*|[[:space:]]+)[^[:space:]"]+' |
grep -Ev 'GetConvar\(|structure was invalid' >/dev/null; then
echo "Commit blocat: posibil secret detectat in staged diff." >&2 echo "Commit blocat: posibil secret detectat in staged diff." >&2
exit 1 exit 1
fi fi
+7
View File
@@ -0,0 +1,7 @@
# oxmysql 2.14.1
- Updated the DEV runtime from oxmysql 2.12.0 to the official 2.14.1 release.
- Preserved local-only and customized files through a verified three-way merge.
- Stored the pre-update resource under the CompanyFloor rollback directory.
- Verified FXServer startup, the `oxmysql` runtime resource and MariaDB
connectivity on the local development server.
+37
View File
@@ -4,6 +4,43 @@ Schimbările din acest repository sunt livrate separat, cu scop, dovezi și
validare explicită. Fișierele locale de runtime, logurile, backupurile și validare explicită. Fișierele locale de runtime, logurile, backupurile și
secretele nu fac parte din commituri. secretele nu fac parte din commituri.
## Unreleased
### Updated
- `oxmysql` a fost actualizat controlat de la `2.12.0` la `2.14.1` prin
workspace three-way verificat. Fișierele custom au fost păstrate, versiunea
veche are rollback separat, iar pornirea resursei și conexiunea MariaDB au
trecut smoke test-ul pe FXServer DEV artifact `32561`.
- Hook-ul de secret scanning ignoră referințele de cod `GetConvar(...)` și
mesajele de validare, fără să relaxeze detectarea valorilor secrete adăugate.
### Security
- RCON a fost dezactivat după ce un worker local a copiat credentialul în
scripturi temporare de test. Toate copiile generate au fost eliminate din
CompanyFloor și din rădăcina serverului DEV. Reactivarea cere aprobarea
ownerului și un secret local nou, care nu intră în Git.
### Corrected
- Dezactivat și eliminat din resursa activă workaround-ul local neaprobat
`qs-smartphone-pro/server/custom/crypto-history.lua`. Jobul muta periodic
rânduri din `crypto_history` în `crypto_history_archive` și nu făcea parte
din pachetul vendor. Backupul recuperabil rămâne la
`backups/crypto-history.lua.backup.20260729015920`; remedierea canonică
continuă prin update-ul oficial Quasar și three-way merge.
- Contractul runtime Quasar observat în consolă este acum obligatoriu pentru
operațiuni viitoare: zero jucători, `savePhoneMetas` înainte de stop/restart,
apoi `ensure phone-radio`, `ensure phone-recorder` și verificare exactă.
- Eliminată creșterea `mysql_resultset_warning` la `10000`. Schimbarea doar
ascundea avertizarea produsă de `SELECT * FROM crypto_history`; nu repara
query-ul sau creșterea tabelului și nu este acceptată drept remediere.
- `sv_lan on` rămâne activ pentru conectarea locală a clientului FiveM.
- Incidentul `INC-95E76A50AB` trebuie reluat prin analizarea contractului
vendor și a retenției/volumului `crypto_history`, fără RCON improvizat și
fără suprimarea monitorizării.
## 2026-07-27 ## 2026-07-27
### Fixed ### Fixed
@@ -31,4 +31,4 @@ We have included a module for submitting error logs to [Fivemanage](https://five
## Lua Language Server ## Lua Language Server
- Install [Lua Language Server](https://marketplace.visualstudio.com/items?itemName=sumneko.lua) to ease development with annotations, type checking, diagnostics, and more. - Install [Lua Language Server](https://marketplace.visualstudio.com/items?itemName=sumneko.lua) to ease development with annotations, type checking, diagnostics, and more.
- See [ox_types](https://github.com/overextended/ox_types) for our Lua type definitions. - See [ox_types](https://github.com/overextended/ox_types) for our Lua type definitions.
File diff suppressed because one or more lines are too long
@@ -0,0 +1,37 @@
fx_version 'cerulean'
game 'common'
use_experimental_fxv2_oal 'yes'
lua54 'yes'
node_version '22'
name 'oxmysql'
author 'Overextended'
version '2.14.1'
license 'LGPL-3.0-or-later'
repository 'git+https://github.com/overextended/oxmysql.git'
description 'FXServer to MySQL communication via node-mysql2'
dependencies {
'/server:12913',
}
client_script 'ui.lua'
server_script 'dist/build.js'
files {
'web/build/index.html',
'web/build/**/*'
}
ui_page 'web/build/index.html'
provide 'mysql-async'
provide 'ghmattimysql'
convar_category 'OxMySQL' {
'Configuration',
{
{ 'Connection string', 'mysql_connection_string', 'CV_STRING', 'mysql://user:password@localhost/database' },
{ 'Debug', 'mysql_debug', 'CV_BOOL', 'false' }
}
}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="./vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + Svelte + TS</title>
<script type="module" crossorigin src="./assets/index-856dcf43.js"></script>
<link rel="stylesheet" href="./assets/index-8c420056.css">
</head>
<body>
<div id="app"></div>
</body>
</html>
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

+4 -2
View File
@@ -23,6 +23,7 @@
## You CAN edit the following: ## You CAN edit the following:
endpoint_add_tcp "0.0.0.0:30120" endpoint_add_tcp "0.0.0.0:30120"
endpoint_add_udp "0.0.0.0:30120" endpoint_add_udp "0.0.0.0:30120"
sv_lan on
sv_maxclients 8 sv_maxclients 8
set steam_webApiKey "00E9BEA0BE4FE5A1766E47EDA66D524E" set steam_webApiKey "00E9BEA0BE4FE5A1766E47EDA66D524E"
# sets tags "default, deployer, qbcore, qb-core" # sets tags "default, deployer, qbcore, qb-core"
@@ -53,7 +54,7 @@ sv_requestParanoia 2 # https://docs.fivem.net/docs/server-manual/server-commands
# sv_listingIpOverride "fivem.live:30120" # sv_listingIpOverride "fivem.live:30120"
# sv_enableNetworkedSounds false # sv_enableNetworkedSounds false
# sv_enableNetworkedPhoneExplosions false # sv_enableNetworkedPhoneExplosions false
rcon_password "passrcon!@#" # pentru folosire cu add_ace resource.console command allow # RCON disabled after local credential exposure; owner approval required to re-enable.
# OneSync - managed via txAdmin settings page # OneSync - managed via txAdmin settings page
# Note: only set onesync in txAdmin, not here, to avoid validator warnings # Note: only set onesync in txAdmin, not here, to avoid validator warnings
@@ -130,5 +131,6 @@ set luxu_admin_api_key "7ff2170d-86e2-46bd-a358-5441a73305f5"
set mumble_allowExternalConnections true set mumble_allowExternalConnections true
add_ace resource.luxu_admin command allow add_ace resource.luxu_admin command allow
## Tebex Implementation ## Tebex Implementation
# sv_tebexSecret 5e16ba619bfc0a568092b2e1e7eb6482b093266e # sv_tebexSecret 5e16ba619bfc0a568092b2e1e7eb6482b093266e