Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccb52cc8b5 | ||
|
|
41ed2b62d4 | ||
|
|
b6ab6417cb | ||
|
|
e857912c74 | ||
|
|
ac18fbf020 | ||
|
|
494a9f8446 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# 3.x is used to run code coverage
|
# 3.x is used to run code coverage
|
||||||
python-version: ["3.x", "3.13", "3.12", "3.11", "3.10", "3.9", "3.8"]
|
python-version: ["3.x", "3.13", "3.12", "3.11", "3.10", "3.9"]
|
||||||
platform: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, macos-13]
|
platform: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, macos-13]
|
||||||
# exclude:
|
# exclude:
|
||||||
|
|
||||||
|
|||||||
22
.github/workflows/ci_docker.yml
vendored
22
.github/workflows/ci_docker.yml
vendored
@@ -112,6 +112,7 @@ jobs:
|
|||||||
|
|
||||||
create-multiarch-debian-manifests:
|
create-multiarch-debian-manifests:
|
||||||
name: Create multiarch manifests for Debian image
|
name: Create multiarch manifests for Debian image
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- build-and-push-docker-debian-image
|
- build-and-push-docker-debian-image
|
||||||
@@ -132,6 +133,7 @@ jobs:
|
|||||||
password: ${{ secrets.GHCR_IO_TOKEN }}
|
password: ${{ secrets.GHCR_IO_TOKEN }}
|
||||||
|
|
||||||
- name: Create multiarch manifests
|
- name: Create multiarch manifests
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
for tag in \
|
for tag in \
|
||||||
@@ -215,7 +217,7 @@ jobs:
|
|||||||
ghcr.io/scito/extract_otp_secrets:only-txt-${{ matrix.PLATFORM_ARCH }}
|
ghcr.io/scito/extract_otp_secrets:only-txt-${{ matrix.PLATFORM_ARCH }}
|
||||||
ghcr.io/scito/extract_otp_secrets:alpine-${{ matrix.PLATFORM_ARCH }}
|
ghcr.io/scito/extract_otp_secrets:alpine-${{ matrix.PLATFORM_ARCH }}
|
||||||
# build on feature branches, push only on master branch
|
# build on feature branches, push only on master branch
|
||||||
push: true # ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
push: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
build-args: |
|
build-args: |
|
||||||
RUN_TESTS=true
|
RUN_TESTS=true
|
||||||
|
|
||||||
@@ -234,6 +236,7 @@ jobs:
|
|||||||
|
|
||||||
create-multiarch-alpine-manifests:
|
create-multiarch-alpine-manifests:
|
||||||
name: Create multiarch manifests for Alpine image
|
name: Create multiarch manifests for Alpine image
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- build-and-push-docker-alpine-image
|
- build-and-push-docker-alpine-image
|
||||||
@@ -257,6 +260,7 @@ jobs:
|
|||||||
password: ${{ secrets.GHCR_IO_TOKEN }}
|
password: ${{ secrets.GHCR_IO_TOKEN }}
|
||||||
|
|
||||||
- name: Create multiarch manifests
|
- name: Create multiarch manifests
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
for tag in \
|
for tag in \
|
||||||
@@ -356,6 +360,7 @@ jobs:
|
|||||||
create-multiarch-bullseye-manifests:
|
create-multiarch-bullseye-manifests:
|
||||||
name: Create multiarch manifests for Bullseye image
|
name: Create multiarch manifests for Bullseye image
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
needs:
|
needs:
|
||||||
- build-and-push-docker-bullseye-image
|
- build-and-push-docker-bullseye-image
|
||||||
steps:
|
steps:
|
||||||
@@ -374,7 +379,8 @@ jobs:
|
|||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GHCR_IO_TOKEN }}
|
password: ${{ secrets.GHCR_IO_TOKEN }}
|
||||||
|
|
||||||
- name: Create multiarch manifests
|
- name:
|
||||||
|
if: ${{ github.ref == 'refs/heads/master' && github.secret_source == 'Actions'}}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
for tag in \
|
for tag in \
|
||||||
@@ -386,3 +392,15 @@ jobs:
|
|||||||
$tag-arm64
|
$tag-arm64
|
||||||
done
|
done
|
||||||
|
|
||||||
|
container-images-clean-up:
|
||||||
|
name: Cleanup old container images
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Delete Container Packages
|
||||||
|
uses: actions/delete-package-versions@v5
|
||||||
|
if: ${{ github.secret_source == 'Actions'}}
|
||||||
|
with:
|
||||||
|
package-name: 'extract_otp_secrets'
|
||||||
|
package-type: 'container'
|
||||||
|
min-versions-to-keep: 1
|
||||||
|
delete-only-untagged-versions: 'true'
|
||||||
|
|||||||
30
Pipfile.lock
generated
30
Pipfile.lock
generated
@@ -193,21 +193,19 @@
|
|||||||
},
|
},
|
||||||
"protobuf": {
|
"protobuf": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:0a18ed4a24198528f2333802eb075e59dea9d679ab7a6c5efb017a59004d849f",
|
"sha256:3c25e51e1359f1f5fa3b298faa6016e650d148f214db2e47671131b9063c53be",
|
||||||
"sha256:0eb32bfa5219fc8d4111803e9a690658aa2e6366384fd0851064b963b6d1f2a7",
|
"sha256:47cd320b7db63e8c9ac35f5596ea1c1e61491d8a8eb6d8b45edc44760b53a4f6",
|
||||||
"sha256:3ea51771449e1035f26069c4c7fd51fba990d07bc55ba80701c78f886bf9c888",
|
"sha256:535fb4e44d0236893d5cf1263a0f706f1160b689a7ab962e9da8a9ce4050b780",
|
||||||
"sha256:5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620",
|
"sha256:554d7e61cce2aa4c63ca27328f757a9f3867bce8ec213bf09096a8d16bcdcb6a",
|
||||||
"sha256:6ce8cc3389a20693bfde6c6562e03474c40851b44975c9b2bf6df7d8c4f864da",
|
"sha256:aa4f7dfaed0d840b03d08d14bfdb41348feaee06a828a8c455698234135b4075",
|
||||||
"sha256:84a57163a0ccef3f96e4b6a20516cedcf5bb3a95a657131c5c3ac62200d23252",
|
"sha256:b510f55ce60f84dc7febc619b47215b900466e3555ab8cb1ba42deb4496d6cc0",
|
||||||
"sha256:a4fa6f80816a9a0678429e84973f2f98cbc218cca434abe8db2ad0bffc98503a",
|
"sha256:ba0706f948d0195f5cac504da156d88174e03218d9364ab40d903788c1903d7e",
|
||||||
"sha256:a8434404bbf139aa9e1300dbf989667a83d42ddda9153d8ab76e0d5dcaca484e",
|
"sha256:e3083660225fa94748ac2e407f09a899e6a28bf9c0e70c75def8d15706bf85fc",
|
||||||
"sha256:b89c115d877892a512f79a8114564fb435943b59067615894c3b13cd3e1fa107",
|
"sha256:ed484f9ddd47f0f1bf0648806cccdb4fe2fb6b19820f9b79a5adf5dcfd1b8c5f"
|
||||||
"sha256:c027e08a08be10b67c06bf2370b99c811c466398c357e615ca88c91c07f0910f",
|
|
||||||
"sha256:daaf63f70f25e8689c072cfad4334ca0ac1d1e05a92fc15c54eb9cf23c3efd84"
|
|
||||||
],
|
],
|
||||||
"index": "pypi",
|
"index": "pypi",
|
||||||
"markers": "python_version >= '3.8'",
|
"markers": "python_version >= '3.9'",
|
||||||
"version": "==5.29.3"
|
"version": "==6.30.1"
|
||||||
},
|
},
|
||||||
"pyzbar": {
|
"pyzbar": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
@@ -530,12 +528,12 @@
|
|||||||
},
|
},
|
||||||
"pytest": {
|
"pytest": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6",
|
"sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
|
||||||
"sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"
|
"sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
|
||||||
],
|
],
|
||||||
"index": "pypi",
|
"index": "pypi",
|
||||||
"markers": "python_version >= '3.8'",
|
"markers": "python_version >= '3.8'",
|
||||||
"version": "==8.3.4"
|
"version": "==8.3.5"
|
||||||
},
|
},
|
||||||
"pytest-cov": {
|
"pytest-cov": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||

|

|
||||||
[](https://github.com/scito/extract_otp_secrets/blob/master/LICENSE)
|
[](https://github.com/scito/extract_otp_secrets/blob/master/LICENSE)
|
||||||
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
||||||

|

|
||||||
[](https://hub.docker.com/repository/docker/scit0/extract_otp_secrets/general)
|
[](https://hub.docker.com/repository/docker/scit0/extract_otp_secrets/general)
|
||||||
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
||||||
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
[](https://stand-with-ukraine.pp.ua)
|
[](https://stand-with-ukraine.pp.ua)
|
||||||
<!-- 
|
<!-- 
|
||||||
[](https://github.com/scito/extract_otp_secrets/blob/master/Pipfile.lock)
|
[](https://github.com/scito/extract_otp_secrets/blob/master/Pipfile.lock)
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- [](https://GitHub.com/scito/extract_otp_secrets/releases/) -->
|
<!-- [](https://GitHub.com/scito/extract_otp_secrets/releases/) -->
|
||||||
|
|
||||||
@@ -380,7 +380,7 @@ python extract_otp_secrets.py = < example_export.png</pre>
|
|||||||
* macOS
|
* macOS
|
||||||
* Windows
|
* Windows
|
||||||
* Uses UTF-8 on all platforms
|
* Uses UTF-8 on all platforms
|
||||||
* Supports Python >= 3.8
|
* Supports Python >= 3.9
|
||||||
* Installation of shared system libraries is optional (🆕 since v2.3)
|
* Installation of shared system libraries is optional (🆕 since v2.3)
|
||||||
* Provides a debug mode (-d) for analyzing import problems
|
* Provides a debug mode (-d) for analyzing import problems
|
||||||
* Written in modern Python using type hints and following best practices
|
* Written in modern Python using type hints and following best practices
|
||||||
@@ -729,7 +729,7 @@ Command for regeneration of Python code from proto3 message definition file (onl
|
|||||||
|
|
||||||
protoc --plugin=protoc-gen-mypy=path/to/protoc-gen-mypy --python_out=src/protobuf_generated_python --mypy_out=src/protobuf_generated_python src/google_auth.proto
|
protoc --plugin=protoc-gen-mypy=path/to/protoc-gen-mypy --python_out=src/protobuf_generated_python --mypy_out=src/protobuf_generated_python src/google_auth.proto
|
||||||
|
|
||||||
The generated protobuf Python code was generated by protoc 29.3 (https://github.com/protocolbuffers/protobuf/releases/tag/v29.3).
|
The generated protobuf Python code was generated by protoc 30.1 (https://github.com/protocolbuffers/protobuf/releases/tag/v30.1).
|
||||||
|
|
||||||
For Python type hint generation the [mypy-protobuf](https://github.com/nipunn1313/mypy-protobuf) package is used.
|
For Python type hint generation the [mypy-protobuf](https://github.com/nipunn1313/mypy-protobuf) package is used.
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ classifiers = [
|
|||||||
"Topic :: Utilities",
|
"Topic :: Utilities",
|
||||||
"Topic :: Security",
|
"Topic :: Security",
|
||||||
"Topic :: Multimedia :: Graphics :: Capture :: Digital Camera",
|
"Topic :: Multimedia :: Graphics :: Capture :: Digital Camera",
|
||||||
"Programming Language :: Python :: 3.8",
|
|
||||||
"Programming Language :: Python :: 3.9",
|
"Programming Language :: Python :: 3.9",
|
||||||
"Programming Language :: Python :: 3.10",
|
"Programming Language :: Python :: 3.10",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
@@ -55,7 +54,7 @@ license = {text = "GNU General Public License v3 (GPLv3)"}
|
|||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
authors = [{name = "scito", email = "info@scito.ch"}]
|
authors = [{name = "scito", email = "info@scito.ch"}]
|
||||||
maintainers = [{name = "scito", email = "info@scito.ch"}]
|
maintainers = [{name = "scito", email = "info@scito.ch"}]
|
||||||
requires-python = ">=3.8, <4"
|
requires-python = ">=3.9, <4"
|
||||||
scripts = {extract_otp_secrets = "extract_otp_secrets:sys_main"}
|
scripts = {extract_otp_secrets = "extract_otp_secrets:sys_main"}
|
||||||
urls = {Project-URL = "https://github.com/scito/extract_otp_secrets", Bug-Reports = "https://github.com/scito/extract_otp_secrets/issues", Source = "https://github.com/scito/extract_otp_secrets"}
|
urls = {Project-URL = "https://github.com/scito/extract_otp_secrets", Bug-Reports = "https://github.com/scito/extract_otp_secrets/issues", Source = "https://github.com/scito/extract_otp_secrets"}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||||
# NO CHECKED-IN PROTOBUF GENCODE
|
# NO CHECKED-IN PROTOBUF GENCODE
|
||||||
# source: google_auth.proto
|
# source: google_auth.proto
|
||||||
# Protobuf Python Version: 5.29.3
|
# Protobuf Python Version: 6.30.1
|
||||||
"""Generated protocol buffer code."""
|
"""Generated protocol buffer code."""
|
||||||
from google.protobuf import descriptor as _descriptor
|
from google.protobuf import descriptor as _descriptor
|
||||||
from google.protobuf import descriptor_pool as _descriptor_pool
|
from google.protobuf import descriptor_pool as _descriptor_pool
|
||||||
@@ -11,9 +11,9 @@ from google.protobuf import symbol_database as _symbol_database
|
|||||||
from google.protobuf.internal import builder as _builder
|
from google.protobuf.internal import builder as _builder
|
||||||
_runtime_version.ValidateProtobufRuntimeVersion(
|
_runtime_version.ValidateProtobufRuntimeVersion(
|
||||||
_runtime_version.Domain.PUBLIC,
|
_runtime_version.Domain.PUBLIC,
|
||||||
5,
|
6,
|
||||||
29,
|
30,
|
||||||
3,
|
1,
|
||||||
'',
|
'',
|
||||||
'google_auth.proto'
|
'google_auth.proto'
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user