mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-10-06 17:31:58 -04:00
nicandClaude Opus 5.5
ad3d5ec54d
* fix: give each migrated password its own random bcrypt salt
migratePasswords() stored the Bytes::Random::Secure object rather than
bytes from it, so en_base64() encoded the string
"Bytes::Random::Secure=HASH(0x...)". bcrypt only reads the first 22
characters of the salt, all from the constant class name, so every user
on every install got the same salt. With neither Bytes::Random::Secure
nor Data::Entropy installed the salt was empty and bcrypt() died with
"bad bcrypt settings", aborting zmupdate.pl. Even the Data::Entropy path
reused a single salt for every user in the run.
Read 16 bytes per user from /dev/urandom, as generateAuthHashSecret()
in ZoneMinder::Config already does. If it can't be read, leave that
user's legacy hash in place, which auth.php still verifies, instead of
writing a weak one. This drops the need for Bytes::Random::Secure and
the deprecated Data::Entropy. refs #4333
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* chore: drop the Data::Entropy dependency from packaging
zmupdate.pl no longer uses Data::Entropy, which upstream has deprecated
(CVE-2025-1860). refs #4333
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix: rehash legacy passwords on every password login
Only the login form called migrateHash(), so accounts that sign in with
user=/pass= or through the API kept their mysql or zmupdate.pl
(mysql+bcrypt) hash, including those with the fixed salt. Call it from
those paths too, and have it check the password type itself.
migrateHash() also regenerated the auth hash from the in-memory user,
which still held the old password, so getAuthUser(), which checks
against the new one in the database, rejected it. Update the in-memory
password first, and update the row by Id rather than by the username
as typed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* fix: note passwords still on a zmupdate.pl-migrated hash
Every salt migratePasswords() used before this branch was shared by all
users in a run: from Data::Entropy, which before 0.008 keys its generator
from rand() (CVE-2025-1860), or, since 38c0f743 with Bytes::Random::Secure
installed, a constant. The original hash input is gone, so zmupdate.pl
can't rehash these, and nothing distinguishes them from properly salted
ones. Log a warning listing every user still on a -ZM- hash, noting that
it is upgraded at their next login or password reset, and that unused
accounts can be disabled or deleted.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
109 lines
3.8 KiB
YAML
109 lines
3.8 KiB
YAML
# For most projects, this workflow file will not need changing; you simply need
|
||
# to commit it to your repository.
|
||
#
|
||
# You may wish to alter this file to override the set of languages analyzed,
|
||
# or to provide custom queries or build logic.
|
||
name: "CodeQL"
|
||
|
||
on:
|
||
push:
|
||
branches: [master]
|
||
paths-ignore:
|
||
- 'db/**'
|
||
- 'docs/**'
|
||
- 'distros/**'
|
||
- 'misc/**'
|
||
- 'onvif/**'
|
||
- 'scripts/**'
|
||
- '**/*.md'
|
||
- '**/*.sql'
|
||
- '**/*.in'
|
||
- '.github/ISSUE_TEMPLATE/**'
|
||
pull_request:
|
||
# The branches below must be a subset of the branches above
|
||
branches: [master]
|
||
paths-ignore:
|
||
- 'db/**'
|
||
- 'docs/**'
|
||
- 'distros/**'
|
||
- 'misc/**'
|
||
- 'onvif/**'
|
||
- 'scripts/**'
|
||
- '**/*.md'
|
||
- '**/*.sql'
|
||
- '**/*.in'
|
||
- '.github/ISSUE_TEMPLATE/**'
|
||
schedule:
|
||
- cron: '0 3 * * 5'
|
||
|
||
permissions:
|
||
contents: read
|
||
|
||
jobs:
|
||
analyze:
|
||
permissions:
|
||
actions: read # for github/codeql-action/init to get workflow details
|
||
contents: read # for actions/checkout to fetch code
|
||
security-events: write # for github/codeql-action/autobuild to send a status report
|
||
name: Analyze
|
||
runs-on: ubuntu-latest
|
||
|
||
strategy:
|
||
fail-fast: false
|
||
matrix:
|
||
# Override automatic language detection by changing the below list
|
||
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
|
||
language: ['cpp', 'javascript']
|
||
# Learn more...
|
||
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
|
||
|
||
steps:
|
||
- name: Checkout repository
|
||
uses: actions/checkout@v7
|
||
with:
|
||
# We must fetch at least the immediate parents so that if this is
|
||
# a pull request then we can checkout the head.
|
||
fetch-depth: 2
|
||
|
||
# Initializes the CodeQL tools for scanning.
|
||
- name: Initialize CodeQL
|
||
uses: github/codeql-action/init@v4.38.2
|
||
with:
|
||
languages: ${{ matrix.language }}
|
||
config-file: ./.github/codeql/codeql-config.yml
|
||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||
# By default, queries listed here will override any specified in a config file.
|
||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||
|
||
- name: Clean install dependencies and build
|
||
run: |
|
||
git submodule init
|
||
git submodule update --init --recursive
|
||
sudo apt-get update
|
||
sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libjwt-gnutls-dev libavdevice-dev
|
||
sudo apt-get install libbz2-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
|
||
sudo apt-get install default-libmysqlclient-dev libpcre2-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
|
||
sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
|
||
sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl
|
||
|
||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||
# If this step fails, then you should remove it and run the build manually (see below)
|
||
- name: Autobuild
|
||
uses: github/codeql-action/autobuild@v4.38.2
|
||
|
||
# ℹ️ Command-line programs to run using the OS shell.
|
||
# 📚 https://git.io/JvXDl-
|
||
|
||
|
||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||
# and modify them (or add more) to build your code if your project
|
||
# uses a compiled language
|
||
|
||
#- run: |
|
||
# make bootstrap
|
||
# make release
|
||
|
||
- name: Perform CodeQL Analysis
|
||
uses: github/codeql-action/analyze@v4.38.2
|