diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c4f2ee1726a..2cfff788538 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,6 +7,7 @@ "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", "postCreateCommand": "/docker-init.sh", + "postStartCommand": "/docker-start.sh", "containerEnv": { "EDITOR_VSCODE": "true" }, @@ -22,7 +23,7 @@ "dbaeumer.vscode-eslint", "eamodio.gitlens", "editorconfig.editorconfig", - "vue.volar", + "vue.volar@2.2.10", "mrmlnc.vscode-duplicate", "ms-azuretools.vscode-docker", "ms-playwright.playwright", @@ -32,23 +33,16 @@ "oderwat.indent-rainbow", "redhat.vscode-yaml", "spmeesseman.vscode-taskexplorer", - "visualstudioexptteam.vscodeintellicode" + "ms-python.pylint", + "charliermarsh.ruff" ], "settings": { "terminal.integrated.defaultProfile.linux": "zsh", "python.pythonPath": "/usr/local/bin/python", "python.languageServer": "Default", - "python.linting.enabled": true, - "python.linting.pylintEnabled": true, "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", "python.formatting.blackPath": "/usr/local/py-utils/bin/black", "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", - "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", - "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", - "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", - "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", - "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", - "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint", "python.testing.pytestArgs": [ "ietf" ], @@ -66,7 +60,7 @@ }, // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [8000, 5432, 5433], + "forwardPorts": [3000, 5432, 8000], "portsAttributes": { "3000": { @@ -77,13 +71,13 @@ "label": "PostgreSQL", "onAutoForward": "silent" }, - "5433": { - "label": "pgAdmin", - "onAutoForward": "silent" - }, "8000": { - "label": "Datatracker", + "label": "NGINX", "onAutoForward": "notify" + }, + "8001": { + "label": "Datatracker", + "onAutoForward": "ignore" } }, diff --git a/.devcontainer/docker-compose.extend.yml b/.devcontainer/docker-compose.extend.yml index b9b5a2764d8..a92f42bc6d4 100644 --- a/.devcontainer/docker-compose.extend.yml +++ b/.devcontainer/docker-compose.extend.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: app: environment: @@ -14,9 +12,10 @@ services: # - datatracker-vscode-ext:/root/.vscode-server/extensions # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. network_mode: service:db - - pgadmin: - network_mode: service:db + blobstore: + ports: + - '9000' + - '9001' volumes: datatracker-vscode-ext: diff --git a/.editorconfig b/.editorconfig index d6eafe8d8f2..7e5ce6236af 100644 --- a/.editorconfig +++ b/.editorconfig @@ -50,3 +50,9 @@ indent_size = 2 [ietf/**.html] insert_final_newline = false + +# Settings for Kubernetes yaml +# --------------------------------------------------------- +# Use 2-space indents +[k8s/**.yaml] +indent_size = 2 diff --git a/.gitattributes b/.gitattributes index 937c0eb3795..62f4aae4323 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,280 @@ -/.yarn/releases/** binary -/.yarn/plugins/** binary +# Auto detect text files and perform LF normalization +* text=auto + +# --------------------------------------------------- +# Python Projects +# --------------------------------------------------- + +# Source files +*.pxd text diff=python +*.py text diff=python +*.py3 text diff=python +*.pyw text diff=python +*.pyx text diff=python +*.pyz text diff=python +*.pyi text diff=python + +# Binary files +*.db binary +*.p binary +*.pkl binary +*.pickle binary +*.pyc binary export-ignore +*.pyo binary export-ignore +*.pyd binary + +# Jupyter notebook +*.ipynb text eol=lf + +# --------------------------------------------------- +# Web Projects +# --------------------------------------------------- + +# Source code +*.bash text eol=lf +*.bat text eol=crlf +*.cmd text eol=crlf +*.coffee text +*.css text diff=css +*.htm text diff=html +*.html text diff=html +*.inc text +*.ini text +*.js text +*.mjs text +*.cjs text +*.json text +*.jsx text +*.less text +*.ls text +*.map text -diff +*.od text +*.onlydata text +*.php text diff=php +*.pl text +*.ps1 text eol=crlf +*.py text diff=python +*.rb text diff=ruby +*.sass text +*.scm text +*.scss text diff=css +*.sh text eol=lf +.husky/* text eol=lf +*.sql text +*.styl text +*.tag text +*.ts text +*.tsx text +*.xml text +*.xhtml text diff=html + +# Docker +Dockerfile text + +# Documentation +*.ipynb text eol=lf +*.markdown text diff=markdown +*.md text diff=markdown +*.mdwn text diff=markdown +*.mdown text diff=markdown +*.mkd text diff=markdown +*.mkdn text diff=markdown +*.mdtxt text +*.mdtext text +*.txt text +AUTHORS text +CHANGELOG text +CHANGES text +CONTRIBUTING text +COPYING text +copyright text +*COPYRIGHT* text +INSTALL text +license text +LICENSE text +NEWS text +readme text +*README* text +TODO text + +# Templates +*.dot text +*.ejs text +*.erb text +*.haml text +*.handlebars text +*.hbs text +*.hbt text +*.jade text +*.latte text +*.mustache text +*.njk text +*.phtml text +*.pug text +*.svelte text +*.tmpl text +*.tpl text +*.twig text +*.vue text + +# Configs +*.cnf text +*.conf text +*.config text +.editorconfig text +.env text +.gitattributes text +.gitconfig text +.htaccess text +*.lock text -diff +package.json text eol=lf +package-lock.json text eol=lf -diff +pnpm-lock.yaml text eol=lf -diff +.prettierrc text +yarn.lock text -diff +*.toml text +*.yaml text +*.yml text +browserslist text +Makefile text +makefile text +# Fixes syntax highlighting on GitHub to allow comments +tsconfig.json linguist-language=JSON-with-Comments + +# Heroku +Procfile text + +# Graphics +*.ai binary +*.bmp binary +*.eps binary +*.gif binary +*.gifv binary +*.ico binary +*.jng binary +*.jp2 binary +*.jpg binary +*.jpeg binary +*.jpx binary +*.jxr binary +*.pdf binary +*.png binary +*.psb binary +*.psd binary +*.svg text +*.svgz binary +*.tif binary +*.tiff binary +*.wbmp binary +*.webp binary + +# Audio +*.kar binary +*.m4a binary +*.mid binary +*.midi binary +*.mp3 binary +*.ogg binary +*.ra binary + +# Video +*.3gpp binary +*.3gp binary +*.as binary +*.asf binary +*.asx binary +*.avi binary +*.fla binary +*.flv binary +*.m4v binary +*.mng binary +*.mov binary +*.mp4 binary +*.mpeg binary +*.mpg binary +*.ogv binary +*.swc binary +*.swf binary +*.webm binary + +# Archives +*.7z binary +*.gz binary +*.jar binary +*.rar binary +*.tar binary +*.zip binary + +# Fonts +*.ttf binary +*.eot binary +*.otf binary +*.woff binary +*.woff2 binary + +# Executables +*.exe binary +*.pyc binary +# Prevents massive diffs caused by vendored, minified files +**/.yarn/releases/** binary +**/.yarn/plugins/** binary + +# RC files (like .babelrc or .eslintrc) +*.*rc text + +# Ignore files (like .npmignore or .gitignore) +*.*ignore text + +# Prevents massive diffs from built files +dist/* binary + +# --------------------------------------------------- +# Common +# --------------------------------------------------- + +# Documents +*.bibtex text diff=bibtex +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text diff=markdown +*.mdx text diff=markdown +*.tex text diff=tex +*.adoc text +*.textile text +*.mustache text +*.csv text eol=crlf +*.tab text +*.tsv text +*.txt text +*.sql text +*.epub diff=astextplain + +# Text files where line endings should be preserved +*.patch -text + +# --------------------------------------------------- +# Vzic specific +# --------------------------------------------------- + +*.pl text diff=perl +*.pm text diff=perl + +# C/C++ +*.c text diff=cpp +*.cc text diff=cpp +*.cxx text diff=cpp +*.cpp text diff=cpp +*.cpi text diff=cpp +*.c++ text diff=cpp +*.hpp text diff=cpp +*.h text diff=cpp +*.h++ text diff=cpp +*.hh text diff=cpp \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 5e27af9fed9..320614b17ec 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,8 @@ -blank_issues_enabled: false -contact_links: - - name: Help and questions - url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions - about: Need help? Have a question on setting up the project or its usage? - - name: Discuss new ideas - url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas - about: Submit ideas for new features or improvements to be discussed. +blank_issues_enabled: false +contact_links: + - name: Help and questions + url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions + about: Need help? Have a question on setting up the project or its usage? + - name: Discuss new ideas + url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas + about: Submit ideas for new features or improvements to be discussed. diff --git a/.github/ISSUE_TEMPLATE/new-feature.yml b/.github/ISSUE_TEMPLATE/new-feature.yml index ddf0b575e84..285081e1c8b 100644 --- a/.github/ISSUE_TEMPLATE/new-feature.yml +++ b/.github/ISSUE_TEMPLATE/new-feature.yml @@ -1,6 +1,7 @@ name: Suggest new feature or enhancement description: Propose a new idea to be implemented. labels: ["enhancement"] +type: Feature body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.yml b/.github/ISSUE_TEMPLATE/report-a-bug.yml index d5b725d7213..47fa1185b40 100644 --- a/.github/ISSUE_TEMPLATE/report-a-bug.yml +++ b/.github/ISSUE_TEMPLATE/report-a-bug.yml @@ -1,6 +1,7 @@ name: Report a Datatracker bug description: Something in the datatracker's behavior isn't right? File a bug report. Don't use this to report RFC errata or issues with the content of Internet-Drafts. labels: ["bug"] +type: Bug body: - type: markdown attributes: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4687d04aa9a..17d89f1aab6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,3 +17,45 @@ updates: directory: "/" schedule: interval: "weekly" + reviewers: + - "rjsparks" + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + groups: + yarn: + patterns: + - "*" + - package-ecosystem: "npm" + directory: "/playwright" + schedule: + interval: "weekly" + groups: + npm: + patterns: + - "*" + - package-ecosystem: "npm" + directory: "/dev/coverage-action" + schedule: + interval: "weekly" + groups: + npm: + patterns: + - "*" + - package-ecosystem: "npm" + directory: "/dev/deploy-to-container" + schedule: + interval: "weekly" + groups: + npm: + patterns: + - "*" + - package-ecosystem: "npm" + directory: "/dev/diff" + schedule: + interval: "weekly" + groups: + npm: + patterns: + - "*" diff --git a/.github/workflows/build-base-app.yml b/.github/workflows/build-base-app.yml index 1be6d802fd9..4a4394fca0c 100644 --- a/.github/workflows/build-base-app.yml +++ b/.github/workflows/build-base-app.yml @@ -1,42 +1,67 @@ -name: Build Base App Docker Image - -on: - push: - branches: - - 'main' - paths: - - 'docker/base.Dockerfile' - - workflow_dispatch: - -jobs: - publish: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Docker Build & Push - uses: docker/build-push-action@v4 - with: - context: . - file: docker/base.Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ghcr.io/ietf-tools/datatracker-app-base:latest +name: Build Base App Docker Image + +on: + push: + branches: + - 'main' + paths: + - 'docker/base.Dockerfile' + - 'requirements.txt' + + workflow_dispatch: + +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: write + packages: write + + steps: + - uses: actions/checkout@v4 + with: + token: ${{ secrets.GH_COMMON_TOKEN }} + + - name: Set Version + run: | + printf -v CURDATE '%(%Y%m%dT%H%M)T' -1 + echo "IMGVERSION=$CURDATE" >> $GITHUB_ENV + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Docker Build & Push + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false + with: + context: . + file: docker/base.Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: | + ghcr.io/ietf-tools/datatracker-app-base:${{ env.IMGVERSION }} + ghcr.io/ietf-tools/datatracker-app-base:py312 + ${{ github.ref == 'refs/heads/main' && 'ghcr.io/ietf-tools/datatracker-app-base:latest' || '' }} + + - name: Update version references + run: | + sed -i "1s/.*/FROM ghcr.io\/ietf-tools\/datatracker-app-base:${{ env.IMGVERSION }}/" dev/build/Dockerfile + echo "${{ env.IMGVERSION }}" > dev/build/TARGET_BASE + + - name: Commit CHANGELOG.md + uses: stefanzweifel/git-auto-commit-action@v6 + with: + branch: ${{ github.ref_name }} + commit_message: 'ci: update base image target version to ${{ env.IMGVERSION }}' + file_pattern: dev/build/Dockerfile dev/build/TARGET_BASE diff --git a/.github/workflows/build-celery-worker.yml b/.github/workflows/build-celery-worker.yml deleted file mode 100644 index be0fc131a50..00000000000 --- a/.github/workflows/build-celery-worker.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build Celery Worker Docker Image - -on: - push: - branches: - - 'main' - paths: - - 'requirements.txt' - - 'dev/celery/**' - - '.github/workflows/build-celery-worker.yml' - - workflow_dispatch: - -jobs: - publish: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Docker Build & Push - uses: docker/build-push-action@v4 - with: - context: . - file: dev/celery/Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ghcr.io/ietf-tools/datatracker-celery:latest - diff --git a/.github/workflows/build-devblobstore.yml b/.github/workflows/build-devblobstore.yml new file mode 100644 index 00000000000..f49a11af19c --- /dev/null +++ b/.github/workflows/build-devblobstore.yml @@ -0,0 +1,47 @@ +name: Build Dev/Test Blobstore Docker Image + +on: + push: + branches: + - 'main' + paths: + - '.github/workflows/build-devblobstore.yml' + + workflow_dispatch: + +env: + MINIO_VERSION: latest + +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Docker Build & Push + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false + with: + context: . + file: docker/devblobstore.Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + build-args: MINIO_VERSION=${{ env.MINIO_VERSION }} + tags: | + ghcr.io/ietf-tools/datatracker-devblobstore:${{ env.MINIO_VERSION }} + ghcr.io/ietf-tools/datatracker-devblobstore:latest diff --git a/.github/workflows/build-mq-broker.yml b/.github/workflows/build-mq-broker.yml index 03df98d123e..4de861dbcd3 100644 --- a/.github/workflows/build-mq-broker.yml +++ b/.github/workflows/build-mq-broker.yml @@ -8,7 +8,13 @@ on: - 'dev/mq/**' - '.github/workflows/build-mq-broker.yml' - workflow_dispatch: + workflow_dispatch: + inputs: + rabbitmq_version: + description: 'RabbitMQ Version' + default: '3.13-alpine' + required: true + type: string jobs: publish: @@ -18,27 +24,31 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker Build & Push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false with: context: . file: dev/mq/Dockerfile platforms: linux/amd64,linux/arm64 push: true - tags: ghcr.io/ietf-tools/datatracker-mq:latest - + build-args: RABBITMQ_VERSION=${{ inputs.rabbitmq_version }} + tags: | + ghcr.io/ietf-tools/datatracker-mq:${{ inputs.rabbitmq_version }} + ghcr.io/ietf-tools/datatracker-mq:latest diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2ac8bd7ae3..5e91445202b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,26 +7,35 @@ on: workflow_dispatch: inputs: - summary: - description: 'Release Summary' - required: false - type: string - default: '' - sandbox: - description: 'Deploy to Sandbox' + deploy: + description: 'Deploy to K8S' + default: 'Skip' + required: true + type: choice + options: + - Skip + - Staging Only + - Staging + Prod + dev: + description: 'Deploy to Dev' default: true required: true type: boolean - legacySandbox: - description: 'Deploy to Legacy Sandbox' + devNoDbRefresh: + description: 'Dev Disable Daily DB Refresh' default: false - required: false + required: true type: boolean skiptests: description: 'Skip Tests' default: false required: true type: boolean + skiparm: + description: 'Skip ARM64 Build' + default: false + required: true + type: boolean ignoreLowerCoverage: description: 'Ignore Lower Coverage' default: false @@ -38,6 +47,10 @@ on: required: true type: boolean +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: # ----------------------------------------------------------------- # PREPARE @@ -50,259 +63,147 @@ jobs: pkg_version: ${{ steps.buildvars.outputs.pkg_version }} from_tag: ${{ steps.semver.outputs.nextStrict }} to_tag: ${{ steps.semver.outputs.current }} + base_image_version: ${{ steps.baseimgversion.outputs.base_image_version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 1 + fetch-tags: false - - name: Get Next Version + - name: Get Next Version (Prod) if: ${{ github.ref_name == 'release' }} id: semver uses: ietf-tools/semver-action@v1 with: token: ${{ github.token }} - branch: main + branch: release skipInvalidTags: true - - - name: Set Next Version Env Var + patchList: fix, bugfix, perf, refactor, test, tests, chore + + - name: Get Dev Version + if: ${{ github.ref_name != 'release' }} + id: semverdev + uses: ietf-tools/semver-action@v1 + with: + token: ${{ github.token }} + branch: release + skipInvalidTags: true + noVersionBumpBehavior: 'current' + noNewCommitBehavior: 'current' + + - name: Set Release Flag if: ${{ github.ref_name == 'release' }} run: | - echo "NEXT_VERSION=$nextStrict" >> $GITHUB_ENV + echo "IS_RELEASE=true" >> $GITHUB_ENV - name: Create Draft Release - uses: ncipollo/release-action@v1.12.0 + uses: ncipollo/release-action@v1.18.0 if: ${{ github.ref_name == 'release' }} with: prerelease: true draft: false commit: ${{ github.sha }} - tag: ${{ env.NEXT_VERSION }} - name: ${{ env.NEXT_VERSION }} + tag: ${{ steps.semver.outputs.nextStrict }} + name: ${{ steps.semver.outputs.nextStrict }} body: '*pending*' token: ${{ secrets.GITHUB_TOKEN }} - name: Set Build Variables id: buildvars run: | - if [[ $NEXT_VERSION ]]; then - echo "Using AUTO SEMVER mode: $NEXT_VERSION" + if [[ $IS_RELEASE ]]; then + echo "Using AUTO SEMVER mode: ${{ steps.semver.outputs.nextStrict }}" echo "should_deploy=true" >> $GITHUB_OUTPUT - echo "pkg_version=$NEXT_VERSION" >> $GITHUB_OUTPUT - echo "::notice::Release $NEXT_VERSION created using branch $GITHUB_REF_NAME" + echo "pkg_version=${{ steps.semver.outputs.nextStrict }}" >> $GITHUB_OUTPUT + echo "::notice::Release ${{ steps.semver.outputs.nextStrict }} created using branch $GITHUB_REF_NAME" else - echo "Using TEST mode: 10.0.0-dev.$GITHUB_RUN_NUMBER" + echo "Using TEST mode: ${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER" echo "should_deploy=false" >> $GITHUB_OUTPUT - echo "pkg_version=10.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_OUTPUT - echo "::notice::Non-production build 10.0.0-dev.$GITHUB_RUN_NUMBER created using branch $GITHUB_REF_NAME" + echo "pkg_version=${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_OUTPUT + echo "::notice::Non-production build ${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER created using branch $GITHUB_REF_NAME" fi + - name: Get Base Image Target Version + id: baseimgversion + run: | + echo "base_image_version=$(sed -n '1p' dev/build/TARGET_BASE)" >> $GITHUB_OUTPUT + # ----------------------------------------------------------------- # TESTS # ----------------------------------------------------------------- - tests-python: - name: Run Tests (Python) + + tests: + name: Run Tests + uses: ./.github/workflows/tests.yml if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} needs: [prepare] - runs-on: ubuntu-latest - container: ghcr.io/ietf-tools/datatracker-app-base:latest - - services: - db: - image: ghcr.io/ietf-tools/datatracker-db:latest - - steps: - - uses: actions/checkout@v3 - - - name: Prepare for tests - run: | - chmod +x ./dev/tests/prepare.sh - sh ./dev/tests/prepare.sh - - - name: Ensure DB is ready - run: | - /usr/local/bin/wait-for db:5432 -- echo "DB ready" - - - name: Run all tests - shell: bash - run: | - echo "Running checks..." - ./ietf/manage.py check - ./ietf/manage.py migrate --fake-initial - echo "Validating migrations..." - if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then - echo "Model changes without migrations found." - exit 1 - fi - echo "Running tests..." - if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then - echo "Lower coverage failures will be ignored." - ./ietf/manage.py test --settings=settings_postgrestest --ignore-lower-coverage - else - ./ietf/manage.py test --settings=settings_postgrestest - fi - coverage xml - - - name: Upload Coverage Results to Codecov - uses: codecov/codecov-action@v3.1.3 - with: - files: coverage.xml - - - name: Convert Coverage Results - if: ${{ always() }} - run: | - mv latest-coverage.json coverage.json - - - name: Upload Coverage Results as Build Artifact - uses: actions/upload-artifact@v3 - if: ${{ always() }} - with: - name: coverage - path: coverage.json + secrets: inherit + with: + ignoreLowerCoverage: ${{ github.event.inputs.ignoreLowerCoverage == 'true' }} + skipSelenium: true + targetBaseVersion: ${{ needs.prepare.outputs.base_image_version }} - tests-playwright: - name: Run Tests (Playwright) - if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} - needs: [prepare] - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - project: [chromium, firefox] - - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-node@v3 - with: - node-version: '18' - - - name: Run all tests - run: | - echo "Installing dependencies..." - yarn - echo "Installing Playwright..." - cd playwright - mkdir test-results - npm ci - npx playwright install --with-deps ${{ matrix.project }} - echo "Running tests..." - npx playwright test --project=${{ matrix.project }} - - - name: Upload Report - uses: actions/upload-artifact@v3 - if: ${{ always() }} - continue-on-error: true - with: - name: playwright-results-${{ matrix.project }} - path: playwright/test-results/ - if-no-files-found: ignore - - tests-playwright-legacy: - name: Run Tests (Playwright Legacy) - if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} - needs: [prepare] - runs-on: ubuntu-latest - container: ghcr.io/ietf-tools/datatracker-app-base:latest - strategy: - fail-fast: false - matrix: - project: [chromium, firefox] - - services: - db: - image: ghcr.io/ietf-tools/datatracker-db:latest - - steps: - - uses: actions/checkout@v3 - - - name: Prepare for tests - run: | - chmod +x ./dev/tests/prepare.sh - sh ./dev/tests/prepare.sh - - - name: Ensure DB is ready - run: | - /usr/local/bin/wait-for db:5432 -- echo "DB ready" - - - name: Start Datatracker - run: | - echo "Running checks..." - ./ietf/manage.py check - echo "Starting datatracker..." - ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local & - echo "Waiting for datatracker to be ready..." - /usr/local/bin/wait-for localhost:8000 -- echo "Datatracker ready" - - - name: Run all tests - env: - # Required to get firefox to run as root: - HOME: "" - run: | - echo "Installing dependencies..." - yarn - echo "Installing Playwright..." - cd playwright - mkdir test-results - npm ci - npx playwright install --with-deps ${{ matrix.project }} - echo "Running tests..." - npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js - - - name: Upload Report - uses: actions/upload-artifact@v3 - if: ${{ always() }} - continue-on-error: true - with: - name: playwright-legacy-results-${{ matrix.project }} - path: playwright/test-results/ - if-no-files-found: ignore - # ----------------------------------------------------------------- # RELEASE # ----------------------------------------------------------------- release: name: Make Release if: ${{ !failure() && !cancelled() }} - needs: [tests-python, tests-playwright, tests-playwright-legacy, prepare] - runs-on: ubuntu-latest + needs: [tests, prepare] + runs-on: + group: hperf-8c32r + permissions: + contents: write + packages: write env: SHOULD_DEPLOY: ${{needs.prepare.outputs.should_deploy}} PKG_VERSION: ${{needs.prepare.outputs.pkg_version}} FROM_TAG: ${{needs.prepare.outputs.from_tag}} TO_TAG: ${{needs.prepare.outputs.to_tag}} + TARGET_BASE: ${{needs.prepare.outputs.base_image_version}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - fetch-depth: 0 - - - name: Setup Node.js - uses: actions/setup-node@v3 + fetch-depth: 1 + fetch-tags: false + + - name: Setup Node.js environment + uses: actions/setup-node@v6 with: - node-version: '16' - + node-version: 18.x + - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.x' - + python-version: "3.x" + + - name: Setup AWS CLI + uses: unfor19/install-aws-cli-action@v1 + with: + version: 2.22.35 + - name: Download a Coverage Results if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} - uses: actions/download-artifact@v3.0.2 + uses: actions/download-artifact@v4.3.0 with: name: coverage - name: Make Release Build env: DEBIAN_FRONTEND: noninteractive + BROWSERSLIST_IGNORE_OLD_DATA: 1 run: | echo "PKG_VERSION: $PKG_VERSION" echo "GITHUB_SHA: $GITHUB_SHA" echo "GITHUB_REF_NAME: $GITHUB_REF_NAME" - echo "Running build script..." - chmod +x ./dev/deploy/build.sh - sh ./dev/deploy/build.sh + echo "Running frontend build script..." + echo "Compiling native node packages..." + yarn rebuild + echo "Packaging static assets..." + yarn build --base=https://static.ietf.org/dt/$PKG_VERSION/ + yarn legacy:build echo "Setting version $PKG_VERSION..." sed -i -r -e "s|^__version__ += '.*'$|__version__ = '$PKG_VERSION'|" ietf/__init__.py sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py @@ -320,8 +221,64 @@ jobs: run: | echo "Build release tarball..." mkdir -p /home/runner/work/release - tar -czf /home/runner/work/release/release.tar.gz -X dev/deploy/exclude-patterns.txt . - + tar -czf /home/runner/work/release/release.tar.gz -X dev/build/exclude-patterns.txt . + + - name: Collect + Push Statics + env: + DEBIAN_FRONTEND: noninteractive + AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_STATIC_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_STATIC_KEY_SECRET }} + AWS_DEFAULT_REGION: auto + AWS_ENDPOINT_URL: ${{ secrets.CF_R2_ENDPOINT }} + run: | + echo "Collecting statics..." + echo "Using ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }}" + docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }} sh dev/build/collectstatics.sh + echo "Pushing statics..." + cd static + aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors + + - name: Augment dockerignore for docker image build + env: + DEBIAN_FRONTEND: noninteractive + run: | + cat >> .dockerignore <> $GITHUB_ENV + + - name: Build Images + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false + with: + context: . + file: dev/build/Dockerfile + platforms: ${{ github.event.inputs.skiparm == 'true' && 'linux/amd64' || 'linux/amd64,linux/arm64' }} + push: true + tags: | + ghcr.io/ietf-tools/datatracker:${{ env.PKG_VERSION }} + ${{ env.FEATURE_LATEST_TAG && format('ghcr.io/ietf-tools/datatracker:{0}-latest', env.FEATURE_LATEST_TAG) || null }} + - name: Update CHANGELOG id: changelog uses: Requarks/changelog-action@v1 @@ -332,6 +289,12 @@ jobs: toTag: ${{ env.TO_TAG }} writeToFile: false + - name: Download Coverage Results + if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} + uses: actions/download-artifact@v4.3.0 + with: + name: coverage + - name: Prepare Coverage Action if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }} working-directory: ./dev/coverage-action @@ -347,12 +310,12 @@ jobs: repoCommon: common version: ${{needs.prepare.outputs.pkg_version}} changelog: ${{ steps.changelog.outputs.changes }} - summary: ${{ github.event.inputs.summary }} + summary: '' coverageResultsPath: coverage.json histCoveragePath: historical-coverage.json - name: Create Release - uses: ncipollo/release-action@v1.12.0 + uses: ncipollo/release-action@v1.18.0 if: ${{ env.SHOULD_DEPLOY == 'true' }} with: allowUpdates: true @@ -365,8 +328,8 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Update Baseline Coverage - uses: ncipollo/release-action@v1.12.0 - if: ${{ github.event.inputs.updateCoverage == 'true' }} + uses: ncipollo/release-action@v1.18.0 + if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }} with: allowUpdates: true tag: baseline @@ -378,7 +341,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Upload Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: release-${{ env.PKG_VERSION }} path: /home/runner/work/release/release.tar.gz @@ -389,7 +352,7 @@ jobs: notify: name: Notify if: ${{ always() }} - needs: [prepare, tests-python, tests-playwright, tests-playwright-legacy, release] + needs: [prepare, tests, release] runs-on: ubuntu-latest env: PKG_VERSION: ${{needs.prepare.outputs.pkg_version}} @@ -397,146 +360,139 @@ jobs: steps: - name: Notify on Slack (Success) if: ${{ !contains(join(needs.*.result, ','), 'failure') }} - uses: slackapi/slack-github-action@v1.23.0 + uses: slackapi/slack-github-action@v2 with: - channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }} + token: ${{ secrets.SLACK_GH_BOT }} + method: chat.postMessage payload: | - { - "text": "Datatracker Build by ${{ github.triggering_actor }} - <@${{ secrets.SLACK_UID_RJSPARKS }}>", - "attachments": [ - { - "color": "28a745", - "fields": [ - { - "title": "Status", - "short": true, - "value": "Completed" - } - ] - } - ] - } - env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_GH_BOT }} + channel: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }} + text: "Datatracker Build by ${{ github.triggering_actor }}" + attachments: + - color: "28a745" + fields: + - title: "Status" + short: true + value: "Completed" - name: Notify on Slack (Failure) if: ${{ contains(join(needs.*.result, ','), 'failure') }} - uses: slackapi/slack-github-action@v1.23.0 + uses: slackapi/slack-github-action@v2 with: - channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }} + token: ${{ secrets.SLACK_GH_BOT }} + method: chat.postMessage payload: | - { - "text": "Datatracker Build by ${{ github.triggering_actor }} - <@${{ secrets.SLACK_UID_RJSPARKS }}>", - "attachments": [ - { - "color": "a82929", - "fields": [ - { - "title": "Status", - "short": true, - "value": "Failed" - } - ] - } - ] - } - env: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_GH_BOT }} + channel: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }} + text: "Datatracker Build by ${{ github.triggering_actor }}" + attachments: + - color: "a82929" + fields: + - title: "Status" + short: true + value: "Failed" # ----------------------------------------------------------------- - # SANDBOX + # DEV # ----------------------------------------------------------------- - sandbox: - name: Deploy to Sandbox - if: ${{ !failure() && !cancelled() && github.event.inputs.sandbox == 'true' }} + dev: + name: Deploy to Dev + if: ${{ !failure() && !cancelled() && github.event.inputs.dev == 'true' }} needs: [prepare, release] - runs-on: [self-hosted, dev-server] + runs-on: ubuntu-latest environment: - name: sandbox + name: dev env: PKG_VERSION: ${{needs.prepare.outputs.pkg_version}} steps: - - uses: actions/checkout@v3 - - - name: Download a Release Artifact - uses: actions/download-artifact@v3.0.2 - with: - name: release-${{ env.PKG_VERSION }} - - - name: Deploy to containers - env: - DEBIAN_FRONTEND: noninteractive - run: | - echo "Reset production flags in settings.py..." - sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = True/' -e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'development'/" ietf/settings.py - echo "Install Deploy to Container CLI dependencies..." - cd dev/deploy-to-container - npm ci - cd ../.. - echo "Start Deploy..." - node ./dev/deploy-to-container/cli.js --branch ${{ github.ref_name }} --domain dev.ietf.org --appversion ${{ env.PKG_VERSION }} --commit ${{ github.sha }} --ghrunid ${{ github.run_id }} - - - name: Cleanup old docker resources - env: - DEBIAN_FRONTEND: noninteractive - run: | - docker image prune -a -f - - legacySandbox: - name: Deploy to Legacy Sandbox - if: ${{ !failure() && !cancelled() && github.event.inputs.legacySandbox == 'true' }} + - uses: actions/checkout@v4 + with: + ref: main + + - name: Get Deploy Name + env: + DEBIAN_FRONTEND: noninteractive + run: | + echo "Install Get Deploy Name CLI dependencies..." + cd dev/k8s-get-deploy-name + npm ci + echo "Get Deploy Name..." + echo "DEPLOY_NAMESPACE=$(node cli.js --branch ${{ github.ref_name }})" >> "$GITHUB_ENV" + + - name: Deploy to dev + uses: the-actions-org/workflow-dispatch@v4 + with: + workflow: deploy-dev.yml + repo: ietf-tools/infra-k8s + ref: main + token: ${{ secrets.GH_INFRA_K8S_TOKEN }} + inputs: '{ "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}", "namespace":"${{ env.DEPLOY_NAMESPACE }}", "disableDailyDbRefresh":${{ inputs.devNoDbRefresh }} }' + wait-for-completion: true + wait-for-completion-timeout: 30m + wait-for-completion-interval: 30s + display-workflow-run-url: false + + # ----------------------------------------------------------------- + # STAGING + # ----------------------------------------------------------------- + staging: + name: Deploy to Staging + if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging Only' || github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }} needs: [prepare, release] - runs-on: [self-hosted, legacy-sandbox-server] + runs-on: ubuntu-latest environment: - name: legacy-sandbox - url: "https://sandbox.ietf.org" + name: staging env: PKG_VERSION: ${{needs.prepare.outputs.pkg_version}} steps: - - name: Download a Release Artifact - uses: actions/download-artifact@v3.0.2 - with: - name: release-${{ env.PKG_VERSION }} - path: /a/www/ietf-datatracker/main.dev.${{ github.run_number }} + - name: Refresh Staging DB + uses: the-actions-org/workflow-dispatch@v4 + with: + workflow: deploy-db.yml + repo: ietf-tools/infra-k8s + ref: main + token: ${{ secrets.GH_INFRA_K8S_TOKEN }} + inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "manifest":"postgres", "forceRecreate":true, "restoreToLastFullSnapshot":true, "waitClusterReady":true }' + wait-for-completion: true + wait-for-completion-timeout: 60m + wait-for-completion-interval: 20s + display-workflow-run-url: false - - name: Extract Release - env: - DEBIAN_FRONTEND: noninteractive - working-directory: /a/www/ietf-datatracker/main.dev.${{ github.run_number }} - run: | - echo "Extracting release tarball..." - tar xzf release.tar.gz - echo "Deleting release tarball..." - rm -rf release.tar.gz - - - name: Setup Environment - env: - DEBIAN_FRONTEND: noninteractive - working-directory: /a/www/ietf-datatracker/main.dev.${{ github.run_number }} - run: | - echo "Copying settings from previous deploy..." - cp ../web/ietf/settings_local.py ietf/ - rsync -a ../web/test/ test/ - echo "Installing Python dependencies..." - python3.9 -mvenv env - source env/bin/activate - pip install -r requirements.txt - pip freeze > frozen-requirements.txt - echo "Collecting static..." - ietf/manage.py collectstatic - echo "Running checks..." - ietf/manage.py check - - - name: Update Docker Containers - env: - DEBIAN_FRONTEND: noninteractive - working-directory: /a/docker/datatracker - run: | - echo "Pulling latest docker images..." - docker image tag ghcr.io/ietf-tools/datatracker-celery:latest datatracker-celery-fallback - docker image tag ghcr.io/ietf-tools/datatracker-mq:latest datatracker-mq-fallback - docker-compose pull - # echo "Shutting down containers..." - # docker-compose down -t 300 - + - name: Deploy to staging + uses: the-actions-org/workflow-dispatch@v4 + with: + workflow: deploy.yml + repo: ietf-tools/infra-k8s + ref: main + token: ${{ secrets.GH_INFRA_K8S_TOKEN }} + inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }' + wait-for-completion: true + wait-for-completion-timeout: 10m + wait-for-completion-interval: 30s + display-workflow-run-url: false + + # ----------------------------------------------------------------- + # PROD + # ----------------------------------------------------------------- + prod: + name: Deploy to Production + if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }} + needs: [prepare, staging] + runs-on: ubuntu-latest + environment: + name: production + env: + PKG_VERSION: ${{needs.prepare.outputs.pkg_version}} + + steps: + - name: Deploy to production + uses: the-actions-org/workflow-dispatch@v4 + with: + workflow: deploy.yml + repo: ietf-tools/infra-k8s + ref: main + token: ${{ secrets.GH_INFRA_K8S_TOKEN }} + inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }' + wait-for-completion: true + wait-for-completion-timeout: 10m + wait-for-completion-interval: 30s + display-workflow-run-url: false diff --git a/.github/workflows/ci-run-tests.yml b/.github/workflows/ci-run-tests.yml index caabc7511e6..278bd8af2f3 100644 --- a/.github/workflows/ci-run-tests.yml +++ b/.github/workflows/ci-run-tests.yml @@ -1,9 +1,10 @@ -name: Run All Tests +name: PR - Run All Tests on: pull_request: branches: - 'main' + - 'feat/rfc' paths: - 'client/**' - 'ietf/**' @@ -12,149 +13,34 @@ on: - 'package.json' jobs: - tests-python: - name: Run Tests (Python) + # ----------------------------------------------------------------- + # PREPARE + # ----------------------------------------------------------------- + prepare: + name: Prepare runs-on: ubuntu-latest - container: ghcr.io/ietf-tools/datatracker-app-base:latest - - services: - db: - image: ghcr.io/ietf-tools/datatracker-db:latest - - steps: - - uses: actions/checkout@v3 - - - name: Prepare for tests - run: | - chmod +x ./dev/tests/prepare.sh - sh ./dev/tests/prepare.sh - - - name: Ensure DB is ready - run: | - /usr/local/bin/wait-for db:5432 -- echo "DB ready" - - - name: Run all tests - run: | - echo "Running checks..." - ./ietf/manage.py check - ./ietf/manage.py migrate --fake-initial - echo "Validating migrations..." - if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then - echo "Model changes without migrations found." - echo ${MSG} - exit 1 - fi - echo "Running tests..." - ./ietf/manage.py test --settings=settings_postgrestest - coverage xml - - - name: Upload Coverage Results to Codecov - uses: codecov/codecov-action@v3.1.3 - with: - files: coverage.xml - - - name: Convert Coverage Results - if: ${{ always() }} - run: | - mv latest-coverage.json coverage.json - - - name: Upload Coverage Results as Build Artifact - uses: actions/upload-artifact@v3.0.0 - if: ${{ always() }} - with: - name: coverage - path: coverage.json - - tests-playwright: - name: Run Tests (Playwright) - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - project: [chromium, firefox] - - steps: - - uses: actions/checkout@v3 + outputs: + base_image_version: ${{ steps.baseimgversion.outputs.base_image_version }} - - uses: actions/setup-node@v3 + steps: + - uses: actions/checkout@v4 with: - node-version: '18' + fetch-depth: 1 + fetch-tags: false - - name: Run all tests + - name: Get Base Image Target Version + id: baseimgversion run: | - echo "Installing dependencies..." - yarn - echo "Installing Playwright..." - cd playwright - mkdir test-results - npm ci - npx playwright install --with-deps ${{ matrix.project }} - echo "Running tests..." - npx playwright test --project=${{ matrix.project }} - - - name: Upload Report - uses: actions/upload-artifact@v3.0.0 - if: ${{ always() }} - continue-on-error: true - with: - name: playwright-results-${{ matrix.project }} - path: playwright/test-results/ - if-no-files-found: ignore + echo "base_image_version=$(sed -n '1p' dev/build/TARGET_BASE)" >> $GITHUB_OUTPUT - tests-playwright-legacy: - name: Run Tests (Playwright Legacy) - runs-on: ubuntu-latest - container: ghcr.io/ietf-tools/datatracker-app-base:latest - strategy: - fail-fast: false - matrix: - project: [chromium, firefox] - - services: - db: - image: ghcr.io/ietf-tools/datatracker-db:latest - - steps: - - uses: actions/checkout@v3 - - - name: Prepare for tests - run: | - chmod +x ./dev/tests/prepare.sh - sh ./dev/tests/prepare.sh - - - name: Ensure DB is ready - run: | - /usr/local/bin/wait-for db:5432 -- echo "DB ready" - - - name: Start Datatracker - run: | - echo "Running checks..." - ./ietf/manage.py check - echo "Starting datatracker..." - ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local & - echo "Waiting for datatracker to be ready..." - /usr/local/bin/wait-for localhost:8000 -- echo "Datatracker ready" - - - name: Run all tests - env: - # Required to get firefox to run as root: - HOME: "" - run: | - echo "Installing dependencies..." - yarn - echo "Installing Playwright..." - cd playwright - mkdir test-results - npm ci - npx playwright install --with-deps ${{ matrix.project }} - echo "Running tests..." - npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js - - - name: Upload Report - uses: actions/upload-artifact@v3 - if: ${{ always() }} - continue-on-error: true - with: - name: playwright-legacy-results-${{ matrix.project }} - path: playwright/test-results/ - if-no-files-found: ignore + # ----------------------------------------------------------------- + # TESTS + # ----------------------------------------------------------------- + tests: + name: Run Tests + uses: ./.github/workflows/tests.yml + needs: [prepare] + with: + ignoreLowerCoverage: false + skipSelenium: true + targetBaseVersion: ${{ needs.prepare.outputs.base_image_version }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4bd7362c4a8..3444c03b5e0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,12 +26,12 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index b0dedc42e08..6d0683c471c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -15,6 +15,8 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 'Dependency Review' - uses: actions/dependency-review-action@v3 + uses: actions/dependency-review-action@v4 + with: + vulnerability-check: false diff --git a/.github/workflows/dev-assets-sync-nightly.yml b/.github/workflows/dev-assets-sync-nightly.yml index 582ba98f1a8..4cfbf6365b4 100644 --- a/.github/workflows/dev-assets-sync-nightly.yml +++ b/.github/workflows/dev-assets-sync-nightly.yml @@ -29,33 +29,21 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker Build & Push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 + env: + DOCKER_BUILD_SUMMARY: false with: context: . file: dev/shared-assets-sync/Dockerfile push: true tags: ghcr.io/ietf-tools/datatracker-rsync-assets:latest - - sync: - name: Run assets rsync - if: ${{ always() }} - runs-on: [self-hosted, dev-server] - needs: [build] - steps: - - name: Run rsync - env: - DEBIAN_FRONTEND: noninteractive - run: | - docker pull ghcr.io/ietf-tools/datatracker-rsync-assets:latest - docker run --rm -v dt-assets:/assets ghcr.io/ietf-tools/datatracker-rsync-assets:latest - docker image prune -a -f diff --git a/.github/workflows/sandbox-refresh.yml b/.github/workflows/sandbox-refresh.yml deleted file mode 100644 index 4d27b9c7429..00000000000 --- a/.github/workflows/sandbox-refresh.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Sandbox Refresh - -on: - # Run every night - schedule: - - cron: '0 9 * * *' - - workflow_dispatch: - -jobs: - main: - name: Refresh DBs - runs-on: [self-hosted, dev-server] - permissions: - contents: read - - steps: - - uses: actions/checkout@v3 - - - name: Refresh DBs - env: - DEBIAN_FRONTEND: noninteractive - run: | - echo "Install Deploy to Container CLI dependencies..." - cd dev/deploy-to-container - npm ci - cd ../.. - echo "Start Refresh..." - node ./dev/deploy-to-container/refresh.js - - - name: Cleanup old docker resources - env: - DEBIAN_FRONTEND: noninteractive - run: | - docker image prune -a -f diff --git a/.github/workflows/tests-az.yml b/.github/workflows/tests-az.yml new file mode 100644 index 00000000000..8553563a192 --- /dev/null +++ b/.github/workflows/tests-az.yml @@ -0,0 +1,109 @@ +name: Tests (Azure Test) + +on: + workflow_dispatch: + +jobs: + main: + name: Run Tests on Azure temp VM + runs-on: ubuntu-latest + + permissions: + contents: read + + steps: + - name: Launch VM on Azure + id: azlaunch + run: | + echo "Authenticating to Azure..." + az login --service-principal -u ${{ secrets.AZ_TESTS_APP_ID }} -p ${{ secrets.AZ_TESTS_PWD }} --tenant ${{ secrets.AZ_TESTS_TENANT_ID }} + echo "Creating VM..." + vminfo=$(az vm create \ + --resource-group ghaDatatrackerTests \ + --name tmpGhaVM2 \ + --image Ubuntu2204 \ + --admin-username azureuser \ + --generate-ssh-keys \ + --priority Spot \ + --size Standard_D4as_v5 \ + --max-price -1 \ + --os-disk-size-gb 30 \ + --eviction-policy Delete \ + --nic-delete-option Delete \ + --output tsv \ + --query "publicIpAddress") + echo "ipaddr=$vminfo" >> "$GITHUB_OUTPUT" + echo "VM Public IP: $vminfo" + cat ~/.ssh/id_rsa > ${{ github.workspace }}/prvkey.key + ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts + + - name: Remote SSH into VM + uses: appleboy/ssh-action@2ead5e36573f08b82fbfce1504f1a4b05a647c6f + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + host: ${{ steps.azlaunch.outputs.ipaddr }} + port: 22 + username: azureuser + command_timeout: 60m + key_path: ${{ github.workspace }}/prvkey.key + envs: GITHUB_TOKEN + script_stop: true + script: | + export DEBIAN_FRONTEND=noninteractive + lsb_release -a + sudo apt-get update + sudo apt-get upgrade -y + + echo "Installing Docker..." + curl -fsSL https://get.docker.com -o get-docker.sh + sudo sh get-docker.sh + + echo "Starting Containers..." + sudo docker network create dtnet + sudo docker run -d --name db --network=dtnet ghcr.io/ietf-tools/datatracker-db:latest & + sudo docker run -d --name app --network=dtnet ghcr.io/ietf-tools/datatracker-app-base:latest sleep infinity & + wait + + echo "Cloning datatracker repo..." + sudo docker exec app git clone --depth=1 https://github.com/ietf-tools/datatracker.git . + echo "Prepare tests..." + sudo docker exec app chmod +x ./dev/tests/prepare.sh + sudo docker exec app sh ./dev/tests/prepare.sh + echo "Running checks..." + sudo docker exec app ietf/manage.py check + sudo docker exec app ietf/manage.py migrate --fake-initial + echo "Running tests..." + sudo docker exec app ietf/manage.py test -v2 --validate-html-harder --settings=settings_test + + - name: Destroy VM + resources + if: always() + shell: pwsh + run: | + echo "Destroying VM..." + az vm delete -g ghaDatatrackerTests -n tmpGhaVM2 --yes --force-deletion true + + $resourceOrderRemovalOrder = [ordered]@{ + "Microsoft.Compute/virtualMachines" = 0 + "Microsoft.Compute/disks" = 1 + "Microsoft.Network/networkInterfaces" = 2 + "Microsoft.Network/publicIpAddresses" = 3 + "Microsoft.Network/networkSecurityGroups" = 4 + "Microsoft.Network/virtualNetworks" = 5 + } + echo "Fetching remaining resources..." + $resources = az resource list --resource-group ghaDatatrackerTests | ConvertFrom-Json + + $orderedResources = $resources + | Sort-Object @{ + Expression = {$resourceOrderRemovalOrder[$_.type]} + Descending = $False + } + + echo "Deleting remaining resources..." + $orderedResources | ForEach-Object { + az resource delete --resource-group ghaDatatrackerTests --ids $_.id --verbose + } + + echo "Logout from Azure..." + az logout diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000000..836314bac09 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,189 @@ +name: Reusable Tests Workflow + +on: + workflow_call: + inputs: + ignoreLowerCoverage: + description: 'Ignore Lower Coverage' + default: false + required: true + type: boolean + skipSelenium: + description: 'Skip Selenium Tests' + default: false + required: false + type: boolean + targetBaseVersion: + description: 'Target Base Image Version' + default: latest + required: false + type: string + +jobs: + tests-python: + name: Python Tests + runs-on: ubuntu-latest + container: ghcr.io/ietf-tools/datatracker-app-base:${{ inputs.targetBaseVersion }} + + services: + db: + image: ghcr.io/ietf-tools/datatracker-db:latest + blobstore: + image: ghcr.io/ietf-tools/datatracker-devblobstore:latest + + steps: + - uses: actions/checkout@v4 + + - name: Prepare for tests + run: | + chmod +x ./dev/tests/prepare.sh + sh ./dev/tests/prepare.sh + + - name: Ensure DB is ready + run: | + /usr/local/bin/wait-for db:5432 -- echo "DB ready" + + - name: Run all tests + shell: bash + run: | + echo "Running checks..." + ./ietf/manage.py check + ./ietf/manage.py migrate --fake-initial + echo "Validating migrations..." + if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then + echo "Model changes without migrations found." + exit 1 + fi + if [[ "x${{ inputs.skipSelenium }}" == "xtrue" ]]; then + echo "Disable selenium tests..." + rm /usr/bin/geckodriver + fi + echo "Running tests..." + if [[ "x${{ inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then + echo "Lower coverage failures will be ignored." + HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage + else + HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test + fi + coverage xml + + - name: Upload geckodriver.log + uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: geckodriverlog + path: geckodriver.log + + - name: Upload Coverage Results to Codecov + uses: codecov/codecov-action@v5 + with: + disable_search: true + files: coverage.xml + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Convert Coverage Results + if: ${{ always() }} + run: | + mv latest-coverage.json coverage.json + + - name: Upload Coverage Results as Build Artifact + uses: actions/upload-artifact@v4 + if: ${{ always() }} + with: + name: coverage + path: coverage.json + + tests-playwright: + name: Playwright Tests + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + project: [chromium, firefox] + + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v6 + with: + node-version: '18' + + - name: Run all tests + run: | + echo "Installing dependencies..." + yarn + echo "Installing Playwright..." + cd playwright + mkdir test-results + npm ci + npx playwright install --with-deps ${{ matrix.project }} + echo "Running tests..." + npx playwright test --project=${{ matrix.project }} + + - name: Upload Report + uses: actions/upload-artifact@v4 + if: ${{ always() }} + continue-on-error: true + with: + name: playwright-results-${{ matrix.project }} + path: playwright/test-results/ + if-no-files-found: ignore + + tests-playwright-legacy: + name: Playwright Legacy Tests + runs-on: ubuntu-latest + container: ghcr.io/ietf-tools/datatracker-app-base:${{ inputs.targetBaseVersion }} + strategy: + fail-fast: false + matrix: + project: [chromium, firefox] + + services: + db: + image: ghcr.io/ietf-tools/datatracker-db:latest + + steps: + - uses: actions/checkout@v4 + + - name: Prepare for tests + run: | + chmod +x ./dev/tests/prepare.sh + sh ./dev/tests/prepare.sh + + - name: Ensure DB is ready + run: | + /usr/local/bin/wait-for db:5432 -- echo "DB ready" + + - name: Start Datatracker + run: | + echo "Running checks..." + ./ietf/manage.py check + ./ietf/manage.py migrate --fake-initial + echo "Starting datatracker..." + ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local & + echo "Waiting for datatracker to be ready..." + /usr/local/bin/wait-for localhost:8000 -- echo "Datatracker ready" + + - name: Run all tests + env: + # Required to get firefox to run as root: + HOME: "" + run: | + echo "Installing dependencies..." + yarn + echo "Installing Playwright..." + cd playwright + mkdir test-results + npm ci + npx playwright install --with-deps ${{ matrix.project }} + echo "Running tests..." + npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js + + - name: Upload Report + uses: actions/upload-artifact@v4 + if: ${{ always() }} + continue-on-error: true + with: + name: playwright-legacy-results-${{ matrix.project }} + path: playwright/test-results/ + if-no-files-found: ignore diff --git a/.gitignore b/.gitignore index 80e5f0228bd..84bc800e3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,14 +17,17 @@ datatracker.sublime-workspace /docker/docker-compose.extend-custom.yml /env /ghostdriver.log +/geckodriver.log /htmlcov /ietf/static/dist-neue /latest-coverage.json /media /node_modules /release-coverage.json +/static /tmp-* /.testresult +*.swp *.pyc __pycache__ .yarn/* diff --git a/.pnp.cjs b/.pnp.cjs index a7d08035818..5fcce34d2f2 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -33,75 +33,84 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { [null, {\ "packageLocation": "./",\ "packageDependencies": [\ - ["@faker-js/faker", "npm:7.6.0"],\ - ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ - ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@parcel/optimizer-data-url", "npm:2.8.3"],\ - ["@parcel/transformer-inline-string", "npm:2.8.3"],\ - ["@parcel/transformer-sass", "npm:2.8.3"],\ - ["@popperjs/core", "npm:2.11.7"],\ - ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.0.2"],\ + ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ + ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@parcel/optimizer-data-url", "npm:2.12.0"],\ + ["@parcel/transformer-inline-string", "npm:2.12.0"],\ + ["@parcel/transformer-sass", "npm:2.12.0"],\ + ["@popperjs/core", "npm:2.11.8"],\ + ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\ ["@twuni/emojify", "npm:1.0.2"],\ - ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.2.1"],\ - ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.3"],\ - ["bootstrap-icons", "npm:1.10.5"],\ - ["browser-fs-access", "npm:0.33.1"],\ + ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\ + ["@vue/language-plugin-pug", "npm:2.0.7"],\ + ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\ + ["bootstrap-icons", "npm:1.11.3"],\ + ["browser-fs-access", "npm:0.35.0"],\ ["browserlist", "npm:1.0.1"],\ - ["c8", "npm:7.13.0"],\ - ["caniuse-lite", "npm:1.0.30001481"],\ - ["d3", "npm:7.8.4"],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\ - ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.13.3"],\ - ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.27.5"],\ - ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.7.0"],\ + ["c8", "npm:9.1.0"],\ + ["caniuse-lite", "npm:1.0.30001603"],\ + ["d3", "npm:7.9.0"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\ + ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\ + ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\ + ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\ ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\ ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\ - ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0"],\ + ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\ ["file-saver", "npm:2.0.5"],\ - ["highcharts", "npm:11.0.1"],\ - ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\ + ["highcharts", "npm:11.4.0"],\ + ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\ ["ical.js", "npm:1.5.0"],\ - ["jquery", "npm:3.6.4"],\ + ["jquery", "npm:3.7.1"],\ ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\ ["js-cookie", "npm:3.0.5"],\ ["list.js", "npm:2.3.1"],\ ["lodash", "npm:4.17.21"],\ ["lodash-es", "npm:4.17.21"],\ - ["luxon", "npm:3.3.0"],\ - ["moment", "npm:2.29.4"],\ - ["moment-timezone", "npm:0.5.43"],\ + ["luxon", "npm:3.4.4"],\ + ["moment", "npm:2.30.1"],\ + ["moment-timezone", "npm:0.5.45"],\ ["ms", "npm:2.1.3"],\ ["murmurhash-js", "npm:1.0.0"],\ - ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.34.3"],\ - ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.8.3"],\ - ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\ + ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\ + ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\ + ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\ ["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\ ["pug", "npm:3.0.2"],\ - ["sass", "npm:1.62.1"],\ + ["sass", "npm:1.72.0"],\ ["seedrandom", "npm:3.0.5"],\ ["select2", "npm:4.1.0-rc.0"],\ ["select2-bootstrap-5-theme", "npm:1.3.0"],\ ["send", "npm:0.18.0"],\ - ["shepherd.js", "npm:11.1.1"],\ + ["shepherd.js", "npm:11.2.0"],\ ["slugify", "npm:1.6.6"],\ - ["sortablejs", "npm:1.15.0"],\ - ["vanillajs-datepicker", "npm:1.3.1"],\ - ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.4"],\ - ["vue", "npm:3.2.47"],\ - ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.6"],\ + ["sortablejs", "npm:1.15.2"],\ + ["vanillajs-datepicker", "npm:1.3.4"],\ + ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ + ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\ ["zxcvbn", "npm:4.4.2"]\ ],\ "linkType": "SOFT"\ }]\ ]],\ + ["@aashutoshrathi/word-wrap", [\ + ["npm:1.2.6", {\ + "packageLocation": "./.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip/node_modules/@aashutoshrathi/word-wrap/",\ + "packageDependencies": [\ + ["@aashutoshrathi/word-wrap", "npm:1.2.6"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@babel/code-frame", [\ ["npm:7.16.7", {\ "packageLocation": "./.yarn/cache/@babel-code-frame-npm-7.16.7-093eb9e124-db2f7faa31.zip/node_modules/@babel/code-frame/",\ @@ -141,6 +150,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@babel/types", "npm:7.18.4"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:7.23.9", {\ + "packageLocation": "./.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip/node_modules/@babel/parser/",\ + "packageDependencies": [\ + ["@babel/parser", "npm:7.23.9"],\ + ["@babel/types", "npm:7.18.4"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@babel/runtime", [\ + ["npm:7.23.2", {\ + "packageLocation": "./.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip/node_modules/@babel/runtime/",\ + "packageDependencies": [\ + ["@babel/runtime", "npm:7.23.2"],\ + ["regenerator-runtime", "npm:0.14.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@babel/types", [\ @@ -164,19 +191,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@css-render/plugin-bem", [\ - ["npm:0.15.10", {\ - "packageLocation": "./.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip/node_modules/@css-render/plugin-bem/",\ + ["npm:0.15.12", {\ + "packageLocation": "./.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip/node_modules/@css-render/plugin-bem/",\ "packageDependencies": [\ - ["@css-render/plugin-bem", "npm:0.15.10"]\ + ["@css-render/plugin-bem", "npm:0.15.12"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10", {\ - "packageLocation": "./.yarn/__virtual__/@css-render-plugin-bem-virtual-1bbf78173b/0/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip/node_modules/@css-render/plugin-bem/",\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12", {\ + "packageLocation": "./.yarn/__virtual__/@css-render-plugin-bem-virtual-105b1b654b/0/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip/node_modules/@css-render/plugin-bem/",\ "packageDependencies": [\ - ["@css-render/plugin-bem", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10"],\ + ["@css-render/plugin-bem", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\ ["@types/css-render", null],\ - ["css-render", "npm:0.15.10"]\ + ["css-render", "npm:0.15.12"]\ ],\ "packagePeers": [\ "@types/css-render",\ @@ -193,12 +220,32 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10", {\ - "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-75d553c878/0/cache/@css-render-vue3-ssr-npm-0.15.10-b8526cc313-7977e0c440.zip/node_modules/@css-render/vue3-ssr/",\ + ["npm:0.15.12", {\ + "packageLocation": "./.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip/node_modules/@css-render/vue3-ssr/",\ "packageDependencies": [\ - ["@css-render/vue3-ssr", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10"],\ + ["@css-render/vue3-ssr", "npm:0.15.12"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10", {\ + "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-8cb63dbe2e/0/cache/@css-render-vue3-ssr-npm-0.15.10-b8526cc313-7977e0c440.zip/node_modules/@css-render/vue3-ssr/",\ + "packageDependencies": [\ + ["@css-render/vue3-ssr", "virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10"],\ ["@types/vue", null],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ + ],\ + "packagePeers": [\ + "@types/vue",\ + "vue"\ + ],\ + "linkType": "HARD"\ + }],\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12", {\ + "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-18db73fb22/0/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip/node_modules/@css-render/vue3-ssr/",\ + "packageDependencies": [\ + ["@css-render/vue3-ssr", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\ + ["@types/vue", null],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -217,199 +264,199 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@esbuild/android-arm", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.17.13-235368b68b/node_modules/@esbuild/android-arm/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.18.20-a30c33e9ed/node_modules/@esbuild/android-arm/",\ "packageDependencies": [\ - ["@esbuild/android-arm", "npm:0.17.13"]\ + ["@esbuild/android-arm", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/android-arm64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.17.13-7d21726b95/node_modules/@esbuild/android-arm64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.18.20-fd4fb45ae7/node_modules/@esbuild/android-arm64/",\ "packageDependencies": [\ - ["@esbuild/android-arm64", "npm:0.17.13"]\ + ["@esbuild/android-arm64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/android-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.17.13-dd7977b0ba/node_modules/@esbuild/android-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.18.20-22b610e3f4/node_modules/@esbuild/android-x64/",\ "packageDependencies": [\ - ["@esbuild/android-x64", "npm:0.17.13"]\ + ["@esbuild/android-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/darwin-arm64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.17.13-3c31ee9bef/node_modules/@esbuild/darwin-arm64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.18.20-00b3504077/node_modules/@esbuild/darwin-arm64/",\ "packageDependencies": [\ - ["@esbuild/darwin-arm64", "npm:0.17.13"]\ + ["@esbuild/darwin-arm64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/darwin-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.17.13-2af4bfbe4a/node_modules/@esbuild/darwin-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b/node_modules/@esbuild/darwin-x64/",\ "packageDependencies": [\ - ["@esbuild/darwin-x64", "npm:0.17.13"]\ + ["@esbuild/darwin-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/freebsd-arm64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.17.13-aee39a763e/node_modules/@esbuild/freebsd-arm64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.18.20-797e8c8987/node_modules/@esbuild/freebsd-arm64/",\ "packageDependencies": [\ - ["@esbuild/freebsd-arm64", "npm:0.17.13"]\ + ["@esbuild/freebsd-arm64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/freebsd-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.17.13-279fb33dbc/node_modules/@esbuild/freebsd-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.18.20-f7563ff3dd/node_modules/@esbuild/freebsd-x64/",\ "packageDependencies": [\ - ["@esbuild/freebsd-x64", "npm:0.17.13"]\ + ["@esbuild/freebsd-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-arm", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.17.13-520e292c25/node_modules/@esbuild/linux-arm/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.18.20-06b400b09e/node_modules/@esbuild/linux-arm/",\ "packageDependencies": [\ - ["@esbuild/linux-arm", "npm:0.17.13"]\ + ["@esbuild/linux-arm", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-arm64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.17.13-533eb0e4eb/node_modules/@esbuild/linux-arm64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe/node_modules/@esbuild/linux-arm64/",\ "packageDependencies": [\ - ["@esbuild/linux-arm64", "npm:0.17.13"]\ + ["@esbuild/linux-arm64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-ia32", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.17.13-46f5ce8b93/node_modules/@esbuild/linux-ia32/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.18.20-2f5a035f9e/node_modules/@esbuild/linux-ia32/",\ "packageDependencies": [\ - ["@esbuild/linux-ia32", "npm:0.17.13"]\ + ["@esbuild/linux-ia32", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-loong64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.17.13-ef4c0fa326/node_modules/@esbuild/linux-loong64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.18.20-e91b93ee90/node_modules/@esbuild/linux-loong64/",\ "packageDependencies": [\ - ["@esbuild/linux-loong64", "npm:0.17.13"]\ + ["@esbuild/linux-loong64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-mips64el", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.17.13-5b1f2c5c01/node_modules/@esbuild/linux-mips64el/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.18.20-a5e9429f2a/node_modules/@esbuild/linux-mips64el/",\ "packageDependencies": [\ - ["@esbuild/linux-mips64el", "npm:0.17.13"]\ + ["@esbuild/linux-mips64el", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-ppc64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.17.13-e41e2e492f/node_modules/@esbuild/linux-ppc64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.18.20-218f398134/node_modules/@esbuild/linux-ppc64/",\ "packageDependencies": [\ - ["@esbuild/linux-ppc64", "npm:0.17.13"]\ + ["@esbuild/linux-ppc64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-riscv64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.17.13-b222bf3e73/node_modules/@esbuild/linux-riscv64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.18.20-6a2972f753/node_modules/@esbuild/linux-riscv64/",\ "packageDependencies": [\ - ["@esbuild/linux-riscv64", "npm:0.17.13"]\ + ["@esbuild/linux-riscv64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-s390x", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.17.13-5a91ba0bd2/node_modules/@esbuild/linux-s390x/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.18.20-ff9d596142/node_modules/@esbuild/linux-s390x/",\ "packageDependencies": [\ - ["@esbuild/linux-s390x", "npm:0.17.13"]\ + ["@esbuild/linux-s390x", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.17.13-01575597b4/node_modules/@esbuild/linux-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.18.20-de8e99b449/node_modules/@esbuild/linux-x64/",\ "packageDependencies": [\ - ["@esbuild/linux-x64", "npm:0.17.13"]\ + ["@esbuild/linux-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/netbsd-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.17.13-8e49ac13ef/node_modules/@esbuild/netbsd-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.18.20-39b460150f/node_modules/@esbuild/netbsd-x64/",\ "packageDependencies": [\ - ["@esbuild/netbsd-x64", "npm:0.17.13"]\ + ["@esbuild/netbsd-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/openbsd-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.17.13-f1857ad246/node_modules/@esbuild/openbsd-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.18.20-90ab921595/node_modules/@esbuild/openbsd-x64/",\ "packageDependencies": [\ - ["@esbuild/openbsd-x64", "npm:0.17.13"]\ + ["@esbuild/openbsd-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/sunos-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.17.13-d366ada0a9/node_modules/@esbuild/sunos-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.18.20-d18b46b343/node_modules/@esbuild/sunos-x64/",\ "packageDependencies": [\ - ["@esbuild/sunos-x64", "npm:0.17.13"]\ + ["@esbuild/sunos-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-arm64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.17.13-cd496c2d1d/node_modules/@esbuild/win32-arm64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3/node_modules/@esbuild/win32-arm64/",\ "packageDependencies": [\ - ["@esbuild/win32-arm64", "npm:0.17.13"]\ + ["@esbuild/win32-arm64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-ia32", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.17.13-8a813564f3/node_modules/@esbuild/win32-ia32/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.18.20-d7ee926338/node_modules/@esbuild/win32-ia32/",\ "packageDependencies": [\ - ["@esbuild/win32-ia32", "npm:0.17.13"]\ + ["@esbuild/win32-ia32", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-x64", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.17.13-29882f65f7/node_modules/@esbuild/win32-x64/",\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda/node_modules/@esbuild/win32-x64/",\ "packageDependencies": [\ - ["@esbuild/win32-x64", "npm:0.17.13"]\ + ["@esbuild/win32-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ @@ -422,12 +469,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:d92bace04d6d26247b24721a8766993aa3a98c631265bb389d6aa7c17b2a0708ccc877f009bd6a9cb50b8597fbe776c68dae7621d198ff292ee4bc23bd4b012f#npm:4.4.0", {\ - "packageLocation": "./.yarn/__virtual__/@eslint-community-eslint-utils-virtual-75945d7e20/0/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip/node_modules/@eslint-community/eslint-utils/",\ + ["virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0", {\ + "packageLocation": "./.yarn/__virtual__/@eslint-community-eslint-utils-virtual-1c7da85a1a/0/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip/node_modules/@eslint-community/eslint-utils/",\ "packageDependencies": [\ - ["@eslint-community/eslint-utils", "virtual:d92bace04d6d26247b24721a8766993aa3a98c631265bb389d6aa7c17b2a0708ccc877f009bd6a9cb50b8597fbe776c68dae7621d198ff292ee4bc23bd4b012f#npm:4.4.0"],\ + ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ + ["eslint", "npm:8.57.0"],\ ["eslint-visitor-keys", "npm:3.3.0"]\ ],\ "packagePeers": [\ @@ -438,22 +485,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@eslint-community/regexpp", [\ - ["npm:4.4.1", {\ - "packageLocation": "./.yarn/cache/@eslint-community-regexpp-npm-4.4.1-44c7391499-db97d8d08e.zip/node_modules/@eslint-community/regexpp/",\ + ["npm:4.10.0", {\ + "packageLocation": "./.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip/node_modules/@eslint-community/regexpp/",\ "packageDependencies": [\ - ["@eslint-community/regexpp", "npm:4.4.1"]\ + ["@eslint-community/regexpp", "npm:4.10.0"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:4.8.0", {\ + "packageLocation": "./.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip/node_modules/@eslint-community/regexpp/",\ + "packageDependencies": [\ + ["@eslint-community/regexpp", "npm:4.8.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@eslint/eslintrc", [\ - ["npm:2.0.2", {\ - "packageLocation": "./.yarn/cache/@eslint-eslintrc-npm-2.0.2-d308674d86-cfcf5e12c7.zip/node_modules/@eslint/eslintrc/",\ + ["npm:2.1.4", {\ + "packageLocation": "./.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip/node_modules/@eslint/eslintrc/",\ "packageDependencies": [\ - ["@eslint/eslintrc", "npm:2.0.2"],\ + ["@eslint/eslintrc", "npm:2.1.4"],\ ["ajv", "npm:6.12.6"],\ ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\ - ["espree", "npm:9.5.1"],\ + ["espree", "npm:9.6.1"],\ ["globals", "npm:13.19.0"],\ ["ignore", "npm:5.2.0"],\ ["import-fresh", "npm:3.3.0"],\ @@ -465,55 +519,57 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@eslint/js", [\ - ["npm:8.39.0", {\ - "packageLocation": "./.yarn/cache/@eslint-js-npm-8.39.0-558d35aa2d-63fe36e2bf.zip/node_modules/@eslint/js/",\ + ["npm:8.57.0", {\ + "packageLocation": "./.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip/node_modules/@eslint/js/",\ "packageDependencies": [\ - ["@eslint/js", "npm:8.39.0"]\ + ["@eslint/js", "npm:8.57.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@faker-js/faker", [\ - ["npm:7.6.0", {\ - "packageLocation": "./.yarn/cache/@faker-js-faker-npm-7.6.0-fa135883e9-942af62217.zip/node_modules/@faker-js/faker/",\ + ["@floating-ui/core", [\ + ["npm:1.4.1", {\ + "packageLocation": "./.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip/node_modules/@floating-ui/core/",\ "packageDependencies": [\ - ["@faker-js/faker", "npm:7.6.0"]\ + ["@floating-ui/core", "npm:1.4.1"],\ + ["@floating-ui/utils", "npm:0.1.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@floating-ui/core", [\ - ["npm:1.2.6", {\ - "packageLocation": "./.yarn/cache/@floating-ui-core-npm-1.2.6-083bec342c-e4aa96c435.zip/node_modules/@floating-ui/core/",\ + ["@floating-ui/dom", [\ + ["npm:1.5.2", {\ + "packageLocation": "./.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip/node_modules/@floating-ui/dom/",\ "packageDependencies": [\ - ["@floating-ui/core", "npm:1.2.6"]\ + ["@floating-ui/dom", "npm:1.5.2"],\ + ["@floating-ui/core", "npm:1.4.1"],\ + ["@floating-ui/utils", "npm:0.1.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@floating-ui/dom", [\ - ["npm:1.2.6", {\ - "packageLocation": "./.yarn/cache/@floating-ui-dom-npm-1.2.6-9d4be07ec3-2226c6c244.zip/node_modules/@floating-ui/dom/",\ + ["@floating-ui/utils", [\ + ["npm:0.1.2", {\ + "packageLocation": "./.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip/node_modules/@floating-ui/utils/",\ "packageDependencies": [\ - ["@floating-ui/dom", "npm:1.2.6"],\ - ["@floating-ui/core", "npm:1.2.6"]\ + ["@floating-ui/utils", "npm:0.1.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@fullcalendar/bootstrap5", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.6-3eb2f2a80e-09f2bdf7dc.zip/node_modules/@fullcalendar/bootstrap5/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip/node_modules/@fullcalendar/bootstrap5/",\ "packageDependencies": [\ - ["@fullcalendar/bootstrap5", "npm:6.1.6"]\ + ["@fullcalendar/bootstrap5", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-bootstrap5-virtual-4eb1694ecd/0/cache/@fullcalendar-bootstrap5-npm-6.1.6-3eb2f2a80e-09f2bdf7dc.zip/node_modules/@fullcalendar/bootstrap5/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-bootstrap5-virtual-50942c1c6f/0/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip/node_modules/@fullcalendar/bootstrap5/",\ "packageDependencies": [\ - ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null]\ ],\ "packagePeers": [\ @@ -524,28 +580,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/core", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-core-npm-6.1.6-a28815a826-72ec698bd2.zip/node_modules/@fullcalendar/core/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip/node_modules/@fullcalendar/core/",\ "packageDependencies": [\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["preact", "npm:10.12.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@fullcalendar/daygrid", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-daygrid-npm-6.1.6-13b72a08b0-e7b60e359b.zip/node_modules/@fullcalendar/daygrid/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip/node_modules/@fullcalendar/daygrid/",\ "packageDependencies": [\ - ["@fullcalendar/daygrid", "npm:6.1.6"]\ + ["@fullcalendar/daygrid", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-daygrid-virtual-c806a244df/0/cache/@fullcalendar-daygrid-npm-6.1.6-13b72a08b0-e7b60e359b.zip/node_modules/@fullcalendar/daygrid/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-daygrid-virtual-b91d1ffe14/0/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip/node_modules/@fullcalendar/daygrid/",\ "packageDependencies": [\ - ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null]\ ],\ "packagePeers": [\ @@ -556,18 +612,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/icalendar", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-icalendar-npm-6.1.6-8b28c6e7df-50d290346a.zip/node_modules/@fullcalendar/icalendar/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip/node_modules/@fullcalendar/icalendar/",\ "packageDependencies": [\ - ["@fullcalendar/icalendar", "npm:6.1.6"]\ + ["@fullcalendar/icalendar", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-icalendar-virtual-82e9ef0594/0/cache/@fullcalendar-icalendar-npm-6.1.6-8b28c6e7df-50d290346a.zip/node_modules/@fullcalendar/icalendar/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-icalendar-virtual-636a290006/0/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip/node_modules/@fullcalendar/icalendar/",\ "packageDependencies": [\ - ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null],\ ["@types/ical.js", null],\ ["ical.js", "npm:1.5.0"]\ @@ -582,18 +638,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/interaction", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-interaction-npm-6.1.6-68ac4c3627-b7dea49059.zip/node_modules/@fullcalendar/interaction/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip/node_modules/@fullcalendar/interaction/",\ "packageDependencies": [\ - ["@fullcalendar/interaction", "npm:6.1.6"]\ + ["@fullcalendar/interaction", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-interaction-virtual-24a0309729/0/cache/@fullcalendar-interaction-npm-6.1.6-68ac4c3627-b7dea49059.zip/node_modules/@fullcalendar/interaction/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-interaction-virtual-3ebf8b0646/0/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip/node_modules/@fullcalendar/interaction/",\ "packageDependencies": [\ - ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null]\ ],\ "packagePeers": [\ @@ -604,18 +660,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/list", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-list-npm-6.1.6-ada94f2f8a-e5beb01c62.zip/node_modules/@fullcalendar/list/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip/node_modules/@fullcalendar/list/",\ "packageDependencies": [\ - ["@fullcalendar/list", "npm:6.1.6"]\ + ["@fullcalendar/list", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-list-virtual-42a14f5528/0/cache/@fullcalendar-list-npm-6.1.6-ada94f2f8a-e5beb01c62.zip/node_modules/@fullcalendar/list/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-list-virtual-1c555df506/0/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip/node_modules/@fullcalendar/list/",\ "packageDependencies": [\ - ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null]\ ],\ "packagePeers": [\ @@ -625,22 +681,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["@fullcalendar/luxon2", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-luxon2-npm-6.1.6-514b9ce297-48d76dc556.zip/node_modules/@fullcalendar/luxon2/",\ + ["@fullcalendar/luxon3", [\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip/node_modules/@fullcalendar/luxon3/",\ "packageDependencies": [\ - ["@fullcalendar/luxon2", "npm:6.1.6"]\ + ["@fullcalendar/luxon3", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-luxon2-virtual-4dc3f00cca/0/cache/@fullcalendar-luxon2-npm-6.1.6-514b9ce297-48d76dc556.zip/node_modules/@fullcalendar/luxon2/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-luxon3-virtual-38643019c2/0/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip/node_modules/@fullcalendar/luxon3/",\ "packageDependencies": [\ - ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null],\ ["@types/luxon", null],\ - ["luxon", "npm:3.3.0"]\ + ["luxon", "npm:3.4.4"]\ ],\ "packagePeers": [\ "@fullcalendar/core",\ @@ -652,19 +708,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/timegrid", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-timegrid-npm-6.1.6-6c6109a419-ef79183dad.zip/node_modules/@fullcalendar/timegrid/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip/node_modules/@fullcalendar/timegrid/",\ "packageDependencies": [\ - ["@fullcalendar/timegrid", "npm:6.1.6"]\ + ["@fullcalendar/timegrid", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-timegrid-virtual-1495e7dbe4/0/cache/@fullcalendar-timegrid-npm-6.1.6-6c6109a419-ef79183dad.zip/node_modules/@fullcalendar/timegrid/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-timegrid-virtual-5e951d78a6/0/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip/node_modules/@fullcalendar/timegrid/",\ "packageDependencies": [\ - ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ - ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ + ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ + ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ ["@types/fullcalendar__core", null]\ ],\ "packagePeers": [\ @@ -675,21 +731,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fullcalendar/vue3", [\ - ["npm:6.1.6", {\ - "packageLocation": "./.yarn/cache/@fullcalendar-vue3-npm-6.1.6-b1a9d6f44b-68fe3ce204.zip/node_modules/@fullcalendar/vue3/",\ + ["npm:6.1.11", {\ + "packageLocation": "./.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip/node_modules/@fullcalendar/vue3/",\ "packageDependencies": [\ - ["@fullcalendar/vue3", "npm:6.1.6"]\ + ["@fullcalendar/vue3", "npm:6.1.11"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6", {\ - "packageLocation": "./.yarn/__virtual__/@fullcalendar-vue3-virtual-ce9611c7d0/0/cache/@fullcalendar-vue3-npm-6.1.6-b1a9d6f44b-68fe3ce204.zip/node_modules/@fullcalendar/vue3/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\ + "packageLocation": "./.yarn/__virtual__/@fullcalendar-vue3-virtual-cb317bc2d1/0/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip/node_modules/@fullcalendar/vue3/",\ "packageDependencies": [\ - ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ + ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ ["@types/fullcalendar__core", null],\ ["@types/vue", null],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@fullcalendar/core",\ @@ -710,21 +766,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@html-validate/stylish", [\ - ["npm:4.0.1", {\ - "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip/node_modules/@html-validate/stylish/",\ + ["npm:4.1.0", {\ + "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip/node_modules/@html-validate/stylish/",\ "packageDependencies": [\ - ["@html-validate/stylish", "npm:4.0.1"],\ + ["@html-validate/stylish", "npm:4.1.0"],\ ["kleur", "npm:4.1.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@humanwhocodes/config-array", [\ - ["npm:0.11.8", {\ - "packageLocation": "./.yarn/cache/@humanwhocodes-config-array-npm-0.11.8-7955bfecc2-0fd6b3c54f.zip/node_modules/@humanwhocodes/config-array/",\ + ["npm:0.11.14", {\ + "packageLocation": "./.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip/node_modules/@humanwhocodes/config-array/",\ "packageDependencies": [\ - ["@humanwhocodes/config-array", "npm:0.11.8"],\ - ["@humanwhocodes/object-schema", "npm:1.2.1"],\ + ["@humanwhocodes/config-array", "npm:0.11.14"],\ + ["@humanwhocodes/object-schema", "npm:2.0.2"],\ ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\ ["minimatch", "npm:3.1.2"]\ ],\ @@ -741,10 +797,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@humanwhocodes/object-schema", [\ - ["npm:1.2.1", {\ - "packageLocation": "./.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip/node_modules/@humanwhocodes/object-schema/",\ + ["npm:2.0.2", {\ + "packageLocation": "./.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip/node_modules/@humanwhocodes/object-schema/",\ "packageDependencies": [\ - ["@humanwhocodes/object-schema", "npm:1.2.1"]\ + ["@humanwhocodes/object-schema", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -782,18 +838,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["@jridgewell/gen-mapping", [\ - ["npm:0.3.2", {\ - "packageLocation": "./.yarn/cache/@jridgewell-gen-mapping-npm-0.3.2-c64eeb4a4e-1832707a1c.zip/node_modules/@jridgewell/gen-mapping/",\ - "packageDependencies": [\ - ["@jridgewell/gen-mapping", "npm:0.3.2"],\ - ["@jridgewell/set-array", "npm:1.1.2"],\ - ["@jridgewell/sourcemap-codec", "npm:1.4.14"],\ - ["@jridgewell/trace-mapping", "npm:0.3.17"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@jridgewell/resolve-uri", [\ ["npm:3.1.0", {\ "packageLocation": "./.yarn/cache/@jridgewell-resolve-uri-npm-3.1.0-6ff2351e61-b5ceaaf9a1.zip/node_modules/@jridgewell/resolve-uri/",\ @@ -803,26 +847,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["@jridgewell/set-array", [\ - ["npm:1.1.2", {\ - "packageLocation": "./.yarn/cache/@jridgewell-set-array-npm-1.1.2-45b82d7fb6-69a84d5980.zip/node_modules/@jridgewell/set-array/",\ - "packageDependencies": [\ - ["@jridgewell/set-array", "npm:1.1.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["@jridgewell/source-map", [\ - ["npm:0.3.2", {\ - "packageLocation": "./.yarn/cache/@jridgewell-source-map-npm-0.3.2-6fd1f37b22-1b83f0eb94.zip/node_modules/@jridgewell/source-map/",\ - "packageDependencies": [\ - ["@jridgewell/source-map", "npm:0.3.2"],\ - ["@jridgewell/gen-mapping", "npm:0.3.2"],\ - ["@jridgewell/trace-mapping", "npm:0.3.17"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@jridgewell/sourcemap-codec", [\ ["npm:1.4.14", {\ "packageLocation": "./.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.14-f5f0630788-61100637b6.zip/node_modules/@jridgewell/sourcemap-codec/",\ @@ -830,6 +854,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@jridgewell/sourcemap-codec", "npm:1.4.14"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.4.15", {\ + "packageLocation": "./.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip/node_modules/@jridgewell/sourcemap-codec/",\ + "packageDependencies": [\ + ["@jridgewell/sourcemap-codec", "npm:1.4.15"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@jridgewell/trace-mapping", [\ @@ -841,15 +872,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@jridgewell/sourcemap-codec", "npm:1.4.14"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:0.3.17", {\ - "packageLocation": "./.yarn/cache/@jridgewell-trace-mapping-npm-0.3.17-57578fd48c-9d703b859c.zip/node_modules/@jridgewell/trace-mapping/",\ - "packageDependencies": [\ - ["@jridgewell/trace-mapping", "npm:0.3.17"],\ - ["@jridgewell/resolve-uri", "npm:3.1.0"],\ - ["@jridgewell/sourcemap-codec", "npm:1.4.14"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@juggle/resize-observer", [\ @@ -887,6 +909,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-darwin-arm64", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c/node_modules/@lmdb/lmdb-darwin-arm64/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-darwin-arm64", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@lmdb/lmdb-darwin-x64", [\ @@ -896,6 +925,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-darwin-x64", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329/node_modules/@lmdb/lmdb-darwin-x64/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-darwin-x64", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@lmdb/lmdb-linux-arm", [\ @@ -905,6 +941,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-linux-arm", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-arm-npm-2.8.5-081004004c/node_modules/@lmdb/lmdb-linux-arm/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-linux-arm", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@lmdb/lmdb-linux-arm64", [\ @@ -914,6 +957,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-linux-arm64", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f/node_modules/@lmdb/lmdb-linux-arm64/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-linux-arm64", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@lmdb/lmdb-linux-x64", [\ @@ -923,6 +973,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-linux-x64", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7/node_modules/@lmdb/lmdb-linux-x64/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-linux-x64", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@lmdb/lmdb-win32-x64", [\ @@ -932,6 +989,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@lmdb/lmdb-win32-x64", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb/node_modules/@lmdb/lmdb-win32-x64/",\ + "packageDependencies": [\ + ["@lmdb/lmdb-win32-x64", "npm:2.8.5"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@mischnic/json-sourcemap", [\ @@ -953,6 +1017,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4/node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@msgpackr-extract/msgpackr-extract-darwin-x64", [\ @@ -962,6 +1033,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a/node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@msgpackr-extract/msgpackr-extract-linux-arm", [\ @@ -971,6 +1049,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-arm-npm-3.0.2-808a652e0b/node_modules/@msgpackr-extract/msgpackr-extract-linux-arm/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@msgpackr-extract/msgpackr-extract-linux-arm64", [\ @@ -980,6 +1065,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6/node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@msgpackr-extract/msgpackr-extract-linux-x64", [\ @@ -989,6 +1081,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d/node_modules/@msgpackr-extract/msgpackr-extract-linux-x64/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@msgpackr-extract/msgpackr-extract-win32-x64", [\ @@ -998,6 +1097,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89/node_modules/@msgpackr-extract/msgpackr-extract-win32-x64/",\ + "packageDependencies": [\ + ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@nodelib/fs.scandir", [\ @@ -1054,45 +1160,45 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/bundler-default", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-bundler-default-npm-2.8.3-b2fd23cf03-219b2be341.zip/node_modules/@parcel/bundler-default/",\ - "packageDependencies": [\ - ["@parcel/bundler-default", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/graph", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip/node_modules/@parcel/bundler-default/",\ + "packageDependencies": [\ + ["@parcel/bundler-default", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/graph", "npm:3.2.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/cache", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\ "packageDependencies": [\ - ["@parcel/cache", "npm:2.6.2"]\ + ["@parcel/cache", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip/node_modules/@parcel/cache/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\ "packageDependencies": [\ - ["@parcel/cache", "npm:2.8.3"]\ + ["@parcel/cache", "npm:2.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-f4ec14de82/0/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip/node_modules/@parcel/cache/",\ - "packageDependencies": [\ - ["@parcel/cache", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-a2e9499dbb/0/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\ + "packageDependencies": [\ + ["@parcel/cache", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@types/parcel__core", null],\ - ["lmdb", "npm:2.5.2"]\ + ["lmdb", "npm:2.8.5"]\ ],\ "packagePeers": [\ "@parcel/core",\ @@ -1100,14 +1206,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-5ef63a38ca/0/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip/node_modules/@parcel/cache/",\ + ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-f3b3d44508/0/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\ "packageDependencies": [\ - ["@parcel/cache", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ + ["@parcel/cache", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/fs", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/fs", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ + ["@parcel/logger", "npm:2.6.2"],\ + ["@parcel/utils", "npm:2.6.2"],\ ["@types/parcel__core", null],\ ["lmdb", "npm:2.5.2"]\ ],\ @@ -1116,16 +1222,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-f3b3d44508/0/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\ + ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-6f5cc88243/0/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\ "packageDependencies": [\ - ["@parcel/cache", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ + ["@parcel/cache", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/fs", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ - ["@parcel/logger", "npm:2.6.2"],\ - ["@parcel/utils", "npm:2.6.2"],\ + ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@types/parcel__core", null],\ - ["lmdb", "npm:2.5.2"]\ + ["lmdb", "npm:2.8.5"]\ ],\ "packagePeers": [\ "@types/parcel__core"\ @@ -1134,76 +1240,77 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/codeframe", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.6.2-39f0ef1504-3253f42b90.zip/node_modules/@parcel/codeframe/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip/node_modules/@parcel/codeframe/",\ "packageDependencies": [\ - ["@parcel/codeframe", "npm:2.6.2"],\ + ["@parcel/codeframe", "npm:2.12.0"],\ ["chalk", "npm:4.1.2"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.8.3-e5df811b95-a6e82c30e6.zip/node_modules/@parcel/codeframe/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.6.2-39f0ef1504-3253f42b90.zip/node_modules/@parcel/codeframe/",\ "packageDependencies": [\ - ["@parcel/codeframe", "npm:2.8.3"],\ + ["@parcel/codeframe", "npm:2.6.2"],\ ["chalk", "npm:4.1.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/compressor-raw", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-compressor-raw-npm-2.8.3-387b54c6ce-ca3b8a4f60.zip/node_modules/@parcel/compressor-raw/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip/node_modules/@parcel/compressor-raw/",\ "packageDependencies": [\ - ["@parcel/compressor-raw", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"]\ + ["@parcel/compressor-raw", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/config-default", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-config-default-npm-2.8.3-465d8ed464-08c700a7a2.zip/node_modules/@parcel/config-default/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip/node_modules/@parcel/config-default/",\ "packageDependencies": [\ - ["@parcel/config-default", "npm:2.8.3"]\ + ["@parcel/config-default", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:079004f749aaa3b41d1755e479be6fc0871d8df3c6d97e1317ea81a49502572ac0da821e08a1cc3e408b007d7607c0863e93b8975d65134412812579e6733926#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-config-default-virtual-ae79298a72/0/cache/@parcel-config-default-npm-2.8.3-465d8ed464-08c700a7a2.zip/node_modules/@parcel/config-default/",\ - "packageDependencies": [\ - ["@parcel/config-default", "virtual:079004f749aaa3b41d1755e479be6fc0871d8df3c6d97e1317ea81a49502572ac0da821e08a1cc3e408b007d7607c0863e93b8975d65134412812579e6733926#npm:2.8.3"],\ - ["@parcel/bundler-default", "npm:2.8.3"],\ - ["@parcel/compressor-raw", "npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/namer-default", "npm:2.8.3"],\ - ["@parcel/optimizer-css", "npm:2.8.3"],\ - ["@parcel/optimizer-htmlnano", "npm:2.8.3"],\ - ["@parcel/optimizer-image", "npm:2.8.3"],\ - ["@parcel/optimizer-svgo", "npm:2.8.3"],\ - ["@parcel/optimizer-terser", "npm:2.8.3"],\ - ["@parcel/packager-css", "npm:2.8.3"],\ - ["@parcel/packager-html", "npm:2.8.3"],\ - ["@parcel/packager-js", "npm:2.8.3"],\ - ["@parcel/packager-raw", "npm:2.8.3"],\ - ["@parcel/packager-svg", "npm:2.8.3"],\ - ["@parcel/reporter-dev-server", "npm:2.8.3"],\ - ["@parcel/resolver-default", "npm:2.8.3"],\ - ["@parcel/runtime-browser-hmr", "npm:2.8.3"],\ - ["@parcel/runtime-js", "npm:2.8.3"],\ - ["@parcel/runtime-react-refresh", "npm:2.8.3"],\ - ["@parcel/runtime-service-worker", "npm:2.8.3"],\ - ["@parcel/transformer-babel", "npm:2.8.3"],\ - ["@parcel/transformer-css", "npm:2.8.3"],\ - ["@parcel/transformer-html", "npm:2.8.3"],\ - ["@parcel/transformer-image", "virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3"],\ - ["@parcel/transformer-js", "virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3"],\ - ["@parcel/transformer-json", "npm:2.8.3"],\ - ["@parcel/transformer-postcss", "npm:2.8.3"],\ - ["@parcel/transformer-posthtml", "npm:2.8.3"],\ - ["@parcel/transformer-raw", "npm:2.8.3"],\ - ["@parcel/transformer-react-refresh-wrap", "npm:2.8.3"],\ - ["@parcel/transformer-svg", "npm:2.8.3"],\ + ["virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-config-default-virtual-284acdc258/0/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip/node_modules/@parcel/config-default/",\ + "packageDependencies": [\ + ["@parcel/config-default", "virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0"],\ + ["@parcel/bundler-default", "npm:2.12.0"],\ + ["@parcel/compressor-raw", "npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/namer-default", "npm:2.12.0"],\ + ["@parcel/optimizer-css", "npm:2.12.0"],\ + ["@parcel/optimizer-htmlnano", "npm:2.12.0"],\ + ["@parcel/optimizer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/optimizer-svgo", "npm:2.12.0"],\ + ["@parcel/optimizer-swc", "npm:2.12.0"],\ + ["@parcel/packager-css", "npm:2.12.0"],\ + ["@parcel/packager-html", "npm:2.12.0"],\ + ["@parcel/packager-js", "npm:2.12.0"],\ + ["@parcel/packager-raw", "npm:2.12.0"],\ + ["@parcel/packager-svg", "npm:2.12.0"],\ + ["@parcel/packager-wasm", "npm:2.12.0"],\ + ["@parcel/reporter-dev-server", "npm:2.12.0"],\ + ["@parcel/resolver-default", "npm:2.12.0"],\ + ["@parcel/runtime-browser-hmr", "npm:2.12.0"],\ + ["@parcel/runtime-js", "npm:2.12.0"],\ + ["@parcel/runtime-react-refresh", "npm:2.12.0"],\ + ["@parcel/runtime-service-worker", "npm:2.12.0"],\ + ["@parcel/transformer-babel", "npm:2.12.0"],\ + ["@parcel/transformer-css", "npm:2.12.0"],\ + ["@parcel/transformer-html", "npm:2.12.0"],\ + ["@parcel/transformer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/transformer-js", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/transformer-json", "npm:2.12.0"],\ + ["@parcel/transformer-postcss", "npm:2.12.0"],\ + ["@parcel/transformer-posthtml", "npm:2.12.0"],\ + ["@parcel/transformer-raw", "npm:2.12.0"],\ + ["@parcel/transformer-react-refresh-wrap", "npm:2.12.0"],\ + ["@parcel/transformer-svg", "npm:2.12.0"],\ ["@types/parcel__core", null]\ ],\ "packagePeers": [\ @@ -1214,6 +1321,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/core", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip/node_modules/@parcel/core/",\ + "packageDependencies": [\ + ["@parcel/core", "npm:2.12.0"],\ + ["@mischnic/json-sourcemap", "npm:0.1.0"],\ + ["@parcel/cache", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/events", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/graph", "npm:3.2.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/profiler", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/source-map", "npm:2.1.1"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["abortcontroller-polyfill", "npm:1.7.3"],\ + ["base-x", "npm:3.0.9"],\ + ["browserslist", "npm:4.20.3"],\ + ["clone", "npm:2.1.2"],\ + ["dotenv", "npm:7.0.0"],\ + ["dotenv-expand", "npm:5.1.0"],\ + ["json5", "npm:2.2.1"],\ + ["msgpackr", "npm:1.10.1"],\ + ["nullthrows", "npm:1.1.1"],\ + ["semver", "npm:7.5.4"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.6.2", {\ "packageLocation": "./.yarn/cache/@parcel-core-npm-2.6.2-f04091cfa7-f550cbbd5e.zip/node_modules/@parcel/core/",\ "packageDependencies": [\ @@ -1244,53 +1383,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:5.7.1"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-core-npm-2.8.3-1751106c31-68adceb1b0.zip/node_modules/@parcel/core/",\ - "packageDependencies": [\ - ["@parcel/core", "npm:2.8.3"],\ - ["@mischnic/json-sourcemap", "npm:0.1.0"],\ - ["@parcel/cache", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/events", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/graph", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/package-manager", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["abortcontroller-polyfill", "npm:1.7.3"],\ - ["base-x", "npm:3.0.9"],\ - ["browserslist", "npm:4.20.3"],\ - ["clone", "npm:2.1.2"],\ - ["dotenv", "npm:7.0.0"],\ - ["dotenv-expand", "npm:5.1.0"],\ - ["json5", "npm:2.2.1"],\ - ["msgpackr", "npm:1.6.0"],\ - ["nullthrows", "npm:1.1.1"],\ - ["semver", "npm:5.7.1"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/diagnostic", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.6.2-ad66c9d460-c20c7b12c4.zip/node_modules/@parcel/diagnostic/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip/node_modules/@parcel/diagnostic/",\ "packageDependencies": [\ - ["@parcel/diagnostic", "npm:2.6.2"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ ["@mischnic/json-sourcemap", "npm:0.1.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.8.3-2e1d38a83b-c24d98a2db.zip/node_modules/@parcel/diagnostic/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.6.2-ad66c9d460-c20c7b12c4.zip/node_modules/@parcel/diagnostic/",\ "packageDependencies": [\ - ["@parcel/diagnostic", "npm:2.8.3"],\ + ["@parcel/diagnostic", "npm:2.6.2"],\ ["@mischnic/json-sourcemap", "npm:0.1.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ @@ -1298,46 +1406,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/events", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-events-npm-2.6.2-c1dc15633e-272898db0c.zip/node_modules/@parcel/events/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip/node_modules/@parcel/events/",\ "packageDependencies": [\ - ["@parcel/events", "npm:2.6.2"]\ + ["@parcel/events", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-events-npm-2.8.3-40eebe35e5-9d23c6663e.zip/node_modules/@parcel/events/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-events-npm-2.6.2-c1dc15633e-272898db0c.zip/node_modules/@parcel/events/",\ "packageDependencies": [\ - ["@parcel/events", "npm:2.8.3"]\ + ["@parcel/events", "npm:2.6.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/fs", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\ "packageDependencies": [\ - ["@parcel/fs", "npm:2.6.2"]\ + ["@parcel/fs", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip/node_modules/@parcel/fs/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\ "packageDependencies": [\ - ["@parcel/fs", "npm:2.8.3"]\ + ["@parcel/fs", "npm:2.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-f882c18483/0/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip/node_modules/@parcel/fs/",\ - "packageDependencies": [\ - ["@parcel/fs", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/fs-search", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-762e5c5add/0/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\ + "packageDependencies": [\ + ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@parcel/watcher", "npm:2.0.7"],\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ ["@types/parcel__core", null]\ ],\ "packagePeers": [\ @@ -1346,16 +1454,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-77e9884705/0/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip/node_modules/@parcel/fs/",\ + ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-cfea854226/0/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\ "packageDependencies": [\ - ["@parcel/fs", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ + ["@parcel/fs", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/fs-search", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/watcher", "npm:2.0.7"],\ - ["@parcel/workers", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ + ["@parcel/fs-search", "npm:2.6.2"],\ + ["@parcel/types", "npm:2.6.2"],\ + ["@parcel/utils", "npm:2.6.2"],\ + ["@parcel/watcher", "npm:2.0.5"],\ + ["@parcel/workers", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ ["@types/parcel__core", null]\ ],\ "packagePeers": [\ @@ -1363,16 +1471,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-cfea854226/0/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\ + ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-ae7dde1116/0/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\ "packageDependencies": [\ - ["@parcel/fs", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ + ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/fs-search", "npm:2.6.2"],\ - ["@parcel/types", "npm:2.6.2"],\ - ["@parcel/utils", "npm:2.6.2"],\ - ["@parcel/watcher", "npm:2.0.5"],\ - ["@parcel/workers", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/watcher", "npm:2.0.7"],\ + ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ ["@types/parcel__core", null]\ ],\ "packagePeers": [\ @@ -1389,14 +1497,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["detect-libc", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/unplugged/@parcel-fs-search-npm-2.8.3-aafc0a2ad7/node_modules/@parcel/fs-search/",\ - "packageDependencies": [\ - ["@parcel/fs-search", "npm:2.8.3"],\ - ["detect-libc", "npm:1.0.3"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/graph", [\ @@ -1409,10 +1509,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-graph-npm-2.8.3-15d2d4448e-ceed8445f5.zip/node_modules/@parcel/graph/",\ + ["npm:3.2.0", {\ + "packageLocation": "./.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip/node_modules/@parcel/graph/",\ "packageDependencies": [\ - ["@parcel/graph", "npm:2.8.3"],\ + ["@parcel/graph", "npm:3.2.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ @@ -1427,18 +1527,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["xxhash-wasm", "npm:0.4.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/unplugged/@parcel-hash-npm-2.8.3-48d5e2907f/node_modules/@parcel/hash/",\ - "packageDependencies": [\ - ["@parcel/hash", "npm:2.8.3"],\ - ["detect-libc", "npm:1.0.3"],\ - ["xxhash-wasm", "npm:0.4.2"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/logger", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip/node_modules/@parcel/logger/",\ + "packageDependencies": [\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/events", "npm:2.12.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.6.2", {\ "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.6.2-d7fe563ebb-d3536408da.zip/node_modules/@parcel/logger/",\ "packageDependencies": [\ @@ -1447,69 +1547,63 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@parcel/events", "npm:2.6.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.8.3-f13624d366-04fd463131.zip/node_modules/@parcel/logger/",\ - "packageDependencies": [\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/events", "npm:2.8.3"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/markdown-ansi", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.6.2-16ce118d53-742c64c5db.zip/node_modules/@parcel/markdown-ansi/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip/node_modules/@parcel/markdown-ansi/",\ "packageDependencies": [\ - ["@parcel/markdown-ansi", "npm:2.6.2"],\ + ["@parcel/markdown-ansi", "npm:2.12.0"],\ ["chalk", "npm:4.1.2"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.8.3-4b66177a38-1985f149b2.zip/node_modules/@parcel/markdown-ansi/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.6.2-16ce118d53-742c64c5db.zip/node_modules/@parcel/markdown-ansi/",\ "packageDependencies": [\ - ["@parcel/markdown-ansi", "npm:2.8.3"],\ + ["@parcel/markdown-ansi", "npm:2.6.2"],\ ["chalk", "npm:4.1.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/namer-default", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-namer-default-npm-2.8.3-486a772540-7c2c343446.zip/node_modules/@parcel/namer-default/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip/node_modules/@parcel/namer-default/",\ "packageDependencies": [\ - ["@parcel/namer-default", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/namer-default", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/node-resolver-core", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-node-resolver-core-npm-2.8.3-40a48fa4e7-4976d3ecc9.zip/node_modules/@parcel/node-resolver-core/",\ + ["npm:3.3.0", {\ + "packageLocation": "./.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip/node_modules/@parcel/node-resolver-core/",\ "packageDependencies": [\ - ["@parcel/node-resolver-core", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/node-resolver-core", "npm:3.3.0"],\ + ["@mischnic/json-sourcemap", "npm:0.1.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/optimizer-css", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-optimizer-css-npm-2.8.3-6e7102b9ab-ffac43a2c2.zip/node_modules/@parcel/optimizer-css/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip/node_modules/@parcel/optimizer-css/",\ "packageDependencies": [\ - ["@parcel/optimizer-css", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/optimizer-css", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["browserslist", "npm:4.20.3"],\ ["lightningcss", "npm:1.17.1"],\ ["nullthrows", "npm:1.1.1"]\ @@ -1518,12 +1612,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/optimizer-data-url", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-optimizer-data-url-npm-2.8.3-dd2c9afc59-5df8d88826.zip/node_modules/@parcel/optimizer-data-url/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip/node_modules/@parcel/optimizer-data-url/",\ "packageDependencies": [\ - ["@parcel/optimizer-data-url", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/optimizer-data-url", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["isbinaryfile", "npm:4.0.10"],\ ["mime", "npm:2.6.0"]\ ],\ @@ -1531,12 +1625,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/optimizer-htmlnano", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-optimizer-htmlnano-npm-2.8.3-62c761ef26-ca1cab7b1e.zip/node_modules/@parcel/optimizer-htmlnano/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip/node_modules/@parcel/optimizer-htmlnano/",\ "packageDependencies": [\ - ["@parcel/optimizer-htmlnano", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["htmlnano", "virtual:62c761ef265a1bb47118c5f610ff8bb4c7a43de129089ff7c8e3644d9427d7669d4e7e8fe06763510806415fe32bf491fdfbec2819a7040538b412dfe2ab9cb1#npm:2.0.2"],\ + ["@parcel/optimizer-htmlnano", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["htmlnano", "virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2"],\ ["nullthrows", "npm:1.1.1"],\ ["posthtml", "npm:0.16.6"],\ ["svgo", "npm:2.8.0"]\ @@ -1545,76 +1639,90 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/optimizer-image", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/unplugged/@parcel-optimizer-image-npm-2.8.3-4a1aa225b2/node_modules/@parcel/optimizer-image/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip/node_modules/@parcel/optimizer-image/",\ "packageDependencies": [\ - ["@parcel/optimizer-image", "npm:2.8.3"],\ - ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["detect-libc", "npm:1.0.3"]\ + ["@parcel/optimizer-image", "npm:2.12.0"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-optimizer-image-virtual-8c3b1760b5/0/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip/node_modules/@parcel/optimizer-image/",\ + "packageDependencies": [\ + ["@parcel/optimizer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@types/parcel__core", null]\ + ],\ + "packagePeers": [\ + "@parcel/core",\ + "@types/parcel__core"\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/optimizer-svgo", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-optimizer-svgo-npm-2.8.3-b5d4af08b7-b3544c08fa.zip/node_modules/@parcel/optimizer-svgo/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip/node_modules/@parcel/optimizer-svgo/",\ "packageDependencies": [\ - ["@parcel/optimizer-svgo", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/optimizer-svgo", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["svgo", "npm:2.8.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@parcel/optimizer-terser", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-optimizer-terser-npm-2.8.3-5e561ce7db-ee1959f596.zip/node_modules/@parcel/optimizer-terser/",\ + ["@parcel/optimizer-swc", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip/node_modules/@parcel/optimizer-swc/",\ "packageDependencies": [\ - ["@parcel/optimizer-terser", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/optimizer-swc", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["nullthrows", "npm:1.1.1"],\ - ["terser", "npm:5.16.5"]\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\ + ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/package-manager", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.6.2-41edbfb7da-0c7dfce953.zip/node_modules/@parcel/package-manager/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\ "packageDependencies": [\ - ["@parcel/package-manager", "npm:2.6.2"]\ + ["@parcel/package-manager", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip/node_modules/@parcel/package-manager/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.6.2-41edbfb7da-0c7dfce953.zip/node_modules/@parcel/package-manager/",\ "packageDependencies": [\ - ["@parcel/package-manager", "npm:2.8.3"]\ + ["@parcel/package-manager", "npm:2.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-74c3fc2aaf/0/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip/node_modules/@parcel/package-manager/",\ - "packageDependencies": [\ - ["@parcel/package-manager", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ + ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-8612c9adea/0/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\ + "packageDependencies": [\ + ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/node-resolver-core", "npm:3.3.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\ ["@types/parcel__core", null],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "packagePeers": [\ "@parcel/core",\ @@ -1622,25 +1730,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-563b128815/0/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip/node_modules/@parcel/package-manager/",\ - "packageDependencies": [\ - ["@parcel/package-manager", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@types/parcel__core", null],\ - ["semver", "npm:5.7.1"]\ - ],\ - "packagePeers": [\ - "@types/parcel__core"\ - ],\ - "linkType": "HARD"\ - }],\ ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-423c759aca/0/cache/@parcel-package-manager-npm-2.6.2-41edbfb7da-0c7dfce953.zip/node_modules/@parcel/package-manager/",\ "packageDependencies": [\ @@ -1659,29 +1748,52 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "@types/parcel__core"\ ],\ "linkType": "HARD"\ + }],\ + ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-5f8211ac5f/0/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\ + "packageDependencies": [\ + ["@parcel/package-manager", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/core", "npm:2.6.2"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/node-resolver-core", "npm:3.3.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\ + ["@types/parcel__core", null],\ + ["semver", "npm:7.5.4"]\ + ],\ + "packagePeers": [\ + "@types/parcel__core"\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@parcel/packager-css", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-packager-css-npm-2.8.3-c127d6c552-bb28fc9f02.zip/node_modules/@parcel/packager-css/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip/node_modules/@parcel/packager-css/",\ "packageDependencies": [\ - ["@parcel/packager-css", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/packager-css", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["lightningcss", "npm:1.17.1"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/packager-html", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-packager-html-npm-2.8.3-4e3da006ce-631f98fca0.zip/node_modules/@parcel/packager-html/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip/node_modules/@parcel/packager-html/",\ "packageDependencies": [\ - ["@parcel/packager-html", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/packager-html", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"],\ ["posthtml", "npm:0.16.6"]\ ],\ @@ -1689,15 +1801,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/packager-js", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-packager-js-npm-2.8.3-3441713a0f-92ac88244b.zip/node_modules/@parcel/packager-js/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip/node_modules/@parcel/packager-js/",\ "packageDependencies": [\ - ["@parcel/packager-js", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/packager-js", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["globals", "npm:13.15.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ @@ -1705,29 +1818,47 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/packager-raw", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-packager-raw-npm-2.8.3-0a1dab14a2-26236dd646.zip/node_modules/@parcel/packager-raw/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip/node_modules/@parcel/packager-raw/",\ "packageDependencies": [\ - ["@parcel/packager-raw", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"]\ + ["@parcel/packager-raw", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/packager-svg", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-packager-svg-npm-2.8.3-c3163591d4-45c966ad8e.zip/node_modules/@parcel/packager-svg/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip/node_modules/@parcel/packager-svg/",\ "packageDependencies": [\ - ["@parcel/packager-svg", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/packager-svg", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["posthtml", "npm:0.16.6"]\ ],\ "linkType": "HARD"\ }]\ ]],\ + ["@parcel/packager-wasm", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip/node_modules/@parcel/packager-wasm/",\ + "packageDependencies": [\ + ["@parcel/packager-wasm", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@parcel/plugin", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip/node_modules/@parcel/plugin/",\ + "packageDependencies": [\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.6.2", {\ "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.6.2-d1ea2dda44-23da0fa372.zip/node_modules/@parcel/plugin/",\ "packageDependencies": [\ @@ -1735,24 +1866,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@parcel/types", "npm:2.6.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.8.3-c228eb7640-a69ac66f5c.zip/node_modules/@parcel/plugin/",\ + }]\ + ]],\ + ["@parcel/profiler", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip/node_modules/@parcel/profiler/",\ "packageDependencies": [\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"]\ + ["@parcel/profiler", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/events", "npm:2.12.0"],\ + ["chrome-trace-event", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/reporter-cli", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-reporter-cli-npm-2.8.3-d340f7fcb8-791dd4706a.zip/node_modules/@parcel/reporter-cli/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip/node_modules/@parcel/reporter-cli/",\ "packageDependencies": [\ - ["@parcel/reporter-cli", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/reporter-cli", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["chalk", "npm:4.1.2"],\ ["term-size", "npm:2.2.1"]\ ],\ @@ -1760,57 +1895,71 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/reporter-dev-server", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-reporter-dev-server-npm-2.8.3-be7051861d-329db9fd0c.zip/node_modules/@parcel/reporter-dev-server/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip/node_modules/@parcel/reporter-dev-server/",\ + "packageDependencies": [\ + ["@parcel/reporter-dev-server", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@parcel/reporter-tracer", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip/node_modules/@parcel/reporter-tracer/",\ "packageDependencies": [\ - ["@parcel/reporter-dev-server", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"]\ + ["@parcel/reporter-tracer", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["chrome-trace-event", "npm:1.0.3"],\ + ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/resolver-default", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-resolver-default-npm-2.8.3-de025989bd-40515a62c1.zip/node_modules/@parcel/resolver-default/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip/node_modules/@parcel/resolver-default/",\ "packageDependencies": [\ - ["@parcel/resolver-default", "npm:2.8.3"],\ - ["@parcel/node-resolver-core", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"]\ + ["@parcel/resolver-default", "npm:2.12.0"],\ + ["@parcel/node-resolver-core", "npm:3.3.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/runtime-browser-hmr", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-runtime-browser-hmr-npm-2.8.3-63941ffa5c-56c276c7b0.zip/node_modules/@parcel/runtime-browser-hmr/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip/node_modules/@parcel/runtime-browser-hmr/",\ "packageDependencies": [\ - ["@parcel/runtime-browser-hmr", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"]\ + ["@parcel/runtime-browser-hmr", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/runtime-js", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-runtime-js-npm-2.8.3-a82379279f-ee5e04f84d.zip/node_modules/@parcel/runtime-js/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip/node_modules/@parcel/runtime-js/",\ "packageDependencies": [\ - ["@parcel/runtime-js", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/runtime-js", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/runtime-react-refresh", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-runtime-react-refresh-npm-2.8.3-42e337381a-327159be0c.zip/node_modules/@parcel/runtime-react-refresh/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip/node_modules/@parcel/runtime-react-refresh/",\ "packageDependencies": [\ - ["@parcel/runtime-react-refresh", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/runtime-react-refresh", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["react-error-overlay", "npm:6.0.9"],\ ["react-refresh", "npm:0.9.0"]\ ],\ @@ -1818,17 +1967,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/runtime-service-worker", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-runtime-service-worker-npm-2.8.3-426255f187-0646fee9a9.zip/node_modules/@parcel/runtime-service-worker/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip/node_modules/@parcel/runtime-service-worker/",\ "packageDependencies": [\ - ["@parcel/runtime-service-worker", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/runtime-service-worker", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ + ["@parcel/rust", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/unplugged/@parcel-rust-npm-2.12.0-0cf943f3e5/node_modules/@parcel/rust/",\ + "packageDependencies": [\ + ["@parcel/rust", "npm:2.12.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@parcel/source-map", [\ ["npm:2.0.5", {\ "packageLocation": "./.yarn/unplugged/@parcel-source-map-npm-2.0.5-2444d2c092/node_modules/@parcel/source-map/",\ @@ -1848,31 +2006,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/transformer-babel", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-babel-npm-2.8.3-bd1a7cae4d-a27bbe8d89.zip/node_modules/@parcel/transformer-babel/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip/node_modules/@parcel/transformer-babel/",\ "packageDependencies": [\ - ["@parcel/transformer-babel", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-babel", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["browserslist", "npm:4.20.3"],\ ["json5", "npm:2.2.1"],\ ["nullthrows", "npm:1.1.1"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-css", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-css-npm-2.8.3-e5a36983ce-31375a1405.zip/node_modules/@parcel/transformer-css/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip/node_modules/@parcel/transformer-css/",\ "packageDependencies": [\ - ["@parcel/transformer-css", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-css", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["browserslist", "npm:4.20.3"],\ ["lightningcss", "npm:1.17.1"],\ ["nullthrows", "npm:1.1.1"]\ @@ -1881,39 +2039,39 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/transformer-html", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-html-npm-2.8.3-ce9c33e277-21600a3e0a.zip/node_modules/@parcel/transformer-html/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip/node_modules/@parcel/transformer-html/",\ "packageDependencies": [\ - ["@parcel/transformer-html", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-html", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"],\ ["posthtml", "npm:0.16.6"],\ ["posthtml-parser", "npm:0.10.2"],\ ["posthtml-render", "npm:3.0.0"],\ - ["semver", "npm:5.7.1"],\ + ["semver", "npm:7.5.4"],\ ["srcset", "npm:4.0.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-image", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-image-npm-2.8.3-ddf03325c2-f4b3464828.zip/node_modules/@parcel/transformer-image/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip/node_modules/@parcel/transformer-image/",\ "packageDependencies": [\ - ["@parcel/transformer-image", "npm:2.8.3"]\ + ["@parcel/transformer-image", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-transformer-image-virtual-007d8db0db/0/cache/@parcel-transformer-image-npm-2.8.3-ddf03325c2-f4b3464828.zip/node_modules/@parcel/transformer-image/",\ - "packageDependencies": [\ - ["@parcel/transformer-image", "virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ + ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-transformer-image-virtual-acc9c20c9c/0/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip/node_modules/@parcel/transformer-image/",\ + "packageDependencies": [\ + ["@parcel/transformer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ ["@types/parcel__core", null],\ ["nullthrows", "npm:1.1.1"]\ ],\ @@ -1925,40 +2083,40 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/transformer-inline-string", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-inline-string-npm-2.8.3-6e4701a9cd-23fa279e1f.zip/node_modules/@parcel/transformer-inline-string/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip/node_modules/@parcel/transformer-inline-string/",\ "packageDependencies": [\ - ["@parcel/transformer-inline-string", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"]\ + ["@parcel/transformer-inline-string", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-js", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/unplugged/@parcel-transformer-js-virtual-b36ac6705d/node_modules/@parcel/transformer-js/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip/node_modules/@parcel/transformer-js/",\ "packageDependencies": [\ - ["@parcel/transformer-js", "npm:2.8.3"]\ + ["@parcel/transformer-js", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3", {\ - "packageLocation": "./.yarn/unplugged/@parcel-transformer-js-virtual-b36ac6705d/node_modules/@parcel/transformer-js/",\ - "packageDependencies": [\ - ["@parcel/transformer-js", "virtual:ae79298a72e3d9363a5f43f0758f258949d82a428fc5aadd2010735eb57aa68b76713869ce052c228d610a7413537515425856a7c357d8a318c5ae937b566246#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-transformer-js-virtual-567f83ac24/0/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip/node_modules/@parcel/transformer-js/",\ + "packageDependencies": [\ + ["@parcel/transformer-js", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@swc/helpers", "npm:0.4.14"],\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@swc/helpers", "npm:0.5.1"],\ ["@types/parcel__core", null],\ ["browserslist", "npm:4.20.3"],\ - ["detect-libc", "npm:1.0.3"],\ ["nullthrows", "npm:1.1.1"],\ ["regenerator-runtime", "npm:0.13.9"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "packagePeers": [\ "@parcel/core",\ @@ -1968,77 +2126,77 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/transformer-json", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-json-npm-2.8.3-fe0a156dc9-04da28b0f0.zip/node_modules/@parcel/transformer-json/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip/node_modules/@parcel/transformer-json/",\ "packageDependencies": [\ - ["@parcel/transformer-json", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-json", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["json5", "npm:2.2.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-postcss", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-postcss-npm-2.8.3-eb5a87320d-2c75cb5cec.zip/node_modules/@parcel/transformer-postcss/",\ - "packageDependencies": [\ - ["@parcel/transformer-postcss", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip/node_modules/@parcel/transformer-postcss/",\ + "packageDependencies": [\ + ["@parcel/transformer-postcss", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["clone", "npm:2.1.2"],\ ["nullthrows", "npm:1.1.1"],\ ["postcss-value-parser", "npm:4.2.0"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-posthtml", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-posthtml-npm-2.8.3-243f774b7a-130c95782a.zip/node_modules/@parcel/transformer-posthtml/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip/node_modules/@parcel/transformer-posthtml/",\ "packageDependencies": [\ - ["@parcel/transformer-posthtml", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/transformer-posthtml", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"],\ ["posthtml", "npm:0.16.6"],\ ["posthtml-parser", "npm:0.10.2"],\ ["posthtml-render", "npm:3.0.0"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-raw", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-raw-npm-2.8.3-766b11ad19-371263bb52.zip/node_modules/@parcel/transformer-raw/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip/node_modules/@parcel/transformer-raw/",\ "packageDependencies": [\ - ["@parcel/transformer-raw", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"]\ + ["@parcel/transformer-raw", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-react-refresh-wrap", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.8.3-bb497d2643-e9648e04b7.zip/node_modules/@parcel/transformer-react-refresh-wrap/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip/node_modules/@parcel/transformer-react-refresh-wrap/",\ "packageDependencies": [\ - ["@parcel/transformer-react-refresh-wrap", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/transformer-react-refresh-wrap", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["react-refresh", "npm:0.9.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/transformer-sass", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-sass-npm-2.8.3-6c449bba66-9cb32b3906.zip/node_modules/@parcel/transformer-sass/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip/node_modules/@parcel/transformer-sass/",\ "packageDependencies": [\ - ["@parcel/transformer-sass", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-sass", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ ["@parcel/source-map", "npm:2.1.1"],\ ["sass", "npm:1.52.1"]\ ],\ @@ -2046,23 +2204,37 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/transformer-svg", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-transformer-svg-npm-2.8.3-b6f4c84f7a-1f3db309e4.zip/node_modules/@parcel/transformer-svg/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip/node_modules/@parcel/transformer-svg/",\ "packageDependencies": [\ - ["@parcel/transformer-svg", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/plugin", "npm:2.8.3"],\ + ["@parcel/transformer-svg", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/plugin", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ ["nullthrows", "npm:1.1.1"],\ ["posthtml", "npm:0.16.6"],\ ["posthtml-parser", "npm:0.10.2"],\ ["posthtml-render", "npm:3.0.0"],\ - ["semver", "npm:5.7.1"]\ + ["semver", "npm:7.5.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@parcel/types", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip/node_modules/@parcel/types/",\ + "packageDependencies": [\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/cache", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/package-manager", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["@parcel/source-map", "npm:2.1.1"],\ + ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ + ["utility-types", "npm:3.10.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.6.2", {\ "packageLocation": "./.yarn/cache/@parcel-types-npm-2.6.2-aa1797faca-16f3c3ac36.zip/node_modules/@parcel/types/",\ "packageDependencies": [\ @@ -2076,23 +2248,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["utility-types", "npm:3.10.0"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-types-npm-2.8.3-394e8cefff-ece0abdd5c.zip/node_modules/@parcel/types/",\ - "packageDependencies": [\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/cache", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/package-manager", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["@parcel/source-map", "npm:2.1.1"],\ - ["@parcel/workers", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ - ["utility-types", "npm:3.10.0"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/utils", [\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip/node_modules/@parcel/utils/",\ + "packageDependencies": [\ + ["@parcel/utils", "npm:2.12.0"],\ + ["@parcel/codeframe", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/markdown-ansi", "npm:2.12.0"],\ + ["@parcel/rust", "npm:2.12.0"],\ + ["@parcel/source-map", "npm:2.1.1"],\ + ["chalk", "npm:4.1.2"],\ + ["nullthrows", "npm:1.1.1"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.6.2", {\ "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.6.2-cab87aed21-a74fdca966.zip/node_modules/@parcel/utils/",\ "packageDependencies": [\ @@ -2106,20 +2279,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["chalk", "npm:4.1.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.8.3-13fd8c7807-69edf3e7c3.zip/node_modules/@parcel/utils/",\ - "packageDependencies": [\ - ["@parcel/utils", "npm:2.8.3"],\ - ["@parcel/codeframe", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/hash", "npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/markdown-ansi", "npm:2.8.3"],\ - ["@parcel/source-map", "npm:2.1.1"],\ - ["chalk", "npm:4.1.2"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@parcel/watcher", [\ @@ -2145,31 +2304,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@parcel/workers", [\ - ["npm:2.6.2", {\ - "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\ "packageDependencies": [\ - ["@parcel/workers", "npm:2.6.2"]\ + ["@parcel/workers", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip/node_modules/@parcel/workers/",\ + ["npm:2.6.2", {\ + "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\ "packageDependencies": [\ - ["@parcel/workers", "npm:2.8.3"]\ + ["@parcel/workers", "npm:2.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-7a0f9788cf/0/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip/node_modules/@parcel/workers/",\ - "packageDependencies": [\ - ["@parcel/workers", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-fbd6240557/0/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\ + "packageDependencies": [\ + ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/profiler", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@types/parcel__core", null],\ - ["chrome-trace-event", "npm:1.0.3"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "packagePeers": [\ @@ -2178,15 +2337,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-3d95d18f90/0/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip/node_modules/@parcel/workers/",\ + ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-fa9718ade0/0/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\ "packageDependencies": [\ - ["@parcel/workers", "virtual:394e8cefff652ee5c389cef6b687eba0ec753377aef335050162baee915b4eeae5061f0dbb5f7bea112cdf448a757aaab57dd5dc71f9134498fc561e4f28e220#npm:2.8.3"],\ + ["@parcel/workers", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/types", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["@parcel/diagnostic", "npm:2.6.2"],\ + ["@parcel/logger", "npm:2.6.2"],\ + ["@parcel/types", "npm:2.6.2"],\ + ["@parcel/utils", "npm:2.6.2"],\ ["@types/parcel__core", null],\ ["chrome-trace-event", "npm:1.0.3"],\ ["nullthrows", "npm:1.1.1"]\ @@ -2196,17 +2355,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2", {\ - "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-fa9718ade0/0/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\ + ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-0f6ac1cb6e/0/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\ "packageDependencies": [\ - ["@parcel/workers", "virtual:aa1797faca4a934b86d07dfa52e0db4db288b85fed415e745782ef9bd4bd39771970f9017a79cb7ed092d23d2539cea12a1cec949dfa0bb86e0fda2290caa70e#npm:2.6.2"],\ + ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\ ["@parcel/core", "npm:2.6.2"],\ - ["@parcel/diagnostic", "npm:2.6.2"],\ - ["@parcel/logger", "npm:2.6.2"],\ - ["@parcel/types", "npm:2.6.2"],\ - ["@parcel/utils", "npm:2.6.2"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/profiler", "npm:2.12.0"],\ + ["@parcel/types", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@types/parcel__core", null],\ - ["chrome-trace-event", "npm:1.0.3"],\ ["nullthrows", "npm:1.1.1"]\ ],\ "packagePeers": [\ @@ -2232,26 +2391,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:2.11.7", {\ - "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.7-c1bac58243-5b65537478.zip/node_modules/@popperjs/core/",\ + ["npm:2.11.8", {\ + "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip/node_modules/@popperjs/core/",\ "packageDependencies": [\ - ["@popperjs/core", "npm:2.11.7"]\ + ["@popperjs/core", "npm:2.11.8"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@rollup/pluginutils", [\ - ["npm:5.0.2", {\ - "packageLocation": "./.yarn/cache/@rollup-pluginutils-npm-5.0.2-6aa9d0ddd4-edea15e543.zip/node_modules/@rollup/pluginutils/",\ + ["npm:5.1.0", {\ + "packageLocation": "./.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip/node_modules/@rollup/pluginutils/",\ "packageDependencies": [\ - ["@rollup/pluginutils", "npm:5.0.2"]\ + ["@rollup/pluginutils", "npm:5.1.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.0.2", {\ - "packageLocation": "./.yarn/__virtual__/@rollup-pluginutils-virtual-ca58d3a074/0/cache/@rollup-pluginutils-npm-5.0.2-6aa9d0ddd4-edea15e543.zip/node_modules/@rollup/pluginutils/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0", {\ + "packageLocation": "./.yarn/__virtual__/@rollup-pluginutils-virtual-e968017249/0/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip/node_modules/@rollup/pluginutils/",\ "packageDependencies": [\ - ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.0.2"],\ + ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\ ["@types/estree", "npm:1.0.0"],\ ["@types/rollup", null],\ ["estree-walker", "npm:2.0.2"],\ @@ -2266,17 +2425,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@sidvind/better-ajv-errors", [\ - ["npm:2.0.0", {\ - "packageLocation": "./.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\ + ["npm:2.1.3", {\ + "packageLocation": "./.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip/node_modules/@sidvind/better-ajv-errors/",\ "packageDependencies": [\ - ["@sidvind/better-ajv-errors", "npm:2.0.0"]\ + ["@sidvind/better-ajv-errors", "npm:2.1.3"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0", {\ - "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-2b217b84ce/0/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\ + ["virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3", {\ + "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-ff98ba00e3/0/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip/node_modules/@sidvind/better-ajv-errors/",\ "packageDependencies": [\ - ["@sidvind/better-ajv-errors", "virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0"],\ + ["@sidvind/better-ajv-errors", "virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3"],\ ["@babel/code-frame", "npm:7.16.7"],\ ["@types/ajv", null],\ ["ajv", "npm:8.11.0"],\ @@ -2289,11 +2448,133 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["@swc/core", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-virtual-8fda1c3f9b/node_modules/@swc/core/",\ + "packageDependencies": [\ + ["@swc/core", "npm:1.3.62"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-virtual-8fda1c3f9b/node_modules/@swc/core/",\ + "packageDependencies": [\ + ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\ + ["@swc/core-darwin-arm64", "npm:1.3.62"],\ + ["@swc/core-darwin-x64", "npm:1.3.62"],\ + ["@swc/core-linux-arm-gnueabihf", "npm:1.3.62"],\ + ["@swc/core-linux-arm64-gnu", "npm:1.3.62"],\ + ["@swc/core-linux-arm64-musl", "npm:1.3.62"],\ + ["@swc/core-linux-x64-gnu", "npm:1.3.62"],\ + ["@swc/core-linux-x64-musl", "npm:1.3.62"],\ + ["@swc/core-win32-arm64-msvc", "npm:1.3.62"],\ + ["@swc/core-win32-ia32-msvc", "npm:1.3.62"],\ + ["@swc/core-win32-x64-msvc", "npm:1.3.62"],\ + ["@swc/helpers", null],\ + ["@types/swc__helpers", null]\ + ],\ + "packagePeers": [\ + "@swc/helpers",\ + "@types/swc__helpers"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-darwin-arm64", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32/node_modules/@swc/core-darwin-arm64/",\ + "packageDependencies": [\ + ["@swc/core-darwin-arm64", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-darwin-x64", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502/node_modules/@swc/core-darwin-x64/",\ + "packageDependencies": [\ + ["@swc/core-darwin-x64", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-linux-arm-gnueabihf", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm-gnueabihf-npm-1.3.62-2528581a9c/node_modules/@swc/core-linux-arm-gnueabihf/",\ + "packageDependencies": [\ + ["@swc/core-linux-arm-gnueabihf", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-linux-arm64-gnu", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356/node_modules/@swc/core-linux-arm64-gnu/",\ + "packageDependencies": [\ + ["@swc/core-linux-arm64-gnu", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-linux-arm64-musl", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm64-musl-npm-1.3.62-5faf35783f/node_modules/@swc/core-linux-arm64-musl/",\ + "packageDependencies": [\ + ["@swc/core-linux-arm64-musl", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-linux-x64-gnu", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907/node_modules/@swc/core-linux-x64-gnu/",\ + "packageDependencies": [\ + ["@swc/core-linux-x64-gnu", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-linux-x64-musl", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-linux-x64-musl-npm-1.3.62-ffabf9bf27/node_modules/@swc/core-linux-x64-musl/",\ + "packageDependencies": [\ + ["@swc/core-linux-x64-musl", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-win32-arm64-msvc", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca/node_modules/@swc/core-win32-arm64-msvc/",\ + "packageDependencies": [\ + ["@swc/core-win32-arm64-msvc", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-win32-ia32-msvc", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-win32-ia32-msvc-npm-1.3.62-56dc98262c/node_modules/@swc/core-win32-ia32-msvc/",\ + "packageDependencies": [\ + ["@swc/core-win32-ia32-msvc", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@swc/core-win32-x64-msvc", [\ + ["npm:1.3.62", {\ + "packageLocation": "./.yarn/unplugged/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0/node_modules/@swc/core-win32-x64-msvc/",\ + "packageDependencies": [\ + ["@swc/core-win32-x64-msvc", "npm:1.3.62"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@swc/helpers", [\ - ["npm:0.4.14", {\ - "packageLocation": "./.yarn/cache/@swc-helpers-npm-0.4.14-f806c3fb16-273fd3f3fc.zip/node_modules/@swc/helpers/",\ + ["npm:0.5.1", {\ + "packageLocation": "./.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip/node_modules/@swc/helpers/",\ "packageDependencies": [\ - ["@swc/helpers", "npm:0.4.14"],\ + ["@swc/helpers", "npm:0.5.1"],\ ["tslib", "npm:2.4.0"]\ ],\ "linkType": "HARD"\ @@ -2344,17 +2625,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["@types/jest", [\ - ["npm:27.4.1", {\ - "packageLocation": "./.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip/node_modules/@types/jest/",\ - "packageDependencies": [\ - ["@types/jest", "npm:27.4.1"],\ - ["jest-matcher-utils", "npm:27.5.1"],\ - ["pretty-format", "npm:27.5.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@types/json5", [\ ["npm:0.0.29", {\ "packageLocation": "./.yarn/cache/@types-json5-npm-0.0.29-f63a7916bd-e60b153664.zip/node_modules/@types/json5/",\ @@ -2365,10 +2635,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@types/katex", [\ - ["npm:0.14.0", {\ - "packageLocation": "./.yarn/cache/@types-katex-npm-0.14.0-acd5bc3e87-330e0d0337.zip/node_modules/@types/katex/",\ + ["npm:0.16.5", {\ + "packageLocation": "./.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip/node_modules/@types/katex/",\ "packageDependencies": [\ - ["@types/katex", "npm:0.14.0"]\ + ["@types/katex", "npm:0.16.5"]\ ],\ "linkType": "HARD"\ }]\ @@ -2380,13 +2650,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/lodash", "npm:4.14.182"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.14.200", {\ + "packageLocation": "./.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip/node_modules/@types/lodash/",\ + "packageDependencies": [\ + ["@types/lodash", "npm:4.14.200"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@types/lodash-es", [\ - ["npm:4.17.6", {\ - "packageLocation": "./.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip/node_modules/@types/lodash-es/",\ + ["npm:4.17.10", {\ + "packageLocation": "./.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip/node_modules/@types/lodash-es/",\ "packageDependencies": [\ - ["@types/lodash-es", "npm:4.17.6"],\ + ["@types/lodash-es", "npm:4.17.10"],\ ["@types/lodash", "npm:4.14.182"]\ ],\ "linkType": "HARD"\ @@ -2410,22 +2687,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["@ungap/structured-clone", [\ + ["npm:1.2.0", {\ + "packageLocation": "./.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip/node_modules/@ungap/structured-clone/",\ + "packageDependencies": [\ + ["@ungap/structured-clone", "npm:1.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@vitejs/plugin-vue", [\ - ["npm:4.2.1", {\ - "packageLocation": "./.yarn/cache/@vitejs-plugin-vue-npm-4.2.1-2b331ccfdc-a7266a4537.zip/node_modules/@vitejs/plugin-vue/",\ + ["npm:4.6.2", {\ + "packageLocation": "./.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip/node_modules/@vitejs/plugin-vue/",\ "packageDependencies": [\ - ["@vitejs/plugin-vue", "npm:4.2.1"]\ + ["@vitejs/plugin-vue", "npm:4.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.2.1", {\ - "packageLocation": "./.yarn/__virtual__/@vitejs-plugin-vue-virtual-68094506b2/0/cache/@vitejs-plugin-vue-npm-4.2.1-2b331ccfdc-a7266a4537.zip/node_modules/@vitejs/plugin-vue/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2", {\ + "packageLocation": "./.yarn/__virtual__/@vitejs-plugin-vue-virtual-090b584a9c/0/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip/node_modules/@vitejs/plugin-vue/",\ "packageDependencies": [\ - ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.2.1"],\ + ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\ ["@types/vite", null],\ ["@types/vue", null],\ - ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.4"],\ - ["vue", "npm:3.2.47"]\ + ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vite",\ @@ -2436,139 +2722,178 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["@volar/language-core", [\ + ["npm:2.1.4", {\ + "packageLocation": "./.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip/node_modules/@volar/language-core/",\ + "packageDependencies": [\ + ["@volar/language-core", "npm:2.1.4"],\ + ["@volar/source-map", "npm:2.1.4"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@volar/language-service", [\ + ["npm:2.1.4", {\ + "packageLocation": "./.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip/node_modules/@volar/language-service/",\ + "packageDependencies": [\ + ["@volar/language-service", "npm:2.1.4"],\ + ["@volar/language-core", "npm:2.1.4"],\ + ["vscode-languageserver-protocol", "npm:3.17.5"],\ + ["vscode-languageserver-textdocument", "npm:1.0.11"],\ + ["vscode-uri", "npm:3.0.8"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@volar/source-map", [\ + ["npm:2.1.4", {\ + "packageLocation": "./.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip/node_modules/@volar/source-map/",\ + "packageDependencies": [\ + ["@volar/source-map", "npm:2.1.4"],\ + ["muggle-string", "npm:0.4.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@vscode/l10n", [\ + ["npm:0.0.18", {\ + "packageLocation": "./.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip/node_modules/@vscode/l10n/",\ + "packageDependencies": [\ + ["@vscode/l10n", "npm:0.0.18"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@vue/compiler-core", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-compiler-core-npm-3.2.47-bb08feddfe-9ccc2a0b89.zip/node_modules/@vue/compiler-core/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip/node_modules/@vue/compiler-core/",\ "packageDependencies": [\ - ["@vue/compiler-core", "npm:3.2.47"],\ - ["@babel/parser", "npm:7.18.4"],\ - ["@vue/shared", "npm:3.2.47"],\ + ["@vue/compiler-core", "npm:3.4.21"],\ + ["@babel/parser", "npm:7.23.9"],\ + ["@vue/shared", "npm:3.4.21"],\ + ["entities", "npm:4.5.0"],\ ["estree-walker", "npm:2.0.2"],\ - ["source-map", "npm:0.6.1"]\ + ["source-map-js", "npm:1.0.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/compiler-dom", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-compiler-dom-npm-3.2.47-a1a6348264-1eced735f8.zip/node_modules/@vue/compiler-dom/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip/node_modules/@vue/compiler-dom/",\ "packageDependencies": [\ - ["@vue/compiler-dom", "npm:3.2.47"],\ - ["@vue/compiler-core", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"]\ + ["@vue/compiler-dom", "npm:3.4.21"],\ + ["@vue/compiler-core", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/compiler-sfc", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-compiler-sfc-npm-3.2.47-d9eca6b75b-4588a51331.zip/node_modules/@vue/compiler-sfc/",\ - "packageDependencies": [\ - ["@vue/compiler-sfc", "npm:3.2.47"],\ - ["@babel/parser", "npm:7.18.4"],\ - ["@vue/compiler-core", "npm:3.2.47"],\ - ["@vue/compiler-dom", "npm:3.2.47"],\ - ["@vue/compiler-ssr", "npm:3.2.47"],\ - ["@vue/reactivity-transform", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"],\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip/node_modules/@vue/compiler-sfc/",\ + "packageDependencies": [\ + ["@vue/compiler-sfc", "npm:3.4.21"],\ + ["@babel/parser", "npm:7.23.9"],\ + ["@vue/compiler-core", "npm:3.4.21"],\ + ["@vue/compiler-dom", "npm:3.4.21"],\ + ["@vue/compiler-ssr", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"],\ ["estree-walker", "npm:2.0.2"],\ - ["magic-string", "npm:0.25.9"],\ - ["postcss", "npm:8.4.12"],\ - ["source-map", "npm:0.6.1"]\ + ["magic-string", "npm:0.30.7"],\ + ["postcss", "npm:8.4.35"],\ + ["source-map-js", "npm:1.0.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/compiler-ssr", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-compiler-ssr-npm-3.2.47-c46fb0bb52-91bc6e4674.zip/node_modules/@vue/compiler-ssr/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip/node_modules/@vue/compiler-ssr/",\ "packageDependencies": [\ - ["@vue/compiler-ssr", "npm:3.2.47"],\ - ["@vue/compiler-dom", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"]\ + ["@vue/compiler-ssr", "npm:3.4.21"],\ + ["@vue/compiler-dom", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/devtools-api", [\ - ["npm:6.4.5", {\ - "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.4.5-bcd56e5fec-40c5adc878.zip/node_modules/@vue/devtools-api/",\ + ["npm:6.5.0", {\ + "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip/node_modules/@vue/devtools-api/",\ "packageDependencies": [\ - ["@vue/devtools-api", "npm:6.4.5"]\ + ["@vue/devtools-api", "npm:6.5.0"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:6.5.0", {\ - "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip/node_modules/@vue/devtools-api/",\ + ["npm:6.6.1", {\ + "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip/node_modules/@vue/devtools-api/",\ "packageDependencies": [\ - ["@vue/devtools-api", "npm:6.5.0"]\ + ["@vue/devtools-api", "npm:6.6.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@vue/reactivity", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-reactivity-npm-3.2.47-1182f7aa47-bd61134e4b.zip/node_modules/@vue/reactivity/",\ + ["@vue/language-plugin-pug", [\ + ["npm:2.0.7", {\ + "packageLocation": "./.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip/node_modules/@vue/language-plugin-pug/",\ "packageDependencies": [\ - ["@vue/reactivity", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"]\ + ["@vue/language-plugin-pug", "npm:2.0.7"],\ + ["@volar/source-map", "npm:2.1.4"],\ + ["volar-service-pug", "npm:0.0.34"]\ ],\ "linkType": "HARD"\ }]\ ]],\ - ["@vue/reactivity-transform", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-reactivity-transform-npm-3.2.47-89701a53ab-6fe54374aa.zip/node_modules/@vue/reactivity-transform/",\ + ["@vue/reactivity", [\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip/node_modules/@vue/reactivity/",\ "packageDependencies": [\ - ["@vue/reactivity-transform", "npm:3.2.47"],\ - ["@babel/parser", "npm:7.18.4"],\ - ["@vue/compiler-core", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"],\ - ["estree-walker", "npm:2.0.2"],\ - ["magic-string", "npm:0.25.9"]\ + ["@vue/reactivity", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/runtime-core", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-runtime-core-npm-3.2.47-d5ec5c27c7-56fd41368c.zip/node_modules/@vue/runtime-core/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip/node_modules/@vue/runtime-core/",\ "packageDependencies": [\ - ["@vue/runtime-core", "npm:3.2.47"],\ - ["@vue/reactivity", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"]\ + ["@vue/runtime-core", "npm:3.4.21"],\ + ["@vue/reactivity", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/runtime-dom", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-runtime-dom-npm-3.2.47-da74228cd1-8987d72761.zip/node_modules/@vue/runtime-dom/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip/node_modules/@vue/runtime-dom/",\ "packageDependencies": [\ - ["@vue/runtime-dom", "npm:3.2.47"],\ - ["@vue/runtime-core", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"],\ - ["csstype", "npm:2.6.20"]\ + ["@vue/runtime-dom", "npm:3.4.21"],\ + ["@vue/runtime-core", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"],\ + ["csstype", "npm:3.1.3"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@vue/server-renderer", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-server-renderer-npm-3.2.47-b845561a5d-482fe3c9bb.zip/node_modules/@vue/server-renderer/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip/node_modules/@vue/server-renderer/",\ "packageDependencies": [\ - ["@vue/server-renderer", "npm:3.2.47"]\ + ["@vue/server-renderer", "npm:3.4.21"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:487db916e160a571ff50687ed972004ec0078aa76b7fedf7bdabfd607dfed3ba7b2d1f51e99387f885501b4dbb11471c0ce20d647adb7ae38656bbc259642ae8#npm:3.2.47", {\ - "packageLocation": "./.yarn/__virtual__/@vue-server-renderer-virtual-7de059ee50/0/cache/@vue-server-renderer-npm-3.2.47-b845561a5d-482fe3c9bb.zip/node_modules/@vue/server-renderer/",\ + ["virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21", {\ + "packageLocation": "./.yarn/__virtual__/@vue-server-renderer-virtual-4c61378d94/0/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip/node_modules/@vue/server-renderer/",\ "packageDependencies": [\ - ["@vue/server-renderer", "virtual:487db916e160a571ff50687ed972004ec0078aa76b7fedf7bdabfd607dfed3ba7b2d1f51e99387f885501b4dbb11471c0ce20d647adb7ae38656bbc259642ae8#npm:3.2.47"],\ + ["@vue/server-renderer", "virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21"],\ ["@types/vue", null],\ - ["@vue/compiler-ssr", "npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"],\ - ["vue", "npm:3.2.47"]\ + ["@vue/compiler-ssr", "npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -2578,10 +2903,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@vue/shared", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/@vue-shared-npm-3.2.47-efa4e85dc8-0aa711dc91.zip/node_modules/@vue/shared/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip/node_modules/@vue/shared/",\ "packageDependencies": [\ - ["@vue/shared", "npm:3.2.47"]\ + ["@vue/shared", "npm:3.4.21"]\ ],\ "linkType": "HARD"\ }]\ @@ -2612,17 +2937,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:8.7.1", {\ - "packageLocation": "./.yarn/cache/acorn-npm-8.7.1-7c7a019990-aca0aabf98.zip/node_modules/acorn/",\ + ["npm:8.10.0", {\ + "packageLocation": "./.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip/node_modules/acorn/",\ "packageDependencies": [\ - ["acorn", "npm:8.7.1"]\ + ["acorn", "npm:8.10.0"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:8.8.0", {\ - "packageLocation": "./.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip/node_modules/acorn/",\ + ["npm:8.7.1", {\ + "packageLocation": "./.yarn/cache/acorn-npm-8.7.1-7c7a019990-aca0aabf98.zip/node_modules/acorn/",\ "packageDependencies": [\ - ["acorn", "npm:8.8.0"]\ + ["acorn", "npm:8.7.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -2635,12 +2960,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:057dc7b3c1f6024b5a316c7e5d452c8397d903f7ff9736e8d71b89efc60141dc4c8c777c0c1057fa0d3bf0d3dd59eec8694b4efb6f0fb20c747ec060bab7195d#npm:5.3.2", {\ - "packageLocation": "./.yarn/__virtual__/acorn-jsx-virtual-232e493aa9/0/cache/acorn-jsx-npm-5.3.2-d7594599ea-c3d3b2a89c.zip/node_modules/acorn-jsx/",\ + ["virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2", {\ + "packageLocation": "./.yarn/__virtual__/acorn-jsx-virtual-834321b202/0/cache/acorn-jsx-npm-5.3.2-d7594599ea-c3d3b2a89c.zip/node_modules/acorn-jsx/",\ "packageDependencies": [\ - ["acorn-jsx", "virtual:057dc7b3c1f6024b5a316c7e5d452c8397d903f7ff9736e8d71b89efc60141dc4c8c777c0c1057fa0d3bf0d3dd59eec8694b4efb6f0fb20c747ec060bab7195d#npm:5.3.2"],\ + ["acorn-jsx", "virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2"],\ ["@types/acorn", null],\ - ["acorn", "npm:8.8.0"]\ + ["acorn", "npm:8.10.0"]\ ],\ "packagePeers": [\ "@types/acorn",\ @@ -2662,15 +2987,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["acorn-walk", [\ - ["npm:8.2.0", {\ - "packageLocation": "./.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip/node_modules/acorn-walk/",\ - "packageDependencies": [\ - ["acorn-walk", "npm:8.2.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["agent-base", [\ ["npm:6.0.2", {\ "packageLocation": "./.yarn/cache/agent-base-npm-6.0.2-428f325a93-f52b6872cc.zip/node_modules/agent-base/",\ @@ -2761,13 +3077,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:5.2.0", {\ - "packageLocation": "./.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip/node_modules/ansi-styles/",\ - "packageDependencies": [\ - ["ansi-styles", "npm:5.2.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:6.2.1", {\ "packageLocation": "./.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip/node_modules/ansi-styles/",\ "packageDependencies": [\ @@ -2816,46 +3125,87 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["array-buffer-byte-length", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip/node_modules/array-buffer-byte-length/",\ + "packageDependencies": [\ + ["array-buffer-byte-length", "npm:1.0.0"],\ + ["call-bind", "npm:1.0.2"],\ + ["is-array-buffer", "npm:3.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["array-includes", [\ - ["npm:3.1.6", {\ - "packageLocation": "./.yarn/cache/array-includes-npm-3.1.6-d0ff9d248b-f22f8cd8ba.zip/node_modules/array-includes/",\ + ["npm:3.1.7", {\ + "packageLocation": "./.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip/node_modules/array-includes/",\ "packageDependencies": [\ - ["array-includes", "npm:3.1.6"],\ + ["array-includes", "npm:3.1.7"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"],\ - ["get-intrinsic", "npm:1.2.0"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ + ["get-intrinsic", "npm:1.2.1"],\ ["is-string", "npm:1.0.7"]\ ],\ "linkType": "HARD"\ }]\ ]],\ + ["array.prototype.findlastindex", [\ + ["npm:1.2.3", {\ + "packageLocation": "./.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip/node_modules/array.prototype.findlastindex/",\ + "packageDependencies": [\ + ["array.prototype.findlastindex", "npm:1.2.3"],\ + ["call-bind", "npm:1.0.2"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ + ["es-shim-unscopables", "npm:1.0.0"],\ + ["get-intrinsic", "npm:1.2.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["array.prototype.flat", [\ - ["npm:1.3.1", {\ - "packageLocation": "./.yarn/cache/array.prototype.flat-npm-1.3.1-e9a9e389c0-5a8415949d.zip/node_modules/array.prototype.flat/",\ + ["npm:1.3.2", {\ + "packageLocation": "./.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip/node_modules/array.prototype.flat/",\ "packageDependencies": [\ - ["array.prototype.flat", "npm:1.3.1"],\ + ["array.prototype.flat", "npm:1.3.2"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ ["es-shim-unscopables", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["array.prototype.flatmap", [\ - ["npm:1.3.1", {\ - "packageLocation": "./.yarn/cache/array.prototype.flatmap-npm-1.3.1-c65186ca34-8c1c43a499.zip/node_modules/array.prototype.flatmap/",\ + ["npm:1.3.2", {\ + "packageLocation": "./.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip/node_modules/array.prototype.flatmap/",\ "packageDependencies": [\ - ["array.prototype.flatmap", "npm:1.3.1"],\ + ["array.prototype.flatmap", "npm:1.3.2"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ ["es-shim-unscopables", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ + ["arraybuffer.prototype.slice", [\ + ["npm:1.0.2", {\ + "packageLocation": "./.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip/node_modules/arraybuffer.prototype.slice/",\ + "packageDependencies": [\ + ["arraybuffer.prototype.slice", "npm:1.0.2"],\ + ["array-buffer-byte-length", "npm:1.0.0"],\ + ["call-bind", "npm:1.0.2"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["is-array-buffer", "npm:3.0.2"],\ + ["is-shared-array-buffer", "npm:1.0.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["asap", [\ ["npm:2.0.6", {\ "packageLocation": "./.yarn/cache/asap-npm-2.0.6-36714d439d-b296c92c4b.zip/node_modules/asap/",\ @@ -2875,10 +3225,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["async-validator", [\ - ["npm:4.1.1", {\ - "packageLocation": "./.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip/node_modules/async-validator/",\ + ["npm:4.2.5", {\ + "packageLocation": "./.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip/node_modules/async-validator/",\ "packageDependencies": [\ - ["async-validator", "npm:4.1.1"]\ + ["async-validator", "npm:4.2.5"]\ ],\ "linkType": "HARD"\ }]\ @@ -2947,10 +3297,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["npm:5.2.3", {\ - "packageLocation": "./.yarn/cache/bootstrap-npm-5.2.3-7458283a23-0211805dec.zip/node_modules/bootstrap/",\ + ["npm:5.3.3", {\ + "packageLocation": "./.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip/node_modules/bootstrap/",\ "packageDependencies": [\ - ["bootstrap", "npm:5.2.3"]\ + ["bootstrap", "npm:5.3.3"]\ ],\ "linkType": "SOFT"\ }],\ @@ -2967,11 +3317,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.3", {\ - "packageLocation": "./.yarn/__virtual__/bootstrap-virtual-c4952ffff0/0/cache/bootstrap-npm-5.2.3-7458283a23-0211805dec.zip/node_modules/bootstrap/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3", {\ + "packageLocation": "./.yarn/__virtual__/bootstrap-virtual-2c24090b13/0/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip/node_modules/bootstrap/",\ "packageDependencies": [\ - ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.3"],\ - ["@popperjs/core", "npm:2.11.7"],\ + ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\ + ["@popperjs/core", "npm:2.11.8"],\ ["@types/popperjs__core", null]\ ],\ "packagePeers": [\ @@ -2982,10 +3332,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["bootstrap-icons", [\ - ["npm:1.10.5", {\ - "packageLocation": "./.yarn/cache/bootstrap-icons-npm-1.10.5-36f80ab074-8a0cfbd237.zip/node_modules/bootstrap-icons/",\ + ["npm:1.11.3", {\ + "packageLocation": "./.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip/node_modules/bootstrap-icons/",\ "packageDependencies": [\ - ["bootstrap-icons", "npm:1.10.5"]\ + ["bootstrap-icons", "npm:1.11.3"]\ ],\ "linkType": "HARD"\ }]\ @@ -3020,10 +3370,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["browser-fs-access", [\ - ["npm:0.33.1", {\ - "packageLocation": "./.yarn/cache/browser-fs-access-npm-0.33.1-1af7eeff22-2fb595c2d2.zip/node_modules/browser-fs-access/",\ + ["npm:0.35.0", {\ + "packageLocation": "./.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip/node_modules/browser-fs-access/",\ "packageDependencies": [\ - ["browser-fs-access", "npm:0.33.1"]\ + ["browser-fs-access", "npm:0.35.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -3052,11 +3402,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["buffer-from", [\ - ["npm:1.1.2", {\ - "packageLocation": "./.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip/node_modules/buffer-from/",\ + ["builtin-modules", [\ + ["npm:3.3.0", {\ + "packageLocation": "./.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip/node_modules/builtin-modules/",\ "packageDependencies": [\ - ["buffer-from", "npm:1.1.2"]\ + ["builtin-modules", "npm:3.3.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -3072,22 +3422,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["c8", [\ - ["npm:7.13.0", {\ - "packageLocation": "./.yarn/cache/c8-npm-7.13.0-9ac8f17e2c-491abf4cf3.zip/node_modules/c8/",\ + ["npm:9.1.0", {\ + "packageLocation": "./.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip/node_modules/c8/",\ "packageDependencies": [\ - ["c8", "npm:7.13.0"],\ + ["c8", "npm:9.1.0"],\ ["@bcoe/v8-coverage", "npm:0.2.3"],\ ["@istanbuljs/schema", "npm:0.1.3"],\ ["find-up", "npm:5.0.0"],\ - ["foreground-child", "npm:2.0.0"],\ + ["foreground-child", "npm:3.1.1"],\ ["istanbul-lib-coverage", "npm:3.2.0"],\ - ["istanbul-lib-report", "npm:3.0.0"],\ - ["istanbul-reports", "npm:3.1.4"],\ - ["rimraf", "npm:3.0.2"],\ + ["istanbul-lib-report", "npm:3.0.1"],\ + ["istanbul-reports", "npm:3.1.6"],\ ["test-exclude", "npm:6.0.0"],\ ["v8-to-istanbul", "npm:9.0.1"],\ - ["yargs", "npm:16.2.0"],\ - ["yargs-parser", "npm:20.2.9"]\ + ["yargs", "npm:17.7.2"],\ + ["yargs-parser", "npm:21.1.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -3128,6 +3477,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["get-intrinsic", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.0.5", {\ + "packageLocation": "./.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip/node_modules/call-bind/",\ + "packageDependencies": [\ + ["call-bind", "npm:1.0.5"],\ + ["function-bind", "npm:1.1.2"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["set-function-length", "npm:1.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["callsites", [\ @@ -3147,10 +3506,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:1.0.30001481", {\ - "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001481-cd8272ecaa-8200a043c1.zip/node_modules/caniuse-lite/",\ + ["npm:1.0.30001603", {\ + "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip/node_modules/caniuse-lite/",\ "packageDependencies": [\ - ["caniuse-lite", "npm:1.0.30001481"]\ + ["caniuse-lite", "npm:1.0.30001603"]\ ],\ "linkType": "HARD"\ }]\ @@ -3231,10 +3590,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["cliui", [\ - ["npm:7.0.4", {\ - "packageLocation": "./.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip/node_modules/cliui/",\ + ["npm:8.0.1", {\ + "packageLocation": "./.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip/node_modules/cliui/",\ "packageDependencies": [\ - ["cliui", "npm:7.0.4"],\ + ["cliui", "npm:8.0.1"],\ ["string-width", "npm:4.2.3"],\ ["strip-ansi", "npm:6.0.1"],\ ["wrap-ansi", "npm:7.0.0"]\ @@ -3295,13 +3654,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["commander", [\ - ["npm:2.20.3", {\ - "packageLocation": "./.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip/node_modules/commander/",\ - "packageDependencies": [\ - ["commander", "npm:2.20.3"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:7.2.0", {\ "packageLocation": "./.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip/node_modules/commander/",\ "packageDependencies": [\ @@ -3385,6 +3737,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["csstype", "npm:3.0.11"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:0.15.12", {\ + "packageLocation": "./.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip/node_modules/css-render/",\ + "packageDependencies": [\ + ["css-render", "npm:0.15.12"],\ + ["@emotion/hash", "npm:0.8.0"],\ + ["csstype", "npm:3.0.11"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["css-select", [\ @@ -3441,26 +3802,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["csstype", [\ - ["npm:2.6.20", {\ - "packageLocation": "./.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip/node_modules/csstype/",\ + ["npm:3.0.11", {\ + "packageLocation": "./.yarn/cache/csstype-npm-3.0.11-b49897178d-95e56abfe9.zip/node_modules/csstype/",\ "packageDependencies": [\ - ["csstype", "npm:2.6.20"]\ + ["csstype", "npm:3.0.11"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:3.0.11", {\ - "packageLocation": "./.yarn/cache/csstype-npm-3.0.11-b49897178d-95e56abfe9.zip/node_modules/csstype/",\ + ["npm:3.1.3", {\ + "packageLocation": "./.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip/node_modules/csstype/",\ "packageDependencies": [\ - ["csstype", "npm:3.0.11"]\ + ["csstype", "npm:3.1.3"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["d3", [\ - ["npm:7.8.4", {\ - "packageLocation": "./.yarn/cache/d3-npm-7.8.4-2a6380492b-8dfea4d026.zip/node_modules/d3/",\ + ["npm:7.9.0", {\ + "packageLocation": "./.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip/node_modules/d3/",\ "packageDependencies": [\ - ["d3", "npm:7.8.4"],\ + ["d3", "npm:7.9.0"],\ ["d3-array", "npm:3.1.6"],\ ["d3-axis", "npm:3.0.0"],\ ["d3-brush", "npm:3.0.0"],\ @@ -3827,28 +4188,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["date-fns", [\ - ["npm:2.28.0", {\ - "packageLocation": "./.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip/node_modules/date-fns/",\ + ["npm:2.30.0", {\ + "packageLocation": "./.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip/node_modules/date-fns/",\ "packageDependencies": [\ - ["date-fns", "npm:2.28.0"]\ + ["date-fns", "npm:2.30.0"],\ + ["@babel/runtime", "npm:7.23.2"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["date-fns-tz", [\ - ["npm:1.3.3", {\ - "packageLocation": "./.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip/node_modules/date-fns-tz/",\ + ["npm:2.0.0", {\ + "packageLocation": "./.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip/node_modules/date-fns-tz/",\ "packageDependencies": [\ - ["date-fns-tz", "npm:1.3.3"]\ + ["date-fns-tz", "npm:2.0.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:1.3.3", {\ - "packageLocation": "./.yarn/__virtual__/date-fns-tz-virtual-ec6b2c4cf2/0/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip/node_modules/date-fns-tz/",\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0", {\ + "packageLocation": "./.yarn/__virtual__/date-fns-tz-virtual-6610d5adee/0/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip/node_modules/date-fns-tz/",\ "packageDependencies": [\ - ["date-fns-tz", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:1.3.3"],\ + ["date-fns-tz", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0"],\ ["@types/date-fns", null],\ - ["date-fns", "npm:2.28.0"]\ + ["date-fns", "npm:2.30.0"]\ ],\ "packagePeers": [\ "@types/date-fns",\ @@ -3879,10 +4241,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:65bed195431eadffc59e2238eb20cc12d9a1665bc7458ce780a9320ff795091b03cb5c4c2094938315ddd967b5b02c0f1df67b3ed435c69b7457092b7cc06ed8#npm:3.2.7", {\ - "packageLocation": "./.yarn/__virtual__/debug-virtual-2e2daad542/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\ + ["virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7", {\ + "packageLocation": "./.yarn/__virtual__/debug-virtual-d2345003b7/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\ "packageDependencies": [\ - ["debug", "virtual:65bed195431eadffc59e2238eb20cc12d9a1665bc7458ce780a9320ff795091b03cb5c4c2094938315ddd967b5b02c0f1df67b3ed435c69b7457092b7cc06ed8#npm:3.2.7"],\ + ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\ ["@types/supports-color", null],\ ["ms", "npm:2.1.2"],\ ["supports-color", null]\ @@ -3932,13 +4294,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["deepmerge", [\ - ["npm:4.2.2", {\ - "packageLocation": "./.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip/node_modules/deepmerge/",\ - "packageDependencies": [\ - ["deepmerge", "npm:4.2.2"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:4.3.1", {\ "packageLocation": "./.yarn/cache/deepmerge-npm-4.3.1-4f751a0844-2024c6a980.zip/node_modules/deepmerge/",\ "packageDependencies": [\ @@ -3947,6 +4302,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["define-data-property", [\ + ["npm:1.1.1", {\ + "packageLocation": "./.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip/node_modules/define-data-property/",\ + "packageDependencies": [\ + ["define-data-property", "npm:1.1.1"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["gopd", "npm:1.0.1"],\ + ["has-property-descriptors", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["define-properties", [\ ["npm:1.1.4", {\ "packageLocation": "./.yarn/cache/define-properties-npm-1.1.4-85ee575655-ce0aef3f9e.zip/node_modules/define-properties/",\ @@ -3956,6 +4323,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["object-keys", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.2.0", {\ + "packageLocation": "./.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip/node_modules/define-properties/",\ + "packageDependencies": [\ + ["define-properties", "npm:1.2.0"],\ + ["has-property-descriptors", "npm:1.0.0"],\ + ["object-keys", "npm:1.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["delaunator", [\ @@ -4009,13 +4385,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["detect-libc", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ - }]\ - ]],\ - ["diff-sequences", [\ - ["npm:27.5.1", {\ - "packageLocation": "./.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip/node_modules/diff-sequences/",\ + }],\ + ["npm:2.0.2", {\ + "packageLocation": "./.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip/node_modules/detect-libc/",\ "packageDependencies": [\ - ["diff-sequences", "npm:27.5.1"]\ + ["detect-libc", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -4184,6 +4558,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["entities", "npm:3.0.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.5.0", {\ + "packageLocation": "./.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip/node_modules/entities/",\ + "packageDependencies": [\ + ["entities", "npm:4.5.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["env-paths", [\ @@ -4215,43 +4596,49 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["es-abstract", [\ - ["npm:1.21.1", {\ - "packageLocation": "./.yarn/cache/es-abstract-npm-1.21.1-28d9a4a469-23ff60d42d.zip/node_modules/es-abstract/",\ + ["npm:1.22.3", {\ + "packageLocation": "./.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip/node_modules/es-abstract/",\ "packageDependencies": [\ - ["es-abstract", "npm:1.21.1"],\ + ["es-abstract", "npm:1.22.3"],\ + ["array-buffer-byte-length", "npm:1.0.0"],\ + ["arraybuffer.prototype.slice", "npm:1.0.2"],\ ["available-typed-arrays", "npm:1.0.5"],\ - ["call-bind", "npm:1.0.2"],\ + ["call-bind", "npm:1.0.5"],\ ["es-set-tostringtag", "npm:2.0.1"],\ ["es-to-primitive", "npm:1.2.1"],\ - ["function-bind", "npm:1.1.1"],\ - ["function.prototype.name", "npm:1.1.5"],\ - ["get-intrinsic", "npm:1.2.0"],\ + ["function.prototype.name", "npm:1.1.6"],\ + ["get-intrinsic", "npm:1.2.2"],\ ["get-symbol-description", "npm:1.0.0"],\ ["globalthis", "npm:1.0.3"],\ ["gopd", "npm:1.0.1"],\ - ["has", "npm:1.0.3"],\ ["has-property-descriptors", "npm:1.0.0"],\ ["has-proto", "npm:1.0.1"],\ ["has-symbols", "npm:1.0.3"],\ - ["internal-slot", "npm:1.0.4"],\ - ["is-array-buffer", "npm:3.0.1"],\ + ["hasown", "npm:2.0.0"],\ + ["internal-slot", "npm:1.0.5"],\ + ["is-array-buffer", "npm:3.0.2"],\ ["is-callable", "npm:1.2.7"],\ ["is-negative-zero", "npm:2.0.2"],\ ["is-regex", "npm:1.1.4"],\ ["is-shared-array-buffer", "npm:1.0.2"],\ ["is-string", "npm:1.0.7"],\ - ["is-typed-array", "npm:1.1.10"],\ + ["is-typed-array", "npm:1.1.12"],\ ["is-weakref", "npm:1.0.2"],\ - ["object-inspect", "npm:1.12.3"],\ + ["object-inspect", "npm:1.13.1"],\ ["object-keys", "npm:1.1.1"],\ ["object.assign", "npm:4.1.4"],\ - ["regexp.prototype.flags", "npm:1.4.3"],\ + ["regexp.prototype.flags", "npm:1.5.1"],\ + ["safe-array-concat", "npm:1.0.1"],\ ["safe-regex-test", "npm:1.0.0"],\ - ["string.prototype.trimend", "npm:1.0.6"],\ - ["string.prototype.trimstart", "npm:1.0.6"],\ + ["string.prototype.trim", "npm:1.2.8"],\ + ["string.prototype.trimend", "npm:1.0.7"],\ + ["string.prototype.trimstart", "npm:1.0.7"],\ + ["typed-array-buffer", "npm:1.0.0"],\ + ["typed-array-byte-length", "npm:1.0.0"],\ + ["typed-array-byte-offset", "npm:1.0.0"],\ ["typed-array-length", "npm:1.0.4"],\ ["unbox-primitive", "npm:1.0.2"],\ - ["which-typed-array", "npm:1.1.9"]\ + ["which-typed-array", "npm:1.1.13"]\ ],\ "linkType": "HARD"\ }]\ @@ -4291,32 +4678,32 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["esbuild", [\ - ["npm:0.17.13", {\ - "packageLocation": "./.yarn/unplugged/esbuild-npm-0.17.13-538abc913d/node_modules/esbuild/",\ - "packageDependencies": [\ - ["esbuild", "npm:0.17.13"],\ - ["@esbuild/android-arm", "npm:0.17.13"],\ - ["@esbuild/android-arm64", "npm:0.17.13"],\ - ["@esbuild/android-x64", "npm:0.17.13"],\ - ["@esbuild/darwin-arm64", "npm:0.17.13"],\ - ["@esbuild/darwin-x64", "npm:0.17.13"],\ - ["@esbuild/freebsd-arm64", "npm:0.17.13"],\ - ["@esbuild/freebsd-x64", "npm:0.17.13"],\ - ["@esbuild/linux-arm", "npm:0.17.13"],\ - ["@esbuild/linux-arm64", "npm:0.17.13"],\ - ["@esbuild/linux-ia32", "npm:0.17.13"],\ - ["@esbuild/linux-loong64", "npm:0.17.13"],\ - ["@esbuild/linux-mips64el", "npm:0.17.13"],\ - ["@esbuild/linux-ppc64", "npm:0.17.13"],\ - ["@esbuild/linux-riscv64", "npm:0.17.13"],\ - ["@esbuild/linux-s390x", "npm:0.17.13"],\ - ["@esbuild/linux-x64", "npm:0.17.13"],\ - ["@esbuild/netbsd-x64", "npm:0.17.13"],\ - ["@esbuild/openbsd-x64", "npm:0.17.13"],\ - ["@esbuild/sunos-x64", "npm:0.17.13"],\ - ["@esbuild/win32-arm64", "npm:0.17.13"],\ - ["@esbuild/win32-ia32", "npm:0.17.13"],\ - ["@esbuild/win32-x64", "npm:0.17.13"]\ + ["npm:0.18.20", {\ + "packageLocation": "./.yarn/unplugged/esbuild-npm-0.18.20-004a76d281/node_modules/esbuild/",\ + "packageDependencies": [\ + ["esbuild", "npm:0.18.20"],\ + ["@esbuild/android-arm", "npm:0.18.20"],\ + ["@esbuild/android-arm64", "npm:0.18.20"],\ + ["@esbuild/android-x64", "npm:0.18.20"],\ + ["@esbuild/darwin-arm64", "npm:0.18.20"],\ + ["@esbuild/darwin-x64", "npm:0.18.20"],\ + ["@esbuild/freebsd-arm64", "npm:0.18.20"],\ + ["@esbuild/freebsd-x64", "npm:0.18.20"],\ + ["@esbuild/linux-arm", "npm:0.18.20"],\ + ["@esbuild/linux-arm64", "npm:0.18.20"],\ + ["@esbuild/linux-ia32", "npm:0.18.20"],\ + ["@esbuild/linux-loong64", "npm:0.18.20"],\ + ["@esbuild/linux-mips64el", "npm:0.18.20"],\ + ["@esbuild/linux-ppc64", "npm:0.18.20"],\ + ["@esbuild/linux-riscv64", "npm:0.18.20"],\ + ["@esbuild/linux-s390x", "npm:0.18.20"],\ + ["@esbuild/linux-x64", "npm:0.18.20"],\ + ["@esbuild/netbsd-x64", "npm:0.18.20"],\ + ["@esbuild/openbsd-x64", "npm:0.18.20"],\ + ["@esbuild/sunos-x64", "npm:0.18.20"],\ + ["@esbuild/win32-arm64", "npm:0.18.20"],\ + ["@esbuild/win32-ia32", "npm:0.18.20"],\ + ["@esbuild/win32-x64", "npm:0.18.20"]\ ],\ "linkType": "HARD"\ }]\ @@ -4356,26 +4743,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint", [\ - ["npm:8.39.0", {\ - "packageLocation": "./.yarn/cache/eslint-npm-8.39.0-d92bace04d-d7a074ff32.zip/node_modules/eslint/",\ - "packageDependencies": [\ - ["eslint", "npm:8.39.0"],\ - ["@eslint-community/eslint-utils", "virtual:d92bace04d6d26247b24721a8766993aa3a98c631265bb389d6aa7c17b2a0708ccc877f009bd6a9cb50b8597fbe776c68dae7621d198ff292ee4bc23bd4b012f#npm:4.4.0"],\ - ["@eslint-community/regexpp", "npm:4.4.1"],\ - ["@eslint/eslintrc", "npm:2.0.2"],\ - ["@eslint/js", "npm:8.39.0"],\ - ["@humanwhocodes/config-array", "npm:0.11.8"],\ + ["npm:8.57.0", {\ + "packageLocation": "./.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip/node_modules/eslint/",\ + "packageDependencies": [\ + ["eslint", "npm:8.57.0"],\ + ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\ + ["@eslint-community/regexpp", "npm:4.8.0"],\ + ["@eslint/eslintrc", "npm:2.1.4"],\ + ["@eslint/js", "npm:8.57.0"],\ + ["@humanwhocodes/config-array", "npm:0.11.14"],\ ["@humanwhocodes/module-importer", "npm:1.0.1"],\ ["@nodelib/fs.walk", "npm:1.2.8"],\ + ["@ungap/structured-clone", "npm:1.2.0"],\ ["ajv", "npm:6.12.6"],\ ["chalk", "npm:4.1.2"],\ ["cross-spawn", "npm:7.0.3"],\ ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\ ["doctrine", "npm:3.0.0"],\ ["escape-string-regexp", "npm:4.0.0"],\ - ["eslint-scope", "npm:7.2.0"],\ - ["eslint-visitor-keys", "npm:3.4.0"],\ - ["espree", "npm:9.5.1"],\ + ["eslint-scope", "npm:7.2.2"],\ + ["eslint-visitor-keys", "npm:3.4.3"],\ + ["espree", "npm:9.6.1"],\ ["esquery", "npm:1.5.0"],\ ["esutils", "npm:2.0.3"],\ ["fast-deep-equal", "npm:3.1.3"],\ @@ -4383,46 +4771,65 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["find-up", "npm:5.0.0"],\ ["glob-parent", "npm:6.0.2"],\ ["globals", "npm:13.19.0"],\ - ["grapheme-splitter", "npm:1.0.4"],\ + ["graphemer", "npm:1.4.0"],\ ["ignore", "npm:5.2.0"],\ - ["import-fresh", "npm:3.3.0"],\ ["imurmurhash", "npm:0.1.4"],\ ["is-glob", "npm:4.0.3"],\ ["is-path-inside", "npm:3.0.3"],\ - ["js-sdsl", "npm:4.1.5"],\ ["js-yaml", "npm:4.1.0"],\ ["json-stable-stringify-without-jsonify", "npm:1.0.1"],\ ["levn", "npm:0.4.1"],\ ["lodash.merge", "npm:4.6.2"],\ ["minimatch", "npm:3.1.2"],\ ["natural-compare", "npm:1.4.0"],\ - ["optionator", "npm:0.9.1"],\ + ["optionator", "npm:0.9.3"],\ ["strip-ansi", "npm:6.0.1"],\ - ["strip-json-comments", "npm:3.1.1"],\ ["text-table", "npm:0.2.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ + ["eslint-compat-utils", [\ + ["npm:0.1.2", {\ + "packageLocation": "./.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip/node_modules/eslint-compat-utils/",\ + "packageDependencies": [\ + ["eslint-compat-utils", "npm:0.1.2"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2", {\ + "packageLocation": "./.yarn/__virtual__/eslint-compat-utils-virtual-a5f7e6147b/0/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip/node_modules/eslint-compat-utils/",\ + "packageDependencies": [\ + ["eslint-compat-utils", "virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2"],\ + ["@types/eslint", null],\ + ["eslint", "npm:8.57.0"]\ + ],\ + "packagePeers": [\ + "@types/eslint",\ + "eslint"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["eslint-config-standard", [\ - ["npm:17.0.0", {\ - "packageLocation": "./.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip/node_modules/eslint-config-standard/",\ + ["npm:17.1.0", {\ + "packageLocation": "./.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip/node_modules/eslint-config-standard/",\ "packageDependencies": [\ - ["eslint-config-standard", "npm:17.0.0"]\ + ["eslint-config-standard", "npm:17.1.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0", {\ - "packageLocation": "./.yarn/__virtual__/eslint-config-standard-virtual-5de208ba69/0/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip/node_modules/eslint-config-standard/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0", {\ + "packageLocation": "./.yarn/__virtual__/eslint-config-standard-virtual-a273ec9ea6/0/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip/node_modules/eslint-config-standard/",\ "packageDependencies": [\ - ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\ + ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\ ["@types/eslint", null],\ ["@types/eslint-plugin-import", null],\ ["@types/eslint-plugin-n", null],\ ["@types/eslint-plugin-promise", null],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.27.5"],\ - ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.7.0"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\ + ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\ ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"]\ ],\ "packagePeers": [\ @@ -4439,38 +4846,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint-import-resolver-node", [\ - ["npm:0.3.7", {\ - "packageLocation": "./.yarn/cache/eslint-import-resolver-node-npm-0.3.7-65bed19543-3379aacf1d.zip/node_modules/eslint-import-resolver-node/",\ + ["npm:0.3.9", {\ + "packageLocation": "./.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip/node_modules/eslint-import-resolver-node/",\ "packageDependencies": [\ - ["eslint-import-resolver-node", "npm:0.3.7"],\ - ["debug", "virtual:65bed195431eadffc59e2238eb20cc12d9a1665bc7458ce780a9320ff795091b03cb5c4c2094938315ddd967b5b02c0f1df67b3ed435c69b7457092b7cc06ed8#npm:3.2.7"],\ - ["is-core-module", "npm:2.11.0"],\ - ["resolve", "patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b"]\ + ["eslint-import-resolver-node", "npm:0.3.9"],\ + ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\ + ["is-core-module", "npm:2.13.0"],\ + ["resolve", "patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["eslint-module-utils", [\ - ["npm:2.7.4", {\ - "packageLocation": "./.yarn/cache/eslint-module-utils-npm-2.7.4-a1640084cb-5da13645da.zip/node_modules/eslint-module-utils/",\ + ["npm:2.8.0", {\ + "packageLocation": "./.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip/node_modules/eslint-module-utils/",\ "packageDependencies": [\ - ["eslint-module-utils", "npm:2.7.4"]\ + ["eslint-module-utils", "npm:2.8.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:bd6906041f26404b69936f019863470d6b0f75b1c61c4157b266eb36d096227fb0d250c76d47e694906c4d352d0c4c1a1a71e1f575fbbb05fe72b26198a32c57#npm:2.7.4", {\ - "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-5ee98b4501/0/cache/eslint-module-utils-npm-2.7.4-a1640084cb-5da13645da.zip/node_modules/eslint-module-utils/",\ + ["virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0", {\ + "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-d80573de1e/0/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip/node_modules/eslint-module-utils/",\ "packageDependencies": [\ - ["eslint-module-utils", "virtual:bd6906041f26404b69936f019863470d6b0f75b1c61c4157b266eb36d096227fb0d250c76d47e694906c4d352d0c4c1a1a71e1f575fbbb05fe72b26198a32c57#npm:2.7.4"],\ + ["eslint-module-utils", "virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0"],\ ["@types/eslint", null],\ ["@types/eslint-import-resolver-node", null],\ ["@types/eslint-import-resolver-typescript", null],\ ["@types/eslint-import-resolver-webpack", null],\ ["@types/typescript-eslint__parser", null],\ ["@typescript-eslint/parser", null],\ - ["debug", "virtual:65bed195431eadffc59e2238eb20cc12d9a1665bc7458ce780a9320ff795091b03cb5c4c2094938315ddd967b5b02c0f1df67b3ed435c69b7457092b7cc06ed8#npm:3.2.7"],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-import-resolver-node", "npm:0.3.7"],\ + ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-import-resolver-node", "npm:0.3.9"],\ ["eslint-import-resolver-typescript", null],\ ["eslint-import-resolver-webpack", null]\ ],\ @@ -4490,20 +4897,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint-plugin-cypress", [\ - ["npm:2.13.3", {\ - "packageLocation": "./.yarn/cache/eslint-plugin-cypress-npm-2.13.3-0ad3bff9c9-9affbcee29.zip/node_modules/eslint-plugin-cypress/",\ + ["npm:2.15.1", {\ + "packageLocation": "./.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip/node_modules/eslint-plugin-cypress/",\ "packageDependencies": [\ - ["eslint-plugin-cypress", "npm:2.13.3"]\ + ["eslint-plugin-cypress", "npm:2.15.1"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.13.3", {\ - "packageLocation": "./.yarn/__virtual__/eslint-plugin-cypress-virtual-2dc00cb202/0/cache/eslint-plugin-cypress-npm-2.13.3-0ad3bff9c9-9affbcee29.zip/node_modules/eslint-plugin-cypress/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1", {\ + "packageLocation": "./.yarn/__virtual__/eslint-plugin-cypress-virtual-33ce75aabf/0/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip/node_modules/eslint-plugin-cypress/",\ "packageDependencies": [\ - ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.13.3"],\ + ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ - ["globals", "npm:11.12.0"]\ + ["eslint", "npm:8.57.0"],\ + ["globals", "npm:13.21.0"]\ ],\ "packagePeers": [\ "@types/eslint",\ @@ -4520,19 +4927,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["npm:4.1.0", {\ - "packageLocation": "./.yarn/cache/eslint-plugin-es-npm-4.1.0-a4cf26d3cd-26b87a216d.zip/node_modules/eslint-plugin-es/",\ - "packageDependencies": [\ - ["eslint-plugin-es", "npm:4.1.0"]\ - ],\ - "linkType": "SOFT"\ - }],\ ["virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1", {\ "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-virtual-9a126af2f5/0/cache/eslint-plugin-es-npm-3.0.1-95e8015220-e57592c523.zip/node_modules/eslint-plugin-es/",\ "packageDependencies": [\ ["eslint-plugin-es", "virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ + ["eslint", "npm:8.57.0"],\ ["eslint-utils", "npm:2.1.0"],\ ["regexpp", "npm:3.2.0"]\ ],\ @@ -4541,15 +4941,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "eslint"\ ],\ "linkType": "HARD"\ + }]\ + ]],\ + ["eslint-plugin-es-x", [\ + ["npm:7.5.0", {\ + "packageLocation": "./.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip/node_modules/eslint-plugin-es-x/",\ + "packageDependencies": [\ + ["eslint-plugin-es-x", "npm:7.5.0"]\ + ],\ + "linkType": "SOFT"\ }],\ - ["virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:4.1.0", {\ - "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-virtual-b9c0bc467b/0/cache/eslint-plugin-es-npm-4.1.0-a4cf26d3cd-26b87a216d.zip/node_modules/eslint-plugin-es/",\ + ["virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0", {\ + "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-x-virtual-ff64d06f93/0/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip/node_modules/eslint-plugin-es-x/",\ "packageDependencies": [\ - ["eslint-plugin-es", "virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:4.1.0"],\ + ["eslint-plugin-es-x", "virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0"],\ + ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\ + ["@eslint-community/regexpp", "npm:4.10.0"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-utils", "npm:2.1.0"],\ - ["regexpp", "npm:3.2.0"]\ + ["eslint", "npm:8.57.0"],\ + ["eslint-compat-utils", "virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2"]\ ],\ "packagePeers": [\ "@types/eslint",\ @@ -4559,36 +4969,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint-plugin-import", [\ - ["npm:2.27.5", {\ - "packageLocation": "./.yarn/cache/eslint-plugin-import-npm-2.27.5-35b044b26f-f500571a38.zip/node_modules/eslint-plugin-import/",\ + ["npm:2.29.1", {\ + "packageLocation": "./.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip/node_modules/eslint-plugin-import/",\ "packageDependencies": [\ - ["eslint-plugin-import", "npm:2.27.5"]\ + ["eslint-plugin-import", "npm:2.29.1"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.27.5", {\ - "packageLocation": "./.yarn/__virtual__/eslint-plugin-import-virtual-bd6906041f/0/cache/eslint-plugin-import-npm-2.27.5-35b044b26f-f500571a38.zip/node_modules/eslint-plugin-import/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1", {\ + "packageLocation": "./.yarn/__virtual__/eslint-plugin-import-virtual-caddce7926/0/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip/node_modules/eslint-plugin-import/",\ "packageDependencies": [\ - ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.27.5"],\ + ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\ ["@types/eslint", null],\ ["@types/typescript-eslint__parser", null],\ ["@typescript-eslint/parser", null],\ - ["array-includes", "npm:3.1.6"],\ - ["array.prototype.flat", "npm:1.3.1"],\ - ["array.prototype.flatmap", "npm:1.3.1"],\ - ["debug", "virtual:65bed195431eadffc59e2238eb20cc12d9a1665bc7458ce780a9320ff795091b03cb5c4c2094938315ddd967b5b02c0f1df67b3ed435c69b7457092b7cc06ed8#npm:3.2.7"],\ + ["array-includes", "npm:3.1.7"],\ + ["array.prototype.findlastindex", "npm:1.2.3"],\ + ["array.prototype.flat", "npm:1.3.2"],\ + ["array.prototype.flatmap", "npm:1.3.2"],\ + ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\ ["doctrine", "npm:2.1.0"],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-import-resolver-node", "npm:0.3.7"],\ - ["eslint-module-utils", "virtual:bd6906041f26404b69936f019863470d6b0f75b1c61c4157b266eb36d096227fb0d250c76d47e694906c4d352d0c4c1a1a71e1f575fbbb05fe72b26198a32c57#npm:2.7.4"],\ - ["has", "npm:1.0.3"],\ - ["is-core-module", "npm:2.11.0"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-import-resolver-node", "npm:0.3.9"],\ + ["eslint-module-utils", "virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0"],\ + ["hasown", "npm:2.0.0"],\ + ["is-core-module", "npm:2.13.1"],\ ["is-glob", "npm:4.0.3"],\ ["minimatch", "npm:3.1.2"],\ - ["object.values", "npm:1.1.6"],\ - ["resolve", "patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b"],\ - ["semver", "npm:6.3.0"],\ - ["tsconfig-paths", "npm:3.14.1"]\ + ["object.fromentries", "npm:2.0.7"],\ + ["object.groupby", "npm:1.0.1"],\ + ["object.values", "npm:1.1.7"],\ + ["semver", "npm:6.3.1"],\ + ["tsconfig-paths", "npm:3.15.0"]\ ],\ "packagePeers": [\ "@types/eslint",\ @@ -4600,27 +5012,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint-plugin-n", [\ - ["npm:15.7.0", {\ - "packageLocation": "./.yarn/cache/eslint-plugin-n-npm-15.7.0-8ea46b0c89-cfbcc67e62.zip/node_modules/eslint-plugin-n/",\ + ["npm:16.6.2", {\ + "packageLocation": "./.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip/node_modules/eslint-plugin-n/",\ "packageDependencies": [\ - ["eslint-plugin-n", "npm:15.7.0"]\ + ["eslint-plugin-n", "npm:16.6.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.7.0", {\ - "packageLocation": "./.yarn/__virtual__/eslint-plugin-n-virtual-fbb8c37210/0/cache/eslint-plugin-n-npm-15.7.0-8ea46b0c89-cfbcc67e62.zip/node_modules/eslint-plugin-n/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2", {\ + "packageLocation": "./.yarn/__virtual__/eslint-plugin-n-virtual-e72a0a9306/0/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip/node_modules/eslint-plugin-n/",\ "packageDependencies": [\ - ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.7.0"],\ + ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\ + ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\ ["@types/eslint", null],\ ["builtins", "npm:5.0.1"],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-plugin-es", "virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:4.1.0"],\ - ["eslint-utils", "virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:3.0.0"],\ - ["ignore", "npm:5.2.0"],\ - ["is-core-module", "npm:2.11.0"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-plugin-es-x", "virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0"],\ + ["get-tsconfig", "npm:4.7.2"],\ + ["globals", "npm:13.24.0"],\ + ["ignore", "npm:5.2.4"],\ + ["is-builtin-module", "npm:3.2.1"],\ + ["is-core-module", "npm:2.12.1"],\ ["minimatch", "npm:3.1.2"],\ - ["resolve", "patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b"],\ - ["semver", "npm:7.3.8"]\ + ["resolve", "patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=07638b"],\ + ["semver", "npm:7.5.3"]\ ],\ "packagePeers": [\ "@types/eslint",\ @@ -4642,7 +5057,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [\ ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ + ["eslint", "npm:8.57.0"],\ ["eslint-plugin-es", "virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1"],\ ["eslint-utils", "npm:2.1.0"],\ ["ignore", "npm:5.2.0"],\ @@ -4670,7 +5085,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [\ ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"]\ + ["eslint", "npm:8.57.0"]\ ],\ "packagePeers": [\ "@types/eslint",\ @@ -4680,25 +5095,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["eslint-plugin-vue", [\ - ["npm:9.11.0", {\ - "packageLocation": "./.yarn/cache/eslint-plugin-vue-npm-9.11.0-b3c0e8ae5d-1bcb6cf768.zip/node_modules/eslint-plugin-vue/",\ + ["npm:9.24.0", {\ + "packageLocation": "./.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip/node_modules/eslint-plugin-vue/",\ "packageDependencies": [\ - ["eslint-plugin-vue", "npm:9.11.0"]\ + ["eslint-plugin-vue", "npm:9.24.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0", {\ - "packageLocation": "./.yarn/__virtual__/eslint-plugin-vue-virtual-b496f670e3/0/cache/eslint-plugin-vue-npm-9.11.0-b3c0e8ae5d-1bcb6cf768.zip/node_modules/eslint-plugin-vue/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0", {\ + "packageLocation": "./.yarn/__virtual__/eslint-plugin-vue-virtual-e080dd5dc6/0/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip/node_modules/eslint-plugin-vue/",\ "packageDependencies": [\ - ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0"],\ - ["@eslint-community/eslint-utils", "virtual:d92bace04d6d26247b24721a8766993aa3a98c631265bb389d6aa7c17b2a0708ccc877f009bd6a9cb50b8597fbe776c68dae7621d198ff292ee4bc23bd4b012f#npm:4.4.0"],\ + ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\ + ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\ ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ + ["eslint", "npm:8.57.0"],\ + ["globals", "npm:13.24.0"],\ ["natural-compare", "npm:1.4.0"],\ ["nth-check", "npm:2.1.1"],\ - ["postcss-selector-parser", "npm:6.0.10"],\ - ["semver", "npm:7.3.7"],\ - ["vue-eslint-parser", "virtual:b496f670e3acb84cc194f988fd3fa15eff7479fe9212e466815f1d307efda1d2ed5782452f48c17f7b772004bd86fa771d60b67ce1881c71b828caf6fc2a9603#npm:9.0.3"],\ + ["postcss-selector-parser", "npm:6.0.15"],\ + ["semver", "npm:7.6.0"],\ + ["vue-eslint-parser", "virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2"],\ ["xml-name-validator", "npm:4.0.0"]\ ],\ "packagePeers": [\ @@ -4718,10 +5134,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:7.2.0", {\ - "packageLocation": "./.yarn/cache/eslint-scope-npm-7.2.0-88784f5a38-64591a2d8b.zip/node_modules/eslint-scope/",\ + ["npm:7.2.2", {\ + "packageLocation": "./.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip/node_modules/eslint-scope/",\ "packageDependencies": [\ - ["eslint-scope", "npm:7.2.0"],\ + ["eslint-scope", "npm:7.2.2"],\ ["esrecurse", "npm:4.3.0"],\ ["estraverse", "npm:5.3.0"]\ ],\ @@ -4736,27 +5152,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint-visitor-keys", "npm:1.3.0"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:3.0.0", {\ - "packageLocation": "./.yarn/cache/eslint-utils-npm-3.0.0-630b3a4013-0668fe02f5.zip/node_modules/eslint-utils/",\ - "packageDependencies": [\ - ["eslint-utils", "npm:3.0.0"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:3.0.0", {\ - "packageLocation": "./.yarn/__virtual__/eslint-utils-virtual-673271877c/0/cache/eslint-utils-npm-3.0.0-630b3a4013-0668fe02f5.zip/node_modules/eslint-utils/",\ - "packageDependencies": [\ - ["eslint-utils", "virtual:fbb8c3721066ef61887f5309241d337d9cae043cc5c9fede0ea8d900cdabf786b9dea63ee87ce779e1ffd85e6a35d182759c106301f028068c68edced9b12f1f#npm:3.0.0"],\ - ["@types/eslint", null],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-visitor-keys", "npm:2.1.0"]\ - ],\ - "packagePeers": [\ - "@types/eslint",\ - "eslint"\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["eslint-visitor-keys", [\ @@ -4767,24 +5162,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:2.1.0", {\ - "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-2.1.0-c31806b6b9-e3081d7dd2.zip/node_modules/eslint-visitor-keys/",\ + ["npm:3.3.0", {\ + "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.3.0-d329af7c8c-d59e68a7c5.zip/node_modules/eslint-visitor-keys/",\ "packageDependencies": [\ - ["eslint-visitor-keys", "npm:2.1.0"]\ + ["eslint-visitor-keys", "npm:3.3.0"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:3.3.0", {\ - "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.3.0-d329af7c8c-d59e68a7c5.zip/node_modules/eslint-visitor-keys/",\ + ["npm:3.4.1", {\ + "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip/node_modules/eslint-visitor-keys/",\ "packageDependencies": [\ - ["eslint-visitor-keys", "npm:3.3.0"]\ + ["eslint-visitor-keys", "npm:3.4.1"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:3.4.0", {\ - "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.4.0-dc8683d774-3315916946.zip/node_modules/eslint-visitor-keys/",\ + ["npm:3.4.3", {\ + "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip/node_modules/eslint-visitor-keys/",\ "packageDependencies": [\ - ["eslint-visitor-keys", "npm:3.4.0"]\ + ["eslint-visitor-keys", "npm:3.4.3"]\ ],\ "linkType": "HARD"\ }]\ @@ -4800,13 +5195,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:9.5.1", {\ - "packageLocation": "./.yarn/cache/espree-npm-9.5.1-057dc7b3c1-cdf6e43540.zip/node_modules/espree/",\ + ["npm:9.6.1", {\ + "packageLocation": "./.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip/node_modules/espree/",\ "packageDependencies": [\ - ["espree", "npm:9.5.1"],\ - ["acorn", "npm:8.8.0"],\ - ["acorn-jsx", "virtual:057dc7b3c1f6024b5a316c7e5d452c8397d903f7ff9736e8d71b89efc60141dc4c8c777c0c1057fa0d3bf0d3dd59eec8694b4efb6f0fb20c747ec060bab7195d#npm:5.3.2"],\ - ["eslint-visitor-keys", "npm:3.4.0"]\ + ["espree", "npm:9.6.1"],\ + ["acorn", "npm:8.10.0"],\ + ["acorn-jsx", "virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2"],\ + ["eslint-visitor-keys", "npm:3.4.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -4999,15 +5394,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["foreground-child", [\ - ["npm:2.0.0", {\ - "packageLocation": "./.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip/node_modules/foreground-child/",\ - "packageDependencies": [\ - ["foreground-child", "npm:2.0.0"],\ - ["cross-spawn", "npm:7.0.3"],\ - ["signal-exit", "npm:3.0.7"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:3.1.1", {\ "packageLocation": "./.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip/node_modules/foreground-child/",\ "packageDependencies": [\ @@ -5063,16 +5449,23 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["function-bind", "npm:1.1.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.1.2", {\ + "packageLocation": "./.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip/node_modules/function-bind/",\ + "packageDependencies": [\ + ["function-bind", "npm:1.1.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["function.prototype.name", [\ - ["npm:1.1.5", {\ - "packageLocation": "./.yarn/cache/function.prototype.name-npm-1.1.5-e776a642bb-acd21d733a.zip/node_modules/function.prototype.name/",\ + ["npm:1.1.6", {\ + "packageLocation": "./.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip/node_modules/function.prototype.name/",\ "packageDependencies": [\ - ["function.prototype.name", "npm:1.1.5"],\ + ["function.prototype.name", "npm:1.1.6"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ ["functions-have-names", "npm:1.2.3"]\ ],\ "linkType": "HARD"\ @@ -5133,6 +5526,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["has-symbols", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.2.1", {\ + "packageLocation": "./.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip/node_modules/get-intrinsic/",\ + "packageDependencies": [\ + ["get-intrinsic", "npm:1.2.1"],\ + ["function-bind", "npm:1.1.1"],\ + ["has", "npm:1.0.3"],\ + ["has-proto", "npm:1.0.1"],\ + ["has-symbols", "npm:1.0.3"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:1.2.2", {\ + "packageLocation": "./.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip/node_modules/get-intrinsic/",\ + "packageDependencies": [\ + ["get-intrinsic", "npm:1.2.2"],\ + ["function-bind", "npm:1.1.2"],\ + ["has-proto", "npm:1.0.1"],\ + ["has-symbols", "npm:1.0.3"],\ + ["hasown", "npm:2.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["get-port", [\ @@ -5155,6 +5570,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["get-tsconfig", [\ + ["npm:4.7.2", {\ + "packageLocation": "./.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip/node_modules/get-tsconfig/",\ + "packageDependencies": [\ + ["get-tsconfig", "npm:4.7.2"],\ + ["resolve-pkg-maps", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["glob", [\ ["npm:10.2.4", {\ "packageLocation": "./.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip/node_modules/glob/",\ @@ -5213,13 +5638,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["globals", [\ - ["npm:11.12.0", {\ - "packageLocation": "./.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip/node_modules/globals/",\ - "packageDependencies": [\ - ["globals", "npm:11.12.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:13.15.0", {\ "packageLocation": "./.yarn/cache/globals-npm-13.15.0-c0b0c83a7a-383ade0873.zip/node_modules/globals/",\ "packageDependencies": [\ @@ -5235,6 +5653,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["type-fest", "npm:0.20.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:13.21.0", {\ + "packageLocation": "./.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip/node_modules/globals/",\ + "packageDependencies": [\ + ["globals", "npm:13.21.0"],\ + ["type-fest", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:13.24.0", {\ + "packageLocation": "./.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip/node_modules/globals/",\ + "packageDependencies": [\ + ["globals", "npm:13.24.0"],\ + ["type-fest", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["globalthis", [\ @@ -5266,11 +5700,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["grapheme-splitter", [\ - ["npm:1.0.4", {\ - "packageLocation": "./.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip/node_modules/grapheme-splitter/",\ + ["graphemer", [\ + ["npm:1.4.0", {\ + "packageLocation": "./.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip/node_modules/graphemer/",\ "packageDependencies": [\ - ["grapheme-splitter", "npm:1.0.4"]\ + ["graphemer", "npm:1.4.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -5357,20 +5791,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["hasown", [\ + ["npm:2.0.0", {\ + "packageLocation": "./.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip/node_modules/hasown/",\ + "packageDependencies": [\ + ["hasown", "npm:2.0.0"],\ + ["function-bind", "npm:1.1.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["highcharts", [\ - ["npm:11.0.1", {\ - "packageLocation": "./.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip/node_modules/highcharts/",\ + ["npm:11.4.0", {\ + "packageLocation": "./.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip/node_modules/highcharts/",\ "packageDependencies": [\ - ["highcharts", "npm:11.0.1"]\ + ["highcharts", "npm:11.4.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["highlight.js", [\ - ["npm:11.5.1", {\ - "packageLocation": "./.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip/node_modules/highlight.js/",\ + ["npm:11.9.0", {\ + "packageLocation": "./.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip/node_modules/highlight.js/",\ "packageDependencies": [\ - ["highlight.js", "npm:11.5.1"]\ + ["highlight.js", "npm:11.9.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -5385,44 +5829,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["html-validate", [\ - ["npm:7.16.0", {\ - "packageLocation": "./.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip/node_modules/html-validate/",\ + ["npm:8.18.1", {\ + "packageLocation": "./.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip/node_modules/html-validate/",\ "packageDependencies": [\ - ["html-validate", "npm:7.16.0"]\ + ["html-validate", "npm:8.18.1"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0", {\ - "packageLocation": "./.yarn/__virtual__/html-validate-virtual-681f166fa5/0/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip/node_modules/html-validate/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1", {\ + "packageLocation": "./.yarn/__virtual__/html-validate-virtual-640261ed3b/0/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip/node_modules/html-validate/",\ "packageDependencies": [\ - ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\ + ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\ ["@babel/code-frame", "npm:7.16.7"],\ - ["@html-validate/stylish", "npm:4.0.1"],\ - ["@sidvind/better-ajv-errors", "virtual:681f166fa525f4703ee9c1e8e4559a36bfdac9fdcbccdfeb239624a192c2aaee56211c254f7093e696cd71a2eaed6484d2ba2bb9ec45b8d53cb66b299a635a53#npm:2.0.0"],\ + ["@html-validate/stylish", "npm:4.1.0"],\ + ["@sidvind/better-ajv-errors", "virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3"],\ ["@types/jest", null],\ ["@types/jest-diff", null],\ ["@types/jest-snapshot", null],\ - ["acorn-walk", "npm:8.2.0"],\ + ["@types/vitest", null],\ ["ajv", "npm:8.11.0"],\ - ["deepmerge", "npm:4.2.2"],\ - ["espree", "npm:9.3.2"],\ + ["deepmerge", "npm:4.3.1"],\ ["glob", "npm:10.2.4"],\ - ["ignore", "npm:5.2.0"],\ + ["ignore", "npm:5.3.1"],\ ["jest", null],\ ["jest-diff", null],\ ["jest-snapshot", null],\ ["kleur", "npm:4.1.4"],\ ["minimist", "npm:1.2.6"],\ ["prompts", "npm:2.4.2"],\ - ["semver", "npm:7.3.7"]\ + ["semver", "npm:7.3.7"],\ + ["vitest", null]\ ],\ "packagePeers": [\ "@types/jest-diff",\ "@types/jest-snapshot",\ "@types/jest",\ + "@types/vitest",\ "jest-diff",\ "jest-snapshot",\ - "jest"\ + "jest",\ + "vitest"\ ],\ "linkType": "HARD"\ }]\ @@ -5435,10 +5881,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:62c761ef265a1bb47118c5f610ff8bb4c7a43de129089ff7c8e3644d9427d7669d4e7e8fe06763510806415fe32bf491fdfbec2819a7040538b412dfe2ab9cb1#npm:2.0.2", {\ - "packageLocation": "./.yarn/__virtual__/htmlnano-virtual-b07a7d37fd/0/cache/htmlnano-npm-2.0.2-a89803bfeb-41f9e0c0e5.zip/node_modules/htmlnano/",\ + ["virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2", {\ + "packageLocation": "./.yarn/__virtual__/htmlnano-virtual-d2bb6df599/0/cache/htmlnano-npm-2.0.2-a89803bfeb-41f9e0c0e5.zip/node_modules/htmlnano/",\ "packageDependencies": [\ - ["htmlnano", "virtual:62c761ef265a1bb47118c5f610ff8bb4c7a43de129089ff7c8e3644d9427d7669d4e7e8fe06763510806415fe32bf491fdfbec2819a7040538b412dfe2ab9cb1#npm:2.0.2"],\ + ["htmlnano", "virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2"],\ ["@types/cssnano", null],\ ["@types/postcss", null],\ ["@types/purgecss", null],\ @@ -5575,6 +6021,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ignore", "npm:5.2.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:5.2.4", {\ + "packageLocation": "./.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip/node_modules/ignore/",\ + "packageDependencies": [\ + ["ignore", "npm:5.2.4"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:5.3.1", {\ + "packageLocation": "./.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip/node_modules/ignore/",\ + "packageDependencies": [\ + ["ignore", "npm:5.3.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["immutable", [\ @@ -5645,11 +6105,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["internal-slot", [\ - ["npm:1.0.4", {\ - "packageLocation": "./.yarn/cache/internal-slot-npm-1.0.4-9183007374-8974588d06.zip/node_modules/internal-slot/",\ + ["npm:1.0.5", {\ + "packageLocation": "./.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip/node_modules/internal-slot/",\ "packageDependencies": [\ - ["internal-slot", "npm:1.0.4"],\ - ["get-intrinsic", "npm:1.2.0"],\ + ["internal-slot", "npm:1.0.5"],\ + ["get-intrinsic", "npm:1.2.1"],\ ["has", "npm:1.0.3"],\ ["side-channel", "npm:1.0.4"]\ ],\ @@ -5684,6 +6144,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["is-typed-array", "npm:1.1.10"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip/node_modules/is-array-buffer/",\ + "packageDependencies": [\ + ["is-array-buffer", "npm:3.0.2"],\ + ["call-bind", "npm:1.0.2"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["is-typed-array", "npm:1.1.10"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["is-arrayish", [\ @@ -5726,6 +6196,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["is-builtin-module", [\ + ["npm:3.2.1", {\ + "packageLocation": "./.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip/node_modules/is-builtin-module/",\ + "packageDependencies": [\ + ["is-builtin-module", "npm:3.2.1"],\ + ["builtin-modules", "npm:3.3.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["is-callable", [\ ["npm:1.2.4", {\ "packageLocation": "./.yarn/cache/is-callable-npm-1.2.4-03fc17459c-1a28d57dc4.zip/node_modules/is-callable/",\ @@ -5743,22 +6223,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["is-core-module", [\ - ["npm:2.10.0", {\ - "packageLocation": "./.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip/node_modules/is-core-module/",\ + ["npm:2.12.1", {\ + "packageLocation": "./.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip/node_modules/is-core-module/",\ "packageDependencies": [\ - ["is-core-module", "npm:2.10.0"],\ + ["is-core-module", "npm:2.12.1"],\ ["has", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:2.11.0", {\ - "packageLocation": "./.yarn/cache/is-core-module-npm-2.11.0-70061e141a-f96fd490c6.zip/node_modules/is-core-module/",\ + ["npm:2.13.0", {\ + "packageLocation": "./.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip/node_modules/is-core-module/",\ "packageDependencies": [\ - ["is-core-module", "npm:2.11.0"],\ + ["is-core-module", "npm:2.13.0"],\ ["has", "npm:1.0.3"]\ ],\ "linkType": "HARD"\ }],\ + ["npm:2.13.1", {\ + "packageLocation": "./.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip/node_modules/is-core-module/",\ + "packageDependencies": [\ + ["is-core-module", "npm:2.13.1"],\ + ["hasown", "npm:2.0.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:2.9.0", {\ "packageLocation": "./.yarn/cache/is-core-module-npm-2.9.0-5ba77c35ae-b27034318b.zip/node_modules/is-core-module/",\ "packageDependencies": [\ @@ -5934,6 +6422,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["has-tostringtag", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.1.12", {\ + "packageLocation": "./.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip/node_modules/is-typed-array/",\ + "packageDependencies": [\ + ["is-typed-array", "npm:1.1.12"],\ + ["which-typed-array", "npm:1.1.13"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["is-weakref", [\ @@ -5946,6 +6442,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["isarray", [\ + ["npm:2.0.5", {\ + "packageLocation": "./.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip/node_modules/isarray/",\ + "packageDependencies": [\ + ["isarray", "npm:2.0.5"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["isbinaryfile", [\ ["npm:4.0.10", {\ "packageLocation": "./.yarn/cache/isbinaryfile-npm-4.0.10-91d1251522-a6b28db7e2.zip/node_modules/isbinaryfile/",\ @@ -5983,13 +6488,23 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["supports-color", "npm:7.2.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.1", {\ + "packageLocation": "./.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip/node_modules/istanbul-lib-report/",\ + "packageDependencies": [\ + ["istanbul-lib-report", "npm:3.0.1"],\ + ["istanbul-lib-coverage", "npm:3.2.0"],\ + ["make-dir", "npm:4.0.0"],\ + ["supports-color", "npm:7.2.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["istanbul-reports", [\ - ["npm:3.1.4", {\ - "packageLocation": "./.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip/node_modules/istanbul-reports/",\ + ["npm:3.1.6", {\ + "packageLocation": "./.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip/node_modules/istanbul-reports/",\ "packageDependencies": [\ - ["istanbul-reports", "npm:3.1.4"],\ + ["istanbul-reports", "npm:3.1.6"],\ ["html-escaper", "npm:2.0.2"],\ ["istanbul-lib-report", "npm:3.0.0"]\ ],\ @@ -6007,46 +6522,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["jest-diff", [\ - ["npm:27.5.1", {\ - "packageLocation": "./.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip/node_modules/jest-diff/",\ - "packageDependencies": [\ - ["jest-diff", "npm:27.5.1"],\ - ["chalk", "npm:4.1.2"],\ - ["diff-sequences", "npm:27.5.1"],\ - ["jest-get-type", "npm:27.5.1"],\ - ["pretty-format", "npm:27.5.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["jest-get-type", [\ - ["npm:27.5.1", {\ - "packageLocation": "./.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip/node_modules/jest-get-type/",\ - "packageDependencies": [\ - ["jest-get-type", "npm:27.5.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["jest-matcher-utils", [\ - ["npm:27.5.1", {\ - "packageLocation": "./.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip/node_modules/jest-matcher-utils/",\ - "packageDependencies": [\ - ["jest-matcher-utils", "npm:27.5.1"],\ - ["chalk", "npm:4.1.2"],\ - ["jest-diff", "npm:27.5.1"],\ - ["jest-get-type", "npm:27.5.1"],\ - ["pretty-format", "npm:27.5.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["jquery", [\ - ["npm:3.6.4", {\ - "packageLocation": "./.yarn/cache/jquery-npm-3.6.4-c665e9b5ea-8354f7bd0a.zip/node_modules/jquery/",\ + ["npm:3.7.1", {\ + "packageLocation": "./.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip/node_modules/jquery/",\ "packageDependencies": [\ - ["jquery", "npm:3.6.4"]\ + ["jquery", "npm:3.7.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -6064,7 +6544,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [\ ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\ ["@types/jquery", null],\ - ["jquery", "npm:3.6.4"]\ + ["jquery", "npm:3.7.1"]\ ],\ "packagePeers": [\ "@types/jquery",\ @@ -6082,15 +6562,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["js-sdsl", [\ - ["npm:4.1.5", {\ - "packageLocation": "./.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip/node_modules/js-sdsl/",\ - "packageDependencies": [\ - ["js-sdsl", "npm:4.1.5"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["js-stringify", [\ ["npm:1.0.2", {\ "packageLocation": "./.yarn/cache/js-stringify-npm-1.0.2-898ffeac57-f9701d9e53.zip/node_modules/js-stringify/",\ @@ -6336,6 +6807,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["weak-lru-cache", "npm:1.2.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.8.5", {\ + "packageLocation": "./.yarn/unplugged/lmdb-npm-2.8.5-e5fdd937dd/node_modules/lmdb/",\ + "packageDependencies": [\ + ["lmdb", "npm:2.8.5"],\ + ["@lmdb/lmdb-darwin-arm64", "npm:2.8.5"],\ + ["@lmdb/lmdb-darwin-x64", "npm:2.8.5"],\ + ["@lmdb/lmdb-linux-arm", "npm:2.8.5"],\ + ["@lmdb/lmdb-linux-arm64", "npm:2.8.5"],\ + ["@lmdb/lmdb-linux-x64", "npm:2.8.5"],\ + ["@lmdb/lmdb-win32-x64", "npm:2.8.5"],\ + ["msgpackr", "npm:1.9.9"],\ + ["node-addon-api", "npm:6.1.0"],\ + ["node-gyp", "npm:9.0.0"],\ + ["node-gyp-build-optional-packages", "npm:5.1.1"],\ + ["ordered-binary", "npm:1.4.1"],\ + ["weak-lru-cache", "npm:1.2.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["locate-path", [\ @@ -6400,20 +6890,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["luxon", [\ - ["npm:3.3.0", {\ - "packageLocation": "./.yarn/cache/luxon-npm-3.3.0-bdbae9bfd5-50cf17a0dc.zip/node_modules/luxon/",\ + ["npm:3.4.4", {\ + "packageLocation": "./.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip/node_modules/luxon/",\ "packageDependencies": [\ - ["luxon", "npm:3.3.0"]\ + ["luxon", "npm:3.4.4"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["magic-string", [\ - ["npm:0.25.9", {\ - "packageLocation": "./.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip/node_modules/magic-string/",\ + ["npm:0.30.7", {\ + "packageLocation": "./.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip/node_modules/magic-string/",\ "packageDependencies": [\ - ["magic-string", "npm:0.25.9"],\ - ["sourcemap-codec", "npm:1.4.8"]\ + ["magic-string", "npm:0.30.7"],\ + ["@jridgewell/sourcemap-codec", "npm:1.4.15"]\ ],\ "linkType": "HARD"\ }]\ @@ -6426,6 +6916,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:6.3.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.0.0", {\ + "packageLocation": "./.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip/node_modules/make-dir/",\ + "packageDependencies": [\ + ["make-dir", "npm:4.0.0"],\ + ["semver", "npm:7.5.3"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["make-fetch-happen", [\ @@ -6610,13 +7108,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["moment", "npm:2.29.4"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.30.1", {\ + "packageLocation": "./.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip/node_modules/moment/",\ + "packageDependencies": [\ + ["moment", "npm:2.30.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["moment-timezone", [\ - ["npm:0.5.43", {\ - "packageLocation": "./.yarn/cache/moment-timezone-npm-0.5.43-1304d8602a-8075c897ed.zip/node_modules/moment-timezone/",\ + ["npm:0.5.45", {\ + "packageLocation": "./.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip/node_modules/moment-timezone/",\ "packageDependencies": [\ - ["moment-timezone", "npm:0.5.43"],\ + ["moment-timezone", "npm:0.5.45"],\ ["moment", "npm:2.29.4"]\ ],\ "linkType": "HARD"\ @@ -6646,6 +7151,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["msgpackr", [\ + ["npm:1.10.1", {\ + "packageLocation": "./.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip/node_modules/msgpackr/",\ + "packageDependencies": [\ + ["msgpackr", "npm:1.10.1"],\ + ["msgpackr-extract", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:1.6.0", {\ "packageLocation": "./.yarn/cache/msgpackr-npm-1.6.0-de9303a46e-7f94acbe93.zip/node_modules/msgpackr/",\ "packageDependencies": [\ @@ -6653,6 +7166,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["msgpackr-extract", "npm:2.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.9.9", {\ + "packageLocation": "./.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip/node_modules/msgpackr/",\ + "packageDependencies": [\ + ["msgpackr", "npm:1.9.9"],\ + ["msgpackr-extract", "npm:3.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["msgpackr-extract", [\ @@ -6670,6 +7191,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-gyp-build-optional-packages", "npm:5.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.0.2", {\ + "packageLocation": "./.yarn/unplugged/msgpackr-extract-npm-3.0.2-93e8773fad/node_modules/msgpackr-extract/",\ + "packageDependencies": [\ + ["msgpackr-extract", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:3.0.2"],\ + ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:3.0.2"],\ + ["node-gyp", "npm:9.0.0"],\ + ["node-gyp-build-optional-packages", "npm:5.0.7"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["muggle-string", [\ + ["npm:0.4.1", {\ + "packageLocation": "./.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip/node_modules/muggle-string/",\ + "packageDependencies": [\ + ["muggle-string", "npm:0.4.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["murmurhash-js", [\ @@ -6682,37 +7227,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["naive-ui", [\ - ["npm:2.34.3", {\ - "packageLocation": "./.yarn/cache/naive-ui-npm-2.34.3-ba2dfb08d8-792d9e6c51.zip/node_modules/naive-ui/",\ + ["npm:2.38.1", {\ + "packageLocation": "./.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip/node_modules/naive-ui/",\ "packageDependencies": [\ - ["naive-ui", "npm:2.34.3"]\ + ["naive-ui", "npm:2.38.1"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.34.3", {\ - "packageLocation": "./.yarn/__virtual__/naive-ui-virtual-4fa5810747/0/cache/naive-ui-npm-2.34.3-ba2dfb08d8-792d9e6c51.zip/node_modules/naive-ui/",\ - "packageDependencies": [\ - ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.34.3"],\ - ["@css-render/plugin-bem", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10"],\ - ["@css-render/vue3-ssr", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10"],\ - ["@types/katex", "npm:0.14.0"],\ - ["@types/lodash", "npm:4.14.182"],\ - ["@types/lodash-es", "npm:4.17.6"],\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1", {\ + "packageLocation": "./.yarn/__virtual__/naive-ui-virtual-32fd9c861d/0/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip/node_modules/naive-ui/",\ + "packageDependencies": [\ + ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\ + ["@css-render/plugin-bem", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\ + ["@css-render/vue3-ssr", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\ + ["@types/katex", "npm:0.16.5"],\ + ["@types/lodash", "npm:4.14.200"],\ + ["@types/lodash-es", "npm:4.17.10"],\ ["@types/vue", null],\ - ["async-validator", "npm:4.1.1"],\ - ["css-render", "npm:0.15.10"],\ - ["date-fns", "npm:2.28.0"],\ - ["date-fns-tz", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:1.3.3"],\ + ["async-validator", "npm:4.2.5"],\ + ["css-render", "npm:0.15.12"],\ + ["csstype", "npm:3.1.3"],\ + ["date-fns", "npm:2.30.0"],\ + ["date-fns-tz", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0"],\ ["evtd", "npm:0.2.4"],\ - ["highlight.js", "npm:11.5.1"],\ + ["highlight.js", "npm:11.9.0"],\ ["lodash", "npm:4.17.21"],\ ["lodash-es", "npm:4.17.21"],\ - ["seemly", "npm:0.3.6"],\ + ["seemly", "npm:0.3.8"],\ ["treemate", "npm:0.3.11"],\ - ["vdirs", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.1.8"],\ - ["vooks", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.2.12"],\ - ["vue", "npm:3.2.47"],\ - ["vueuc", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.4.47"]\ + ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\ + ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ + ["vueuc", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -6722,17 +7268,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["nanoid", [\ - ["npm:3.3.3", {\ - "packageLocation": "./.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip/node_modules/nanoid/",\ - "packageDependencies": [\ - ["nanoid", "npm:3.3.3"]\ - ],\ - "linkType": "HARD"\ - }],\ - ["npm:3.3.6", {\ - "packageLocation": "./.yarn/cache/nanoid-npm-3.3.6-e6d6ae7e71-7d0eda6570.zip/node_modules/nanoid/",\ + ["npm:3.3.7", {\ + "packageLocation": "./.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip/node_modules/nanoid/",\ "packageDependencies": [\ - ["nanoid", "npm:3.3.6"]\ + ["nanoid", "npm:3.3.7"]\ ],\ "linkType": "HARD"\ }]\ @@ -6771,6 +7310,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-gyp", "npm:9.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:6.1.0", {\ + "packageLocation": "./.yarn/unplugged/node-addon-api-npm-6.1.0-634c545b39/node_modules/node-addon-api/",\ + "packageDependencies": [\ + ["node-addon-api", "npm:6.1.0"],\ + ["node-gyp", "npm:9.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["node-gyp", [\ @@ -6815,6 +7362,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-gyp-build-optional-packages", "npm:5.0.3"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:5.0.7", {\ + "packageLocation": "./.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip/node_modules/node-gyp-build-optional-packages/",\ + "packageDependencies": [\ + ["node-gyp-build-optional-packages", "npm:5.0.7"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:5.1.1", {\ + "packageLocation": "./.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip/node_modules/node-gyp-build-optional-packages/",\ + "packageDependencies": [\ + ["node-gyp-build-optional-packages", "npm:5.1.1"],\ + ["detect-libc", "npm:2.0.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["node-releases", [\ @@ -6894,10 +7456,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:1.12.3", {\ - "packageLocation": "./.yarn/cache/object-inspect-npm-1.12.3-1e7d20f5ff-dabfd824d9.zip/node_modules/object-inspect/",\ + ["npm:1.13.1", {\ + "packageLocation": "./.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip/node_modules/object-inspect/",\ "packageDependencies": [\ - ["object-inspect", "npm:1.12.3"]\ + ["object-inspect", "npm:1.13.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -6924,14 +7486,39 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["object.fromentries", [\ + ["npm:2.0.7", {\ + "packageLocation": "./.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip/node_modules/object.fromentries/",\ + "packageDependencies": [\ + ["object.fromentries", "npm:2.0.7"],\ + ["call-bind", "npm:1.0.2"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["object.groupby", [\ + ["npm:1.0.1", {\ + "packageLocation": "./.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip/node_modules/object.groupby/",\ + "packageDependencies": [\ + ["object.groupby", "npm:1.0.1"],\ + ["call-bind", "npm:1.0.2"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"],\ + ["get-intrinsic", "npm:1.2.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["object.values", [\ - ["npm:1.1.6", {\ - "packageLocation": "./.yarn/cache/object.values-npm-1.1.6-ab9b67ccd3-f6fff9fd81.zip/node_modules/object.values/",\ + ["npm:1.1.7", {\ + "packageLocation": "./.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip/node_modules/object.values/",\ "packageDependencies": [\ - ["object.values", "npm:1.1.6"],\ + ["object.values", "npm:1.1.7"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"]\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"]\ ],\ "linkType": "HARD"\ }]\ @@ -6957,16 +7544,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["optionator", [\ - ["npm:0.9.1", {\ - "packageLocation": "./.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip/node_modules/optionator/",\ + ["npm:0.9.3", {\ + "packageLocation": "./.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip/node_modules/optionator/",\ "packageDependencies": [\ - ["optionator", "npm:0.9.1"],\ + ["optionator", "npm:0.9.3"],\ + ["@aashutoshrathi/word-wrap", "npm:1.2.6"],\ ["deep-is", "npm:0.1.4"],\ ["fast-levenshtein", "npm:2.0.6"],\ ["levn", "npm:0.4.1"],\ ["prelude-ls", "npm:1.2.1"],\ - ["type-check", "npm:0.4.0"],\ - ["word-wrap", "npm:1.2.3"]\ + ["type-check", "npm:0.4.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -6978,6 +7565,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ordered-binary", "npm:1.2.5"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.4.1", {\ + "packageLocation": "./.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip/node_modules/ordered-binary/",\ + "packageDependencies": [\ + ["ordered-binary", "npm:1.4.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["p-limit", [\ @@ -7011,32 +7605,32 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["parcel", [\ - ["npm:2.8.3", {\ - "packageLocation": "./.yarn/cache/parcel-npm-2.8.3-5d8a8e1092-09cd2dc23c.zip/node_modules/parcel/",\ + ["npm:2.12.0", {\ + "packageLocation": "./.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip/node_modules/parcel/",\ "packageDependencies": [\ - ["parcel", "npm:2.8.3"]\ + ["parcel", "npm:2.12.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.8.3", {\ - "packageLocation": "./.yarn/__virtual__/parcel-virtual-079004f749/0/cache/parcel-npm-2.8.3-5d8a8e1092-09cd2dc23c.zip/node_modules/parcel/",\ - "packageDependencies": [\ - ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.8.3"],\ - ["@parcel/config-default", "virtual:079004f749aaa3b41d1755e479be6fc0871d8df3c6d97e1317ea81a49502572ac0da821e08a1cc3e408b007d7607c0863e93b8975d65134412812579e6733926#npm:2.8.3"],\ - ["@parcel/core", "npm:2.8.3"],\ - ["@parcel/diagnostic", "npm:2.8.3"],\ - ["@parcel/events", "npm:2.8.3"],\ - ["@parcel/fs", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/logger", "npm:2.8.3"],\ - ["@parcel/package-manager", "virtual:1751106c31c022beab60638c8a9494de4916f0aa7d7ea5bf610db1916ce86c51e464d56c223dd24e1a6fe3f7439c0465735b9968451150db84bbb38b4819b62c#npm:2.8.3"],\ - ["@parcel/reporter-cli", "npm:2.8.3"],\ - ["@parcel/reporter-dev-server", "npm:2.8.3"],\ - ["@parcel/utils", "npm:2.8.3"],\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0", {\ + "packageLocation": "./.yarn/__virtual__/parcel-virtual-fdd74b573c/0/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip/node_modules/parcel/",\ + "packageDependencies": [\ + ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\ + ["@parcel/config-default", "virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0"],\ + ["@parcel/core", "npm:2.12.0"],\ + ["@parcel/diagnostic", "npm:2.12.0"],\ + ["@parcel/events", "npm:2.12.0"],\ + ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/logger", "npm:2.12.0"],\ + ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\ + ["@parcel/reporter-cli", "npm:2.12.0"],\ + ["@parcel/reporter-dev-server", "npm:2.12.0"],\ + ["@parcel/reporter-tracer", "npm:2.12.0"],\ + ["@parcel/utils", "npm:2.12.0"],\ ["@types/parcel__core", null],\ ["chalk", "npm:4.1.2"],\ ["commander", "npm:7.2.0"],\ - ["get-port", "npm:4.2.0"],\ - ["v8-compile-cache", "npm:2.3.0"]\ + ["get-port", "npm:4.2.0"]\ ],\ "packagePeers": [\ "@types/parcel__core"\ @@ -7142,25 +7736,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["pinia", [\ - ["npm:2.0.35", {\ - "packageLocation": "./.yarn/cache/pinia-npm-2.0.35-60f8addaf8-cecb1e1e97.zip/node_modules/pinia/",\ + ["npm:2.1.7", {\ + "packageLocation": "./.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip/node_modules/pinia/",\ "packageDependencies": [\ - ["pinia", "npm:2.0.35"]\ + ["pinia", "npm:2.1.7"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35", {\ - "packageLocation": "./.yarn/__virtual__/pinia-virtual-9f965060ea/0/cache/pinia-npm-2.0.35-60f8addaf8-cecb1e1e97.zip/node_modules/pinia/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7", {\ + "packageLocation": "./.yarn/__virtual__/pinia-virtual-cf6f7439ee/0/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip/node_modules/pinia/",\ "packageDependencies": [\ - ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\ + ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\ ["@types/typescript", null],\ ["@types/vue", null],\ ["@types/vue__composition-api", null],\ ["@vue/composition-api", null],\ ["@vue/devtools-api", "npm:6.5.0"],\ ["typescript", null],\ - ["vue", "npm:3.2.47"],\ - ["vue-demi", "virtual:9f965060eafe5d7d052212cc7fd6fef913db724957f695b650ecef8b5179ad752b46bfcd2beb1965c04a72ea327c1241f8e860a445f77aaf193b4f78ba29f8b4#npm:0.13.1"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ + ["vue-demi", "virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5"]\ ],\ "packagePeers": [\ "@types/typescript",\ @@ -7189,8 +7783,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/vue", null],\ ["@types/vue__composition-api", null],\ ["@vue/composition-api", null],\ - ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\ - ["vue", "npm:3.2.47"],\ + ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ ["vue-demi", "virtual:f56fcf19bbebc2ada1b28955da8cc216b1e9a569a1a7337d2d1926c1ebd1bc7a5bd91aedae1d05c15c8562f33caf7c59bd3020a667340f6bdc6a7b13fc2ba847#npm:0.12.5"]\ ],\ "packagePeers": [\ @@ -7205,21 +7799,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["postcss", [\ - ["npm:8.4.12", {\ - "packageLocation": "./.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip/node_modules/postcss/",\ + ["npm:8.4.33", {\ + "packageLocation": "./.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip/node_modules/postcss/",\ "packageDependencies": [\ - ["postcss", "npm:8.4.12"],\ - ["nanoid", "npm:3.3.3"],\ + ["postcss", "npm:8.4.33"],\ + ["nanoid", "npm:3.3.7"],\ ["picocolors", "npm:1.0.0"],\ ["source-map-js", "npm:1.0.2"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:8.4.23", {\ - "packageLocation": "./.yarn/cache/postcss-npm-8.4.23-d4a02a832d-8bb9d1b2ea.zip/node_modules/postcss/",\ + ["npm:8.4.35", {\ + "packageLocation": "./.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip/node_modules/postcss/",\ "packageDependencies": [\ - ["postcss", "npm:8.4.23"],\ - ["nanoid", "npm:3.3.6"],\ + ["postcss", "npm:8.4.35"],\ + ["nanoid", "npm:3.3.7"],\ ["picocolors", "npm:1.0.0"],\ ["source-map-js", "npm:1.0.2"]\ ],\ @@ -7227,10 +7821,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["postcss-selector-parser", [\ - ["npm:6.0.10", {\ - "packageLocation": "./.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip/node_modules/postcss-selector-parser/",\ + ["npm:6.0.15", {\ + "packageLocation": "./.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip/node_modules/postcss-selector-parser/",\ "packageDependencies": [\ - ["postcss-selector-parser", "npm:6.0.10"],\ + ["postcss-selector-parser", "npm:6.0.15"],\ ["cssesc", "npm:3.0.0"],\ ["util-deprecate", "npm:1.0.2"]\ ],\ @@ -7303,18 +7897,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["pretty-format", [\ - ["npm:27.5.1", {\ - "packageLocation": "./.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip/node_modules/pretty-format/",\ - "packageDependencies": [\ - ["pretty-format", "npm:27.5.1"],\ - ["ansi-regex", "npm:5.0.1"],\ - ["ansi-styles", "npm:5.2.0"],\ - ["react-is", "npm:17.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["promise", [\ ["npm:7.3.1", {\ "packageLocation": "./.yarn/cache/promise-npm-7.3.1-5d81d474c0-475bb06913.zip/node_modules/promise/",\ @@ -7547,15 +8129,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["react-is", [\ - ["npm:17.0.2", {\ - "packageLocation": "./.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip/node_modules/react-is/",\ - "packageDependencies": [\ - ["react-is", "npm:17.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["react-refresh", [\ ["npm:0.9.0", {\ "packageLocation": "./.yarn/cache/react-refresh-npm-0.9.0-02c61ee045-6440146176.zip/node_modules/react-refresh/",\ @@ -7594,16 +8167,23 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["regenerator-runtime", "npm:0.13.9"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:0.14.0", {\ + "packageLocation": "./.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip/node_modules/regenerator-runtime/",\ + "packageDependencies": [\ + ["regenerator-runtime", "npm:0.14.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["regexp.prototype.flags", [\ - ["npm:1.4.3", {\ - "packageLocation": "./.yarn/cache/regexp.prototype.flags-npm-1.4.3-df1c08b65d-51228bae73.zip/node_modules/regexp.prototype.flags/",\ + ["npm:1.5.1", {\ + "packageLocation": "./.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip/node_modules/regexp.prototype.flags/",\ "packageDependencies": [\ - ["regexp.prototype.flags", "npm:1.4.3"],\ + ["regexp.prototype.flags", "npm:1.5.1"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["functions-have-names", "npm:1.2.3"]\ + ["define-properties", "npm:1.2.0"],\ + ["set-function-name", "npm:2.0.1"]\ ],\ "linkType": "HARD"\ }]\ @@ -7646,11 +8226,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b", {\ - "packageLocation": "./.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip/node_modules/resolve/",\ + ["patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=07638b", {\ + "packageLocation": "./.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip/node_modules/resolve/",\ + "packageDependencies": [\ + ["resolve", "patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=07638b"],\ + ["is-core-module", "npm:2.12.1"],\ + ["path-parse", "npm:1.0.7"],\ + ["supports-preserve-symlinks-flag", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b", {\ + "packageLocation": "./.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip/node_modules/resolve/",\ "packageDependencies": [\ - ["resolve", "patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b"],\ - ["is-core-module", "npm:2.10.0"],\ + ["resolve", "patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b"],\ + ["is-core-module", "npm:2.13.0"],\ ["path-parse", "npm:1.0.7"],\ ["supports-preserve-symlinks-flag", "npm:1.0.0"]\ ],\ @@ -7666,6 +8256,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["resolve-pkg-maps", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip/node_modules/resolve-pkg-maps/",\ + "packageDependencies": [\ + ["resolve-pkg-maps", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["retry", [\ ["npm:0.12.0", {\ "packageLocation": "./.yarn/cache/retry-npm-0.12.0-72ac7fb4cc-623bd7d2e5.zip/node_modules/retry/",\ @@ -7704,10 +8303,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["rollup", [\ - ["npm:3.21.6", {\ - "packageLocation": "./.yarn/cache/rollup-npm-3.21.6-ae95b73a21-bb6786ee0d.zip/node_modules/rollup/",\ + ["npm:3.29.4", {\ + "packageLocation": "./.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip/node_modules/rollup/",\ "packageDependencies": [\ - ["rollup", "npm:3.21.6"],\ + ["rollup", "npm:3.29.4"],\ ["fsevents", "patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7"]\ ],\ "linkType": "HARD"\ @@ -7718,70 +8317,70 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./",\ "packageDependencies": [\ ["root-workspace-0b6124", "workspace:."],\ - ["@faker-js/faker", "npm:7.6.0"],\ - ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/core", "npm:6.1.6"],\ - ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.6"],\ - ["@parcel/optimizer-data-url", "npm:2.8.3"],\ - ["@parcel/transformer-inline-string", "npm:2.8.3"],\ - ["@parcel/transformer-sass", "npm:2.8.3"],\ - ["@popperjs/core", "npm:2.11.7"],\ - ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.0.2"],\ + ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/core", "npm:6.1.11"],\ + ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\ + ["@parcel/optimizer-data-url", "npm:2.12.0"],\ + ["@parcel/transformer-inline-string", "npm:2.12.0"],\ + ["@parcel/transformer-sass", "npm:2.12.0"],\ + ["@popperjs/core", "npm:2.11.8"],\ + ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\ ["@twuni/emojify", "npm:1.0.2"],\ - ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.2.1"],\ - ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.3"],\ - ["bootstrap-icons", "npm:1.10.5"],\ - ["browser-fs-access", "npm:0.33.1"],\ + ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\ + ["@vue/language-plugin-pug", "npm:2.0.7"],\ + ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\ + ["bootstrap-icons", "npm:1.11.3"],\ + ["browser-fs-access", "npm:0.35.0"],\ ["browserlist", "npm:1.0.1"],\ - ["c8", "npm:7.13.0"],\ - ["caniuse-lite", "npm:1.0.30001481"],\ - ["d3", "npm:7.8.4"],\ - ["eslint", "npm:8.39.0"],\ - ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\ - ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.13.3"],\ - ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.27.5"],\ - ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.7.0"],\ + ["c8", "npm:9.1.0"],\ + ["caniuse-lite", "npm:1.0.30001603"],\ + ["d3", "npm:7.9.0"],\ + ["eslint", "npm:8.57.0"],\ + ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\ + ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\ + ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\ + ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\ ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\ ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\ - ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.11.0"],\ + ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\ ["file-saver", "npm:2.0.5"],\ - ["highcharts", "npm:11.0.1"],\ - ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.16.0"],\ + ["highcharts", "npm:11.4.0"],\ + ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\ ["ical.js", "npm:1.5.0"],\ - ["jquery", "npm:3.6.4"],\ + ["jquery", "npm:3.7.1"],\ ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\ ["js-cookie", "npm:3.0.5"],\ ["list.js", "npm:2.3.1"],\ ["lodash", "npm:4.17.21"],\ ["lodash-es", "npm:4.17.21"],\ - ["luxon", "npm:3.3.0"],\ - ["moment", "npm:2.29.4"],\ - ["moment-timezone", "npm:0.5.43"],\ + ["luxon", "npm:3.4.4"],\ + ["moment", "npm:2.30.1"],\ + ["moment-timezone", "npm:0.5.45"],\ ["ms", "npm:2.1.3"],\ ["murmurhash-js", "npm:1.0.0"],\ - ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.34.3"],\ - ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.8.3"],\ - ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.35"],\ + ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\ + ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\ + ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\ ["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\ ["pug", "npm:3.0.2"],\ - ["sass", "npm:1.62.1"],\ + ["sass", "npm:1.72.0"],\ ["seedrandom", "npm:3.0.5"],\ ["select2", "npm:4.1.0-rc.0"],\ ["select2-bootstrap-5-theme", "npm:1.3.0"],\ ["send", "npm:0.18.0"],\ - ["shepherd.js", "npm:11.1.1"],\ + ["shepherd.js", "npm:11.2.0"],\ ["slugify", "npm:1.6.6"],\ - ["sortablejs", "npm:1.15.0"],\ - ["vanillajs-datepicker", "npm:1.3.1"],\ - ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.4"],\ - ["vue", "npm:3.2.47"],\ - ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.6"],\ + ["sortablejs", "npm:1.15.2"],\ + ["vanillajs-datepicker", "npm:1.3.4"],\ + ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ + ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\ ["zxcvbn", "npm:4.4.2"]\ ],\ "linkType": "SOFT"\ @@ -7806,6 +8405,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["safe-array-concat", [\ + ["npm:1.0.1", {\ + "packageLocation": "./.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip/node_modules/safe-array-concat/",\ + "packageDependencies": [\ + ["safe-array-concat", "npm:1.0.1"],\ + ["call-bind", "npm:1.0.2"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["has-symbols", "npm:1.0.3"],\ + ["isarray", "npm:2.0.5"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["safe-buffer", [\ ["npm:5.1.2", {\ "packageLocation": "./.yarn/cache/safe-buffer-npm-5.1.2-c27fedf6c4-f2f1f7943c.zip/node_modules/safe-buffer/",\ @@ -7854,10 +8466,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:1.62.1", {\ - "packageLocation": "./.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip/node_modules/sass/",\ + ["npm:1.72.0", {\ + "packageLocation": "./.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip/node_modules/sass/",\ "packageDependencies": [\ - ["sass", "npm:1.62.1"],\ + ["sass", "npm:1.72.0"],\ ["chokidar", "npm:3.5.3"],\ ["immutable", "npm:4.0.0"],\ ["source-map-js", "npm:1.0.2"]\ @@ -7875,18 +8487,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["seemly", [\ - ["npm:0.3.3", {\ - "packageLocation": "./.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip/node_modules/seemly/",\ + ["npm:0.3.6", {\ + "packageLocation": "./.yarn/cache/seemly-npm-0.3.6-87ae398976-56d0472d99.zip/node_modules/seemly/",\ "packageDependencies": [\ - ["seemly", "npm:0.3.3"],\ - ["@types/jest", "npm:27.4.1"]\ + ["seemly", "npm:0.3.6"]\ ],\ "linkType": "HARD"\ }],\ - ["npm:0.3.6", {\ - "packageLocation": "./.yarn/cache/seemly-npm-0.3.6-87ae398976-56d0472d99.zip/node_modules/seemly/",\ + ["npm:0.3.8", {\ + "packageLocation": "./.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip/node_modules/seemly/",\ "packageDependencies": [\ - ["seemly", "npm:0.3.6"]\ + ["seemly", "npm:0.3.8"]\ ],\ "linkType": "HARD"\ }]\ @@ -7926,6 +8537,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ + ["npm:6.3.1", {\ + "packageLocation": "./.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip/node_modules/semver/",\ + "packageDependencies": [\ + ["semver", "npm:6.3.1"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:7.3.7", {\ "packageLocation": "./.yarn/cache/semver-npm-7.3.7-3bfe704194-2fa3e87756.zip/node_modules/semver/",\ "packageDependencies": [\ @@ -7934,10 +8552,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ - ["npm:7.3.8", {\ - "packageLocation": "./.yarn/cache/semver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip/node_modules/semver/",\ + ["npm:7.5.3", {\ + "packageLocation": "./.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip/node_modules/semver/",\ + "packageDependencies": [\ + ["semver", "npm:7.5.3"],\ + ["lru-cache", "npm:6.0.0"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:7.5.4", {\ + "packageLocation": "./.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip/node_modules/semver/",\ + "packageDependencies": [\ + ["semver", "npm:7.5.4"],\ + ["lru-cache", "npm:6.0.0"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:7.6.0", {\ + "packageLocation": "./.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip/node_modules/semver/",\ "packageDependencies": [\ - ["semver", "npm:7.3.8"],\ + ["semver", "npm:7.6.0"],\ ["lru-cache", "npm:6.0.0"]\ ],\ "linkType": "HARD"\ @@ -7974,6 +8608,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["set-function-length", [\ + ["npm:1.1.1", {\ + "packageLocation": "./.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip/node_modules/set-function-length/",\ + "packageDependencies": [\ + ["set-function-length", "npm:1.1.1"],\ + ["define-data-property", "npm:1.1.1"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["gopd", "npm:1.0.1"],\ + ["has-property-descriptors", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["set-function-name", [\ + ["npm:2.0.1", {\ + "packageLocation": "./.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip/node_modules/set-function-name/",\ + "packageDependencies": [\ + ["set-function-name", "npm:2.0.1"],\ + ["define-data-property", "npm:1.1.1"],\ + ["functions-have-names", "npm:1.2.3"],\ + ["has-property-descriptors", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["setprototypeof", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/setprototypeof-npm-1.2.0-0fedbdcd3a-be18cbbf70.zip/node_modules/setprototypeof/",\ @@ -8003,11 +8662,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["shepherd.js", [\ - ["npm:11.1.1", {\ - "packageLocation": "./.yarn/cache/shepherd.js-npm-11.1.1-c87ab2ed73-1d2a0563b6.zip/node_modules/shepherd.js/",\ + ["npm:11.2.0", {\ + "packageLocation": "./.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip/node_modules/shepherd.js/",\ "packageDependencies": [\ - ["shepherd.js", "npm:11.1.1"],\ - ["@floating-ui/dom", "npm:1.2.6"],\ + ["shepherd.js", "npm:11.2.0"],\ + ["@floating-ui/dom", "npm:1.5.2"],\ ["deepmerge", "npm:4.3.1"]\ ],\ "linkType": "HARD"\ @@ -8092,10 +8751,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["sortablejs", [\ - ["npm:1.15.0", {\ - "packageLocation": "./.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip/node_modules/sortablejs/",\ + ["npm:1.15.2", {\ + "packageLocation": "./.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip/node_modules/sortablejs/",\ "packageDependencies": [\ - ["sortablejs", "npm:1.15.0"]\ + ["sortablejs", "npm:1.15.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -8118,26 +8777,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["source-map-support", [\ - ["npm:0.5.21", {\ - "packageLocation": "./.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip/node_modules/source-map-support/",\ - "packageDependencies": [\ - ["source-map-support", "npm:0.5.21"],\ - ["buffer-from", "npm:1.1.2"],\ - ["source-map", "npm:0.6.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["sourcemap-codec", [\ - ["npm:1.4.8", {\ - "packageLocation": "./.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip/node_modules/sourcemap-codec/",\ - "packageDependencies": [\ - ["sourcemap-codec", "npm:1.4.8"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["srcset", [\ ["npm:4.0.0", {\ "packageLocation": "./.yarn/cache/srcset-npm-4.0.0-4e99d43236-aceb898c92.zip/node_modules/srcset/",\ @@ -8206,26 +8845,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["string.prototype.trim", [\ + ["npm:1.2.8", {\ + "packageLocation": "./.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip/node_modules/string.prototype.trim/",\ + "packageDependencies": [\ + ["string.prototype.trim", "npm:1.2.8"],\ + ["call-bind", "npm:1.0.2"],\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["string.prototype.trimend", [\ - ["npm:1.0.6", {\ - "packageLocation": "./.yarn/cache/string.prototype.trimend-npm-1.0.6-304246ecc1-0fdc34645a.zip/node_modules/string.prototype.trimend/",\ + ["npm:1.0.7", {\ + "packageLocation": "./.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip/node_modules/string.prototype.trimend/",\ "packageDependencies": [\ - ["string.prototype.trimend", "npm:1.0.6"],\ + ["string.prototype.trimend", "npm:1.0.7"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"]\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["string.prototype.trimstart", [\ - ["npm:1.0.6", {\ - "packageLocation": "./.yarn/cache/string.prototype.trimstart-npm-1.0.6-0926caea6c-89080feef4.zip/node_modules/string.prototype.trimstart/",\ + ["npm:1.0.7", {\ + "packageLocation": "./.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip/node_modules/string.prototype.trimstart/",\ "packageDependencies": [\ - ["string.prototype.trimstart", "npm:1.0.6"],\ + ["string.prototype.trimstart", "npm:1.0.7"],\ ["call-bind", "npm:1.0.2"],\ - ["define-properties", "npm:1.1.4"],\ - ["es-abstract", "npm:1.21.1"]\ + ["define-properties", "npm:1.2.0"],\ + ["es-abstract", "npm:1.22.3"]\ ],\ "linkType": "HARD"\ }]\ @@ -8343,19 +8994,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["terser", [\ - ["npm:5.16.5", {\ - "packageLocation": "./.yarn/cache/terser-npm-5.16.5-b3f4101afe-f2c1a087fa.zip/node_modules/terser/",\ - "packageDependencies": [\ - ["terser", "npm:5.16.5"],\ - ["@jridgewell/source-map", "npm:0.3.2"],\ - ["acorn", "npm:8.7.1"],\ - ["commander", "npm:2.20.3"],\ - ["source-map-support", "npm:0.5.21"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["test-exclude", [\ ["npm:6.0.0", {\ "packageLocation": "./.yarn/cache/test-exclude-npm-6.0.0-3fb03d69df-3b34a3d771.zip/node_modules/test-exclude/",\ @@ -8433,10 +9071,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["tsconfig-paths", [\ - ["npm:3.14.1", {\ - "packageLocation": "./.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip/node_modules/tsconfig-paths/",\ + ["npm:3.15.0", {\ + "packageLocation": "./.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip/node_modules/tsconfig-paths/",\ "packageDependencies": [\ - ["tsconfig-paths", "npm:3.14.1"],\ + ["tsconfig-paths", "npm:3.15.0"],\ ["@types/json5", "npm:0.0.29"],\ ["json5", "npm:1.0.2"],\ ["minimist", "npm:1.2.6"],\ @@ -8473,6 +9111,45 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["typed-array-buffer", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip/node_modules/typed-array-buffer/",\ + "packageDependencies": [\ + ["typed-array-buffer", "npm:1.0.0"],\ + ["call-bind", "npm:1.0.2"],\ + ["get-intrinsic", "npm:1.2.1"],\ + ["is-typed-array", "npm:1.1.10"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["typed-array-byte-length", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip/node_modules/typed-array-byte-length/",\ + "packageDependencies": [\ + ["typed-array-byte-length", "npm:1.0.0"],\ + ["call-bind", "npm:1.0.2"],\ + ["for-each", "npm:0.3.3"],\ + ["has-proto", "npm:1.0.1"],\ + ["is-typed-array", "npm:1.1.10"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["typed-array-byte-offset", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip/node_modules/typed-array-byte-offset/",\ + "packageDependencies": [\ + ["typed-array-byte-offset", "npm:1.0.0"],\ + ["available-typed-arrays", "npm:1.0.5"],\ + ["call-bind", "npm:1.0.2"],\ + ["for-each", "npm:0.3.3"],\ + ["has-proto", "npm:1.0.1"],\ + ["is-typed-array", "npm:1.1.10"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["typed-array-length", [\ ["npm:1.0.4", {\ "packageLocation": "./.yarn/cache/typed-array-length-npm-1.0.4-92771b81fc-2228febc93.zip/node_modules/typed-array-length/",\ @@ -8546,15 +9223,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["v8-compile-cache", [\ - ["npm:2.3.0", {\ - "packageLocation": "./.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip/node_modules/v8-compile-cache/",\ - "packageDependencies": [\ - ["v8-compile-cache", "npm:2.3.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["v8-to-istanbul", [\ ["npm:9.0.1", {\ "packageLocation": "./.yarn/cache/v8-to-istanbul-npm-9.0.1-58bbce7857-a49c34bf0a.zip/node_modules/v8-to-istanbul/",\ @@ -8568,10 +9236,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["vanillajs-datepicker", [\ - ["npm:1.3.1", {\ - "packageLocation": "./.yarn/cache/vanillajs-datepicker-npm-1.3.1-75a9d66ea4-c01ea7ec70.zip/node_modules/vanillajs-datepicker/",\ + ["npm:1.3.4", {\ + "packageLocation": "./.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip/node_modules/vanillajs-datepicker/",\ "packageDependencies": [\ - ["vanillajs-datepicker", "npm:1.3.1"]\ + ["vanillajs-datepicker", "npm:1.3.4"]\ ],\ "linkType": "HARD"\ }]\ @@ -8584,13 +9252,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.1.8", {\ - "packageLocation": "./.yarn/__virtual__/vdirs-virtual-f3d9f623fd/0/cache/vdirs-npm-0.1.8-59a32a98d6-a7be8ccad3.zip/node_modules/vdirs/",\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8", {\ + "packageLocation": "./.yarn/__virtual__/vdirs-virtual-6e8e27ef7d/0/cache/vdirs-npm-0.1.8-59a32a98d6-a7be8ccad3.zip/node_modules/vdirs/",\ "packageDependencies": [\ - ["vdirs", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.1.8"],\ + ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\ ["@types/vue", null],\ ["evtd", "npm:0.2.3"],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8600,41 +9268,45 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["vite", [\ - ["npm:4.3.4", {\ - "packageLocation": "./.yarn/cache/vite-npm-4.3.4-4744edd48c-90ce3923ef.zip/node_modules/vite/",\ + ["npm:4.5.3", {\ + "packageLocation": "./.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip/node_modules/vite/",\ "packageDependencies": [\ - ["vite", "npm:4.3.4"]\ + ["vite", "npm:4.5.3"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.4", {\ - "packageLocation": "./.yarn/__virtual__/vite-virtual-610e3576a6/0/cache/vite-npm-4.3.4-4744edd48c-90ce3923ef.zip/node_modules/vite/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3", {\ + "packageLocation": "./.yarn/__virtual__/vite-virtual-69c30fd9fd/0/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip/node_modules/vite/",\ "packageDependencies": [\ - ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.4"],\ + ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\ ["@types/less", null],\ + ["@types/lightningcss", null],\ ["@types/node", null],\ ["@types/sass", null],\ ["@types/stylus", null],\ ["@types/sugarss", null],\ ["@types/terser", null],\ - ["esbuild", "npm:0.17.13"],\ + ["esbuild", "npm:0.18.20"],\ ["fsevents", "patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7"],\ ["less", null],\ - ["postcss", "npm:8.4.23"],\ - ["rollup", "npm:3.21.6"],\ - ["sass", "npm:1.62.1"],\ + ["lightningcss", null],\ + ["postcss", "npm:8.4.33"],\ + ["rollup", "npm:3.29.4"],\ + ["sass", "npm:1.72.0"],\ ["stylus", null],\ ["sugarss", null],\ ["terser", null]\ ],\ "packagePeers": [\ "@types/less",\ + "@types/lightningcss",\ "@types/node",\ "@types/sass",\ "@types/stylus",\ "@types/sugarss",\ "@types/terser",\ "less",\ + "lightningcss",\ "sass",\ "stylus",\ "sugarss",\ @@ -8652,6 +9324,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["volar-service-html", [\ + ["npm:0.0.34", {\ + "packageLocation": "./.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip/node_modules/volar-service-html/",\ + "packageDependencies": [\ + ["volar-service-html", "npm:0.0.34"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34", {\ + "packageLocation": "./.yarn/__virtual__/volar-service-html-virtual-5a9107a24d/0/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip/node_modules/volar-service-html/",\ + "packageDependencies": [\ + ["volar-service-html", "virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34"],\ + ["@types/volar__language-service", null],\ + ["@volar/language-service", "npm:2.1.4"],\ + ["vscode-html-languageservice", "npm:5.1.2"],\ + ["vscode-languageserver-textdocument", "npm:1.0.11"],\ + ["vscode-uri", "npm:3.0.8"]\ + ],\ + "packagePeers": [\ + "@types/volar__language-service",\ + "@volar/language-service"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["volar-service-pug", [\ + ["npm:0.0.34", {\ + "packageLocation": "./.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip/node_modules/volar-service-pug/",\ + "packageDependencies": [\ + ["volar-service-pug", "npm:0.0.34"],\ + ["@volar/language-service", "npm:2.1.4"],\ + ["pug-lexer", "npm:5.0.1"],\ + ["pug-parser", "npm:6.0.0"],\ + ["volar-service-html", "virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34"],\ + ["vscode-html-languageservice", "npm:5.1.2"],\ + ["vscode-languageserver-textdocument", "npm:1.0.11"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["vooks", [\ ["npm:0.2.12", {\ "packageLocation": "./.yarn/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\ @@ -8660,13 +9372,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.2.12", {\ - "packageLocation": "./.yarn/__virtual__/vooks-virtual-f44f5b55b4/0/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12", {\ + "packageLocation": "./.yarn/__virtual__/vooks-virtual-ca0a47c4bf/0/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\ "packageDependencies": [\ - ["vooks", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.2.12"],\ + ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\ ["@types/vue", null],\ ["evtd", "npm:0.2.3"],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8675,16 +9387,89 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["vscode-html-languageservice", [\ + ["npm:5.1.2", {\ + "packageLocation": "./.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip/node_modules/vscode-html-languageservice/",\ + "packageDependencies": [\ + ["vscode-html-languageservice", "npm:5.1.2"],\ + ["@vscode/l10n", "npm:0.0.18"],\ + ["vscode-languageserver-textdocument", "npm:1.0.11"],\ + ["vscode-languageserver-types", "npm:3.17.5"],\ + ["vscode-uri", "npm:3.0.8"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["vscode-jsonrpc", [\ + ["npm:8.2.0", {\ + "packageLocation": "./.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip/node_modules/vscode-jsonrpc/",\ + "packageDependencies": [\ + ["vscode-jsonrpc", "npm:8.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["vscode-languageserver-protocol", [\ + ["npm:3.17.5", {\ + "packageLocation": "./.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip/node_modules/vscode-languageserver-protocol/",\ + "packageDependencies": [\ + ["vscode-languageserver-protocol", "npm:3.17.5"],\ + ["vscode-jsonrpc", "npm:8.2.0"],\ + ["vscode-languageserver-types", "npm:3.17.5"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["vscode-languageserver-textdocument", [\ + ["npm:1.0.11", {\ + "packageLocation": "./.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip/node_modules/vscode-languageserver-textdocument/",\ + "packageDependencies": [\ + ["vscode-languageserver-textdocument", "npm:1.0.11"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["vscode-languageserver-types", [\ + ["npm:3.17.5", {\ + "packageLocation": "./.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip/node_modules/vscode-languageserver-types/",\ + "packageDependencies": [\ + ["vscode-languageserver-types", "npm:3.17.5"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["vscode-uri", [\ + ["npm:3.0.8", {\ + "packageLocation": "./.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip/node_modules/vscode-uri/",\ + "packageDependencies": [\ + ["vscode-uri", "npm:3.0.8"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["vue", [\ - ["npm:3.2.47", {\ - "packageLocation": "./.yarn/cache/vue-npm-3.2.47-487db916e1-3b586f61fd.zip/node_modules/vue/",\ + ["npm:3.4.21", {\ + "packageLocation": "./.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip/node_modules/vue/",\ + "packageDependencies": [\ + ["vue", "npm:3.4.21"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21", {\ + "packageLocation": "./.yarn/__virtual__/vue-virtual-b79af6274d/0/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip/node_modules/vue/",\ "packageDependencies": [\ - ["vue", "npm:3.2.47"],\ - ["@vue/compiler-dom", "npm:3.2.47"],\ - ["@vue/compiler-sfc", "npm:3.2.47"],\ - ["@vue/runtime-dom", "npm:3.2.47"],\ - ["@vue/server-renderer", "virtual:487db916e160a571ff50687ed972004ec0078aa76b7fedf7bdabfd607dfed3ba7b2d1f51e99387f885501b4dbb11471c0ce20d647adb7ae38656bbc259642ae8#npm:3.2.47"],\ - ["@vue/shared", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\ + ["@types/typescript", null],\ + ["@vue/compiler-dom", "npm:3.4.21"],\ + ["@vue/compiler-sfc", "npm:3.4.21"],\ + ["@vue/runtime-dom", "npm:3.4.21"],\ + ["@vue/server-renderer", "virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21"],\ + ["@vue/shared", "npm:3.4.21"],\ + ["typescript", null]\ + ],\ + "packagePeers": [\ + "@types/typescript",\ + "typescript"\ ],\ "linkType": "HARD"\ }]\ @@ -8697,21 +9482,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["npm:0.13.1", {\ - "packageLocation": "./.yarn/unplugged/vue-demi-virtual-89e28ee82b/node_modules/vue-demi/",\ + ["npm:0.14.5", {\ + "packageLocation": "./.yarn/unplugged/vue-demi-virtual-b0e571907e/node_modules/vue-demi/",\ "packageDependencies": [\ - ["vue-demi", "npm:0.13.1"]\ + ["vue-demi", "npm:0.14.5"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:9f965060eafe5d7d052212cc7fd6fef913db724957f695b650ecef8b5179ad752b46bfcd2beb1965c04a72ea327c1241f8e860a445f77aaf193b4f78ba29f8b4#npm:0.13.1", {\ - "packageLocation": "./.yarn/unplugged/vue-demi-virtual-89e28ee82b/node_modules/vue-demi/",\ + ["virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5", {\ + "packageLocation": "./.yarn/unplugged/vue-demi-virtual-b0e571907e/node_modules/vue-demi/",\ "packageDependencies": [\ - ["vue-demi", "virtual:9f965060eafe5d7d052212cc7fd6fef913db724957f695b650ecef8b5179ad752b46bfcd2beb1965c04a72ea327c1241f8e860a445f77aaf193b4f78ba29f8b4#npm:0.13.1"],\ + ["vue-demi", "virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5"],\ ["@types/vue", null],\ ["@types/vue__composition-api", null],\ ["@vue/composition-api", null],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8728,7 +9513,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/vue", null],\ ["@types/vue__composition-api", null],\ ["@vue/composition-api", null],\ - ["vue", "npm:3.2.47"]\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8740,20 +9525,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["vue-eslint-parser", [\ - ["npm:9.0.3", {\ - "packageLocation": "./.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip/node_modules/vue-eslint-parser/",\ + ["npm:9.4.2", {\ + "packageLocation": "./.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip/node_modules/vue-eslint-parser/",\ "packageDependencies": [\ - ["vue-eslint-parser", "npm:9.0.3"]\ + ["vue-eslint-parser", "npm:9.4.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:b496f670e3acb84cc194f988fd3fa15eff7479fe9212e466815f1d307efda1d2ed5782452f48c17f7b772004bd86fa771d60b67ce1881c71b828caf6fc2a9603#npm:9.0.3", {\ - "packageLocation": "./.yarn/__virtual__/vue-eslint-parser-virtual-a1ca4a04bf/0/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip/node_modules/vue-eslint-parser/",\ + ["virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2", {\ + "packageLocation": "./.yarn/__virtual__/vue-eslint-parser-virtual-f703c550a2/0/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip/node_modules/vue-eslint-parser/",\ "packageDependencies": [\ - ["vue-eslint-parser", "virtual:b496f670e3acb84cc194f988fd3fa15eff7479fe9212e466815f1d307efda1d2ed5782452f48c17f7b772004bd86fa771d60b67ce1881c71b828caf6fc2a9603#npm:9.0.3"],\ + ["vue-eslint-parser", "virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2"],\ ["@types/eslint", null],\ ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\ - ["eslint", "npm:8.39.0"],\ + ["eslint", "npm:8.57.0"],\ ["eslint-scope", "npm:7.1.1"],\ ["eslint-visitor-keys", "npm:3.3.0"],\ ["espree", "npm:9.3.2"],\ @@ -8769,20 +9554,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["vue-router", [\ - ["npm:4.1.6", {\ - "packageLocation": "./.yarn/cache/vue-router-npm-4.1.6-ccab7109e1-c7f0156ac0.zip/node_modules/vue-router/",\ + ["npm:4.3.0", {\ + "packageLocation": "./.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip/node_modules/vue-router/",\ "packageDependencies": [\ - ["vue-router", "npm:4.1.6"]\ + ["vue-router", "npm:4.3.0"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.6", {\ - "packageLocation": "./.yarn/__virtual__/vue-router-virtual-670ec833a5/0/cache/vue-router-npm-4.1.6-ccab7109e1-c7f0156ac0.zip/node_modules/vue-router/",\ + ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0", {\ + "packageLocation": "./.yarn/__virtual__/vue-router-virtual-82f54143bf/0/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip/node_modules/vue-router/",\ "packageDependencies": [\ - ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.6"],\ + ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\ ["@types/vue", null],\ - ["@vue/devtools-api", "npm:6.4.5"],\ - ["vue", "npm:3.2.47"]\ + ["@vue/devtools-api", "npm:6.6.1"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8792,26 +9577,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["vueuc", [\ - ["npm:0.4.47", {\ - "packageLocation": "./.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip/node_modules/vueuc/",\ + ["npm:0.4.58", {\ + "packageLocation": "./.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip/node_modules/vueuc/",\ "packageDependencies": [\ - ["vueuc", "npm:0.4.47"]\ + ["vueuc", "npm:0.4.58"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.4.47", {\ - "packageLocation": "./.yarn/__virtual__/vueuc-virtual-326ef48c83/0/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip/node_modules/vueuc/",\ + ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58", {\ + "packageLocation": "./.yarn/__virtual__/vueuc-virtual-2366be83ef/0/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip/node_modules/vueuc/",\ "packageDependencies": [\ - ["vueuc", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.4.47"],\ - ["@css-render/vue3-ssr", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.15.10"],\ + ["vueuc", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58"],\ + ["@css-render/vue3-ssr", "virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10"],\ ["@juggle/resize-observer", "npm:3.3.1"],\ ["@types/vue", null],\ ["css-render", "npm:0.15.10"],\ - ["evtd", "npm:0.2.3"],\ - ["seemly", "npm:0.3.3"],\ - ["vdirs", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.1.8"],\ - ["vooks", "virtual:4fa5810747c131dcf20cc36c17e835ba5fa42265b3b1f99a6712420e8672195f31ac73d077125c82af29bde6232df6ecc61b1f3ff0dde337b62085ef712e7d6a#npm:0.2.12"],\ - ["vue", "npm:3.2.47"]\ + ["evtd", "npm:0.2.4"],\ + ["seemly", "npm:0.3.6"],\ + ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\ + ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\ + ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\ ],\ "packagePeers": [\ "@types/vue",\ @@ -8854,16 +9639,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["which-typed-array", [\ - ["npm:1.1.9", {\ - "packageLocation": "./.yarn/cache/which-typed-array-npm-1.1.9-9559c95dfc-fe0178ca44.zip/node_modules/which-typed-array/",\ + ["npm:1.1.13", {\ + "packageLocation": "./.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip/node_modules/which-typed-array/",\ "packageDependencies": [\ - ["which-typed-array", "npm:1.1.9"],\ + ["which-typed-array", "npm:1.1.13"],\ ["available-typed-arrays", "npm:1.0.5"],\ - ["call-bind", "npm:1.0.2"],\ + ["call-bind", "npm:1.0.5"],\ ["for-each", "npm:0.3.3"],\ ["gopd", "npm:1.0.1"],\ - ["has-tostringtag", "npm:1.0.0"],\ - ["is-typed-array", "npm:1.1.10"]\ + ["has-tostringtag", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -8891,15 +9675,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["word-wrap", [\ - ["npm:1.2.3", {\ - "packageLocation": "./.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip/node_modules/word-wrap/",\ - "packageDependencies": [\ - ["word-wrap", "npm:1.2.3"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["wrap-ansi", [\ ["npm:7.0.0", {\ "packageLocation": "./.yarn/cache/wrap-ansi-npm-7.0.0-ad6e1a0554-a790b846fd.zip/node_modules/wrap-ansi/",\ @@ -8977,26 +9752,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["yargs", [\ - ["npm:16.2.0", {\ - "packageLocation": "./.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip/node_modules/yargs/",\ + ["npm:17.7.2", {\ + "packageLocation": "./.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip/node_modules/yargs/",\ "packageDependencies": [\ - ["yargs", "npm:16.2.0"],\ - ["cliui", "npm:7.0.4"],\ + ["yargs", "npm:17.7.2"],\ + ["cliui", "npm:8.0.1"],\ ["escalade", "npm:3.1.1"],\ ["get-caller-file", "npm:2.0.5"],\ ["require-directory", "npm:2.1.1"],\ ["string-width", "npm:4.2.3"],\ ["y18n", "npm:5.0.8"],\ - ["yargs-parser", "npm:20.2.9"]\ + ["yargs-parser", "npm:21.1.1"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["yargs-parser", [\ - ["npm:20.2.9", {\ - "packageLocation": "./.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip/node_modules/yargs-parser/",\ + ["npm:21.1.1", {\ + "packageLocation": "./.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip/node_modules/yargs-parser/",\ "packageDependencies": [\ - ["yargs-parser", "npm:20.2.9"]\ + ["yargs-parser", "npm:21.1.1"]\ ],\ "linkType": "HARD"\ }]\ diff --git a/.vscode/launch.json b/.vscode/launch.json index 8dfc1b9b7a3..227eb8f6155 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "program": "${workspaceFolder}/ietf/manage.py", "args": [ "runserver", - "0.0.0.0:8000", + "0.0.0.0:8001", "--settings=settings_local" ], "django": true, @@ -30,7 +30,7 @@ "program": "${workspaceFolder}/ietf/manage.py", "args": [ "runserver", - "0.0.0.0:8000", + "0.0.0.0:8001", "--settings=settings_local_vite" ], "django": true, @@ -48,7 +48,7 @@ "program": "${workspaceFolder}/ietf/manage.py", "args": [ "runserver", - "0.0.0.0:8000", + "0.0.0.0:8001", "--settings=settings_local_debug" ], "django": true, diff --git a/.vscode/settings.json b/.vscode/settings.json index 6acc6412645..b323cd02f77 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,55 +1,61 @@ { - "taskExplorer.exclude": [ - "**/.vscode-test/**", - "**/bin/**", - "**/build/**", - "**/CompiledOutput/**", - "**/dist/**", - "**/doc/**", - "**/ext/**", - "**/out/**", - "**/output/**", - "**/packages/**", - "**/release/**", - "**/releases/**", - "**/samples/**", - "**/sdks/**", - "**/static/**", - "**/target/**", - "**/test/**", - "**/third_party/**", - "**/vendor/**", - "**/work/**", - "/workspace/bootstrap/nuget/MyGet.ps1" - ], - "taskExplorer.enableAnt": false, - "taskExplorer.enableAppPublisher": false, - "taskExplorer.enablePipenv": false, - "taskExplorer.enableBash": false, - "taskExplorer.enableBatch": false, - "taskExplorer.enableGradle": false, - "taskExplorer.enableGrunt": false, - "taskExplorer.enableGulp": false, - "taskExplorer.enablePerl": false, - "taskExplorer.enableMake": false, - "taskExplorer.enableMaven": false, - "taskExplorer.enableNsis": false, - "taskExplorer.enableNpm": false, - "taskExplorer.enablePowershell": false, - "taskExplorer.enablePython": false, - "taskExplorer.enableRuby": false, - "taskExplorer.enableTsc": false, - "taskExplorer.enableWorkspace": true, - "taskExplorer.enableExplorerView": false, - "taskExplorer.enableSideBar": true, - "search.exclude": { - "**/.yarn": true, - "**/.pnp.*": true - }, - "eslint.nodePath": ".yarn/sdks", - "eslint.validate": [ - "javascript", - "javascriptreact", - "vue" - ] + "taskExplorer.exclude": [ + "**/.vscode-test/**", + "**/bin/**", + "**/build/**", + "**/CompiledOutput/**", + "**/dist/**", + "**/doc/**", + "**/ext/**", + "**/out/**", + "**/output/**", + "**/packages/**", + "**/release/**", + "**/releases/**", + "**/samples/**", + "**/sdks/**", + "**/static/**", + "**/target/**", + "**/test/**", + "**/third_party/**", + "**/vendor/**", + "**/work/**", + "/workspace/bootstrap/nuget/MyGet.ps1" + ], + "taskExplorer.enabledTasks": { + "ant": false, + "bash": false, + "batch": false, + "composer": false, + "gradle": false, + "grunt": false, + "gulp": false, + "make": false, + "maven": false, + "npm": false, + "perl": false, + "pipenv": false, + "powershell": false, + "python": false, + "ruby": false, + "tsc": false + }, + "taskExplorer.enableExplorerView": false, + "taskExplorer.enableSideBar": true, + "taskExplorer.showLastTasks": false, + "search.exclude": { + "**/.yarn": true, + "**/.pnp.*": true + }, + "eslint.nodePath": ".yarn/sdks", + "eslint.validate": [ + "javascript", + "javascriptreact", + "vue" + ], + "python.linting.pylintArgs": ["--load-plugins", "pylint_django"], + "python.testing.pytestEnabled": false, + "python.testing.unittestEnabled": false, + "python.linting.enabled": true, + "python.terminal.shellIntegration.enabled": false } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7e43a30f885..8b36b0e6ac9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -48,7 +48,7 @@ "args": [ "${workspaceFolder}/ietf/manage.py", "test", - "--settings=settings_postgrestest" + "--settings=settings_test" ], "group": "test", "presentation": { @@ -68,7 +68,7 @@ "args": [ "${workspaceFolder}/ietf/manage.py", "test", - "--settings=settings_postgrestest", + "--settings=settings_test", "--pattern=tests_js.py" ], "group": "test", @@ -105,10 +105,11 @@ "command": "/usr/local/bin/python", "args": [ "-m", - "smtpd", + "aiosmtpd", "-n", "-c", - "DebuggingServer", + "ietf.utils.aiosmtpd.DevDebuggingHandler", + "-l", "localhost:2025" ], "presentation": { diff --git a/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip b/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip new file mode 100644 index 00000000000..9334304c2a2 Binary files /dev/null and b/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip differ diff --git a/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip b/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip new file mode 100644 index 00000000000..7b6c44fc3f1 Binary files /dev/null and b/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip differ diff --git a/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip b/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip new file mode 100644 index 00000000000..f0d44978579 Binary files /dev/null and b/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip differ diff --git a/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip b/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip deleted file mode 100644 index 7df7772871c..00000000000 Binary files a/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip and /dev/null differ diff --git a/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip b/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip new file mode 100644 index 00000000000..7145fae1186 Binary files /dev/null and b/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip differ diff --git a/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip b/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip new file mode 100644 index 00000000000..0e75f8a4c7e Binary files /dev/null and b/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip differ diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.13-3c31ee9bef-8.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.13-3c31ee9bef-8.zip deleted file mode 100644 index 90c4b9139a3..00000000000 Binary files a/.yarn/cache/@esbuild-darwin-arm64-npm-0.17.13-3c31ee9bef-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip new file mode 100644 index 00000000000..dfd7b765546 Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip differ diff --git a/.yarn/cache/@esbuild-darwin-x64-npm-0.17.13-2af4bfbe4a-8.zip b/.yarn/cache/@esbuild-darwin-x64-npm-0.17.13-2af4bfbe4a-8.zip deleted file mode 100644 index 13d316951e8..00000000000 Binary files a/.yarn/cache/@esbuild-darwin-x64-npm-0.17.13-2af4bfbe4a-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip b/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip new file mode 100644 index 00000000000..432802b69e8 Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip differ diff --git a/.yarn/cache/@esbuild-linux-arm64-npm-0.17.13-533eb0e4eb-8.zip b/.yarn/cache/@esbuild-linux-arm64-npm-0.17.13-533eb0e4eb-8.zip deleted file mode 100644 index d69620a547d..00000000000 Binary files a/.yarn/cache/@esbuild-linux-arm64-npm-0.17.13-533eb0e4eb-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip b/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip new file mode 100644 index 00000000000..6eb51fcc998 Binary files /dev/null and b/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip differ diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.17.13-01575597b4-8.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.17.13-01575597b4-8.zip deleted file mode 100644 index e8d42bffa6c..00000000000 Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.17.13-01575597b4-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip new file mode 100644 index 00000000000..bcbc77a84f4 Binary files /dev/null and b/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip differ diff --git a/.yarn/cache/@esbuild-win32-arm64-npm-0.17.13-cd496c2d1d-8.zip b/.yarn/cache/@esbuild-win32-arm64-npm-0.17.13-cd496c2d1d-8.zip deleted file mode 100644 index 233ca33f756..00000000000 Binary files a/.yarn/cache/@esbuild-win32-arm64-npm-0.17.13-cd496c2d1d-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip b/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip new file mode 100644 index 00000000000..cf9c15613b3 Binary files /dev/null and b/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip differ diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.17.13-29882f65f7-8.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.17.13-29882f65f7-8.zip deleted file mode 100644 index 5e0f19912b2..00000000000 Binary files a/.yarn/cache/@esbuild-win32-x64-npm-0.17.13-29882f65f7-8.zip and /dev/null differ diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip new file mode 100644 index 00000000000..768cc68f13c Binary files /dev/null and b/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip differ diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip new file mode 100644 index 00000000000..7ef5a489734 Binary files /dev/null and b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip differ diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.4.1-44c7391499-db97d8d08e.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.4.1-44c7391499-db97d8d08e.zip deleted file mode 100644 index 7399004e87c..00000000000 Binary files a/.yarn/cache/@eslint-community-regexpp-npm-4.4.1-44c7391499-db97d8d08e.zip and /dev/null differ diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip new file mode 100644 index 00000000000..0cbfbf8d840 Binary files /dev/null and b/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip differ diff --git a/.yarn/cache/@eslint-eslintrc-npm-2.0.2-d308674d86-cfcf5e12c7.zip b/.yarn/cache/@eslint-eslintrc-npm-2.0.2-d308674d86-cfcf5e12c7.zip deleted file mode 100644 index 5c48d0ca96e..00000000000 Binary files a/.yarn/cache/@eslint-eslintrc-npm-2.0.2-d308674d86-cfcf5e12c7.zip and /dev/null differ diff --git a/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip b/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip new file mode 100644 index 00000000000..58788ff7a69 Binary files /dev/null and b/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip differ diff --git a/.yarn/cache/@eslint-js-npm-8.39.0-558d35aa2d-63fe36e2bf.zip b/.yarn/cache/@eslint-js-npm-8.39.0-558d35aa2d-63fe36e2bf.zip deleted file mode 100644 index 8d2d49225c9..00000000000 Binary files a/.yarn/cache/@eslint-js-npm-8.39.0-558d35aa2d-63fe36e2bf.zip and /dev/null differ diff --git a/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip b/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip new file mode 100644 index 00000000000..82eab16e7cf Binary files /dev/null and b/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip differ diff --git a/.yarn/cache/@faker-js-faker-npm-7.6.0-fa135883e9-942af62217.zip b/.yarn/cache/@faker-js-faker-npm-7.6.0-fa135883e9-942af62217.zip deleted file mode 100644 index 1317dcc1a8d..00000000000 Binary files a/.yarn/cache/@faker-js-faker-npm-7.6.0-fa135883e9-942af62217.zip and /dev/null differ diff --git a/.yarn/cache/@floating-ui-core-npm-1.2.6-083bec342c-e4aa96c435.zip b/.yarn/cache/@floating-ui-core-npm-1.2.6-083bec342c-e4aa96c435.zip deleted file mode 100644 index 7f721669d59..00000000000 Binary files a/.yarn/cache/@floating-ui-core-npm-1.2.6-083bec342c-e4aa96c435.zip and /dev/null differ diff --git a/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip b/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip new file mode 100644 index 00000000000..e8ce36ae61f Binary files /dev/null and b/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip differ diff --git a/.yarn/cache/@floating-ui-dom-npm-1.2.6-9d4be07ec3-2226c6c244.zip b/.yarn/cache/@floating-ui-dom-npm-1.2.6-9d4be07ec3-2226c6c244.zip deleted file mode 100644 index ba1a82c7223..00000000000 Binary files a/.yarn/cache/@floating-ui-dom-npm-1.2.6-9d4be07ec3-2226c6c244.zip and /dev/null differ diff --git a/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip b/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip new file mode 100644 index 00000000000..a984181e2c0 Binary files /dev/null and b/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip differ diff --git a/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip b/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip new file mode 100644 index 00000000000..ada2c49e446 Binary files /dev/null and b/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip differ diff --git a/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip b/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip new file mode 100644 index 00000000000..edc7da3b252 Binary files /dev/null and b/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip differ diff --git a/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.6-3eb2f2a80e-09f2bdf7dc.zip b/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.6-3eb2f2a80e-09f2bdf7dc.zip deleted file mode 100644 index 82448f2e595..00000000000 Binary files a/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.6-3eb2f2a80e-09f2bdf7dc.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip b/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip new file mode 100644 index 00000000000..c9eee67d634 Binary files /dev/null and b/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip differ diff --git a/.yarn/cache/@fullcalendar-core-npm-6.1.6-a28815a826-72ec698bd2.zip b/.yarn/cache/@fullcalendar-core-npm-6.1.6-a28815a826-72ec698bd2.zip deleted file mode 100644 index ca97c59c2c0..00000000000 Binary files a/.yarn/cache/@fullcalendar-core-npm-6.1.6-a28815a826-72ec698bd2.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip b/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip new file mode 100644 index 00000000000..3a7449a3a8c Binary files /dev/null and b/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip differ diff --git a/.yarn/cache/@fullcalendar-daygrid-npm-6.1.6-13b72a08b0-e7b60e359b.zip b/.yarn/cache/@fullcalendar-daygrid-npm-6.1.6-13b72a08b0-e7b60e359b.zip deleted file mode 100644 index 28546a4017b..00000000000 Binary files a/.yarn/cache/@fullcalendar-daygrid-npm-6.1.6-13b72a08b0-e7b60e359b.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip b/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip new file mode 100644 index 00000000000..861ed1b3660 Binary files /dev/null and b/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip differ diff --git a/.yarn/cache/@fullcalendar-icalendar-npm-6.1.6-8b28c6e7df-50d290346a.zip b/.yarn/cache/@fullcalendar-icalendar-npm-6.1.6-8b28c6e7df-50d290346a.zip deleted file mode 100644 index 77442c19e80..00000000000 Binary files a/.yarn/cache/@fullcalendar-icalendar-npm-6.1.6-8b28c6e7df-50d290346a.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip b/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip new file mode 100644 index 00000000000..b04343467b9 Binary files /dev/null and b/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip differ diff --git a/.yarn/cache/@fullcalendar-interaction-npm-6.1.6-68ac4c3627-b7dea49059.zip b/.yarn/cache/@fullcalendar-interaction-npm-6.1.6-68ac4c3627-b7dea49059.zip deleted file mode 100644 index 5ef3e72602a..00000000000 Binary files a/.yarn/cache/@fullcalendar-interaction-npm-6.1.6-68ac4c3627-b7dea49059.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip b/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip new file mode 100644 index 00000000000..93cd34af81e Binary files /dev/null and b/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip differ diff --git a/.yarn/cache/@fullcalendar-list-npm-6.1.6-ada94f2f8a-e5beb01c62.zip b/.yarn/cache/@fullcalendar-list-npm-6.1.6-ada94f2f8a-e5beb01c62.zip deleted file mode 100644 index 47074403e26..00000000000 Binary files a/.yarn/cache/@fullcalendar-list-npm-6.1.6-ada94f2f8a-e5beb01c62.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-luxon2-npm-6.1.6-514b9ce297-48d76dc556.zip b/.yarn/cache/@fullcalendar-luxon2-npm-6.1.6-514b9ce297-48d76dc556.zip deleted file mode 100644 index c9bff7378c2..00000000000 Binary files a/.yarn/cache/@fullcalendar-luxon2-npm-6.1.6-514b9ce297-48d76dc556.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip b/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip new file mode 100644 index 00000000000..6e717b3495d Binary files /dev/null and b/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip differ diff --git a/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip b/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip new file mode 100644 index 00000000000..917beeda690 Binary files /dev/null and b/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip differ diff --git a/.yarn/cache/@fullcalendar-timegrid-npm-6.1.6-6c6109a419-ef79183dad.zip b/.yarn/cache/@fullcalendar-timegrid-npm-6.1.6-6c6109a419-ef79183dad.zip deleted file mode 100644 index ea839748d4a..00000000000 Binary files a/.yarn/cache/@fullcalendar-timegrid-npm-6.1.6-6c6109a419-ef79183dad.zip and /dev/null differ diff --git a/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip b/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip new file mode 100644 index 00000000000..3054aa761fa Binary files /dev/null and b/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip differ diff --git a/.yarn/cache/@fullcalendar-vue3-npm-6.1.6-b1a9d6f44b-68fe3ce204.zip b/.yarn/cache/@fullcalendar-vue3-npm-6.1.6-b1a9d6f44b-68fe3ce204.zip deleted file mode 100644 index b64d739f4d4..00000000000 Binary files a/.yarn/cache/@fullcalendar-vue3-npm-6.1.6-b1a9d6f44b-68fe3ce204.zip and /dev/null differ diff --git a/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip b/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip deleted file mode 100644 index c7eff4b6c95..00000000000 Binary files a/.yarn/cache/@html-validate-stylish-npm-4.0.1-a5ee83fd48-89c83ea1ae.zip and /dev/null differ diff --git a/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip b/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip new file mode 100644 index 00000000000..d56d9f34cff Binary files /dev/null and b/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip differ diff --git a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip new file mode 100644 index 00000000000..166fee4b827 Binary files /dev/null and b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip differ diff --git a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.8-7955bfecc2-0fd6b3c54f.zip b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.8-7955bfecc2-0fd6b3c54f.zip deleted file mode 100755 index dc21af1cbc7..00000000000 Binary files a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.8-7955bfecc2-0fd6b3c54f.zip and /dev/null differ diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip deleted file mode 100644 index 2b79104af59..00000000000 Binary files a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip and /dev/null differ diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip new file mode 100644 index 00000000000..cf6847cf44f Binary files /dev/null and b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip differ diff --git a/.yarn/cache/@jridgewell-gen-mapping-npm-0.3.2-c64eeb4a4e-1832707a1c.zip b/.yarn/cache/@jridgewell-gen-mapping-npm-0.3.2-c64eeb4a4e-1832707a1c.zip deleted file mode 100644 index e030e7e42fd..00000000000 Binary files a/.yarn/cache/@jridgewell-gen-mapping-npm-0.3.2-c64eeb4a4e-1832707a1c.zip and /dev/null differ diff --git a/.yarn/cache/@jridgewell-set-array-npm-1.1.2-45b82d7fb6-69a84d5980.zip b/.yarn/cache/@jridgewell-set-array-npm-1.1.2-45b82d7fb6-69a84d5980.zip deleted file mode 100644 index 3b901fc14bc..00000000000 Binary files a/.yarn/cache/@jridgewell-set-array-npm-1.1.2-45b82d7fb6-69a84d5980.zip and /dev/null differ diff --git a/.yarn/cache/@jridgewell-source-map-npm-0.3.2-6fd1f37b22-1b83f0eb94.zip b/.yarn/cache/@jridgewell-source-map-npm-0.3.2-6fd1f37b22-1b83f0eb94.zip deleted file mode 100644 index cdc4bd0e2fd..00000000000 Binary files a/.yarn/cache/@jridgewell-source-map-npm-0.3.2-6fd1f37b22-1b83f0eb94.zip and /dev/null differ diff --git a/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip b/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip new file mode 100644 index 00000000000..402f52b7ae2 Binary files /dev/null and b/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip differ diff --git a/.yarn/cache/@jridgewell-trace-mapping-npm-0.3.17-57578fd48c-9d703b859c.zip b/.yarn/cache/@jridgewell-trace-mapping-npm-0.3.17-57578fd48c-9d703b859c.zip deleted file mode 100644 index 29e13633c13..00000000000 Binary files a/.yarn/cache/@jridgewell-trace-mapping-npm-0.3.17-57578fd48c-9d703b859c.zip and /dev/null differ diff --git a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip new file mode 100644 index 00000000000..6df931b4afd Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip differ diff --git a/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip new file mode 100644 index 00000000000..db77cafaeaf Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip differ diff --git a/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip b/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip new file mode 100644 index 00000000000..d4522df85ef Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip differ diff --git a/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip b/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip new file mode 100644 index 00000000000..8820ec421fe Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip differ diff --git a/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip b/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip new file mode 100644 index 00000000000..201d7cb1f17 Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip new file mode 100644 index 00000000000..06cbbf0cff3 Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip new file mode 100644 index 00000000000..110c9561156 Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip new file mode 100644 index 00000000000..ab2c36a442c Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip new file mode 100644 index 00000000000..2fa6ef4f77b Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip new file mode 100644 index 00000000000..b63546421d9 Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip differ diff --git a/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip b/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip new file mode 100644 index 00000000000..024e0363912 Binary files /dev/null and b/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip differ diff --git a/.yarn/cache/@parcel-bundler-default-npm-2.8.3-b2fd23cf03-219b2be341.zip b/.yarn/cache/@parcel-bundler-default-npm-2.8.3-b2fd23cf03-219b2be341.zip deleted file mode 100644 index a7da1dbf88f..00000000000 Binary files a/.yarn/cache/@parcel-bundler-default-npm-2.8.3-b2fd23cf03-219b2be341.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip b/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip new file mode 100644 index 00000000000..a358668eb7b Binary files /dev/null and b/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip differ diff --git a/.yarn/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip b/.yarn/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip deleted file mode 100644 index 9bab66eb462..00000000000 Binary files a/.yarn/cache/@parcel-cache-npm-2.8.3-7b70a160bc-cd679053d2.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip b/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip new file mode 100644 index 00000000000..f4239d8ba7c Binary files /dev/null and b/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip differ diff --git a/.yarn/cache/@parcel-codeframe-npm-2.8.3-e5df811b95-a6e82c30e6.zip b/.yarn/cache/@parcel-codeframe-npm-2.8.3-e5df811b95-a6e82c30e6.zip deleted file mode 100644 index 630555b5c81..00000000000 Binary files a/.yarn/cache/@parcel-codeframe-npm-2.8.3-e5df811b95-a6e82c30e6.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip b/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip new file mode 100644 index 00000000000..da576253816 Binary files /dev/null and b/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip differ diff --git a/.yarn/cache/@parcel-compressor-raw-npm-2.8.3-387b54c6ce-ca3b8a4f60.zip b/.yarn/cache/@parcel-compressor-raw-npm-2.8.3-387b54c6ce-ca3b8a4f60.zip deleted file mode 100644 index d09d13d2cbe..00000000000 Binary files a/.yarn/cache/@parcel-compressor-raw-npm-2.8.3-387b54c6ce-ca3b8a4f60.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip b/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip new file mode 100644 index 00000000000..a4934d017e7 Binary files /dev/null and b/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip differ diff --git a/.yarn/cache/@parcel-config-default-npm-2.8.3-465d8ed464-08c700a7a2.zip b/.yarn/cache/@parcel-config-default-npm-2.8.3-465d8ed464-08c700a7a2.zip deleted file mode 100644 index 9089d4f8ec9..00000000000 Binary files a/.yarn/cache/@parcel-config-default-npm-2.8.3-465d8ed464-08c700a7a2.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip b/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip new file mode 100644 index 00000000000..42c39ebe36a Binary files /dev/null and b/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip differ diff --git a/.yarn/cache/@parcel-core-npm-2.8.3-1751106c31-68adceb1b0.zip b/.yarn/cache/@parcel-core-npm-2.8.3-1751106c31-68adceb1b0.zip deleted file mode 100644 index 5c32746cac6..00000000000 Binary files a/.yarn/cache/@parcel-core-npm-2.8.3-1751106c31-68adceb1b0.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip b/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip new file mode 100644 index 00000000000..a8e890bf5c0 Binary files /dev/null and b/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip differ diff --git a/.yarn/cache/@parcel-diagnostic-npm-2.8.3-2e1d38a83b-c24d98a2db.zip b/.yarn/cache/@parcel-diagnostic-npm-2.8.3-2e1d38a83b-c24d98a2db.zip deleted file mode 100644 index 8cb3bdc723d..00000000000 Binary files a/.yarn/cache/@parcel-diagnostic-npm-2.8.3-2e1d38a83b-c24d98a2db.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip b/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip new file mode 100644 index 00000000000..b806eb99acf Binary files /dev/null and b/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip differ diff --git a/.yarn/cache/@parcel-events-npm-2.8.3-40eebe35e5-9d23c6663e.zip b/.yarn/cache/@parcel-events-npm-2.8.3-40eebe35e5-9d23c6663e.zip deleted file mode 100644 index 64e1abfcb42..00000000000 Binary files a/.yarn/cache/@parcel-events-npm-2.8.3-40eebe35e5-9d23c6663e.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip b/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip new file mode 100644 index 00000000000..52cbc5f7f1a Binary files /dev/null and b/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip differ diff --git a/.yarn/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip b/.yarn/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip deleted file mode 100644 index 8226ced942c..00000000000 Binary files a/.yarn/cache/@parcel-fs-npm-2.8.3-a413e84c2d-cc421552da.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-fs-search-npm-2.8.3-aafc0a2ad7-25e8eda694.zip b/.yarn/cache/@parcel-fs-search-npm-2.8.3-aafc0a2ad7-25e8eda694.zip deleted file mode 100644 index 8277ed6b0a6..00000000000 Binary files a/.yarn/cache/@parcel-fs-search-npm-2.8.3-aafc0a2ad7-25e8eda694.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-graph-npm-2.8.3-15d2d4448e-ceed8445f5.zip b/.yarn/cache/@parcel-graph-npm-2.8.3-15d2d4448e-ceed8445f5.zip deleted file mode 100644 index 919aa79628c..00000000000 Binary files a/.yarn/cache/@parcel-graph-npm-2.8.3-15d2d4448e-ceed8445f5.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip b/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip new file mode 100644 index 00000000000..27f3718928a Binary files /dev/null and b/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip differ diff --git a/.yarn/cache/@parcel-hash-npm-2.8.3-48d5e2907f-29cef199fe.zip b/.yarn/cache/@parcel-hash-npm-2.8.3-48d5e2907f-29cef199fe.zip deleted file mode 100644 index 4fec7f1d702..00000000000 Binary files a/.yarn/cache/@parcel-hash-npm-2.8.3-48d5e2907f-29cef199fe.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip b/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip new file mode 100644 index 00000000000..7231e4c65db Binary files /dev/null and b/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip differ diff --git a/.yarn/cache/@parcel-logger-npm-2.8.3-f13624d366-04fd463131.zip b/.yarn/cache/@parcel-logger-npm-2.8.3-f13624d366-04fd463131.zip deleted file mode 100644 index 07da31249ec..00000000000 Binary files a/.yarn/cache/@parcel-logger-npm-2.8.3-f13624d366-04fd463131.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip b/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip new file mode 100644 index 00000000000..22582b46fa1 Binary files /dev/null and b/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip differ diff --git a/.yarn/cache/@parcel-markdown-ansi-npm-2.8.3-4b66177a38-1985f149b2.zip b/.yarn/cache/@parcel-markdown-ansi-npm-2.8.3-4b66177a38-1985f149b2.zip deleted file mode 100644 index 6a28973b587..00000000000 Binary files a/.yarn/cache/@parcel-markdown-ansi-npm-2.8.3-4b66177a38-1985f149b2.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip b/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip new file mode 100644 index 00000000000..7db7fb405c2 Binary files /dev/null and b/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip differ diff --git a/.yarn/cache/@parcel-namer-default-npm-2.8.3-486a772540-7c2c343446.zip b/.yarn/cache/@parcel-namer-default-npm-2.8.3-486a772540-7c2c343446.zip deleted file mode 100644 index a6e34e55b2c..00000000000 Binary files a/.yarn/cache/@parcel-namer-default-npm-2.8.3-486a772540-7c2c343446.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-node-resolver-core-npm-2.8.3-40a48fa4e7-4976d3ecc9.zip b/.yarn/cache/@parcel-node-resolver-core-npm-2.8.3-40a48fa4e7-4976d3ecc9.zip deleted file mode 100644 index 3bcae151b65..00000000000 Binary files a/.yarn/cache/@parcel-node-resolver-core-npm-2.8.3-40a48fa4e7-4976d3ecc9.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip b/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip new file mode 100644 index 00000000000..76a69962a64 Binary files /dev/null and b/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip differ diff --git a/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip b/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip new file mode 100644 index 00000000000..f1c61749b92 Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip differ diff --git a/.yarn/cache/@parcel-optimizer-css-npm-2.8.3-6e7102b9ab-ffac43a2c2.zip b/.yarn/cache/@parcel-optimizer-css-npm-2.8.3-6e7102b9ab-ffac43a2c2.zip deleted file mode 100644 index fd8439d218d..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-css-npm-2.8.3-6e7102b9ab-ffac43a2c2.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip b/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip new file mode 100644 index 00000000000..28497d33271 Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip differ diff --git a/.yarn/cache/@parcel-optimizer-data-url-npm-2.8.3-dd2c9afc59-5df8d88826.zip b/.yarn/cache/@parcel-optimizer-data-url-npm-2.8.3-dd2c9afc59-5df8d88826.zip deleted file mode 100644 index 43f688f184d..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-data-url-npm-2.8.3-dd2c9afc59-5df8d88826.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip new file mode 100644 index 00000000000..4089a870fb0 Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip differ diff --git a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.8.3-62c761ef26-ca1cab7b1e.zip b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.8.3-62c761ef26-ca1cab7b1e.zip deleted file mode 100644 index d052e87e37a..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.8.3-62c761ef26-ca1cab7b1e.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip b/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip new file mode 100644 index 00000000000..8b0a44e7568 Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip differ diff --git a/.yarn/cache/@parcel-optimizer-image-npm-2.8.3-4a1aa225b2-72c5acffae.zip b/.yarn/cache/@parcel-optimizer-image-npm-2.8.3-4a1aa225b2-72c5acffae.zip deleted file mode 100644 index 5b564498b22..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-image-npm-2.8.3-4a1aa225b2-72c5acffae.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip b/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip new file mode 100644 index 00000000000..441bead99b8 Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip differ diff --git a/.yarn/cache/@parcel-optimizer-svgo-npm-2.8.3-b5d4af08b7-b3544c08fa.zip b/.yarn/cache/@parcel-optimizer-svgo-npm-2.8.3-b5d4af08b7-b3544c08fa.zip deleted file mode 100644 index f7837f38ced..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-svgo-npm-2.8.3-b5d4af08b7-b3544c08fa.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip b/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip new file mode 100644 index 00000000000..8b137cf673d Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip differ diff --git a/.yarn/cache/@parcel-optimizer-terser-npm-2.8.3-5e561ce7db-ee1959f596.zip b/.yarn/cache/@parcel-optimizer-terser-npm-2.8.3-5e561ce7db-ee1959f596.zip deleted file mode 100644 index 544b923d5ca..00000000000 Binary files a/.yarn/cache/@parcel-optimizer-terser-npm-2.8.3-5e561ce7db-ee1959f596.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip b/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip new file mode 100644 index 00000000000..1e757bdf2f3 Binary files /dev/null and b/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip differ diff --git a/.yarn/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip b/.yarn/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip deleted file mode 100644 index 7a3b45cfac8..00000000000 Binary files a/.yarn/cache/@parcel-package-manager-npm-2.8.3-0dc329e43e-572a5aacfd.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip b/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip new file mode 100644 index 00000000000..4cf7815f57f Binary files /dev/null and b/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip differ diff --git a/.yarn/cache/@parcel-packager-css-npm-2.8.3-c127d6c552-bb28fc9f02.zip b/.yarn/cache/@parcel-packager-css-npm-2.8.3-c127d6c552-bb28fc9f02.zip deleted file mode 100644 index 13645d27271..00000000000 Binary files a/.yarn/cache/@parcel-packager-css-npm-2.8.3-c127d6c552-bb28fc9f02.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip b/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip new file mode 100644 index 00000000000..989402a62c2 Binary files /dev/null and b/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip differ diff --git a/.yarn/cache/@parcel-packager-html-npm-2.8.3-4e3da006ce-631f98fca0.zip b/.yarn/cache/@parcel-packager-html-npm-2.8.3-4e3da006ce-631f98fca0.zip deleted file mode 100644 index 3128a18fc55..00000000000 Binary files a/.yarn/cache/@parcel-packager-html-npm-2.8.3-4e3da006ce-631f98fca0.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip b/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip new file mode 100644 index 00000000000..461ec50d284 Binary files /dev/null and b/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip differ diff --git a/.yarn/cache/@parcel-packager-js-npm-2.8.3-3441713a0f-92ac88244b.zip b/.yarn/cache/@parcel-packager-js-npm-2.8.3-3441713a0f-92ac88244b.zip deleted file mode 100644 index f74455017a4..00000000000 Binary files a/.yarn/cache/@parcel-packager-js-npm-2.8.3-3441713a0f-92ac88244b.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip b/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip new file mode 100644 index 00000000000..e27b5ed1e3e Binary files /dev/null and b/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip differ diff --git a/.yarn/cache/@parcel-packager-raw-npm-2.8.3-0a1dab14a2-26236dd646.zip b/.yarn/cache/@parcel-packager-raw-npm-2.8.3-0a1dab14a2-26236dd646.zip deleted file mode 100644 index 57014e28a49..00000000000 Binary files a/.yarn/cache/@parcel-packager-raw-npm-2.8.3-0a1dab14a2-26236dd646.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip b/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip new file mode 100644 index 00000000000..f3d37303b01 Binary files /dev/null and b/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip differ diff --git a/.yarn/cache/@parcel-packager-svg-npm-2.8.3-c3163591d4-45c966ad8e.zip b/.yarn/cache/@parcel-packager-svg-npm-2.8.3-c3163591d4-45c966ad8e.zip deleted file mode 100644 index a10bf2cf73b..00000000000 Binary files a/.yarn/cache/@parcel-packager-svg-npm-2.8.3-c3163591d4-45c966ad8e.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip b/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip new file mode 100644 index 00000000000..5b569f20045 Binary files /dev/null and b/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip differ diff --git a/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip b/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip new file mode 100644 index 00000000000..667d7230e6d Binary files /dev/null and b/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip differ diff --git a/.yarn/cache/@parcel-plugin-npm-2.8.3-c228eb7640-a69ac66f5c.zip b/.yarn/cache/@parcel-plugin-npm-2.8.3-c228eb7640-a69ac66f5c.zip deleted file mode 100644 index 84df098c7b4..00000000000 Binary files a/.yarn/cache/@parcel-plugin-npm-2.8.3-c228eb7640-a69ac66f5c.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip b/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip new file mode 100644 index 00000000000..1cacc845711 Binary files /dev/null and b/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip differ diff --git a/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip b/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip new file mode 100644 index 00000000000..f6e625d396b Binary files /dev/null and b/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip differ diff --git a/.yarn/cache/@parcel-reporter-cli-npm-2.8.3-d340f7fcb8-791dd4706a.zip b/.yarn/cache/@parcel-reporter-cli-npm-2.8.3-d340f7fcb8-791dd4706a.zip deleted file mode 100644 index 791f45b2caa..00000000000 Binary files a/.yarn/cache/@parcel-reporter-cli-npm-2.8.3-d340f7fcb8-791dd4706a.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip b/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip new file mode 100644 index 00000000000..f1fb1818e94 Binary files /dev/null and b/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip differ diff --git a/.yarn/cache/@parcel-reporter-dev-server-npm-2.8.3-be7051861d-329db9fd0c.zip b/.yarn/cache/@parcel-reporter-dev-server-npm-2.8.3-be7051861d-329db9fd0c.zip deleted file mode 100644 index 23d9ee06132..00000000000 Binary files a/.yarn/cache/@parcel-reporter-dev-server-npm-2.8.3-be7051861d-329db9fd0c.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip b/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip new file mode 100644 index 00000000000..2196f5407cc Binary files /dev/null and b/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip differ diff --git a/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip b/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip new file mode 100644 index 00000000000..8022d046517 Binary files /dev/null and b/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip differ diff --git a/.yarn/cache/@parcel-resolver-default-npm-2.8.3-de025989bd-40515a62c1.zip b/.yarn/cache/@parcel-resolver-default-npm-2.8.3-de025989bd-40515a62c1.zip deleted file mode 100644 index 69fdc94c795..00000000000 Binary files a/.yarn/cache/@parcel-resolver-default-npm-2.8.3-de025989bd-40515a62c1.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip new file mode 100644 index 00000000000..f71de2152bf Binary files /dev/null and b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip differ diff --git a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.8.3-63941ffa5c-56c276c7b0.zip b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.8.3-63941ffa5c-56c276c7b0.zip deleted file mode 100644 index 32c71ce5823..00000000000 Binary files a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.8.3-63941ffa5c-56c276c7b0.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip b/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip new file mode 100644 index 00000000000..be9c7d7e4b9 Binary files /dev/null and b/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip differ diff --git a/.yarn/cache/@parcel-runtime-js-npm-2.8.3-a82379279f-ee5e04f84d.zip b/.yarn/cache/@parcel-runtime-js-npm-2.8.3-a82379279f-ee5e04f84d.zip deleted file mode 100644 index 439cd1e5ad2..00000000000 Binary files a/.yarn/cache/@parcel-runtime-js-npm-2.8.3-a82379279f-ee5e04f84d.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip new file mode 100644 index 00000000000..8dc8e5281c8 Binary files /dev/null and b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip differ diff --git a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.8.3-42e337381a-327159be0c.zip b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.8.3-42e337381a-327159be0c.zip deleted file mode 100644 index 6a956933a85..00000000000 Binary files a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.8.3-42e337381a-327159be0c.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip b/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip new file mode 100644 index 00000000000..18682c22ae2 Binary files /dev/null and b/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip differ diff --git a/.yarn/cache/@parcel-runtime-service-worker-npm-2.8.3-426255f187-0646fee9a9.zip b/.yarn/cache/@parcel-runtime-service-worker-npm-2.8.3-426255f187-0646fee9a9.zip deleted file mode 100644 index b5f661ceffe..00000000000 Binary files a/.yarn/cache/@parcel-runtime-service-worker-npm-2.8.3-426255f187-0646fee9a9.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip b/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip new file mode 100644 index 00000000000..d5fe4206c9a Binary files /dev/null and b/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip differ diff --git a/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip b/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip new file mode 100644 index 00000000000..9286325c9ed Binary files /dev/null and b/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip differ diff --git a/.yarn/cache/@parcel-transformer-babel-npm-2.8.3-bd1a7cae4d-a27bbe8d89.zip b/.yarn/cache/@parcel-transformer-babel-npm-2.8.3-bd1a7cae4d-a27bbe8d89.zip deleted file mode 100644 index 4b3123e02cc..00000000000 Binary files a/.yarn/cache/@parcel-transformer-babel-npm-2.8.3-bd1a7cae4d-a27bbe8d89.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip b/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip new file mode 100644 index 00000000000..f3e0520c716 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip differ diff --git a/.yarn/cache/@parcel-transformer-css-npm-2.8.3-e5a36983ce-31375a1405.zip b/.yarn/cache/@parcel-transformer-css-npm-2.8.3-e5a36983ce-31375a1405.zip deleted file mode 100644 index 29126c1d316..00000000000 Binary files a/.yarn/cache/@parcel-transformer-css-npm-2.8.3-e5a36983ce-31375a1405.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip b/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip new file mode 100644 index 00000000000..3628f3f90d9 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip differ diff --git a/.yarn/cache/@parcel-transformer-html-npm-2.8.3-ce9c33e277-21600a3e0a.zip b/.yarn/cache/@parcel-transformer-html-npm-2.8.3-ce9c33e277-21600a3e0a.zip deleted file mode 100644 index 495efcafec6..00000000000 Binary files a/.yarn/cache/@parcel-transformer-html-npm-2.8.3-ce9c33e277-21600a3e0a.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip b/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip new file mode 100644 index 00000000000..3a78e4e0701 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip differ diff --git a/.yarn/cache/@parcel-transformer-image-npm-2.8.3-ddf03325c2-f4b3464828.zip b/.yarn/cache/@parcel-transformer-image-npm-2.8.3-ddf03325c2-f4b3464828.zip deleted file mode 100644 index f1db93e7c09..00000000000 Binary files a/.yarn/cache/@parcel-transformer-image-npm-2.8.3-ddf03325c2-f4b3464828.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip b/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip new file mode 100644 index 00000000000..0c4f3341c8b Binary files /dev/null and b/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip differ diff --git a/.yarn/cache/@parcel-transformer-inline-string-npm-2.8.3-6e4701a9cd-23fa279e1f.zip b/.yarn/cache/@parcel-transformer-inline-string-npm-2.8.3-6e4701a9cd-23fa279e1f.zip deleted file mode 100644 index baac58657ea..00000000000 Binary files a/.yarn/cache/@parcel-transformer-inline-string-npm-2.8.3-6e4701a9cd-23fa279e1f.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip b/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip new file mode 100644 index 00000000000..1ce667ac8dc Binary files /dev/null and b/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip differ diff --git a/.yarn/cache/@parcel-transformer-js-npm-2.8.3-2fc28b9273-29fb203502.zip b/.yarn/cache/@parcel-transformer-js-npm-2.8.3-2fc28b9273-29fb203502.zip deleted file mode 100644 index b15a3f69941..00000000000 Binary files a/.yarn/cache/@parcel-transformer-js-npm-2.8.3-2fc28b9273-29fb203502.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip b/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip new file mode 100644 index 00000000000..926c01eb816 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip differ diff --git a/.yarn/cache/@parcel-transformer-json-npm-2.8.3-fe0a156dc9-04da28b0f0.zip b/.yarn/cache/@parcel-transformer-json-npm-2.8.3-fe0a156dc9-04da28b0f0.zip deleted file mode 100644 index 68129bf255e..00000000000 Binary files a/.yarn/cache/@parcel-transformer-json-npm-2.8.3-fe0a156dc9-04da28b0f0.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip b/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip new file mode 100644 index 00000000000..3bbacafa818 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip differ diff --git a/.yarn/cache/@parcel-transformer-postcss-npm-2.8.3-eb5a87320d-2c75cb5cec.zip b/.yarn/cache/@parcel-transformer-postcss-npm-2.8.3-eb5a87320d-2c75cb5cec.zip deleted file mode 100644 index 0719d5cdf80..00000000000 Binary files a/.yarn/cache/@parcel-transformer-postcss-npm-2.8.3-eb5a87320d-2c75cb5cec.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip b/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip new file mode 100644 index 00000000000..e912a09713f Binary files /dev/null and b/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip differ diff --git a/.yarn/cache/@parcel-transformer-posthtml-npm-2.8.3-243f774b7a-130c95782a.zip b/.yarn/cache/@parcel-transformer-posthtml-npm-2.8.3-243f774b7a-130c95782a.zip deleted file mode 100644 index 213e503a9e8..00000000000 Binary files a/.yarn/cache/@parcel-transformer-posthtml-npm-2.8.3-243f774b7a-130c95782a.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip b/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip new file mode 100644 index 00000000000..40b7e2d3c42 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip differ diff --git a/.yarn/cache/@parcel-transformer-raw-npm-2.8.3-766b11ad19-371263bb52.zip b/.yarn/cache/@parcel-transformer-raw-npm-2.8.3-766b11ad19-371263bb52.zip deleted file mode 100644 index 19491751df8..00000000000 Binary files a/.yarn/cache/@parcel-transformer-raw-npm-2.8.3-766b11ad19-371263bb52.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip new file mode 100644 index 00000000000..23210becb7e Binary files /dev/null and b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip differ diff --git a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.8.3-bb497d2643-e9648e04b7.zip b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.8.3-bb497d2643-e9648e04b7.zip deleted file mode 100644 index d19cf7d0beb..00000000000 Binary files a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.8.3-bb497d2643-e9648e04b7.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip b/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip new file mode 100644 index 00000000000..d62c3420670 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip differ diff --git a/.yarn/cache/@parcel-transformer-sass-npm-2.8.3-6c449bba66-9cb32b3906.zip b/.yarn/cache/@parcel-transformer-sass-npm-2.8.3-6c449bba66-9cb32b3906.zip deleted file mode 100644 index 371b47c1ba0..00000000000 Binary files a/.yarn/cache/@parcel-transformer-sass-npm-2.8.3-6c449bba66-9cb32b3906.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip b/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip new file mode 100644 index 00000000000..01af21f6a31 Binary files /dev/null and b/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip differ diff --git a/.yarn/cache/@parcel-transformer-svg-npm-2.8.3-b6f4c84f7a-1f3db309e4.zip b/.yarn/cache/@parcel-transformer-svg-npm-2.8.3-b6f4c84f7a-1f3db309e4.zip deleted file mode 100644 index b3836d49857..00000000000 Binary files a/.yarn/cache/@parcel-transformer-svg-npm-2.8.3-b6f4c84f7a-1f3db309e4.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip b/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip new file mode 100644 index 00000000000..ea6decc566b Binary files /dev/null and b/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip differ diff --git a/.yarn/cache/@parcel-types-npm-2.8.3-394e8cefff-ece0abdd5c.zip b/.yarn/cache/@parcel-types-npm-2.8.3-394e8cefff-ece0abdd5c.zip deleted file mode 100644 index e92d3882332..00000000000 Binary files a/.yarn/cache/@parcel-types-npm-2.8.3-394e8cefff-ece0abdd5c.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip b/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip new file mode 100644 index 00000000000..8eda5989418 Binary files /dev/null and b/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip differ diff --git a/.yarn/cache/@parcel-utils-npm-2.8.3-13fd8c7807-69edf3e7c3.zip b/.yarn/cache/@parcel-utils-npm-2.8.3-13fd8c7807-69edf3e7c3.zip deleted file mode 100644 index 71a485806db..00000000000 Binary files a/.yarn/cache/@parcel-utils-npm-2.8.3-13fd8c7807-69edf3e7c3.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip b/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip new file mode 100644 index 00000000000..53f28c9470b Binary files /dev/null and b/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip differ diff --git a/.yarn/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip b/.yarn/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip deleted file mode 100644 index c1a47cfa1aa..00000000000 Binary files a/.yarn/cache/@parcel-workers-npm-2.8.3-39050bfde5-e3168b3e9e.zip and /dev/null differ diff --git a/.yarn/cache/@popperjs-core-npm-2.11.7-c1bac58243-5b65537478.zip b/.yarn/cache/@popperjs-core-npm-2.11.7-c1bac58243-5b65537478.zip deleted file mode 100644 index 12651e9657d..00000000000 Binary files a/.yarn/cache/@popperjs-core-npm-2.11.7-c1bac58243-5b65537478.zip and /dev/null differ diff --git a/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip b/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip new file mode 100644 index 00000000000..a5eef4b2275 Binary files /dev/null and b/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip differ diff --git a/.yarn/cache/@rollup-pluginutils-npm-5.0.2-6aa9d0ddd4-edea15e543.zip b/.yarn/cache/@rollup-pluginutils-npm-5.0.2-6aa9d0ddd4-edea15e543.zip deleted file mode 100644 index d898c5035c8..00000000000 Binary files a/.yarn/cache/@rollup-pluginutils-npm-5.0.2-6aa9d0ddd4-edea15e543.zip and /dev/null differ diff --git a/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip b/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip new file mode 100644 index 00000000000..923a7a91a8e Binary files /dev/null and b/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip differ diff --git a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip deleted file mode 100644 index 5990cc76044..00000000000 Binary files a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip and /dev/null differ diff --git a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip new file mode 100644 index 00000000000..ad36770e19c Binary files /dev/null and b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip differ diff --git a/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip new file mode 100644 index 00000000000..ad2ff12c7fc Binary files /dev/null and b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip differ diff --git a/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip b/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip new file mode 100644 index 00000000000..7edd14afd02 Binary files /dev/null and b/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip differ diff --git a/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip b/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip new file mode 100644 index 00000000000..87afaa92853 Binary files /dev/null and b/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip differ diff --git a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip new file mode 100644 index 00000000000..a1aa6dbae5f Binary files /dev/null and b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip differ diff --git a/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip b/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip new file mode 100644 index 00000000000..dc6b151bf1a Binary files /dev/null and b/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip differ diff --git a/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip b/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip new file mode 100644 index 00000000000..bb62885e7f4 Binary files /dev/null and b/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip differ diff --git a/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip b/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip new file mode 100644 index 00000000000..f306c1e943d Binary files /dev/null and b/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip differ diff --git a/.yarn/cache/@swc-helpers-npm-0.4.14-f806c3fb16-273fd3f3fc.zip b/.yarn/cache/@swc-helpers-npm-0.4.14-f806c3fb16-273fd3f3fc.zip deleted file mode 100644 index 9cf5ea445e3..00000000000 Binary files a/.yarn/cache/@swc-helpers-npm-0.4.14-f806c3fb16-273fd3f3fc.zip and /dev/null differ diff --git a/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip b/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip new file mode 100644 index 00000000000..36ed12e7cb0 Binary files /dev/null and b/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip differ diff --git a/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip b/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip deleted file mode 100644 index 28e1c1b1249..00000000000 Binary files a/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip and /dev/null differ diff --git a/.yarn/cache/@types-katex-npm-0.14.0-acd5bc3e87-330e0d0337.zip b/.yarn/cache/@types-katex-npm-0.14.0-acd5bc3e87-330e0d0337.zip deleted file mode 100644 index 79825772d5d..00000000000 Binary files a/.yarn/cache/@types-katex-npm-0.14.0-acd5bc3e87-330e0d0337.zip and /dev/null differ diff --git a/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip b/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip new file mode 100644 index 00000000000..92aafc4818a Binary files /dev/null and b/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip differ diff --git a/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip b/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip new file mode 100644 index 00000000000..d0043c3a60f Binary files /dev/null and b/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip differ diff --git a/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip b/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip deleted file mode 100644 index 3bd29bcbad1..00000000000 Binary files a/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip and /dev/null differ diff --git a/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip b/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip new file mode 100644 index 00000000000..ae8b2ba4c0c Binary files /dev/null and b/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip differ diff --git a/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip new file mode 100644 index 00000000000..598a36e0855 Binary files /dev/null and b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip differ diff --git a/.yarn/cache/@vitejs-plugin-vue-npm-4.2.1-2b331ccfdc-a7266a4537.zip b/.yarn/cache/@vitejs-plugin-vue-npm-4.2.1-2b331ccfdc-a7266a4537.zip deleted file mode 100644 index 6035cbba067..00000000000 Binary files a/.yarn/cache/@vitejs-plugin-vue-npm-4.2.1-2b331ccfdc-a7266a4537.zip and /dev/null differ diff --git a/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip b/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip new file mode 100644 index 00000000000..7cf07fbe2db Binary files /dev/null and b/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip differ diff --git a/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip b/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip new file mode 100644 index 00000000000..25e6d3f94d2 Binary files /dev/null and b/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip differ diff --git a/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip b/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip new file mode 100644 index 00000000000..5f494d902e7 Binary files /dev/null and b/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip differ diff --git a/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip b/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip new file mode 100644 index 00000000000..0ea96c4d975 Binary files /dev/null and b/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip differ diff --git a/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip b/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip new file mode 100644 index 00000000000..2d6533a2047 Binary files /dev/null and b/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip differ diff --git a/.yarn/cache/@vue-compiler-core-npm-3.2.47-bb08feddfe-9ccc2a0b89.zip b/.yarn/cache/@vue-compiler-core-npm-3.2.47-bb08feddfe-9ccc2a0b89.zip deleted file mode 100644 index a9c27c0e86b..00000000000 Binary files a/.yarn/cache/@vue-compiler-core-npm-3.2.47-bb08feddfe-9ccc2a0b89.zip and /dev/null differ diff --git a/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip b/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip new file mode 100644 index 00000000000..ba6ec89e542 Binary files /dev/null and b/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip differ diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.2.47-a1a6348264-1eced735f8.zip b/.yarn/cache/@vue-compiler-dom-npm-3.2.47-a1a6348264-1eced735f8.zip deleted file mode 100644 index 28c544e9c0c..00000000000 Binary files a/.yarn/cache/@vue-compiler-dom-npm-3.2.47-a1a6348264-1eced735f8.zip and /dev/null differ diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip b/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip new file mode 100644 index 00000000000..4d0c8cd01ff Binary files /dev/null and b/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip differ diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.2.47-d9eca6b75b-4588a51331.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.2.47-d9eca6b75b-4588a51331.zip deleted file mode 100644 index 792c794dc40..00000000000 Binary files a/.yarn/cache/@vue-compiler-sfc-npm-3.2.47-d9eca6b75b-4588a51331.zip and /dev/null differ diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip new file mode 100644 index 00000000000..95e0d0d70cc Binary files /dev/null and b/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip differ diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.2.47-c46fb0bb52-91bc6e4674.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.2.47-c46fb0bb52-91bc6e4674.zip deleted file mode 100644 index 96c0b15a8f4..00000000000 Binary files a/.yarn/cache/@vue-compiler-ssr-npm-3.2.47-c46fb0bb52-91bc6e4674.zip and /dev/null differ diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip new file mode 100644 index 00000000000..f03e17b0803 Binary files /dev/null and b/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip differ diff --git a/.yarn/cache/@vue-devtools-api-npm-6.4.5-bcd56e5fec-40c5adc878.zip b/.yarn/cache/@vue-devtools-api-npm-6.4.5-bcd56e5fec-40c5adc878.zip deleted file mode 100644 index 2b07edd0a9e..00000000000 Binary files a/.yarn/cache/@vue-devtools-api-npm-6.4.5-bcd56e5fec-40c5adc878.zip and /dev/null differ diff --git a/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip b/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip new file mode 100644 index 00000000000..f14e2cdac7d Binary files /dev/null and b/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip differ diff --git a/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip b/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip new file mode 100644 index 00000000000..e637e5f5566 Binary files /dev/null and b/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip differ diff --git a/.yarn/cache/@vue-reactivity-npm-3.2.47-1182f7aa47-bd61134e4b.zip b/.yarn/cache/@vue-reactivity-npm-3.2.47-1182f7aa47-bd61134e4b.zip deleted file mode 100644 index 149946e8248..00000000000 Binary files a/.yarn/cache/@vue-reactivity-npm-3.2.47-1182f7aa47-bd61134e4b.zip and /dev/null differ diff --git a/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip b/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip new file mode 100644 index 00000000000..adc965a4734 Binary files /dev/null and b/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip differ diff --git a/.yarn/cache/@vue-reactivity-transform-npm-3.2.47-89701a53ab-6fe54374aa.zip b/.yarn/cache/@vue-reactivity-transform-npm-3.2.47-89701a53ab-6fe54374aa.zip deleted file mode 100644 index 3d7a85c70ea..00000000000 Binary files a/.yarn/cache/@vue-reactivity-transform-npm-3.2.47-89701a53ab-6fe54374aa.zip and /dev/null differ diff --git a/.yarn/cache/@vue-runtime-core-npm-3.2.47-d5ec5c27c7-56fd41368c.zip b/.yarn/cache/@vue-runtime-core-npm-3.2.47-d5ec5c27c7-56fd41368c.zip deleted file mode 100644 index 780efab2612..00000000000 Binary files a/.yarn/cache/@vue-runtime-core-npm-3.2.47-d5ec5c27c7-56fd41368c.zip and /dev/null differ diff --git a/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip b/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip new file mode 100644 index 00000000000..ffb48a907a7 Binary files /dev/null and b/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip differ diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.2.47-da74228cd1-8987d72761.zip b/.yarn/cache/@vue-runtime-dom-npm-3.2.47-da74228cd1-8987d72761.zip deleted file mode 100644 index 7399438dbc6..00000000000 Binary files a/.yarn/cache/@vue-runtime-dom-npm-3.2.47-da74228cd1-8987d72761.zip and /dev/null differ diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip b/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip new file mode 100644 index 00000000000..c65601f0a9e Binary files /dev/null and b/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip differ diff --git a/.yarn/cache/@vue-server-renderer-npm-3.2.47-b845561a5d-482fe3c9bb.zip b/.yarn/cache/@vue-server-renderer-npm-3.2.47-b845561a5d-482fe3c9bb.zip deleted file mode 100644 index a848ae2600b..00000000000 Binary files a/.yarn/cache/@vue-server-renderer-npm-3.2.47-b845561a5d-482fe3c9bb.zip and /dev/null differ diff --git a/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip b/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip new file mode 100644 index 00000000000..4da755254b4 Binary files /dev/null and b/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip differ diff --git a/.yarn/cache/@vue-shared-npm-3.2.47-efa4e85dc8-0aa711dc91.zip b/.yarn/cache/@vue-shared-npm-3.2.47-efa4e85dc8-0aa711dc91.zip deleted file mode 100644 index 975c32d829a..00000000000 Binary files a/.yarn/cache/@vue-shared-npm-3.2.47-efa4e85dc8-0aa711dc91.zip and /dev/null differ diff --git a/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip b/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip new file mode 100644 index 00000000000..01c52809b3b Binary files /dev/null and b/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip differ diff --git a/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip b/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip new file mode 100644 index 00000000000..6820207002d Binary files /dev/null and b/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip differ diff --git a/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip b/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip deleted file mode 100644 index b5376b13928..00000000000 Binary files a/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip and /dev/null differ diff --git a/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip b/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip deleted file mode 100644 index f140c4ab5c2..00000000000 Binary files a/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip and /dev/null differ diff --git a/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip b/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip deleted file mode 100644 index 62c09039bd1..00000000000 Binary files a/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip and /dev/null differ diff --git a/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip b/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip new file mode 100644 index 00000000000..d2d609a6675 Binary files /dev/null and b/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip differ diff --git a/.yarn/cache/array-includes-npm-3.1.6-d0ff9d248b-f22f8cd8ba.zip b/.yarn/cache/array-includes-npm-3.1.6-d0ff9d248b-f22f8cd8ba.zip deleted file mode 100644 index a1083551bf7..00000000000 Binary files a/.yarn/cache/array-includes-npm-3.1.6-d0ff9d248b-f22f8cd8ba.zip and /dev/null differ diff --git a/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip b/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip new file mode 100644 index 00000000000..1f7fc2c5773 Binary files /dev/null and b/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip differ diff --git a/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip b/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip new file mode 100644 index 00000000000..8aaa4a956a2 Binary files /dev/null and b/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip differ diff --git a/.yarn/cache/array.prototype.flat-npm-1.3.1-e9a9e389c0-5a8415949d.zip b/.yarn/cache/array.prototype.flat-npm-1.3.1-e9a9e389c0-5a8415949d.zip deleted file mode 100644 index f3e42570b91..00000000000 Binary files a/.yarn/cache/array.prototype.flat-npm-1.3.1-e9a9e389c0-5a8415949d.zip and /dev/null differ diff --git a/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip b/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip new file mode 100644 index 00000000000..7720137d70f Binary files /dev/null and b/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip differ diff --git a/.yarn/cache/array.prototype.flatmap-npm-1.3.1-c65186ca34-8c1c43a499.zip b/.yarn/cache/array.prototype.flatmap-npm-1.3.1-c65186ca34-8c1c43a499.zip deleted file mode 100644 index a791d28dca9..00000000000 Binary files a/.yarn/cache/array.prototype.flatmap-npm-1.3.1-c65186ca34-8c1c43a499.zip and /dev/null differ diff --git a/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip b/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip new file mode 100644 index 00000000000..2553a317f10 Binary files /dev/null and b/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip differ diff --git a/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip b/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip new file mode 100644 index 00000000000..559e55f81ab Binary files /dev/null and b/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip differ diff --git a/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip b/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip deleted file mode 100644 index 71730f2e231..00000000000 Binary files a/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip and /dev/null differ diff --git a/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip b/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip new file mode 100644 index 00000000000..36bedd6286e Binary files /dev/null and b/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip differ diff --git a/.yarn/cache/bootstrap-icons-npm-1.10.5-36f80ab074-8a0cfbd237.zip b/.yarn/cache/bootstrap-icons-npm-1.10.5-36f80ab074-8a0cfbd237.zip deleted file mode 100644 index 5aef05dd974..00000000000 Binary files a/.yarn/cache/bootstrap-icons-npm-1.10.5-36f80ab074-8a0cfbd237.zip and /dev/null differ diff --git a/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip b/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip new file mode 100644 index 00000000000..e20ab2ecb3b Binary files /dev/null and b/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip differ diff --git a/.yarn/cache/bootstrap-npm-5.2.3-7458283a23-0211805dec.zip b/.yarn/cache/bootstrap-npm-5.2.3-7458283a23-0211805dec.zip deleted file mode 100644 index 24c59290c55..00000000000 Binary files a/.yarn/cache/bootstrap-npm-5.2.3-7458283a23-0211805dec.zip and /dev/null differ diff --git a/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip b/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip new file mode 100644 index 00000000000..ca3961acc15 Binary files /dev/null and b/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip differ diff --git a/.yarn/cache/browser-fs-access-npm-0.33.1-1af7eeff22-2fb595c2d2.zip b/.yarn/cache/browser-fs-access-npm-0.33.1-1af7eeff22-2fb595c2d2.zip deleted file mode 100644 index 0a5ae951415..00000000000 Binary files a/.yarn/cache/browser-fs-access-npm-0.33.1-1af7eeff22-2fb595c2d2.zip and /dev/null differ diff --git a/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip b/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip new file mode 100644 index 00000000000..2202ffed8e5 Binary files /dev/null and b/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip differ diff --git a/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip b/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip deleted file mode 100644 index efe1b763807..00000000000 Binary files a/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip and /dev/null differ diff --git a/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip b/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip new file mode 100644 index 00000000000..c7e20444c61 Binary files /dev/null and b/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip differ diff --git a/.yarn/cache/c8-npm-7.13.0-9ac8f17e2c-491abf4cf3.zip b/.yarn/cache/c8-npm-7.13.0-9ac8f17e2c-491abf4cf3.zip deleted file mode 100644 index a457d8fb705..00000000000 Binary files a/.yarn/cache/c8-npm-7.13.0-9ac8f17e2c-491abf4cf3.zip and /dev/null differ diff --git a/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip b/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip new file mode 100644 index 00000000000..1e5812b784f Binary files /dev/null and b/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip differ diff --git a/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip b/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip new file mode 100644 index 00000000000..29854c129a4 Binary files /dev/null and b/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip differ diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001481-cd8272ecaa-8200a043c1.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001481-cd8272ecaa-8200a043c1.zip deleted file mode 100644 index f08e1fb3554..00000000000 Binary files a/.yarn/cache/caniuse-lite-npm-1.0.30001481-cd8272ecaa-8200a043c1.zip and /dev/null differ diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip new file mode 100644 index 00000000000..f3bd2d06bca Binary files /dev/null and b/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip differ diff --git a/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip b/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip deleted file mode 100644 index 24f58564e46..00000000000 Binary files a/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip and /dev/null differ diff --git a/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip new file mode 100644 index 00000000000..a90643c5e5a Binary files /dev/null and b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip differ diff --git a/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip b/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip deleted file mode 100644 index 6a14adf507d..00000000000 Binary files a/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip and /dev/null differ diff --git a/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip b/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip new file mode 100644 index 00000000000..a23ef5e7b96 Binary files /dev/null and b/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip differ diff --git a/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip b/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip deleted file mode 100644 index 59ddf4f69fc..00000000000 Binary files a/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip and /dev/null differ diff --git a/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip b/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip new file mode 100644 index 00000000000..9853f0cf0b0 Binary files /dev/null and b/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip differ diff --git a/.yarn/cache/d3-npm-7.8.4-2a6380492b-8dfea4d026.zip b/.yarn/cache/d3-npm-7.8.4-2a6380492b-8dfea4d026.zip deleted file mode 100644 index ca5a565ef8e..00000000000 Binary files a/.yarn/cache/d3-npm-7.8.4-2a6380492b-8dfea4d026.zip and /dev/null differ diff --git a/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip b/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip new file mode 100644 index 00000000000..e78ffffee57 Binary files /dev/null and b/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip differ diff --git a/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip b/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip deleted file mode 100644 index 1e88493b725..00000000000 Binary files a/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip and /dev/null differ diff --git a/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip b/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip new file mode 100644 index 00000000000..f51ffd3ec9f Binary files /dev/null and b/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip differ diff --git a/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip b/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip deleted file mode 100644 index 856e44240d0..00000000000 Binary files a/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip and /dev/null differ diff --git a/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip b/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip new file mode 100644 index 00000000000..337d3f2fd4c Binary files /dev/null and b/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip differ diff --git a/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip b/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip deleted file mode 100644 index 3e07a61c478..00000000000 Binary files a/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip and /dev/null differ diff --git a/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip b/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip new file mode 100644 index 00000000000..75936e23744 Binary files /dev/null and b/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip differ diff --git a/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip b/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip new file mode 100644 index 00000000000..bcbfcf6e68f Binary files /dev/null and b/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip differ diff --git a/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip b/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip new file mode 100644 index 00000000000..1db92146bac Binary files /dev/null and b/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip differ diff --git a/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip b/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip deleted file mode 100644 index ddfadea4583..00000000000 Binary files a/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip and /dev/null differ diff --git a/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip b/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip new file mode 100644 index 00000000000..3772a4510ca Binary files /dev/null and b/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip differ diff --git a/.yarn/cache/es-abstract-npm-1.21.1-28d9a4a469-23ff60d42d.zip b/.yarn/cache/es-abstract-npm-1.21.1-28d9a4a469-23ff60d42d.zip deleted file mode 100644 index 46e5d7d326f..00000000000 Binary files a/.yarn/cache/es-abstract-npm-1.21.1-28d9a4a469-23ff60d42d.zip and /dev/null differ diff --git a/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip b/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip new file mode 100644 index 00000000000..f72f30d6f55 Binary files /dev/null and b/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip differ diff --git a/.yarn/cache/esbuild-npm-0.17.13-538abc913d-c3be8d41a3.zip b/.yarn/cache/esbuild-npm-0.17.13-538abc913d-c3be8d41a3.zip deleted file mode 100644 index 994bb8b78f5..00000000000 Binary files a/.yarn/cache/esbuild-npm-0.17.13-538abc913d-c3be8d41a3.zip and /dev/null differ diff --git a/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip b/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip new file mode 100644 index 00000000000..74931c9be30 Binary files /dev/null and b/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip differ diff --git a/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip b/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip new file mode 100644 index 00000000000..505e336b087 Binary files /dev/null and b/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip differ diff --git a/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip b/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip deleted file mode 100644 index 0cb3ae760a3..00000000000 Binary files a/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip and /dev/null differ diff --git a/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip b/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip new file mode 100644 index 00000000000..1cc26fbd860 Binary files /dev/null and b/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip differ diff --git a/.yarn/cache/eslint-import-resolver-node-npm-0.3.7-65bed19543-3379aacf1d.zip b/.yarn/cache/eslint-import-resolver-node-npm-0.3.7-65bed19543-3379aacf1d.zip deleted file mode 100644 index f9111a337b5..00000000000 Binary files a/.yarn/cache/eslint-import-resolver-node-npm-0.3.7-65bed19543-3379aacf1d.zip and /dev/null differ diff --git a/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip b/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip new file mode 100644 index 00000000000..f2e17574bdb Binary files /dev/null and b/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip differ diff --git a/.yarn/cache/eslint-module-utils-npm-2.7.4-a1640084cb-5da13645da.zip b/.yarn/cache/eslint-module-utils-npm-2.7.4-a1640084cb-5da13645da.zip deleted file mode 100644 index 005d442b0f9..00000000000 Binary files a/.yarn/cache/eslint-module-utils-npm-2.7.4-a1640084cb-5da13645da.zip and /dev/null differ diff --git a/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip b/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip new file mode 100644 index 00000000000..964bee4e4de Binary files /dev/null and b/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip differ diff --git a/.yarn/cache/eslint-npm-8.39.0-d92bace04d-d7a074ff32.zip b/.yarn/cache/eslint-npm-8.39.0-d92bace04d-d7a074ff32.zip deleted file mode 100644 index 8c0e13f66fe..00000000000 Binary files a/.yarn/cache/eslint-npm-8.39.0-d92bace04d-d7a074ff32.zip and /dev/null differ diff --git a/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip b/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip new file mode 100644 index 00000000000..73f8f9dff6f Binary files /dev/null and b/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip differ diff --git a/.yarn/cache/eslint-plugin-cypress-npm-2.13.3-0ad3bff9c9-9affbcee29.zip b/.yarn/cache/eslint-plugin-cypress-npm-2.13.3-0ad3bff9c9-9affbcee29.zip deleted file mode 100644 index 8ba449dd877..00000000000 Binary files a/.yarn/cache/eslint-plugin-cypress-npm-2.13.3-0ad3bff9c9-9affbcee29.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip b/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip new file mode 100644 index 00000000000..13724ec234a Binary files /dev/null and b/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip differ diff --git a/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip b/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip new file mode 100644 index 00000000000..1d334e0a107 Binary files /dev/null and b/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip differ diff --git a/.yarn/cache/eslint-plugin-import-npm-2.27.5-35b044b26f-f500571a38.zip b/.yarn/cache/eslint-plugin-import-npm-2.27.5-35b044b26f-f500571a38.zip deleted file mode 100644 index 6b2c4b1f33d..00000000000 Binary files a/.yarn/cache/eslint-plugin-import-npm-2.27.5-35b044b26f-f500571a38.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip b/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip new file mode 100644 index 00000000000..bc424a6a644 Binary files /dev/null and b/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip differ diff --git a/.yarn/cache/eslint-plugin-n-npm-15.7.0-8ea46b0c89-cfbcc67e62.zip b/.yarn/cache/eslint-plugin-n-npm-15.7.0-8ea46b0c89-cfbcc67e62.zip deleted file mode 100644 index 0bcae16736b..00000000000 Binary files a/.yarn/cache/eslint-plugin-n-npm-15.7.0-8ea46b0c89-cfbcc67e62.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip b/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip new file mode 100644 index 00000000000..9c7224993f0 Binary files /dev/null and b/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip differ diff --git a/.yarn/cache/eslint-plugin-vue-npm-9.11.0-b3c0e8ae5d-1bcb6cf768.zip b/.yarn/cache/eslint-plugin-vue-npm-9.11.0-b3c0e8ae5d-1bcb6cf768.zip deleted file mode 100644 index 2e16ba40d50..00000000000 Binary files a/.yarn/cache/eslint-plugin-vue-npm-9.11.0-b3c0e8ae5d-1bcb6cf768.zip and /dev/null differ diff --git a/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip b/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip new file mode 100644 index 00000000000..285d11da2d8 Binary files /dev/null and b/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip differ diff --git a/.yarn/cache/eslint-scope-npm-7.2.0-88784f5a38-64591a2d8b.zip b/.yarn/cache/eslint-scope-npm-7.2.0-88784f5a38-64591a2d8b.zip deleted file mode 100644 index 466323f2bc9..00000000000 Binary files a/.yarn/cache/eslint-scope-npm-7.2.0-88784f5a38-64591a2d8b.zip and /dev/null differ diff --git a/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip b/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip new file mode 100644 index 00000000000..29b002eb988 Binary files /dev/null and b/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip differ diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.0-dc8683d774-3315916946.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.0-dc8683d774-3315916946.zip deleted file mode 100644 index 0f229634aed..00000000000 Binary files a/.yarn/cache/eslint-visitor-keys-npm-3.4.0-dc8683d774-3315916946.zip and /dev/null differ diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip new file mode 100644 index 00000000000..e442ca3b416 Binary files /dev/null and b/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip differ diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip new file mode 100644 index 00000000000..7c61b814bff Binary files /dev/null and b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip differ diff --git a/.yarn/cache/espree-npm-9.5.1-057dc7b3c1-cdf6e43540.zip b/.yarn/cache/espree-npm-9.5.1-057dc7b3c1-cdf6e43540.zip deleted file mode 100644 index 5c2543e3f27..00000000000 Binary files a/.yarn/cache/espree-npm-9.5.1-057dc7b3c1-cdf6e43540.zip and /dev/null differ diff --git a/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip b/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip new file mode 100644 index 00000000000..0014c0574a5 Binary files /dev/null and b/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip differ diff --git a/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip b/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip deleted file mode 100644 index d947311d1e9..00000000000 Binary files a/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip and /dev/null differ diff --git a/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip b/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip new file mode 100644 index 00000000000..55fbdad3a3b Binary files /dev/null and b/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip differ diff --git a/.yarn/cache/function.prototype.name-npm-1.1.5-e776a642bb-acd21d733a.zip b/.yarn/cache/function.prototype.name-npm-1.1.5-e776a642bb-acd21d733a.zip deleted file mode 100644 index ac0af539ea9..00000000000 Binary files a/.yarn/cache/function.prototype.name-npm-1.1.5-e776a642bb-acd21d733a.zip and /dev/null differ diff --git a/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip b/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip new file mode 100644 index 00000000000..9c6ff345f9b Binary files /dev/null and b/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip differ diff --git a/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip b/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip new file mode 100644 index 00000000000..687f611165a Binary files /dev/null and b/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip differ diff --git a/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip b/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip new file mode 100644 index 00000000000..510eb5f0ed9 Binary files /dev/null and b/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip differ diff --git a/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip b/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip new file mode 100644 index 00000000000..6580ce43519 Binary files /dev/null and b/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip differ diff --git a/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip b/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip deleted file mode 100644 index 306b5aacad3..00000000000 Binary files a/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip and /dev/null differ diff --git a/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip b/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip new file mode 100644 index 00000000000..597f67a92ed Binary files /dev/null and b/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip differ diff --git a/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip b/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip new file mode 100644 index 00000000000..c8cb0244afd Binary files /dev/null and b/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip differ diff --git a/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip b/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip deleted file mode 100644 index 1eb26cc6a98..00000000000 Binary files a/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip and /dev/null differ diff --git a/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip b/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip new file mode 100644 index 00000000000..e04f8d37244 Binary files /dev/null and b/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip differ diff --git a/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip b/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip new file mode 100644 index 00000000000..5454406288a Binary files /dev/null and b/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip differ diff --git a/.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip b/.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip deleted file mode 100644 index c953a64563b..00000000000 Binary files a/.yarn/cache/highcharts-npm-11.0.1-05a14e3887-773a7b8765.zip and /dev/null differ diff --git a/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip b/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip new file mode 100644 index 00000000000..9c2f2df1544 Binary files /dev/null and b/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip differ diff --git a/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip b/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip deleted file mode 100644 index efbd98ed5de..00000000000 Binary files a/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip and /dev/null differ diff --git a/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip b/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip new file mode 100644 index 00000000000..7a740063fa6 Binary files /dev/null and b/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip differ diff --git a/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip b/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip deleted file mode 100644 index 21317c53e85..00000000000 Binary files a/.yarn/cache/html-validate-npm-7.16.0-ceaf62fb08-cce9a9e8f7.zip and /dev/null differ diff --git a/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip b/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip new file mode 100644 index 00000000000..b2f855af033 Binary files /dev/null and b/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip differ diff --git a/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip b/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip new file mode 100644 index 00000000000..50627d8e106 Binary files /dev/null and b/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip differ diff --git a/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip b/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip new file mode 100644 index 00000000000..75ba53a2709 Binary files /dev/null and b/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip differ diff --git a/.yarn/cache/internal-slot-npm-1.0.4-9183007374-8974588d06.zip b/.yarn/cache/internal-slot-npm-1.0.4-9183007374-8974588d06.zip deleted file mode 100644 index cba2d7ba669..00000000000 Binary files a/.yarn/cache/internal-slot-npm-1.0.4-9183007374-8974588d06.zip and /dev/null differ diff --git a/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip b/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip new file mode 100644 index 00000000000..18fccd3ac20 Binary files /dev/null and b/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip differ diff --git a/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip b/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip new file mode 100644 index 00000000000..7556381d456 Binary files /dev/null and b/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip differ diff --git a/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip b/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip new file mode 100644 index 00000000000..be908976b53 Binary files /dev/null and b/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip differ diff --git a/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip b/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip deleted file mode 100644 index 42dc0c31ebf..00000000000 Binary files a/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip and /dev/null differ diff --git a/.yarn/cache/is-core-module-npm-2.11.0-70061e141a-f96fd490c6.zip b/.yarn/cache/is-core-module-npm-2.11.0-70061e141a-f96fd490c6.zip deleted file mode 100644 index 4b89bc40ec2..00000000000 Binary files a/.yarn/cache/is-core-module-npm-2.11.0-70061e141a-f96fd490c6.zip and /dev/null differ diff --git a/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip b/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip new file mode 100644 index 00000000000..9512b2ef2b1 Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip differ diff --git a/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip b/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip new file mode 100644 index 00000000000..636775cb5ed Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip differ diff --git a/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip b/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip new file mode 100644 index 00000000000..897f5056855 Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip differ diff --git a/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip b/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip new file mode 100644 index 00000000000..4a35c2e95fb Binary files /dev/null and b/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip differ diff --git a/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip b/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip new file mode 100644 index 00000000000..f46224f1cc3 Binary files /dev/null and b/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip differ diff --git a/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip b/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip new file mode 100644 index 00000000000..b946848afd9 Binary files /dev/null and b/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip differ diff --git a/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip b/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip deleted file mode 100644 index c9a9a9c9496..00000000000 Binary files a/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip and /dev/null differ diff --git a/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip b/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip new file mode 100644 index 00000000000..4a337c3397a Binary files /dev/null and b/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip differ diff --git a/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip b/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip deleted file mode 100644 index de55e34a9cf..00000000000 Binary files a/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip and /dev/null differ diff --git a/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip b/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip deleted file mode 100644 index 50167f4d8d1..00000000000 Binary files a/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip and /dev/null differ diff --git a/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip b/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip deleted file mode 100644 index f4bc56be0ff..00000000000 Binary files a/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip and /dev/null differ diff --git a/.yarn/cache/jquery-npm-3.6.4-c665e9b5ea-8354f7bd0a.zip b/.yarn/cache/jquery-npm-3.6.4-c665e9b5ea-8354f7bd0a.zip deleted file mode 100644 index 898d7a11943..00000000000 Binary files a/.yarn/cache/jquery-npm-3.6.4-c665e9b5ea-8354f7bd0a.zip and /dev/null differ diff --git a/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip b/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip new file mode 100644 index 00000000000..dda19f270f1 Binary files /dev/null and b/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip differ diff --git a/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip b/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip deleted file mode 100644 index c581e91e647..00000000000 Binary files a/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip and /dev/null differ diff --git a/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip b/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip new file mode 100644 index 00000000000..1fe6a6f48d0 Binary files /dev/null and b/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip differ diff --git a/.yarn/cache/luxon-npm-3.3.0-bdbae9bfd5-50cf17a0dc.zip b/.yarn/cache/luxon-npm-3.3.0-bdbae9bfd5-50cf17a0dc.zip deleted file mode 100644 index e70d3dc06d7..00000000000 Binary files a/.yarn/cache/luxon-npm-3.3.0-bdbae9bfd5-50cf17a0dc.zip and /dev/null differ diff --git a/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip b/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip new file mode 100644 index 00000000000..ed7709ee9ee Binary files /dev/null and b/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip differ diff --git a/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip b/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip deleted file mode 100644 index caa6d6b49e8..00000000000 Binary files a/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip and /dev/null differ diff --git a/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip b/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip new file mode 100644 index 00000000000..7d9e6ff1d39 Binary files /dev/null and b/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip differ diff --git a/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip b/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip new file mode 100644 index 00000000000..2a141eff65f Binary files /dev/null and b/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip differ diff --git a/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip b/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip new file mode 100644 index 00000000000..7454cc21afd Binary files /dev/null and b/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip differ diff --git a/.yarn/cache/moment-timezone-npm-0.5.43-1304d8602a-8075c897ed.zip b/.yarn/cache/moment-timezone-npm-0.5.43-1304d8602a-8075c897ed.zip deleted file mode 100644 index 6200ccaec8e..00000000000 Binary files a/.yarn/cache/moment-timezone-npm-0.5.43-1304d8602a-8075c897ed.zip and /dev/null differ diff --git a/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip b/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip new file mode 100644 index 00000000000..4cd7864ca50 Binary files /dev/null and b/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip differ diff --git a/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip b/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip new file mode 100644 index 00000000000..b9af6cd2413 Binary files /dev/null and b/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip differ diff --git a/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip b/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip new file mode 100644 index 00000000000..12aaa36344f Binary files /dev/null and b/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip differ diff --git a/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip b/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip new file mode 100644 index 00000000000..ce927778aa8 Binary files /dev/null and b/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip differ diff --git a/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip b/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip new file mode 100644 index 00000000000..4cec1b177d1 Binary files /dev/null and b/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip differ diff --git a/.yarn/cache/naive-ui-npm-2.34.3-ba2dfb08d8-792d9e6c51.zip b/.yarn/cache/naive-ui-npm-2.34.3-ba2dfb08d8-792d9e6c51.zip deleted file mode 100755 index d025f4e6746..00000000000 Binary files a/.yarn/cache/naive-ui-npm-2.34.3-ba2dfb08d8-792d9e6c51.zip and /dev/null differ diff --git a/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip b/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip new file mode 100644 index 00000000000..fb6dc789a1e Binary files /dev/null and b/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip differ diff --git a/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip b/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip deleted file mode 100644 index d28e91f1ff3..00000000000 Binary files a/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip and /dev/null differ diff --git a/.yarn/cache/nanoid-npm-3.3.6-e6d6ae7e71-7d0eda6570.zip b/.yarn/cache/nanoid-npm-3.3.6-e6d6ae7e71-7d0eda6570.zip deleted file mode 100644 index 8526acad726..00000000000 Binary files a/.yarn/cache/nanoid-npm-3.3.6-e6d6ae7e71-7d0eda6570.zip and /dev/null differ diff --git a/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip b/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip new file mode 100644 index 00000000000..7b2fd6e1b55 Binary files /dev/null and b/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip differ diff --git a/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip new file mode 100644 index 00000000000..012df449c0f Binary files /dev/null and b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip differ diff --git a/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip b/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip new file mode 100644 index 00000000000..d023f1a69dd Binary files /dev/null and b/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip differ diff --git a/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip b/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip new file mode 100644 index 00000000000..840821996db Binary files /dev/null and b/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip differ diff --git a/.yarn/cache/object-inspect-npm-1.12.3-1e7d20f5ff-dabfd824d9.zip b/.yarn/cache/object-inspect-npm-1.12.3-1e7d20f5ff-dabfd824d9.zip deleted file mode 100644 index ec58095dc8f..00000000000 Binary files a/.yarn/cache/object-inspect-npm-1.12.3-1e7d20f5ff-dabfd824d9.zip and /dev/null differ diff --git a/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip b/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip new file mode 100644 index 00000000000..1e1bbfbcfa7 Binary files /dev/null and b/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip differ diff --git a/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip b/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip new file mode 100644 index 00000000000..a976cc8e0e1 Binary files /dev/null and b/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip differ diff --git a/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip b/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip new file mode 100644 index 00000000000..c67f462cfbe Binary files /dev/null and b/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip differ diff --git a/.yarn/cache/object.values-npm-1.1.6-ab9b67ccd3-f6fff9fd81.zip b/.yarn/cache/object.values-npm-1.1.6-ab9b67ccd3-f6fff9fd81.zip deleted file mode 100644 index 679cbd793fe..00000000000 Binary files a/.yarn/cache/object.values-npm-1.1.6-ab9b67ccd3-f6fff9fd81.zip and /dev/null differ diff --git a/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip b/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip new file mode 100644 index 00000000000..4c12832e028 Binary files /dev/null and b/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip differ diff --git a/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip b/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip deleted file mode 100644 index 6e6efe345ba..00000000000 Binary files a/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip and /dev/null differ diff --git a/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip b/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip new file mode 100644 index 00000000000..06266323c5e Binary files /dev/null and b/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip differ diff --git a/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip b/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip new file mode 100644 index 00000000000..35ea485c2b3 Binary files /dev/null and b/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip differ diff --git a/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip b/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip new file mode 100644 index 00000000000..965ad65ddc1 Binary files /dev/null and b/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip differ diff --git a/.yarn/cache/parcel-npm-2.8.3-5d8a8e1092-09cd2dc23c.zip b/.yarn/cache/parcel-npm-2.8.3-5d8a8e1092-09cd2dc23c.zip deleted file mode 100644 index c703c90cc34..00000000000 Binary files a/.yarn/cache/parcel-npm-2.8.3-5d8a8e1092-09cd2dc23c.zip and /dev/null differ diff --git a/.yarn/cache/pinia-npm-2.0.35-60f8addaf8-cecb1e1e97.zip b/.yarn/cache/pinia-npm-2.0.35-60f8addaf8-cecb1e1e97.zip deleted file mode 100644 index 38181abf9a1..00000000000 Binary files a/.yarn/cache/pinia-npm-2.0.35-60f8addaf8-cecb1e1e97.zip and /dev/null differ diff --git a/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip b/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip new file mode 100644 index 00000000000..352e0a2f9ff Binary files /dev/null and b/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip differ diff --git a/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip b/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip deleted file mode 100644 index 4f940728b96..00000000000 Binary files a/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip and /dev/null differ diff --git a/.yarn/cache/postcss-npm-8.4.23-d4a02a832d-8bb9d1b2ea.zip b/.yarn/cache/postcss-npm-8.4.23-d4a02a832d-8bb9d1b2ea.zip deleted file mode 100644 index 561478eb099..00000000000 Binary files a/.yarn/cache/postcss-npm-8.4.23-d4a02a832d-8bb9d1b2ea.zip and /dev/null differ diff --git a/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip b/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip new file mode 100644 index 00000000000..57638cbd81a Binary files /dev/null and b/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip differ diff --git a/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip b/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip new file mode 100644 index 00000000000..888dccea0cd Binary files /dev/null and b/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip differ diff --git a/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip b/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip deleted file mode 100644 index 496c72f70c2..00000000000 Binary files a/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip and /dev/null differ diff --git a/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip b/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip new file mode 100644 index 00000000000..c6d454663eb Binary files /dev/null and b/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip differ diff --git a/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip b/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip deleted file mode 100644 index 8d28efe3e1f..00000000000 Binary files a/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip and /dev/null differ diff --git a/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip b/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip deleted file mode 100644 index 8b0c3e54609..00000000000 Binary files a/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip and /dev/null differ diff --git a/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip b/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip new file mode 100644 index 00000000000..743dca6a4ef Binary files /dev/null and b/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip differ diff --git a/.yarn/cache/regexp.prototype.flags-npm-1.4.3-df1c08b65d-51228bae73.zip b/.yarn/cache/regexp.prototype.flags-npm-1.4.3-df1c08b65d-51228bae73.zip deleted file mode 100644 index 9e56b1a48bb..00000000000 Binary files a/.yarn/cache/regexp.prototype.flags-npm-1.4.3-df1c08b65d-51228bae73.zip and /dev/null differ diff --git a/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip b/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip new file mode 100644 index 00000000000..d73fb5c3dfb Binary files /dev/null and b/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip differ diff --git a/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip b/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip deleted file mode 100644 index d41402c877c..00000000000 Binary files a/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip and /dev/null differ diff --git a/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip b/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip new file mode 100644 index 00000000000..f3daae8bc83 Binary files /dev/null and b/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip differ diff --git a/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip b/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip new file mode 100644 index 00000000000..87b2b21978e Binary files /dev/null and b/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip differ diff --git a/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip b/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip deleted file mode 100644 index c3066c3608a..00000000000 Binary files a/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip and /dev/null differ diff --git a/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip b/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip new file mode 100644 index 00000000000..7d4960beb50 Binary files /dev/null and b/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip differ diff --git a/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip b/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip new file mode 100644 index 00000000000..84c63abe59c Binary files /dev/null and b/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip differ diff --git a/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip new file mode 100644 index 00000000000..53ff3fc69e2 Binary files /dev/null and b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip differ diff --git a/.yarn/cache/rollup-npm-3.21.6-ae95b73a21-bb6786ee0d.zip b/.yarn/cache/rollup-npm-3.21.6-ae95b73a21-bb6786ee0d.zip deleted file mode 100644 index dcc06fb8786..00000000000 Binary files a/.yarn/cache/rollup-npm-3.21.6-ae95b73a21-bb6786ee0d.zip and /dev/null differ diff --git a/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip b/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip new file mode 100644 index 00000000000..9f6628aa426 Binary files /dev/null and b/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip differ diff --git a/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip b/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip new file mode 100644 index 00000000000..6789308b813 Binary files /dev/null and b/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip differ diff --git a/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip b/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip deleted file mode 100644 index 745da7a176c..00000000000 Binary files a/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip and /dev/null differ diff --git a/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip b/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip new file mode 100644 index 00000000000..a3aea4e6687 Binary files /dev/null and b/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip differ diff --git a/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip b/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip deleted file mode 100644 index 5265b570838..00000000000 Binary files a/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip and /dev/null differ diff --git a/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip b/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip new file mode 100644 index 00000000000..03ae0a8f508 Binary files /dev/null and b/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip differ diff --git a/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip b/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip new file mode 100644 index 00000000000..91f42cf845e Binary files /dev/null and b/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip differ diff --git a/.yarn/cache/semver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip b/.yarn/cache/semver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip deleted file mode 100644 index c6d8940e6f3..00000000000 Binary files a/.yarn/cache/semver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip and /dev/null differ diff --git a/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip b/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip new file mode 100644 index 00000000000..79b7d4718ca Binary files /dev/null and b/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip differ diff --git a/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip new file mode 100644 index 00000000000..f8689471f58 Binary files /dev/null and b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip differ diff --git a/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip b/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip new file mode 100644 index 00000000000..a5494e10ac9 Binary files /dev/null and b/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip differ diff --git a/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip b/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip new file mode 100644 index 00000000000..024add469c9 Binary files /dev/null and b/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip differ diff --git a/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip b/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip new file mode 100644 index 00000000000..f18d53b5996 Binary files /dev/null and b/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip differ diff --git a/.yarn/cache/shepherd.js-npm-11.1.1-c87ab2ed73-1d2a0563b6.zip b/.yarn/cache/shepherd.js-npm-11.1.1-c87ab2ed73-1d2a0563b6.zip deleted file mode 100644 index 58028462dc1..00000000000 Binary files a/.yarn/cache/shepherd.js-npm-11.1.1-c87ab2ed73-1d2a0563b6.zip and /dev/null differ diff --git a/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip b/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip new file mode 100644 index 00000000000..6bd0d1e294c Binary files /dev/null and b/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip differ diff --git a/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip b/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip deleted file mode 100644 index 9028b71d1c6..00000000000 Binary files a/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip and /dev/null differ diff --git a/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip b/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip new file mode 100644 index 00000000000..b3031257615 Binary files /dev/null and b/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip differ diff --git a/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip b/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip deleted file mode 100644 index 5fc27c8438d..00000000000 Binary files a/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip and /dev/null differ diff --git a/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip b/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip deleted file mode 100644 index de84f79779c..00000000000 Binary files a/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip and /dev/null differ diff --git a/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip b/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip new file mode 100644 index 00000000000..543f676ced7 Binary files /dev/null and b/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip differ diff --git a/.yarn/cache/string.prototype.trimend-npm-1.0.6-304246ecc1-0fdc34645a.zip b/.yarn/cache/string.prototype.trimend-npm-1.0.6-304246ecc1-0fdc34645a.zip deleted file mode 100644 index c28cc815b20..00000000000 Binary files a/.yarn/cache/string.prototype.trimend-npm-1.0.6-304246ecc1-0fdc34645a.zip and /dev/null differ diff --git a/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip b/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip new file mode 100644 index 00000000000..93f30c147e5 Binary files /dev/null and b/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip differ diff --git a/.yarn/cache/string.prototype.trimstart-npm-1.0.6-0926caea6c-89080feef4.zip b/.yarn/cache/string.prototype.trimstart-npm-1.0.6-0926caea6c-89080feef4.zip deleted file mode 100644 index 6203bec399b..00000000000 Binary files a/.yarn/cache/string.prototype.trimstart-npm-1.0.6-0926caea6c-89080feef4.zip and /dev/null differ diff --git a/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip b/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip new file mode 100644 index 00000000000..187509d0528 Binary files /dev/null and b/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip differ diff --git a/.yarn/cache/terser-npm-5.16.5-b3f4101afe-f2c1a087fa.zip b/.yarn/cache/terser-npm-5.16.5-b3f4101afe-f2c1a087fa.zip deleted file mode 100644 index e7b665654a8..00000000000 Binary files a/.yarn/cache/terser-npm-5.16.5-b3f4101afe-f2c1a087fa.zip and /dev/null differ diff --git a/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip b/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip deleted file mode 100644 index 98a7ab1f879..00000000000 Binary files a/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip and /dev/null differ diff --git a/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip b/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip new file mode 100644 index 00000000000..abfe8dd47e9 Binary files /dev/null and b/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip differ diff --git a/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip b/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip new file mode 100644 index 00000000000..7e8dc8f1eda Binary files /dev/null and b/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip differ diff --git a/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip b/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip new file mode 100644 index 00000000000..9cd6f34788c Binary files /dev/null and b/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip differ diff --git a/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip b/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip new file mode 100644 index 00000000000..2318610bbc8 Binary files /dev/null and b/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip differ diff --git a/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip b/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip deleted file mode 100644 index 0e04423cd8d..00000000000 Binary files a/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip and /dev/null differ diff --git a/.yarn/cache/vanillajs-datepicker-npm-1.3.1-75a9d66ea4-c01ea7ec70.zip b/.yarn/cache/vanillajs-datepicker-npm-1.3.1-75a9d66ea4-c01ea7ec70.zip deleted file mode 100644 index 3926d112dd2..00000000000 Binary files a/.yarn/cache/vanillajs-datepicker-npm-1.3.1-75a9d66ea4-c01ea7ec70.zip and /dev/null differ diff --git a/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip b/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip new file mode 100644 index 00000000000..151d4c9230a Binary files /dev/null and b/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip differ diff --git a/.yarn/cache/vite-npm-4.3.4-4744edd48c-90ce3923ef.zip b/.yarn/cache/vite-npm-4.3.4-4744edd48c-90ce3923ef.zip deleted file mode 100644 index 896a446356a..00000000000 Binary files a/.yarn/cache/vite-npm-4.3.4-4744edd48c-90ce3923ef.zip and /dev/null differ diff --git a/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip b/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip new file mode 100644 index 00000000000..c6bb0e4ef76 Binary files /dev/null and b/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip differ diff --git a/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip b/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip new file mode 100644 index 00000000000..0f1e9805f75 Binary files /dev/null and b/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip differ diff --git a/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip b/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip new file mode 100644 index 00000000000..d53f3521eed Binary files /dev/null and b/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip differ diff --git a/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip b/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip new file mode 100644 index 00000000000..d83607888be Binary files /dev/null and b/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip differ diff --git a/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip b/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip new file mode 100644 index 00000000000..75e2c086b64 Binary files /dev/null and b/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip differ diff --git a/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip b/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip new file mode 100644 index 00000000000..bcb5ae5b4e2 Binary files /dev/null and b/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip differ diff --git a/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip b/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip new file mode 100644 index 00000000000..b1edfda12d2 Binary files /dev/null and b/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip differ diff --git a/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip b/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip new file mode 100644 index 00000000000..ec214b2903f Binary files /dev/null and b/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip differ diff --git a/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip b/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip new file mode 100644 index 00000000000..6dadd110c90 Binary files /dev/null and b/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip differ diff --git a/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip b/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip deleted file mode 100644 index 570ed5bd38c..00000000000 Binary files a/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip and /dev/null differ diff --git a/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip b/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip new file mode 100644 index 00000000000..413aac531f1 Binary files /dev/null and b/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip differ diff --git a/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip b/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip deleted file mode 100644 index 175f3e88467..00000000000 Binary files a/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip and /dev/null differ diff --git a/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip b/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip new file mode 100644 index 00000000000..9ec85e189ea Binary files /dev/null and b/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip differ diff --git a/.yarn/cache/vue-npm-3.2.47-487db916e1-3b586f61fd.zip b/.yarn/cache/vue-npm-3.2.47-487db916e1-3b586f61fd.zip deleted file mode 100644 index 10ecd8d0713..00000000000 Binary files a/.yarn/cache/vue-npm-3.2.47-487db916e1-3b586f61fd.zip and /dev/null differ diff --git a/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip b/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip new file mode 100644 index 00000000000..c48b4e5dfe6 Binary files /dev/null and b/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip differ diff --git a/.yarn/cache/vue-router-npm-4.1.6-ccab7109e1-c7f0156ac0.zip b/.yarn/cache/vue-router-npm-4.1.6-ccab7109e1-c7f0156ac0.zip deleted file mode 100644 index 2c00e0a7cef..00000000000 Binary files a/.yarn/cache/vue-router-npm-4.1.6-ccab7109e1-c7f0156ac0.zip and /dev/null differ diff --git a/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip b/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip new file mode 100644 index 00000000000..6b939536248 Binary files /dev/null and b/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip differ diff --git a/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip b/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip deleted file mode 100644 index 0a267b628a7..00000000000 Binary files a/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip and /dev/null differ diff --git a/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip b/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip new file mode 100644 index 00000000000..f62e5e32e82 Binary files /dev/null and b/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip differ diff --git a/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip b/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip new file mode 100644 index 00000000000..0d9d2479da7 Binary files /dev/null and b/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip differ diff --git a/.yarn/cache/which-typed-array-npm-1.1.9-9559c95dfc-fe0178ca44.zip b/.yarn/cache/which-typed-array-npm-1.1.9-9559c95dfc-fe0178ca44.zip deleted file mode 100644 index e7e7d548deb..00000000000 Binary files a/.yarn/cache/which-typed-array-npm-1.1.9-9559c95dfc-fe0178ca44.zip and /dev/null differ diff --git a/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip b/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip deleted file mode 100644 index 518977eb886..00000000000 Binary files a/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip and /dev/null differ diff --git a/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip b/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip deleted file mode 100644 index d11c27d5104..00000000000 Binary files a/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip and /dev/null differ diff --git a/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip new file mode 100644 index 00000000000..54c49dc9c62 Binary files /dev/null and b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip differ diff --git a/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip b/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip deleted file mode 100644 index f230038cfc2..00000000000 Binary files a/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip and /dev/null differ diff --git a/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip b/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip new file mode 100644 index 00000000000..d68ba748e74 Binary files /dev/null and b/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip differ diff --git a/LICENSE b/LICENSE index aaed0ef57dc..dc6e0c56635 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2008-2022, The IETF Trust +Copyright (c) 2008-2024, The IETF Trust All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,4 +26,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 51d9271160f..baffc311e7e 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ [![Release](https://img.shields.io/github/release/ietf-tools/datatracker.svg?style=flat&maxAge=300)](https://github.com/ietf-tools/datatracker/releases) [![License](https://img.shields.io/github/license/ietf-tools/datatracker)](https://github.com/ietf-tools/datatracker/blob/main/LICENSE) [![Code Coverage](https://codecov.io/gh/ietf-tools/datatracker/branch/feat/bs5/graph/badge.svg?token=V4DXB0Q28C)](https://codecov.io/gh/ietf-tools/datatracker) -[![Python Version](https://img.shields.io/badge/python-3.9-blue?logo=python&logoColor=white)](#prerequisites) -[![Django Version](https://img.shields.io/badge/django-2.x-51be95?logo=django&logoColor=white)](#prerequisites) +[![Python Version](https://img.shields.io/badge/python-3.12-blue?logo=python&logoColor=white)](#prerequisites) +[![Django Version](https://img.shields.io/badge/django-4.x-51be95?logo=django&logoColor=white)](#prerequisites) [![Node Version](https://img.shields.io/badge/node.js-16.x-green?logo=node.js&logoColor=white)](#prerequisites) -[![MariaDB Version](https://img.shields.io/badge/postgres-14-blue?logo=postgresql&logoColor=white)](#prerequisites) +[![MariaDB Version](https://img.shields.io/badge/postgres-17-blue?logo=postgresql&logoColor=white)](#prerequisites) ##### The day-to-day front-end to the IETF database for people who work on IETF standards. @@ -18,6 +18,7 @@ - [Changelog](https://github.com/ietf-tools/datatracker/releases) - [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) - [Getting Started](#getting-started) - *[ tl;dr ](#the-tldr-to-get-going)* + - [Creating a Fork](#creating-a-fork) - [Git Cloning Tips](#git-cloning-tips) - [Docker Dev Environment](docker/README.md) - [Database & Assets](#database--assets) @@ -43,14 +44,24 @@ This project is following the standard **Git Feature Workflow** development model. Learn about all the various steps of the development workflow, from creating a fork to submitting a pull request, in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide. +> [!TIP] > Make sure to read the [Styleguides](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md#styleguides) section to ensure a cohesive code format across the project. You can submit bug reports, enhancement and new feature requests in the [discussions](https://github.com/ietf-tools/datatracker/discussions) area. Accepted tickets will be converted to issues. +#### Creating a Fork + +Click the Fork button in the top-right corner of the repository to create a personal copy that you can work on. + +> [!NOTE] +> Some GitHub Actions might be enabled by default in your fork. You should disable them by going to **Settings** > **Actions** > **General** and selecting **Disable actions** (then Save). + #### Git Cloning Tips As outlined in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide, you will first want to create a fork of the datatracker project in your personal GitHub account before cloning it. +Windows developers: [Start with WSL2 from the beginning](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md). + Because of the extensive history of this project, cloning the datatracker project locally can take a long time / disk space. You can speed up the cloning process by limiting the history depth, for example *(replace `USERNAME` with your GitHub username)*: - To fetch only up to the 10 latest commits: @@ -72,9 +83,9 @@ Many developers are using [VS Code](https://code.visualstudio.com/) and taking a If VS Code is not available to you, in your clone, type `cd docker; ./run` -Once the containers are started, run the tests to make sure your checkout is a good place to start from (all tests should pass - if any fail, ask for help at tools-develop@). Inside the app container's shell type: +Once the containers are started, run the tests to make sure your checkout is a good place to start from (all tests should pass - if any fail, ask for help at tools-help@). Inside the app container's shell type: ```sh -ietf/manage.py test --settings=settings_postgrestest +ietf/manage.py test --settings=settings_test ``` Note that we recently moved the datatracker onto PostgreSQL - you may still find older documentation that suggests testing with settings_sqlitetest. That will no longer work. @@ -95,7 +106,25 @@ Read the [Docker Dev Environment](docker/README.md) guide to get started. Nightly database dumps of the datatracker are available as Docker images: `ghcr.io/ietf-tools/datatracker-db:latest` -> Note that to update the database in your dev environment to the latest version, you should run the `docker/cleandb` script. +> [!TIP] +> In order to update the database in your dev environment to the latest version, you should run the `docker/cleandb` script. + +### Blob storage for dev/test + +The dev and test environments use [minio](https://github.com/minio/minio) to provide local blob storage. See the settings files for how the app container communicates with the blobstore container. If you need to work with minio directly from outside the containers (to interact with its api or console), use `docker compose` from the top level directory of your clone to expose it at an ephemeral port. + +``` +$ docker compose port blobstore 9001 +0.0.0.0: + +$ curl -I http://localhost: +HTTP/1.1 200 OK +... +``` + + +The minio container exposes the minio api at port 9000 and the minio console at port 9001 + ### Frontend Development @@ -113,7 +142,7 @@ Pages will gradually be updated to Vue 3 components. These components are locate Each Vue 3 app has its own sub-directory. For example, the agenda app is located under `/client/agenda`. -The datatracker makes use of the Django-Vite plugin to point to either the Vite.js server or the precompiled production files. The `DJANGO_VITE_DEV_MODE` flag, found in the `ietf/settings_local.py` file determines whether the Vite.js server is used or not. +The datatracker makes use of the Django-Vite plugin to point to either the Vite.js server or the precompiled production files. The `DJANGO_VITE["default"]["dev_mode"]` flag, found in the `ietf/settings_local.py` file determines whether the Vite.js server is used or not. In development mode, you must start the Vite.js development server, in addition to the usual Datatracker server: @@ -133,10 +162,10 @@ This will create packages under `ietf/static/dist-neue`, which are then served b #### Parcel *(Legacy/jQuery)* -The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css`, respectively. +The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css` respectively, bundled using Parcel. Static images are likewise in `ietf/static/images`. -Whenever changes are made to the files under `ietf/static`, you must re-run `parcel` to package them: +Whenever changes are made to the files under `ietf/static`, you must re-run the build command to package them: ``` shell yarn legacy:build @@ -219,9 +248,10 @@ before activating a new release. From a datatracker container, run the command: ```sh -./ietf/manage.py test --settings=settings_postgrestest +./ietf/manage.py test --settings=settings_test ``` +> [!TIP] > You can limit the run to specific tests using the `--pattern` argument. ### Frontend Tests @@ -231,11 +261,13 @@ Frontend tests are done via Playwright. There're 2 different type of tests: - Tests that test Vue pages / components and run natively without any external dependency. - Tests that require a running datatracker instance to test against (usually legacy views). +> [!IMPORTANT] > Make sure you have Node.js 16.x or later installed on your machine. #### Run Vue Tests -> :warning: All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise. +> [!WARNING] +> All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise. 1. Run **once** to install dependencies on your system: ```sh @@ -268,7 +300,8 @@ Frontend tests are done via Playwright. There're 2 different type of tests: First, you need to start a datatracker instance (dev or prod), ideally from a docker container, exposing the 8000 port. -> :warning: All commands below **MUST** be run from the `./playwright` directory. +> [!WARNING] +> All commands below **MUST** be run from the `./playwright` directory. 1. Run **once** to install dependencies on your system: ```sh @@ -281,6 +314,7 @@ npm run install-deps npm run test:legacy ``` + ### Diff Tool To compare 2 different datatracker instances and look for diff, read the [diff tool instructions](dev/diff). diff --git a/bin/add-old-drafts-from-archive.py b/bin/add-old-drafts-from-archive.py deleted file mode 100755 index 239ba7837cc..00000000000 --- a/bin/add-old-drafts-from-archive.py +++ /dev/null @@ -1,151 +0,0 @@ -#!/usr/bin/env python -# Copyright The IETF Trust 2017-2019, All Rights Reserved - -import datetime -import os -import sys -from pathlib import Path -from contextlib import closing - -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -import django -django.setup() - -from django.conf import settings -from django.core.validators import validate_email, ValidationError -from ietf.utils.draft import PlaintextDraft -from ietf.submit.utils import update_authors -from ietf.utils.timezone import date_today - -import debug # pyflakes:ignore - -from ietf.doc.models import Document, NewRevisionDocEvent, DocEvent, State -from ietf.person.models import Person - -system = Person.objects.get(name="(System)") -expired = State.objects.get(type='draft',slug='expired') - -names = set() -print 'collecting draft names ...' -versions = 0 -for p in Path(settings.INTERNET_DRAFT_PATH).glob('draft*.txt'): - n = str(p).split('/')[-1].split('-') - if n[-1][:2].isdigit(): - name = '-'.join(n[:-1]) - if '--' in name or '.txt' in name or '[' in name or '=' in name or '&' in name: - continue - if name.startswith('draft-draft-'): - continue - if name == 'draft-ietf-trade-iotp-v1_0-dsig': - continue - if len(n[-1]) != 6: - continue - if name.startswith('draft-mlee-'): - continue - names.add('-'.join(n[:-1])) - -count=0 -print 'iterating through names ...' -for name in sorted(names): - if not Document.objects.filter(name=name).exists(): - paths = list(Path(settings.INTERNET_DRAFT_PATH).glob('%s-??.txt'%name)) - paths.sort() - doc = None - for p in paths: - n = str(p).split('/')[-1].split('-') - rev = n[-1][:2] - with open(str(p)) as txt_file: - raw = txt_file.read() - try: - text = raw.decode('utf8') - except UnicodeDecodeError: - text = raw.decode('latin1') - try: - draft = PlaintextDraft(text, txt_file.name, name_from_source=True) - except Exception as e: - print name, rev, "Can't parse", p,":",e - continue - if draft.errors and draft.errors.keys()!=['draftname',]: - print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc), draft.errors, draft.get_title().encode('utf8') - else: - time = datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc) - if not doc: - doc = Document.objects.create(name=name, - time=time, - type_id='draft', - title=draft.get_title(), - abstract=draft.get_abstract(), - rev = rev, - pages=draft.get_pagecount(), - words=draft.get_wordcount(), - expires=time+datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), - ) - DocAlias.objects.create(name=doc.name).docs.add(doc) - doc.states.add(expired) - # update authors - authors = [] - for author in draft.get_author_list(): - full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author - - author_name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip() - - if email: - try: - validate_email(email) - except ValidationError: - email = "" - - def turn_into_unicode(s): - if s is None: - return u"" - - if isinstance(s, unicode): - return s - else: - try: - return s.decode("utf-8") - except UnicodeDecodeError: - try: - return s.decode("latin-1") - except UnicodeDecodeError: - return "" - - author_name = turn_into_unicode(author_name) - email = turn_into_unicode(email) - company = turn_into_unicode(company) - - authors.append({ - "name": author_name, - "email": email, - "affiliation": company, - "country": country - }) - dummysubmission=type('', (), {})() #https://stackoverflow.com/questions/19476816/creating-an-empty-object-in-python - dummysubmission.authors = authors - update_authors(doc,dummysubmission) - - # add a docevent with words explaining where this came from - events = [] - e = NewRevisionDocEvent.objects.create( - type="new_revision", - doc=doc, - rev=rev, - by=system, - desc="New version available: %s-%s.txt" % (doc.name, doc.rev), - time=time, - ) - events.append(e) - e = DocEvent.objects.create( - type="comment", - doc = doc, - rev = rev, - by = system, - desc = "Revision added from id-archive on %s by %s"%(date_today(),sys.argv[0]), - time=time, - ) - events.append(e) - doc.time = time - doc.rev = rev - doc.save_with_history(events) - print "Added",name, rev diff --git a/bin/check-copyright b/bin/check-copyright deleted file mode 100755 index 13cbcd85828..00000000000 --- a/bin/check-copyright +++ /dev/null @@ -1,261 +0,0 @@ -#!/usr/bin/env python3.7 -# -*- mode: python; coding: utf-8 -*- -# Copyright The IETF Trust 2019, All Rights Reserved -""" -NAME - $program - Check for current copyright notice in given files - -SYNOPSIS - $program [OPTIONS] ARGS - -DESCRIPTION - Given a list of files or filename wildcard patterns, check all for - an IETF Trust copyright notice with the current year. Optionally - generate a diff on standard out which can be used by 'patch'. - - An invocation similar to the following can be particularly useful with - a set of changed version-controlled files, as it will fix up the - Copyright statements of any python files with pending changes: - - $ check-copyright -p $(svn st | cut -c 9- | grep '\.py$' ) | patch -p0 - - -%(options)s - -AUTHOR - Written by Henrik Levkowetz, - -COPYRIGHT - Copyright 2019 the IETF Trust - - This program is free software; you can redistribute it and/or modify - it under the terms of the Simplified BSD license as published by the - Open Source Initiative at http://opensource.org/licenses/BSD-2-Clause. - -""" - - -import datetime -import os -import sys -import time - -path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -if not path in sys.path: - sys.path.insert(0, path) - -import getopt -import re -import pytz -import tzparse -import debug - -version = "1.0.0" -program = os.path.basename(sys.argv[0]) -progdir = os.path.dirname(sys.argv[0]) - -debug.debug = True - -# ---------------------------------------------------------------------- -# Parse options - -options = "" -for line in re.findall("\n +(if|elif) +opt in \[(.+)\]:\s+#(.+)\n", open(sys.argv[0]).read()): - if not options: - options += "OPTIONS\n" - options += " %-16s %s\n" % (line[1].replace('"', ''), line[2]) -options = options.strip() - -# with ' < 1:' on the next line, this is a no-op: -if len(sys.argv) < 1: - print(__doc__ % locals()) - sys.exit(1) - -try: - opts, files = getopt.gnu_getopt(sys.argv[1:], "hC:pvV", ["help", "copyright=", "patch", "version", "verbose",]) -except Exception as e: - print( "%s: %s" % (program, e)) - sys.exit(1) - -# ---------------------------------------------------------------------- -# Handle options - -# set default values, if any -opt_verbose = 0 -opt_patch = False -opt_copyright = "Copyright The IETF Trust {years}, All Rights Reserved" - -# handle individual options -for opt, value in opts: - if opt in ["-h", "--help"]: # Output this help, then exit - print( __doc__ % locals() ) - sys.exit(1) - elif opt in ["-p", "--patch"]: # Generate patch output rather than error messages - opt_patch = True - elif opt in ["-C", "--copyright"]: # Copyright line pattern using {years} for years - opt_copyright = value - elif opt in ["-V", "--version"]: # Output version information, then exit - print( program, version ) - sys.exit(0) - elif opt in ["-v", "--verbose"]: # Be more verbose - opt_verbose += 1 - -# ---------------------------------------------------------------------- -def say(s): - sys.stderr.write("%s\n" % (s)) - -# ---------------------------------------------------------------------- -def note(s): - if opt_verbose: - sys.stderr.write("%s\n" % (s)) - -# ---------------------------------------------------------------------- -def die(s, error=1): - sys.stderr.write("\n%s: Error: %s\n\n" % (program, s)) - sys.exit(error) - -# ---------------------------------------------------------------------- - -def pipe(cmd, inp=None): - import shlex - from subprocess import Popen, PIPE - args = shlex.split(cmd) - bufsize = 4096 - stdin = PIPE if inp else None - pipe = Popen(args, stdin=stdin, stdout=PIPE, stderr=PIPE, bufsize=bufsize, encoding='utf-8', universal_newlines=True) - out, err = pipe.communicate(inp) - code = pipe.returncode - if code != 0: - raise OSError(err) - return out - -# ---------------------------------------------------------------------- -def split_loginfo(line): - try: - parts = line.split() - rev = parts[0][1:] - who = parts[2] - date = parts[4] - time = parts[5] - tz = parts[6] - when = tzparse.tzparse(" ".join(parts[4:7]), "%Y-%m-%d %H:%M:%S %Z") - when = when.astimezone(pytz.utc) - except ValueError as e: - sys.stderr.write("Bad log line format: %s\n %s\n" % (line, e)) - - return rev, who, when - -# ---------------------------------------------------------------------- -def get_first_commit(path): - note("Getting first commit for '%s'" % path) - cmd = 'svn log %s' % path - if opt_verbose > 1: - note("Running '%s' ..." % cmd) - try: - commit_log = pipe(cmd) - commit_log = commit_log.splitlines() - commit_log.reverse() - for line in commit_log: - if re.search(loginfo_format, line): - rev, who, when = split_loginfo(line) - break - else: - pass - except OSError: - rev, who, when = None, None, datetime.datetime.now(datetime.timezone.utc) - return { path: { 'rev': rev, 'who': who, 'date': when.strftime('%Y-%m-%d %H:%M:%S'), }, } - - -# ---------------------------------------------------------------------- -# The program itself - -import os -import json - -cwd = os.getcwd() - -# Get current initinfo from cache and svn -cachefn = os.path.join(os.environ.get('HOME', '.'), '.initinfo') - -if os.path.exists(cachefn): - note("Reading initinfo cache file %s" % cachefn) - with open(cachefn, "r") as file: - cache = json.load(file) -else: - sys.stderr.write("No initinfo cache file found -- will have to extract all information from SVN.\n"+ - "This may take some time.\n\n") - cache = {} -initinfo = cache - -merged_revs = {} -write_cache = False -loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d ' - -year = time.strftime('%Y') -copyright_re = "(?i)"+opt_copyright.format(years=r"(\d+-)?\d+") -for path in files: - try: - if not os.path.exists(path): - note("File does not exist: %s" % path) - continue - note("Checking path %s" % path) - if not path in initinfo: - initinfo.update(get_first_commit(path)) - write_cache = True - date = initinfo[path]['date'] - init = date[:4] - - copyright_year_re = "(?i)"+opt_copyright.format(years=r"({init}-)?{year}".format(init=init, year=year)) - with open(path) as file: - try: - chunk = file.read(4000) - except UnicodeDecodeError as e: - sys.stderr.write(f'Error when reading {file.name}: {e}\n') - raise - if os.path.basename(path) == '__init__.py' and len(chunk)==0: - continue - if not re.search(copyright_year_re, chunk): - if year == init: - copyright = opt_copyright.format(years=year) - else: - copyright = opt_copyright.format(years=f"{init}-{year}") - if opt_patch: - print(f"--- {file.name}\t(original)") - print(f"+++ {file.name}\t(modified)") - if not re.search(copyright_re, chunk): - # Simple case, just insert copyright at the top - print( "@@ -1,3 +1,4 @@") - print(f"+# {copyright}") - for i, line in list(enumerate(chunk.splitlines()))[:3]: - print(f" {line}") - else: - # Find old copyright, then emit preceding lines, - # change, and following lines. - pos = None - for i, line in enumerate(chunk.splitlines(), start=1): - if re.search(copyright_re, line): - pos = i - break - if not pos: - raise RuntimeError("Unexpected state: Expected a copyright line, but found none") - print(f"@@ -1,{pos+3} +1,{pos+3} @@") - for i, line in list(enumerate(chunk.splitlines(), start=1))[:pos+3]: - if i == pos: - print(f"-{line}") - print(f"+# {copyright}") - else: - print(f" {line}") - else: - sys.stderr.write(f"{path}(1): Error: Missing or bad copyright. Expected: {copyright}") - except Exception: - if write_cache: - cache = initinfo - with open(cachefn, "w") as file: - json.dump(cache, file, indent=2, sort_keys=True) - raise - -if write_cache: - cache = initinfo - with open(cachefn, "w") as file: - json.dump(cache, file, indent=2, sort_keys=True) - diff --git a/bin/count.c b/bin/count.c deleted file mode 100644 index 786f15eb978..00000000000 --- a/bin/count.c +++ /dev/null @@ -1,26 +0,0 @@ -#include - -int main( void ) -{ - int c; - int count = 0; - - //turn off buffering - setvbuf(stdin, NULL, _IONBF, 0); - setvbuf(stdout, NULL, _IONBF, 0); - setvbuf(stderr, NULL, _IONBF, 0); - - c = fgetc(stdin); - while(c != EOF) - { - if (c=='.' || c=='E' || c=='F' || c=='s') count++; else count=0; - fputc(c, stdout); - fflush(stdout); - if (count && count % 76 == 0) { - fprintf(stderr, "%4d\n", count); - fflush(stderr); - } - c = fgetc(stdin); - } - return 0; -} diff --git a/bin/daily b/bin/daily deleted file mode 100755 index 2835a93cc15..00000000000 --- a/bin/daily +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# Nightly datatracker jobs. -# -# This script is expected to be triggered by cron from -# /etc/cron.d/datatracker -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -# Make sure we stop if something goes wrong: -program=${0##*/} -trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR - -# Datatracker directory -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -logger -p user.info -t cron "Running $DTDIR/bin/daily" - -# Run the hourly jobs first -$DTDIR/bin/hourly - -# Set up the virtual environment -source $DTDIR/env/bin/activate - - -# Update our information about the current version of some commands we use -$DTDIR/ietf/manage.py update_external_command_info - -# Get IANA-registered yang models -#YANG_IANA_DIR=$(python -c 'import ietf.settings; print ietf.settings.SUBMIT_YANG_IANA_MODEL_DIR') -# Hardcode the rsync target to avoid any unwanted deletes: -# rsync -avzq --delete rsync.ietf.org::iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/ -rsync -avzq --delete /a/www/ietf-ftp/iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/ - -# Get Yang models from Yangcatalog. -rsync -avzq rsync://yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/ - -# Populate the yang repositories -$DTDIR/ietf/manage.py populate_yang_model_dirs -v0 - -# Re-run yang checks on active documents -$DTDIR/ietf/manage.py run_yang_model_checks -v0 - -# Expire Internet-Drafts -# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: -$DTDIR/ietf/bin/expire-ids - -# Send nomcom reminders about nomination acceptance and questionnaires -$DTDIR/ietf/manage.py send_reminders - -# Expire last calls -# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: -$DTDIR/ietf/bin/expire-last-calls - -# Run an extended version of the rfc editor update, to catch changes -# with backdated timestamps -# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: -$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01 - -# Fetch meeting attendance data from ietf.org/registration/attendees -$DTDIR/ietf/manage.py fetch_meeting_attendance --latest 2 - -# Send reminders originating from the review app -$DTDIR/ietf/bin/send-review-reminders - -# Purge older PersonApiKeyEvents -$DTDIR/ietf/manage.py purge_old_personal_api_key_events 14 diff --git a/bin/drop-new-tables b/bin/drop-new-tables deleted file mode 100755 index ec1594ae261..00000000000 --- a/bin/drop-new-tables +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Drop tables which don't exist in the database dump. - -[ -n "$1" ] || { echo -e "\nUsage: $0 DUMPFILE\n\nError: No database dump file given"; exit 1; } - -zcat $1 | head | grep "Database: ietf_utf8" || { echo "Is this a database dump? Expected to see 'Database: ietf_utf8' "; exit 1; } - -echo -e "\nSQL commands:\n" - -diff <(zcat $1 | grep '^DROP TABLE IF EXISTS' | tr -d '`;' | field 5) <(ietf/manage.py dbshell <<< 'show tables;' | tail -n +2) | grep '^>' | awk '{print "drop table if exists", $2, ";";}' | tee /dev/stderr | ietf/manage.py dbshell - -echo -e "\nDone" diff --git a/bin/dump-to-names-json b/bin/dump-to-names-json deleted file mode 100644 index 9c7dfac07dd..00000000000 --- a/bin/dump-to-names-json +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# This script provides a limited selected dump of database content with the -# purpose of generating a test fixture that provides the test data needed -# by the test suite. -# -# The generated data fixture is sorted and normalized in order to produce -# minimal commit diffs which reflect only actual changes in the fixture data, -# without apparent changes resulting only from ordering changes. - -set -x -ietf/manage.py dumpdata --indent 1 doc.State doc.BallotType doc.StateType \ - mailtrigger.MailTrigger mailtrigger.Recipient name utils.VersionInfo \ - group.GroupFeatures stats.CountryAlias dbtemplate.DBTemplate \ - | jq --sort-keys "sort_by(.model, .pk)" \ - | jq '[.[] | select(.model!="dbtemplate.dbtemplate" or .pk==354)]' > ietf/name/fixtures/names.json diff --git a/bin/every15m b/bin/every15m deleted file mode 100755 index c0b0752f6a2..00000000000 --- a/bin/every15m +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# datatracker jobs to run every 15 minutes -# -# This script is expected to be triggered by cron from -# /etc/cron.d/datatracker - -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -# Set up the virtual environment -source $DTDIR/env/bin/activate - -logger -p user.info -t cron "Running $DTDIR/bin/every15m" - -# Send mail scheduled to go out at certain times -$DTDIR/ietf/bin/send-scheduled-mail all - -# Reparse the last _year_ of RFC index entries -# (which is the default if -d is not provided) -# until https://github.com/ietf-tools/datatracker/issues/3734 -# is addressed. -# This takes about 20s on production as of 2022-08-11 -$DTDIR/ietf/bin/rfc-editor-index-updates - diff --git a/bin/hourly b/bin/hourly deleted file mode 100755 index 77310302ce8..00000000000 --- a/bin/hourly +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -# Hourly datatracker jobs -# -# This script is expected to be triggered by cron from -# /etc/cron.d/datatracker -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -# Make sure we stop if something goes wrong: -program=${0##*/} -trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR - -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -# Set up the virtual environment -source $DTDIR/env/bin/activate - -logger -p user.info -t cron "Running $DTDIR/bin/hourly" - -# *** Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: *** - -# # Update community lists. Remove once the community rewrite (will be around 6.20.0 ) -# $DTDIR/ietf/manage.py update_community_lists -# -# # Polling backup for iana and rfc-editory post APIs -$DTDIR/ietf/bin/iana-changes-updates -$DTDIR/ietf/bin/iana-protocols-updates -# $DTDIR/ietf/bin/rfc-editor-index-updates -# $DTDIR/ietf/bin/rfc-editor-queue-updates -# -# # Generate alias and virtual files for draft email aliases -# $DTDIR/ietf/bin/generate-draft-aliases && \ -# ( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \ -# ( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; ) -# -# # Generate alias and virtual files for group email aliases -# $DTDIR/ietf/bin/generate-wg-aliases && \ -# ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \ -# ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; ) -# -# Generate some static files -ID=/a/ietfdata/doc/draft/repository -DERIVED=/a/ietfdata/derived -DOWNLOAD=/a/www/www6s/download - -export TMPDIR=/a/tmp - -TMPFILE1=`mktemp` || exit 1 -TMPFILE2=`mktemp` || exit 1 -TMPFILE3=`mktemp` || exit 1 -TMPFILE4=`mktemp` || exit 1 -TMPFILE5=`mktemp` || exit 1 -TMPFILE6=`mktemp` || exit 1 -TMPFILE7=`mktemp` || exit 1 -TMPFILE8=`mktemp` || exit 1 -TMPFILE9=`mktemp` || exit 1 -TMPFILEA=`mktemp` || exit 1 -TMPFILEB=`mktemp` || exit 1 - -chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 $TMPFILE8 $TMPFILE9 $TMPFILEA $TMPFILEB - -python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1 -python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2 -python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3 -cp $TMPFILE1 $TMPFILE4 -cp $TMPFILE2 $TMPFILE5 -cp $TMPFILE3 $TMPFILE6 -cp $TMPFILE1 $TMPFILE8 -cp $TMPFILE2 $TMPFILE9 -cp $TMPFILE3 $TMPFILEA -python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7 -cp $TMPFILE7 $TMPFILEB - -mv $TMPFILE1 $ID/all_id.txt -mv $TMPFILE2 $ID/1id-index.txt -mv $TMPFILE3 $ID/1id-abstracts.txt -mv $TMPFILE4 $DOWNLOAD/id-all.txt -mv $TMPFILE5 $DOWNLOAD/id-index.txt -mv $TMPFILE6 $DOWNLOAD/id-abstract.txt -mv $TMPFILE7 $ID/all_id2.txt -mv $TMPFILE8 $DERIVED/all_id.txt -mv $TMPFILE9 $DERIVED/1id-index.txt -mv $TMPFILEA $DERIVED/1id-abstracts.txt -mv $TMPFILEB $DERIVED/all_id2.txt - -$DTDIR/ietf/manage.py generate_idnits2_rfc_status -$DTDIR/ietf/manage.py generate_idnits2_rfcs_obsoleted - -CHARTER=/a/www/ietf-ftp/charter -wget -q https://datatracker.ietf.org/wg/1wg-charters-by-acronym.txt -O $CHARTER/1wg-charters-by-acronym.txt -wget -q https://datatracker.ietf.org/wg/1wg-charters.txt -O $CHARTER/1wg-charters.txt - -# Regenerate the last week of bibxml-ids -$DTDIR/ietf/manage.py generate_draft_bibxml_files - -# Create and update group wikis -#$DTDIR/ietf/manage.py create_group_wikis - -# exit 0 diff --git a/bin/mkdiagram b/bin/mkdiagram deleted file mode 100755 index 4f015c0abea..00000000000 --- a/bin/mkdiagram +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# assume we're in bin/, sibling to ietf/ - -cd ${0%/*}/../ietf || { echo "CD to ietf directory failed, bailing out"; exit; } - -trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit 1' ERR - -if [ "$*" ]; then apps="$@"; graph="${1%.*}"; else apps=$(ls */models.py | sed 's!/models.py!!'); graph="models"; fi - -newapps="doc group meeting message person name" -legacyapps="announcements idindex idrfc idtracker iesg ietfauth ipr liaisons mailinglists proceedings redirects submit wgcharter wginfo" - -proxy="$(grep ^class */proxy.py | tr '()' ' ' | awk '{printf $2 ","}')" -names="$(grep ^class name/models.py | tr '()' ' ' | awk '{printf $2 ","}')" -legacy="$(for app in $legacyapps; do grep ^class $app/models.py | tr '()' ' '; done | grep -v ' Meeting\\(' | awk '{printf $2 ","}')" -events="$(egrep '^class .+DocEvent' doc/models.py | tr '()' ' ' | awk '{printf $2 ","}')" - -echo -e "proxy: $proxy\n" -echo -e "names: $names\n" -echo -e "legacy:$legacy\n" -echo -e "events:$events\n" - -exclude="--exclude=$proxy,$names,$legacy" - -export PYTHONPATH="$PWD/.." - -echo "Validating..." -./manage.py validate - -export PYTHONPATH=`dirname $PWD` -module=${PWD##*/} -export DJANGO_SETTINGS_MODULE=$module.settings -export graph -export title - -echo "Generate model graph" -graph="models-with-names-and-events" -title="New IETF Database schema" -${0%/*}/../ietf/manage.py graph_models --exclude="$proxy,$legacy" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png - -echo "Generate new model without names" -graph="models-with-names" -title="New IETF Database schema, without name tables" -modelviz.py --exclude="$proxy,$legacy,$names" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png - -echo "Generate new model without names and subevents" -graph="models" -title="New IETF Database schema, without name tables and subevents" -modelviz.py --exclude="$proxy,$legacy,$names,$events" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png diff --git a/bin/mm_hourly b/bin/mm_hourly deleted file mode 100755 index 0d1da2e572c..00000000000 --- a/bin/mm_hourly +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Hourly datatracker jobs, ***run as mailman*** -# -# This script is expected to be triggered by cron from -# $DTDIR/etc/cron.d/datatracker which should be symlinked from -# /etc/cron.d/ - -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -# Make sure we stop if something goes wrong: -program=${0##*/} -trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR - -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -# Set up the virtual environment -source $DTDIR/env/bin/activate - -logger -p user.info -t cron "Running $DTDIR/bin/mm_hourly" - -$DTDIR/ietf/manage.py import_mailman_listinfo diff --git a/bin/monthly b/bin/monthly deleted file mode 100755 index 1d36abc2102..00000000000 --- a/bin/monthly +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Weekly datatracker jobs. -# -# This script is expected to be triggered by cron from -# /etc/cron.d/datatracker -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -# Set up the virtual environment -source $DTDIR/env/bin/activate - -logger -p user.info -t cron "Running $DTDIR/bin/monthly" - diff --git a/bin/release-coverage b/bin/release-coverage deleted file mode 100755 index 22177c17a6c..00000000000 --- a/bin/release-coverage +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -zcat release-coverage.json.gz | jq 'to_entries[] | [.value.time, .key, .value.code.coverage, .value.template.coverage, .value.url.coverage] ' 2>/dev/null | tr "\n][" " \n" | tr -d ' "Z' | tr ",T" " " | sort -n | cut -c 2- | sed -n '/2015-03-10/,$p' diff --git a/bin/update b/bin/update deleted file mode 100755 index bcb6e8b1297..00000000000 --- a/bin/update +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/bash - -version="0.34" -program=$(basename $0) - -NEW="" # If there are more than $NEW % new lines, skip update -OLD="" # If there are more than $OLD % deleted lines, skip update -FILE="" -verbose="" -silent="" - -# ---------------------------------------------------------------------- -function usage() { -cat < -EOF -exit -} - - -# ---------------------------------------------------------------------- -function note() { - if [ -n "$verbose" ]; then - echo -e "$program: $*" - fi -} - -# ---------------------------------------------------------------------- -function warn() { - [ "$QUIET" ] || echo -e "$program: $*" -} - -# ---------------------------------------------------------------------- -function err() { - echo -e "$program: $*" > /dev/stderr -} - -# ----------------------------------------------------------------------------- -function leave() { - errcode=$1; shift - if [ "$errcode" -ge "2" ]; then warn "$*"; else note "$*"; fi - if [ -f "$tempfile" ]; then rm $tempfile; fi - if [ -f "$difffile" ]; then rm $difffile; fi - if [ "$errcode" = "1" -a "$RESULT" = "0" ]; then exit 0; else exit $errcode; fi -} - -# ---------------------------------------------------------------------- -# Set up error trap -trap 'leave 127 "$program($LINENO): Command failed with error code $? while processing '$origfile'."' ERR - -# exit with a message if a command fails -set -e - -# ---------------------------------------------------------------------- -# Get any options -# - -# Default values -PAT="\$path\$base.%Y-%m-%d_%H%M" -RESULT="0" -QUIET="" - -# Based on the sample code in /usr/share/doc/util-linux/examples/parse.bash.gz -if [ "$(uname)" = "Linux" ]; then - GETOPT_RESULT=$(getopt -o bc:ef:hn:o:p:qrvV --long backup,maxchg:,empty,file:,help,maxnew:,maxold:,prefix:,report,quiet,verbose,version -n "$program" -- "$@") -else - GETOPT_RESULT=$(getopt bc:ef:hn:o:p:qrvV "$@") -fi - -if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi - -note "GETOPT_RESULT: $GETOPT_RESULT" -eval set -- "$GETOPT_RESULT" - -while true ; do - case "$1" in - -b|--backup) backup=1; shift ;; # Back up earlier versions by creating a backup file - -c|--maxchg) CHG="$2"; shift 2 ;; # Limit on percentage of changed lines - -e|--empty) empty=1; shift ;; # Permit the update to be empty (default: discard) - -f|--file) FILE="$2"; shift 2 ;; # Read input from FILE instead of standard input - -h|--help) usage; shift ;; # Show this text and exit - -n|--maxnew) NEW="$2"; shift 2 ;; # Limit on percentage of new (added) lines - -o|--maxold) OLD="$2"; shift 2 ;; # Limit on percentage of old (deleted) lines - -p|--pat*) PAT="$2"; shift 2 ;; # Backup name base ('$path$base.%Y%m%d_%H%M') - -q|--quiet) QUIET=1; shift;; # Be less verbose - -r|--result) RESULT=1; shift ;; # Return 1 if update not done - -v|--verbose) verbose=1; shift ;; # Be more verbose about what's happening - -V|--version) echo -e "$program\t$version"; exit;; # Show version and exit - --) shift ; break ;; - *) echo "$program: Internal error, inconsistent option specification." ; exit 1 ;; - esac -done - -if [ $CHG ]; then OLD=$CHG; NEW=$CHG; fi - -if [ $# -lt 1 ]; then echo -e "$program: Missing output filename\n"; usage; fi - -origfile=$1 -tempfile=$(mktemp) -difffile=$(mktemp) - -if [ -e "$origfile" ]; then - cp -p $origfile $tempfile # For ownership and permissions - cat $FILE > $tempfile - [ "$FILE" ] && touch -r $FILE $tempfile - # This won't work if we don't have sufficient privileges: - #chown --reference=$origfile $tempfile - #chmod --reference=$origfile $tempfile -else - cat $FILE > $origfile - [ "$FILE" ] && touch -r $FILE $tempfile - leave 0 "Created file '$origfile'" -fi - -origlen=$(wc -c < $origfile) -newlen=$(wc -c < $tempfile) - -if [ $origlen = 0 -a $newlen = 0 ]; then - rm $tempfile - leave 1 "New content is identical (and void) - not updating '$origfile'." -fi -if [ $newlen = 0 -a -z "$empty" ]; then - leave 1 "New content is void - not updating '$origfile'." -fi - -diff $origfile $tempfile > $difffile || [ $? -le 1 ] && true # suppress the '1' error code on differences -difflen=$(wc -l < $difffile) -if [ $difflen = 0 ]; then - leave 1 "New content is identical - not updating '$origfile'." -fi - -if [ "$OLD" -o "$NEW" ]; then - - if [ "$NEW" ]; then maxnew=$(( $origlen * $NEW / 100 )); fi - if [ "$OLD" ]; then maxdel=$(( $origlen * $OLD / 100 )); fi - - newcount=$(grep "^> " $difffile | wc -c) - outcount=$(grep "^< " $difffile | wc -c) - delcount=$(grep "^! " $difffile | wc -c) - delcount=$(( $outcount + $delcount )) - rm $difffile - - if [ "$OLD" ]; then - if [ "$delcount" -ge "$maxdel" ]; then - cp $tempfile $origfile.update - leave 2 "New content has too many removed lines ($delcount/$origlen)\n - not updating '$origfile'.\nNew content placed in '$origfile.update' instead" - fi - fi - if [ "$NEW" ]; then - if [ "$newcount" -ge "$maxnew" ]; then - cp $tempfile $origfile.update - leave 2 "New content has too many added lines ($newcount/$origlen)\n - not updating '$origfile'.\nNew content placed in '$origfile.update' instead" - fi - fi -fi - -if [ "$backup" ]; then - - path=${origfile%/*} - name=${origfile##*/} - base=${name%.*} - ext=${origfile##*.} - - if [ "$ext" = "$origfile" ]; then - ext="" - elif [ ! "${ext%/*}" = "$ext" ]; then - ext="" - else - ext=".$ext" - fi - - if [ "$path" = "$origfile" ]; then - path="" - else - path="$path/" - fi - - ver=1 - backfile=$(eval date +"$PAT") - backpath="${backfile%/*}" - if [ "$backpath" = "$backfile" ]; then - backpath="." - fi - if [ ! -d $backpath ]; then - if [ -e $backpath ]; then - leave 3 "The backup path '$backpath' exists but isn't a directory" - else - mkdir -p $backpath - fi - fi - while [ -e "$backfile,$ver$ext" ]; do - ver=$(( $ver+1 )) - done - note "Saving backup: $backfile,$ver$ext" - cp -p "$origfile" "$backfile,$ver$ext" - chmod -w "$backfile,$ver$ext" || true -fi - -if ! mv $tempfile $origfile; then cp -p $tempfile $origfile; fi -leave 0 "Updated file '$origfile'" diff --git a/bin/weekly b/bin/weekly deleted file mode 100755 index cca8403fd4a..00000000000 --- a/bin/weekly +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Weekly datatracker jobs. -# -# This script is expected to be triggered by cron from -# /etc/cron.d/datatracker -export LANG=en_US.UTF-8 -export PYTHONIOENCODING=utf-8 - -DTDIR=/a/www/ietf-datatracker/web -cd $DTDIR/ - -# Set up the virtual environment -source $DTDIR/env/bin/activate - -logger -p user.info -t cron "Running $DTDIR/bin/weekly" - - -# Send out weekly summaries of apikey usage - -$DTDIR/ietf/manage.py send_apikey_usage_emails - -# Send notifications about coming expirations -$DTDIR/ietf/bin/notify-expirations - diff --git a/client/App.vue b/client/App.vue index 0664525ca45..7750674296d 100644 --- a/client/App.vue +++ b/client/App.vue @@ -26,6 +26,28 @@ const siteStore = useSiteStore() const appContainer = ref(null) +// -------------------------------------------------------------------- +// Set user theme +// -------------------------------------------------------------------- + +function updateTheme() { + const desiredTheme = window.localStorage?.getItem('theme') + if (desiredTheme === 'dark') { + siteStore.theme = 'dark' + } else if (desiredTheme === 'light') { + siteStore.theme = 'light' + } else if (window.matchMedia("(prefers-color-scheme: dark)").matches) { + siteStore.theme = 'dark' + } else { + siteStore.theme = 'light' + } +} + +updateTheme() + +// this change event fires for either light or dark changes +window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', updateTheme) + // -------------------------------------------------------------------- // Handle browser resize // -------------------------------------------------------------------- diff --git a/client/Embedded.vue b/client/Embedded.vue index a0f0d2831ec..80b105dc152 100644 --- a/client/Embedded.vue +++ b/client/Embedded.vue @@ -1,12 +1,13 @@ diff --git a/client/components/Polls.vue b/client/components/Polls.vue index 72c8e1c6331..0846d4ed160 100644 --- a/client/components/Polls.vue +++ b/client/components/Polls.vue @@ -3,19 +3,20 @@ n-data-table( v-if='state.items.length > 0' :data='state.items' - :columns='columns' + :columns='state.columns' striped ) - span.text-muted(v-else) + span.text-danger(v-else-if='state.errMessage') + em {{ state.errMessage }} + span.text-body-secondary(v-else) em No polls available. + diff --git a/client/components/Status.vue b/client/components/Status.vue new file mode 100644 index 00000000000..4fded5bbe40 --- /dev/null +++ b/client/components/Status.vue @@ -0,0 +1,80 @@ + diff --git a/client/components/n-theme.vue b/client/components/n-theme.vue index 9fff81671e9..b55c9772b97 100644 --- a/client/components/n-theme.vue +++ b/client/components/n-theme.vue @@ -1,24 +1,45 @@ - diff --git a/client/embedded.js b/client/embedded.js index f3b01f68f5e..0509c0aecf8 100644 --- a/client/embedded.js +++ b/client/embedded.js @@ -1,5 +1,12 @@ import { createApp } from 'vue' +import piniaPersist from 'pinia-plugin-persist' import Embedded from './Embedded.vue' +import { createPiniaSingleton } from './shared/create-pinia-singleton' + +// Initialize store (Pinia) + +const pinia = createPiniaSingleton() +pinia.use(piniaPersist) // Mount App @@ -9,5 +16,6 @@ for (const mnt of mountEls) { componentName: mnt.dataset.component, componentId: mnt.dataset.componentId }) + app.use(pinia) app.mount(mnt) } diff --git a/client/index.html b/client/index.html index 740c9943291..75d6f777276 100644 --- a/client/index.html +++ b/client/index.html @@ -12,6 +12,7 @@ +
@@ -20,5 +21,6 @@
+ diff --git a/client/main.js b/client/main.js index 0dc5cf32e07..3fbad907b1d 100644 --- a/client/main.js +++ b/client/main.js @@ -1,14 +1,14 @@ import { createApp } from 'vue' -import { createPinia } from 'pinia' import piniaPersist from 'pinia-plugin-persist' import App from './App.vue' import router from './router' +import { createPiniaSingleton } from './shared/create-pinia-singleton' const app = createApp(App, {}) // Initialize store (Pinia) -const pinia = createPinia() +const pinia = createPiniaSingleton() pinia.use(piniaPersist) app.use(pinia) diff --git a/client/shared/create-pinia-singleton.js b/client/shared/create-pinia-singleton.js new file mode 100644 index 00000000000..f0013245a1e --- /dev/null +++ b/client/shared/create-pinia-singleton.js @@ -0,0 +1,6 @@ +import { createPinia } from 'pinia' + +export function createPiniaSingleton(){ + window.pinia = window.pinia ?? createPinia() + return window.pinia +} diff --git a/client/shared/json-wrapper.js b/client/shared/json-wrapper.js new file mode 100644 index 00000000000..e080b5a4791 --- /dev/null +++ b/client/shared/json-wrapper.js @@ -0,0 +1,20 @@ +export const JSONWrapper = { + parse(jsonString, defaultValue) { + if(typeof jsonString !== "string") { + return defaultValue + } + try { + return JSON.parse(jsonString); + } catch (e) { + console.error(e); + } + return defaultValue + }, + stringify(data) { + try { + return JSON.stringify(data); + } catch (e) { + console.error(e) + } + }, +} diff --git a/client/shared/local-storage-wrapper.js b/client/shared/local-storage-wrapper.js new file mode 100644 index 00000000000..88cd3dc589e --- /dev/null +++ b/client/shared/local-storage-wrapper.js @@ -0,0 +1,42 @@ + +/* + * DEVELOPER NOTE + * + * Some browsers can block storage (localStorage, sessionStorage) + * access for privacy reasons, and all browsers can have storage + * that's full, and then they throw exceptions. + * + * See https://michalzalecki.com/why-using-localStorage-directly-is-a-bad-idea/ + * + * Exceptions can even be thrown when testing if localStorage + * even exists. This can throw: + * + * if (window.localStorage) + * + * Also localStorage/sessionStorage can be enabled after DOMContentLoaded + * so we handle it gracefully. + * + * 1) we need to wrap all usage in try/catch + * 2) we need to defer actual usage of these until + * necessary, + * + */ + +export const localStorageWrapper = { + getItem: (key) => { + try { + return localStorage.getItem(key) + } catch (e) { + console.error(e); + } + return null; + }, + setItem: (key, value) => { + try { + return localStorage.setItem(key, value) + } catch (e) { + console.error(e); + } + return; + }, +} diff --git a/client/shared/status-common.js b/client/shared/status-common.js new file mode 100644 index 00000000000..6503bfbf634 --- /dev/null +++ b/client/shared/status-common.js @@ -0,0 +1,5 @@ +// Used in Playwright Status and components + +export const STATUS_STORAGE_KEY = "status-dismissed" + +export const generateStatusTestId = (id) => `status-${id}` diff --git a/client/shared/store.js b/client/shared/store.js index 389d5e5a82c..5dd57f2c814 100644 --- a/client/shared/store.js +++ b/client/shared/store.js @@ -6,6 +6,7 @@ export const useSiteStore = defineStore('site', { criticalErrorLink: null, criticalErrorLinkText: null, isMobile: /Mobi/i.test(navigator.userAgent), - viewport: Math.round(window.innerWidth) + viewport: Math.round(window.innerWidth), + theme: null }) }) diff --git a/client/shared/timezones.js b/client/shared/timezones.js index c3bc4730005..8239c1f98ee 100644 --- a/client/shared/timezones.js +++ b/client/shared/timezones.js @@ -1,252 +1,252 @@ export default [ - { label: '(GMT-11:00) Niue', value: 'Pacific/Niue' }, - { label: '(GMT-11:00) Pago Pago', value: 'Pacific/Pago_Pago' }, - { label: '(GMT-10:00) Hawaii Time', value: 'Pacific/Honolulu' }, - { label: '(GMT-10:00) Rarotonga', value: 'Pacific/Rarotonga' }, - { label: '(GMT-10:00) Tahiti', value: 'Pacific/Tahiti' }, - { label: '(GMT-09:30) Marquesas', value: 'Pacific/Marquesas' }, - { label: '(GMT-09:00) Alaska Time', value: 'America/Anchorage' }, - { label: '(GMT-09:00) Gambier', value: 'Pacific/Gambier' }, - { label: '(GMT-08:00) Pacific Time - Los Angeles', value: 'America/Los_Angeles' }, - { label: '(GMT-08:00) Pacific Time - Tijuana', value: 'America/Tijuana' }, - { label: '(GMT-08:00) Pacific Time - Vancouver', value: 'America/Vancouver' }, - { label: '(GMT-08:00) Pacific Time - Whitehorse', value: 'America/Whitehorse' }, - { label: '(GMT-08:00) Pitcairn', value: 'Pacific/Pitcairn' }, - { label: '(GMT-07:00) Mountain Time - Arizona', value: 'America/Phoenix' }, - { label: '(GMT-07:00) Mountain Time - Chihuahua, Mazatlan', value: 'America/Mazatlan' }, - { label: '(GMT-07:00) Mountain Time - Dawson Creek', value: 'America/Dawson_Creek' }, - { label: '(GMT-07:00) Mountain Time - Denver', value: 'America/Denver' }, - { label: '(GMT-07:00) Mountain Time - Edmonton', value: 'America/Edmonton' }, - { label: '(GMT-07:00) Mountain Time - Hermosillo', value: 'America/Hermosillo' }, - { label: '(GMT-07:00) Mountain Time - Yellowknife', value: 'America/Yellowknife' }, - { label: '(GMT-06:00) Belize', value: 'America/Belize' }, - { label: '(GMT-06:00) Central Time - Chicago', value: 'America/Chicago' }, - { label: '(GMT-06:00) Central Time - Mexico City', value: 'America/Mexico_City' }, - { label: '(GMT-06:00) Central Time - Regina', value: 'America/Regina' }, - { label: '(GMT-06:00) Central Time - Tegucigalpa', value: 'America/Tegucigalpa' }, - { label: '(GMT-06:00) Central Time - Winnipeg', value: 'America/Winnipeg' }, - { label: '(GMT-06:00) Costa Rica', value: 'America/Costa_Rica' }, - { label: '(GMT-06:00) El Salvador', value: 'America/El_Salvador' }, - { label: '(GMT-06:00) Galapagos', value: 'Pacific/Galapagos' }, - { label: '(GMT-06:00) Guatemala', value: 'America/Guatemala' }, - { label: '(GMT-06:00) Managua', value: 'America/Managua' }, - { label: '(GMT-05:00) America Cancun', value: 'America/Cancun' }, - { label: '(GMT-05:00) Bogota', value: 'America/Bogota' }, - { label: '(GMT-05:00) Easter Island', value: 'Pacific/Easter' }, - { label: '(GMT-05:00) Eastern Time - New York', value: 'America/New_York' }, - { label: '(GMT-05:00) Eastern Time - Iqaluit', value: 'America/Iqaluit' }, - { label: '(GMT-05:00) Eastern Time - Toronto', value: 'America/Toronto' }, - { label: '(GMT-05:00) Guayaquil', value: 'America/Guayaquil' }, - { label: '(GMT-05:00) Havana', value: 'America/Havana' }, - { label: '(GMT-05:00) Jamaica', value: 'America/Jamaica' }, - { label: '(GMT-05:00) Lima', value: 'America/Lima' }, - { label: '(GMT-05:00) Nassau', value: 'America/Nassau' }, - { label: '(GMT-05:00) Panama', value: 'America/Panama' }, - { label: '(GMT-05:00) Port-au-Prince', value: 'America/Port-au-Prince' }, - { label: '(GMT-05:00) Rio Branco', value: 'America/Rio_Branco' }, - { label: '(GMT-04:00) Atlantic Time - Halifax', value: 'America/Halifax' }, - { label: '(GMT-04:00) Barbados', value: 'America/Barbados' }, - { label: '(GMT-04:00) Bermuda', value: 'Atlantic/Bermuda' }, - { label: '(GMT-04:00) Boa Vista', value: 'America/Boa_Vista' }, - { label: '(GMT-04:00) Caracas', value: 'America/Caracas' }, - { label: '(GMT-04:00) Curacao', value: 'America/Curacao' }, - { label: '(GMT-04:00) Grand Turk', value: 'America/Grand_Turk' }, - { label: '(GMT-04:00) Guyana', value: 'America/Guyana' }, - { label: '(GMT-04:00) La Paz', value: 'America/La_Paz' }, - { label: '(GMT-04:00) Manaus', value: 'America/Manaus' }, - { label: '(GMT-04:00) Martinique', value: 'America/Martinique' }, - { label: '(GMT-04:00) Port of Spain', value: 'America/Port_of_Spain' }, - { label: '(GMT-04:00) Porto Velho', value: 'America/Porto_Velho' }, - { label: '(GMT-04:00) Puerto Rico', value: 'America/Puerto_Rico' }, - { label: '(GMT-04:00) Santo Domingo', value: 'America/Santo_Domingo' }, - { label: '(GMT-04:00) Thule', value: 'America/Thule' }, - { label: '(GMT-03:30) Newfoundland Time - St. Johns', value: 'America/St_Johns' }, - { label: '(GMT-03:00) Araguaina', value: 'America/Araguaina' }, - { label: '(GMT-03:00) Asuncion', value: 'America/Asuncion' }, - { label: '(GMT-03:00) Belem', value: 'America/Belem' }, - { label: '(GMT-03:00) Buenos Aires', value: 'America/Argentina/Buenos_Aires' }, - { label: '(GMT-03:00) Campo Grande', value: 'America/Campo_Grande' }, - { label: '(GMT-03:00) Cayenne', value: 'America/Cayenne' }, - { label: '(GMT-03:00) Cuiaba', value: 'America/Cuiaba' }, - { label: '(GMT-03:00) Fortaleza', value: 'America/Fortaleza' }, - { label: '(GMT-03:00) Godthab', value: 'America/Godthab' }, - { label: '(GMT-03:00) Maceio', value: 'America/Maceio' }, - { label: '(GMT-03:00) Miquelon', value: 'America/Miquelon' }, - { label: '(GMT-03:00) Montevideo', value: 'America/Montevideo' }, - { label: '(GMT-03:00) Palmer', value: 'Antarctica/Palmer' }, - { label: '(GMT-03:00) Paramaribo', value: 'America/Paramaribo' }, - { label: '(GMT-03:00) Punta Arenas', value: 'America/Punta_Arenas' }, - { label: '(GMT-03:00) Recife', value: 'America/Recife' }, - { label: '(GMT-03:00) Rothera', value: 'Antarctica/Rothera' }, - { label: '(GMT-03:00) Salvador', value: 'America/Bahia' }, - { label: '(GMT-03:00) Santiago', value: 'America/Santiago' }, - { label: '(GMT-03:00) Stanley', value: 'Atlantic/Stanley' }, - { label: '(GMT-02:00) Noronha', value: 'America/Noronha' }, - { label: '(GMT-02:00) Sao Paulo', value: 'America/Sao_Paulo' }, - { label: '(GMT-02:00) South Georgia', value: 'Atlantic/South_Georgia' }, - { label: '(GMT-01:00) Azores', value: 'Atlantic/Azores' }, - { label: '(GMT-01:00) Cape Verde', value: 'Atlantic/Cape_Verde' }, - { label: '(GMT-01:00) Scoresbysund', value: 'America/Scoresbysund' }, - { label: '(GMT+00:00) Abidjan', value: 'Africa/Abidjan' }, - { label: '(GMT+00:00) Accra', value: 'Africa/Accra' }, - { label: '(GMT+00:00) Bissau', value: 'Africa/Bissau' }, - { label: '(GMT+00:00) Canary Islands', value: 'Atlantic/Canary' }, - { label: '(GMT+00:00) Casablanca', value: 'Africa/Casablanca' }, - { label: '(GMT+00:00) Danmarkshavn', value: 'America/Danmarkshavn' }, - { label: '(GMT+00:00) Dublin', value: 'Europe/Dublin' }, - { label: '(GMT+00:00) El Aaiun', value: 'Africa/El_Aaiun' }, - { label: '(GMT+00:00) Faeroe', value: 'Atlantic/Faroe' }, - { label: '(GMT+00:00) UTC / GMT', value: 'UTC' }, - { label: '(GMT+00:00) Lisbon', value: 'Europe/Lisbon' }, - { label: '(GMT+00:00) London', value: 'Europe/London' }, - { label: '(GMT+00:00) Monrovia', value: 'Africa/Monrovia' }, - { label: '(GMT+00:00) Reykjavik', value: 'Atlantic/Reykjavik' }, - { label: '(GMT+01:00) Algiers', value: 'Africa/Algiers' }, - { label: '(GMT+01:00) Amsterdam', value: 'Europe/Amsterdam' }, - { label: '(GMT+01:00) Andorra', value: 'Europe/Andorra' }, - { label: '(GMT+01:00) Berlin', value: 'Europe/Berlin' }, - { label: '(GMT+01:00) Brussels', value: 'Europe/Brussels' }, - { label: '(GMT+01:00) Budapest', value: 'Europe/Budapest' }, - { label: '(GMT+01:00) Central European Time - Belgrade', value: 'Europe/Belgrade' }, - { label: '(GMT+01:00) Central European Time - Prague', value: 'Europe/Prague' }, - { label: '(GMT+01:00) Ceuta', value: 'Africa/Ceuta' }, - { label: '(GMT+01:00) Copenhagen', value: 'Europe/Copenhagen' }, - { label: '(GMT+01:00) Gibraltar', value: 'Europe/Gibraltar' }, - { label: '(GMT+01:00) Lagos', value: 'Africa/Lagos' }, - { label: '(GMT+01:00) Luxembourg', value: 'Europe/Luxembourg' }, - { label: '(GMT+01:00) Madrid', value: 'Europe/Madrid' }, - { label: '(GMT+01:00) Malta', value: 'Europe/Malta' }, - { label: '(GMT+01:00) Monaco', value: 'Europe/Monaco' }, - { label: '(GMT+01:00) Ndjamena', value: 'Africa/Ndjamena' }, - { label: '(GMT+01:00) Oslo', value: 'Europe/Oslo' }, - { label: '(GMT+01:00) Paris', value: 'Europe/Paris' }, - { label: '(GMT+01:00) Rome', value: 'Europe/Rome' }, - { label: '(GMT+01:00) Stockholm', value: 'Europe/Stockholm' }, - { label: '(GMT+01:00) Tirane', value: 'Europe/Tirane' }, - { label: '(GMT+01:00) Tunis', value: 'Africa/Tunis' }, - { label: '(GMT+01:00) Vienna', value: 'Europe/Vienna' }, - { label: '(GMT+01:00) Warsaw', value: 'Europe/Warsaw' }, - { label: '(GMT+01:00) Zurich', value: 'Europe/Zurich' }, - { label: '(GMT+02:00) Amman', value: 'Asia/Amman' }, - { label: '(GMT+02:00) Athens', value: 'Europe/Athens' }, - { label: '(GMT+02:00) Beirut', value: 'Asia/Beirut' }, - { label: '(GMT+02:00) Bucharest', value: 'Europe/Bucharest' }, - { label: '(GMT+02:00) Cairo', value: 'Africa/Cairo' }, - { label: '(GMT+02:00) Chisinau', value: 'Europe/Chisinau' }, - { label: '(GMT+02:00) Damascus', value: 'Asia/Damascus' }, - { label: '(GMT+02:00) Gaza', value: 'Asia/Gaza' }, - { label: '(GMT+02:00) Helsinki', value: 'Europe/Helsinki' }, - { label: '(GMT+02:00) Jerusalem', value: 'Asia/Jerusalem' }, - { label: '(GMT+02:00) Johannesburg', value: 'Africa/Johannesburg' }, - { label: '(GMT+02:00) Khartoum', value: 'Africa/Khartoum' }, - { label: '(GMT+02:00) Kiev', value: 'Europe/Kiev' }, - { label: '(GMT+02:00) Maputo', value: 'Africa/Maputo' }, - { label: '(GMT+02:00) Moscow-01 - Kaliningrad', value: 'Europe/Kaliningrad' }, - { label: '(GMT+02:00) Nicosia', value: 'Asia/Nicosia' }, - { label: '(GMT+02:00) Riga', value: 'Europe/Riga' }, - { label: '(GMT+02:00) Sofia', value: 'Europe/Sofia' }, - { label: '(GMT+02:00) Tallinn', value: 'Europe/Tallinn' }, - { label: '(GMT+02:00) Tripoli', value: 'Africa/Tripoli' }, - { label: '(GMT+02:00) Vilnius', value: 'Europe/Vilnius' }, - { label: '(GMT+02:00) Windhoek', value: 'Africa/Windhoek' }, - { label: '(GMT+03:00) Baghdad', value: 'Asia/Baghdad' }, - { label: '(GMT+03:00) Istanbul', value: 'Europe/Istanbul' }, - { label: '(GMT+03:00) Minsk', value: 'Europe/Minsk' }, - { label: '(GMT+03:00) Moscow+00 - Moscow', value: 'Europe/Moscow' }, - { label: '(GMT+03:00) Nairobi', value: 'Africa/Nairobi' }, - { label: '(GMT+03:00) Qatar', value: 'Asia/Qatar' }, - { label: '(GMT+03:00) Riyadh', value: 'Asia/Riyadh' }, - { label: '(GMT+03:00) Syowa', value: 'Antarctica/Syowa' }, - { label: '(GMT+03:30) Tehran', value: 'Asia/Tehran' }, - { label: '(GMT+04:00) Baku', value: 'Asia/Baku' }, - { label: '(GMT+04:00) Dubai', value: 'Asia/Dubai' }, - { label: '(GMT+04:00) Mahe', value: 'Indian/Mahe' }, - { label: '(GMT+04:00) Mauritius', value: 'Indian/Mauritius' }, - { label: '(GMT+04:00) Moscow+01 - Samara', value: 'Europe/Samara' }, - { label: '(GMT+04:00) Reunion', value: 'Indian/Reunion' }, - { label: '(GMT+04:00) Tbilisi', value: 'Asia/Tbilisi' }, - { label: '(GMT+04:00) Yerevan', value: 'Asia/Yerevan' }, - { label: '(GMT+04:30) Kabul', value: 'Asia/Kabul' }, - { label: '(GMT+05:00) Aqtau', value: 'Asia/Aqtau' }, - { label: '(GMT+05:00) Aqtobe', value: 'Asia/Aqtobe' }, - { label: '(GMT+05:00) Ashgabat', value: 'Asia/Ashgabat' }, - { label: '(GMT+05:00) Dushanbe', value: 'Asia/Dushanbe' }, - { label: '(GMT+05:00) Karachi', value: 'Asia/Karachi' }, - { label: '(GMT+05:00) Kerguelen', value: 'Indian/Kerguelen' }, - { label: '(GMT+05:00) Maldives', value: 'Indian/Maldives' }, - { label: '(GMT+05:00) Mawson', value: 'Antarctica/Mawson' }, - { label: '(GMT+05:00) Moscow+02 - Yekaterinburg', value: 'Asia/Yekaterinburg' }, - { label: '(GMT+05:00) Tashkent', value: 'Asia/Tashkent' }, - { label: '(GMT+05:30) Colombo', value: 'Asia/Colombo' }, - { label: '(GMT+05:30) India Standard Time', value: 'Asia/Kolkata' }, - { label: '(GMT+05:45) Kathmandu', value: 'Asia/Kathmandu' }, - { label: '(GMT+06:00) Almaty', value: 'Asia/Almaty' }, - { label: '(GMT+06:00) Bishkek', value: 'Asia/Bishkek' }, - { label: '(GMT+06:00) Chagos', value: 'Indian/Chagos' }, - { label: '(GMT+06:00) Dhaka', value: 'Asia/Dhaka' }, - { label: '(GMT+06:00) Moscow+03 - Omsk', value: 'Asia/Omsk' }, - { label: '(GMT+06:00) Thimphu', value: 'Asia/Thimphu' }, - { label: '(GMT+06:00) Vostok', value: 'Antarctica/Vostok' }, - { label: '(GMT+06:30) Cocos', value: 'Indian/Cocos' }, - { label: '(GMT+06:30) Rangoon', value: 'Asia/Yangon' }, - { label: '(GMT+07:00) Bangkok', value: 'Asia/Bangkok' }, - { label: '(GMT+07:00) Christmas', value: 'Indian/Christmas' }, - { label: '(GMT+07:00) Davis', value: 'Antarctica/Davis' }, - { label: '(GMT+07:00) Hanoi', value: 'Asia/Saigon' }, - { label: '(GMT+07:00) Hovd', value: 'Asia/Hovd' }, - { label: '(GMT+07:00) Jakarta', value: 'Asia/Jakarta' }, - { label: '(GMT+07:00) Moscow+04 - Krasnoyarsk', value: 'Asia/Krasnoyarsk' }, - { label: '(GMT+08:00) Brunei', value: 'Asia/Brunei' }, - { label: '(GMT+08:00) China Time - Beijing', value: 'Asia/Shanghai' }, - { label: '(GMT+08:00) Choibalsan', value: 'Asia/Choibalsan' }, - { label: '(GMT+08:00) Hong Kong', value: 'Asia/Hong_Kong' }, - { label: '(GMT+08:00) Kuala Lumpur', value: 'Asia/Kuala_Lumpur' }, - { label: '(GMT+08:00) Macau', value: 'Asia/Macau' }, - { label: '(GMT+08:00) Makassar', value: 'Asia/Makassar' }, - { label: '(GMT+08:00) Manila', value: 'Asia/Manila' }, - { label: '(GMT+08:00) Moscow+05 - Irkutsk', value: 'Asia/Irkutsk' }, - { label: '(GMT+08:00) Singapore', value: 'Asia/Singapore' }, - { label: '(GMT+08:00) Taipei', value: 'Asia/Taipei' }, - { label: '(GMT+08:00) Ulaanbaatar', value: 'Asia/Ulaanbaatar' }, - { label: '(GMT+08:00) Western Time - Perth', value: 'Australia/Perth' }, - { label: '(GMT+08:30) Pyongyang', value: 'Asia/Pyongyang' }, - { label: '(GMT+09:00) Dili', value: 'Asia/Dili' }, - { label: '(GMT+09:00) Jayapura', value: 'Asia/Jayapura' }, - { label: '(GMT+09:00) Moscow+06 - Yakutsk', value: 'Asia/Yakutsk' }, - { label: '(GMT+09:00) Palau', value: 'Pacific/Palau' }, - { label: '(GMT+09:00) Seoul', value: 'Asia/Seoul' }, - { label: '(GMT+09:00) Tokyo', value: 'Asia/Tokyo' }, - { label: '(GMT+09:30) Central Time - Darwin', value: 'Australia/Darwin' }, - { label: '(GMT+10:00) Dumont D\'Urville', value: 'Antarctica/DumontDUrville' }, - { label: '(GMT+10:00) Eastern Time - Brisbane', value: 'Australia/Brisbane' }, - { label: '(GMT+10:00) Guam', value: 'Pacific/Guam' }, - { label: '(GMT+10:00) Moscow+07 - Vladivostok', value: 'Asia/Vladivostok' }, - { label: '(GMT+10:00) Port Moresby', value: 'Pacific/Port_Moresby' }, - { label: '(GMT+10:00) Truk', value: 'Pacific/Chuuk' }, - { label: '(GMT+10:30) Central Time - Adelaide', value: 'Australia/Adelaide' }, - { label: '(GMT+11:00) Casey', value: 'Antarctica/Casey' }, - { label: '(GMT+11:00) Eastern Time - Hobart', value: 'Australia/Hobart' }, - { label: '(GMT+11:00) Eastern Time - Melbourne, Sydney', value: 'Australia/Sydney' }, - { label: '(GMT+11:00) Efate', value: 'Pacific/Efate' }, - { label: '(GMT+11:00) Guadalcanal', value: 'Pacific/Guadalcanal' }, - { label: '(GMT+11:00) Kosrae', value: 'Pacific/Kosrae' }, - { label: '(GMT+11:00) Moscow+08 - Magadan', value: 'Asia/Magadan' }, - { label: '(GMT+11:00) Norfolk', value: 'Pacific/Norfolk' }, - { label: '(GMT+11:00) Noumea', value: 'Pacific/Noumea' }, - { label: '(GMT+11:00) Ponape', value: 'Pacific/Pohnpei' }, - { label: '(GMT+12:00) Funafuti', value: 'Pacific/Funafuti' }, - { label: '(GMT+12:00) Kwajalein', value: 'Pacific/Kwajalein' }, - { label: '(GMT+12:00) Majuro', value: 'Pacific/Majuro' }, - { label: '(GMT+12:00) Moscow+09 - Petropavlovsk-Kamchatskiy', value: 'Asia/Kamchatka' }, - { label: '(GMT+12:00) Nauru', value: 'Pacific/Nauru' }, - { label: '(GMT+12:00) Tarawa', value: 'Pacific/Tarawa' }, - { label: '(GMT+12:00) Wake', value: 'Pacific/Wake' }, - { label: '(GMT+12:00) Wallis', value: 'Pacific/Wallis' }, - { label: '(GMT+13:00) Auckland', value: 'Pacific/Auckland' }, - { label: '(GMT+13:00) Enderbury', value: 'Pacific/Enderbury' }, - { label: '(GMT+13:00) Fakaofo', value: 'Pacific/Fakaofo' }, - { label: '(GMT+13:00) Fiji', value: 'Pacific/Fiji' }, - { label: '(GMT+13:00) Tongatapu', value: 'Pacific/Tongatapu' }, - { label: '(GMT+14:00) Apia', value: 'Pacific/Apia' }, - { label: '(GMT+14:00) Kiritimati', value: 'Pacific/Kiritimati' } + { label: 'Pacific - Niue', value: 'Pacific/Niue' }, + { label: 'Pacific - Pago Pago', value: 'Pacific/Pago_Pago' }, + { label: 'Pacific - Hawaii Time', value: 'Pacific/Honolulu' }, + { label: 'Pacific - Rarotonga', value: 'Pacific/Rarotonga' }, + { label: 'Pacific - Tahiti', value: 'Pacific/Tahiti' }, + { label: 'Pacific - Marquesas', value: 'Pacific/Marquesas' }, + { label: 'America - Alaska Time', value: 'America/Anchorage' }, + { label: 'Pacific - Gambier', value: 'Pacific/Gambier' }, + { label: 'America - Pacific Time - Los Angeles', value: 'America/Los_Angeles' }, + { label: 'America - Pacific Time - Tijuana', value: 'America/Tijuana' }, + { label: 'America - Pacific Time - Vancouver', value: 'America/Vancouver' }, + { label: 'America - Pacific Time - Whitehorse', value: 'America/Whitehorse' }, + { label: 'Pacific - Pitcairn', value: 'Pacific/Pitcairn' }, + { label: 'America - Mountain Time - Arizona', value: 'America/Phoenix' }, + { label: 'America - Mountain Time - Chihuahua, Mazatlan', value: 'America/Mazatlan' }, + { label: 'America - Mountain Time - Dawson Creek', value: 'America/Dawson_Creek' }, + { label: 'America - Mountain Time - Denver', value: 'America/Denver' }, + { label: 'America - Mountain Time - Edmonton', value: 'America/Edmonton' }, + { label: 'America - Mountain Time - Hermosillo', value: 'America/Hermosillo' }, + { label: 'America - Mountain Time - Yellowknife', value: 'America/Yellowknife' }, + { label: 'America - Belize', value: 'America/Belize' }, + { label: 'America - Central Time - Chicago', value: 'America/Chicago' }, + { label: 'America - Central Time - Mexico City', value: 'America/Mexico_City' }, + { label: 'America - Central Time - Regina', value: 'America/Regina' }, + { label: 'America - Central Time - Tegucigalpa', value: 'America/Tegucigalpa' }, + { label: 'America - Central Time - Winnipeg', value: 'America/Winnipeg' }, + { label: 'America - Costa Rica', value: 'America/Costa_Rica' }, + { label: 'America - El Salvador', value: 'America/El_Salvador' }, + { label: 'Pacific - Galapagos', value: 'Pacific/Galapagos' }, + { label: 'America - Guatemala', value: 'America/Guatemala' }, + { label: 'America - Managua', value: 'America/Managua' }, + { label: 'America - America Cancun', value: 'America/Cancun' }, + { label: 'America - Bogota', value: 'America/Bogota' }, + { label: 'Pacific - Easter Island', value: 'Pacific/Easter' }, + { label: 'America - Eastern Time - New York', value: 'America/New_York' }, + { label: 'America - Eastern Time - Iqaluit', value: 'America/Iqaluit' }, + { label: 'America - Eastern Time - Toronto', value: 'America/Toronto' }, + { label: 'America - Guayaquil', value: 'America/Guayaquil' }, + { label: 'America - Havana', value: 'America/Havana' }, + { label: 'America - Jamaica', value: 'America/Jamaica' }, + { label: 'America - Lima', value: 'America/Lima' }, + { label: 'America - Nassau', value: 'America/Nassau' }, + { label: 'America - Panama', value: 'America/Panama' }, + { label: 'America - Port-au-Prince', value: 'America/Port-au-Prince' }, + { label: 'America - Rio Branco', value: 'America/Rio_Branco' }, + { label: 'America - Atlantic Time - Halifax', value: 'America/Halifax' }, + { label: 'America - Barbados', value: 'America/Barbados' }, + { label: 'Atlantic - Bermuda', value: 'Atlantic/Bermuda' }, + { label: 'America - Boa Vista', value: 'America/Boa_Vista' }, + { label: 'America - Caracas', value: 'America/Caracas' }, + { label: 'America - Curacao', value: 'America/Curacao' }, + { label: 'America - Grand Turk', value: 'America/Grand_Turk' }, + { label: 'America - Guyana', value: 'America/Guyana' }, + { label: 'America - La Paz', value: 'America/La_Paz' }, + { label: 'America - Manaus', value: 'America/Manaus' }, + { label: 'America - Martinique', value: 'America/Martinique' }, + { label: 'America - Port of Spain', value: 'America/Port_of_Spain' }, + { label: 'America - Porto Velho', value: 'America/Porto_Velho' }, + { label: 'America - Puerto Rico', value: 'America/Puerto_Rico' }, + { label: 'America - Santo Domingo', value: 'America/Santo_Domingo' }, + { label: 'America - Thule', value: 'America/Thule' }, + { label: 'America - Newfoundland Time - St. Johns', value: 'America/St_Johns' }, + { label: 'America - Araguaina', value: 'America/Araguaina' }, + { label: 'America - Asuncion', value: 'America/Asuncion' }, + { label: 'America - Belem', value: 'America/Belem' }, + { label: 'America - Buenos Aires', value: 'America/Argentina/Buenos_Aires' }, + { label: 'America - Campo Grande', value: 'America/Campo_Grande' }, + { label: 'America - Cayenne', value: 'America/Cayenne' }, + { label: 'America - Cuiaba', value: 'America/Cuiaba' }, + { label: 'America - Fortaleza', value: 'America/Fortaleza' }, + { label: 'America - Godthab', value: 'America/Godthab' }, + { label: 'America - Maceio', value: 'America/Maceio' }, + { label: 'America - Miquelon', value: 'America/Miquelon' }, + { label: 'America - Montevideo', value: 'America/Montevideo' }, + { label: 'Antarctica - Palmer', value: 'Antarctica/Palmer' }, + { label: 'America - Paramaribo', value: 'America/Paramaribo' }, + { label: 'America - Punta Arenas', value: 'America/Punta_Arenas' }, + { label: 'America - Recife', value: 'America/Recife' }, + { label: 'Antarctica - Rothera', value: 'Antarctica/Rothera' }, + { label: 'America - Salvador', value: 'America/Bahia' }, + { label: 'America - Santiago', value: 'America/Santiago' }, + { label: 'Atlantic - Stanley', value: 'Atlantic/Stanley' }, + { label: 'America - Noronha', value: 'America/Noronha' }, + { label: 'America - Sao Paulo', value: 'America/Sao_Paulo' }, + { label: 'Atlantic - South Georgia', value: 'Atlantic/South_Georgia' }, + { label: 'Atlantic - Azores', value: 'Atlantic/Azores' }, + { label: 'Atlantic - Cape Verde', value: 'Atlantic/Cape_Verde' }, + { label: 'America - Scoresbysund', value: 'America/Scoresbysund' }, + { label: 'Africa - Abidjan', value: 'Africa/Abidjan' }, + { label: 'Africa - Accra', value: 'Africa/Accra' }, + { label: 'Africa - Bissau', value: 'Africa/Bissau' }, + { label: 'Atlantic - Canary Islands', value: 'Atlantic/Canary' }, + { label: 'Africa - Casablanca', value: 'Africa/Casablanca' }, + { label: 'America - Danmarkshavn', value: 'America/Danmarkshavn' }, + { label: 'Europe - Dublin', value: 'Europe/Dublin' }, + { label: 'Africa - El Aaiun', value: 'Africa/El_Aaiun' }, + { label: 'Atlantic - Faeroe', value: 'Atlantic/Faroe' }, + { label: 'UTC / GMT', value: 'UTC' }, + { label: 'Europe - Lisbon', value: 'Europe/Lisbon' }, + { label: 'Europe - London', value: 'Europe/London' }, + { label: 'Africa - Monrovia', value: 'Africa/Monrovia' }, + { label: 'Atlantic - Reykjavik', value: 'Atlantic/Reykjavik' }, + { label: 'Africa - Algiers', value: 'Africa/Algiers' }, + { label: 'Europe - Amsterdam', value: 'Europe/Amsterdam' }, + { label: 'Europe - Andorra', value: 'Europe/Andorra' }, + { label: 'Europe - Berlin', value: 'Europe/Berlin' }, + { label: 'Europe - Brussels', value: 'Europe/Brussels' }, + { label: 'Europe - Budapest', value: 'Europe/Budapest' }, + { label: 'Europe - Central European Time - Belgrade', value: 'Europe/Belgrade' }, + { label: 'Europe - Central European Time - Prague', value: 'Europe/Prague' }, + { label: 'Africa - Ceuta', value: 'Africa/Ceuta' }, + { label: 'Europe - Copenhagen', value: 'Europe/Copenhagen' }, + { label: 'Europe - Gibraltar', value: 'Europe/Gibraltar' }, + { label: 'Africa - Lagos', value: 'Africa/Lagos' }, + { label: 'Europe - Luxembourg', value: 'Europe/Luxembourg' }, + { label: 'Europe - Madrid', value: 'Europe/Madrid' }, + { label: 'Europe - Malta', value: 'Europe/Malta' }, + { label: 'Europe - Monaco', value: 'Europe/Monaco' }, + { label: 'Africa - Ndjamena', value: 'Africa/Ndjamena' }, + { label: 'Europe - Oslo', value: 'Europe/Oslo' }, + { label: 'Europe - Paris', value: 'Europe/Paris' }, + { label: 'Europe - Rome', value: 'Europe/Rome' }, + { label: 'Europe - Stockholm', value: 'Europe/Stockholm' }, + { label: 'Europe - Tirane', value: 'Europe/Tirane' }, + { label: 'Africa - Tunis', value: 'Africa/Tunis' }, + { label: 'Europe - Vienna', value: 'Europe/Vienna' }, + { label: 'Europe - Warsaw', value: 'Europe/Warsaw' }, + { label: 'Europe - Zurich', value: 'Europe/Zurich' }, + { label: 'Asia - Amman', value: 'Asia/Amman' }, + { label: 'Europe - Athens', value: 'Europe/Athens' }, + { label: 'Asia - Beirut', value: 'Asia/Beirut' }, + { label: 'Europe - Bucharest', value: 'Europe/Bucharest' }, + { label: 'Africa - Cairo', value: 'Africa/Cairo' }, + { label: 'Europe - Chisinau', value: 'Europe/Chisinau' }, + { label: 'Asia - Damascus', value: 'Asia/Damascus' }, + { label: 'Asia - Gaza', value: 'Asia/Gaza' }, + { label: 'Europe - Helsinki', value: 'Europe/Helsinki' }, + { label: 'Asia - Jerusalem', value: 'Asia/Jerusalem' }, + { label: 'Africa - Johannesburg', value: 'Africa/Johannesburg' }, + { label: 'Africa - Khartoum', value: 'Africa/Khartoum' }, + { label: 'Europe - Kiev', value: 'Europe/Kiev' }, + { label: 'Africa - Maputo', value: 'Africa/Maputo' }, + { label: 'Europe - Moscow-01 - Kaliningrad', value: 'Europe/Kaliningrad' }, + { label: 'Asia - Nicosia', value: 'Asia/Nicosia' }, + { label: 'Europe - Riga', value: 'Europe/Riga' }, + { label: 'Europe - Sofia', value: 'Europe/Sofia' }, + { label: 'Europe - Tallinn', value: 'Europe/Tallinn' }, + { label: 'Africa - Tripoli', value: 'Africa/Tripoli' }, + { label: 'Europe - Vilnius', value: 'Europe/Vilnius' }, + { label: 'Africa - Windhoek', value: 'Africa/Windhoek' }, + { label: 'Asia - Baghdad', value: 'Asia/Baghdad' }, + { label: 'Europe - Istanbul', value: 'Europe/Istanbul' }, + { label: 'Europe - Minsk', value: 'Europe/Minsk' }, + { label: 'Europe - Moscow+00 - Moscow', value: 'Europe/Moscow' }, + { label: 'Africa - Nairobi', value: 'Africa/Nairobi' }, + { label: 'Asia - Qatar', value: 'Asia/Qatar' }, + { label: 'Asia - Riyadh', value: 'Asia/Riyadh' }, + { label: 'Antarctica - Syowa', value: 'Antarctica/Syowa' }, + { label: 'Asia - Tehran', value: 'Asia/Tehran' }, + { label: 'Asia - Baku', value: 'Asia/Baku' }, + { label: 'Asia - Dubai', value: 'Asia/Dubai' }, + { label: 'Indian - Mahe', value: 'Indian/Mahe' }, + { label: 'Indian - Mauritius', value: 'Indian/Mauritius' }, + { label: 'Europe - Moscow+01 - Samara', value: 'Europe/Samara' }, + { label: 'Indian - Reunion', value: 'Indian/Reunion' }, + { label: 'Asia - Tbilisi', value: 'Asia/Tbilisi' }, + { label: 'Asia - Yerevan', value: 'Asia/Yerevan' }, + { label: 'Asia - Kabul', value: 'Asia/Kabul' }, + { label: 'Asia - Aqtau', value: 'Asia/Aqtau' }, + { label: 'Asia - Aqtobe', value: 'Asia/Aqtobe' }, + { label: 'Asia - Ashgabat', value: 'Asia/Ashgabat' }, + { label: 'Asia - Dushanbe', value: 'Asia/Dushanbe' }, + { label: 'Asia - Karachi', value: 'Asia/Karachi' }, + { label: 'Indian - Kerguelen', value: 'Indian/Kerguelen' }, + { label: 'Indian - Maldives', value: 'Indian/Maldives' }, + { label: 'Antarctica - Mawson', value: 'Antarctica/Mawson' }, + { label: 'Asia - Moscow+02 - Yekaterinburg', value: 'Asia/Yekaterinburg' }, + { label: 'Asia - Tashkent', value: 'Asia/Tashkent' }, + { label: 'Asia - Colombo', value: 'Asia/Colombo' }, + { label: 'Asia - India Standard Time', value: 'Asia/Kolkata' }, + { label: 'Asia - Kathmandu', value: 'Asia/Kathmandu' }, + { label: 'Asia - Almaty', value: 'Asia/Almaty' }, + { label: 'Asia - Bishkek', value: 'Asia/Bishkek' }, + { label: 'Indian - Chagos', value: 'Indian/Chagos' }, + { label: 'Asia - Dhaka', value: 'Asia/Dhaka' }, + { label: 'Asia - Moscow+03 - Omsk', value: 'Asia/Omsk' }, + { label: 'Asia - Thimphu', value: 'Asia/Thimphu' }, + { label: 'Antarctica - Vostok', value: 'Antarctica/Vostok' }, + { label: 'Indian - Cocos', value: 'Indian/Cocos' }, + { label: 'Asia - Rangoon', value: 'Asia/Yangon' }, + { label: 'Asia - Bangkok', value: 'Asia/Bangkok' }, + { label: 'Indian - Christmas', value: 'Indian/Christmas' }, + { label: 'Antarctica - Davis', value: 'Antarctica/Davis' }, + { label: 'Asia - Hanoi', value: 'Asia/Saigon' }, + { label: 'Asia - Hovd', value: 'Asia/Hovd' }, + { label: 'Asia - Jakarta', value: 'Asia/Jakarta' }, + { label: 'Asia - Moscow+04 - Krasnoyarsk', value: 'Asia/Krasnoyarsk' }, + { label: 'Asia - Brunei', value: 'Asia/Brunei' }, + { label: 'Asia - China Time - Beijing', value: 'Asia/Shanghai' }, + { label: 'Asia - Choibalsan', value: 'Asia/Choibalsan' }, + { label: 'Asia - Hong Kong', value: 'Asia/Hong_Kong' }, + { label: 'Asia - Kuala Lumpur', value: 'Asia/Kuala_Lumpur' }, + { label: 'Asia - Macau', value: 'Asia/Macau' }, + { label: 'Asia - Makassar', value: 'Asia/Makassar' }, + { label: 'Asia - Manila', value: 'Asia/Manila' }, + { label: 'Asia - Moscow+05 - Irkutsk', value: 'Asia/Irkutsk' }, + { label: 'Asia - Singapore', value: 'Asia/Singapore' }, + { label: 'Asia - Taipei', value: 'Asia/Taipei' }, + { label: 'Asia - Ulaanbaatar', value: 'Asia/Ulaanbaatar' }, + { label: 'Australia - Western Time - Perth', value: 'Australia/Perth' }, + { label: 'Asia - Pyongyang', value: 'Asia/Pyongyang' }, + { label: 'Asia - Dili', value: 'Asia/Dili' }, + { label: 'Asia - Jayapura', value: 'Asia/Jayapura' }, + { label: 'Asia - Moscow+06 - Yakutsk', value: 'Asia/Yakutsk' }, + { label: 'Pacific - Palau', value: 'Pacific/Palau' }, + { label: 'Asia - Seoul', value: 'Asia/Seoul' }, + { label: 'Asia - Tokyo', value: 'Asia/Tokyo' }, + { label: 'Australia - Central Time - Darwin', value: 'Australia/Darwin' }, + { label: 'Antarctica - Dumont D\'Urville', value: 'Antarctica/DumontDUrville' }, + { label: 'Australia - Eastern Time - Brisbane', value: 'Australia/Brisbane' }, + { label: 'Pacific - Guam', value: 'Pacific/Guam' }, + { label: 'Asia - Moscow+07 - Vladivostok', value: 'Asia/Vladivostok' }, + { label: 'Pacific - Port Moresby', value: 'Pacific/Port_Moresby' }, + { label: 'Pacific - Truk', value: 'Pacific/Chuuk' }, + { label: 'Australia - Central Time - Adelaide', value: 'Australia/Adelaide' }, + { label: 'Antarctica - Casey', value: 'Antarctica/Casey' }, + { label: 'Australia - Eastern Time - Hobart', value: 'Australia/Hobart' }, + { label: 'Australia - Eastern Time - Melbourne, Sydney', value: 'Australia/Sydney' }, + { label: 'Pacific - Efate', value: 'Pacific/Efate' }, + { label: 'Pacific - Guadalcanal', value: 'Pacific/Guadalcanal' }, + { label: 'Pacific - Kosrae', value: 'Pacific/Kosrae' }, + { label: 'Asia - Moscow+08 - Magadan', value: 'Asia/Magadan' }, + { label: 'Pacific - Norfolk', value: 'Pacific/Norfolk' }, + { label: 'Pacific - Noumea', value: 'Pacific/Noumea' }, + { label: 'Pacific - Ponape', value: 'Pacific/Pohnpei' }, + { label: 'Pacific - Funafuti', value: 'Pacific/Funafuti' }, + { label: 'Pacific - Kwajalein', value: 'Pacific/Kwajalein' }, + { label: 'Pacific - Majuro', value: 'Pacific/Majuro' }, + { label: 'Asia - Moscow+09 - Petropavlovsk-Kamchatskiy', value: 'Asia/Kamchatka' }, + { label: 'Pacific - Nauru', value: 'Pacific/Nauru' }, + { label: 'Pacific - Tarawa', value: 'Pacific/Tarawa' }, + { label: 'Pacific - Wake', value: 'Pacific/Wake' }, + { label: 'Pacific - Wallis', value: 'Pacific/Wallis' }, + { label: 'Pacific - Auckland', value: 'Pacific/Auckland' }, + { label: 'Pacific - Enderbury', value: 'Pacific/Enderbury' }, + { label: 'Pacific - Fakaofo', value: 'Pacific/Fakaofo' }, + { label: 'Pacific - Fiji', value: 'Pacific/Fiji' }, + { label: 'Pacific - Tongatapu', value: 'Pacific/Tongatapu' }, + { label: 'Pacific - Apia', value: 'Pacific/Apia' }, + { label: 'Pacific - Kiritimati', value: 'Pacific/Kiritimati' } ] diff --git a/client/shared/urls.json b/client/shared/urls.json index 285caa07d2c..15410d68df1 100644 --- a/client/shared/urls.json +++ b/client/shared/urls.json @@ -1,5 +1,6 @@ { "bofDefinition": "https://www.ietf.org/how/bofs/", + "hackathonWiki": "https://wiki.ietf.org/meeting/{meetingNumber}/hackathon", "meetingCalIcs": "/meeting/{meetingNumber}/agenda.ics", "meetingDetails": "/meeting/{meetingNumber}/session/{eventAcronym}/", "meetingMaterialsPdf": "/meeting/{meetingNumber}/agenda/{eventAcronym}-drafts.pdf", diff --git a/client/shared/xslugify.js b/client/shared/xslugify.js index daf0bdf2ba4..e1ac556ddf0 100644 --- a/client/shared/xslugify.js +++ b/client/shared/xslugify.js @@ -1,5 +1,5 @@ import slugify from 'slugify' export default (str) => { - return slugify(str.replace('/', '-'), { lower: true }) + return slugify(str.replaceAll('/', '-').replaceAll(/['&]/g, ''), { lower: true }) } diff --git a/debug.py b/debug.py index bf34367cceb..4f0d64bae2b 100644 --- a/debug.py +++ b/debug.py @@ -3,15 +3,7 @@ import sys import time as timeutils import inspect -from typing import Callable -try: - import syslog - logger = syslog.syslog # type: Callable -except ImportError: # import syslog will fail on Windows boxes - import logging - logging.basicConfig(filename='tracker.log',level=logging.INFO) - logger = logging.info try: from pprint import pformat @@ -55,7 +47,7 @@ def fix(s,n=64): if len(s) > n+3: s = s[:n]+"..." return s - def wrap(fn, *params,**kwargs): + def wrap(*params,**kwargs): call = wrap.callcount = wrap.callcount + 1 indent = ' ' * _report_indent[0] @@ -81,8 +73,8 @@ def wrap(fn, *params,**kwargs): return ret wrap.callcount = 0 if debug: - from decorator import decorator - return decorator(wrap, fn) + from functools import update_wrapper + return update_wrapper(wrap, fn) else: return fn @@ -119,7 +111,7 @@ def clock(s): def time(fn): """Decorator to print timing information about a function call. """ - def wrap(fn, *params,**kwargs): + def wrap(*params,**kwargs): indent = ' ' * _report_indent[0] fc = "%s.%s()" % (fn.__module__, fn.__name__,) @@ -132,8 +124,8 @@ def wrap(fn, *params,**kwargs): return ret wrap.callcount = 0 if debug: - from decorator import decorator - return decorator(wrap, fn) + from functools import update_wrapper + return update_wrapper(wrap, fn) else: return fn @@ -155,13 +147,6 @@ def showpos(name): indent = ' ' * (_report_indent[0]) sys.stderr.write("%s%s:%s: %s: '%s'\n" % (indent, fn, line, name, value)) -def log(name): - if debug: - frame = inspect.stack()[1][0] - value = eval(name, frame.f_globals, frame.f_locals) - indent = ' ' * (_report_indent[0]) - logger("%s%s: %s" % (indent, name, value)) - def pprint(name): if debug: frame = inspect.stack()[1][0] @@ -190,7 +175,7 @@ def type(name): value = eval(name, frame.f_globals, frame.f_locals) indent = ' ' * (_report_indent[0]) sys.stderr.write("%s%s: %s\n" % (indent, name, value)) - + def say(s): if debug: indent = ' ' * (_report_indent[0]) @@ -205,11 +190,11 @@ def wrapper(*args, **kwargs): prof.dump_stats(datafn) return retval if debug: - from decorator import decorator - return decorator(wrapper, fn) + from functools import update_wrapper + return update_wrapper(wrapper, fn) else: return fn - + def traceback(levels=None): if debug: indent = ' ' * (_report_indent[0]) diff --git a/dev/INSTALL b/dev/INSTALL deleted file mode 100644 index 15c74729721..00000000000 --- a/dev/INSTALL +++ /dev/null @@ -1,155 +0,0 @@ -============================================================================== - IETF Datatracker -============================================================================== - ------------------------------------------------------------------------------- - Installation Instructions ------------------------------------------------------------------------------- - -General Instructions for Deployment of a New Release -==================================================== - - 0. Prepare to hold different roles at different stages of the instructions below. - You will need to be root, wwwrun, and some user in group docker. - Consider using separate shells for the wwwrun and other roles. These instructions - are written assuming you will only use one shell. - - 1. Make a directory to hold the new release as wwwrun:: - sudo su - -s /bin/bash wwwrun - mkdir /a/www/ietf-datatracker/${releasenumber} - cd /a/www/ietf-datatracker/${releasenumber} - - 2. Fetch the release tarball from github - (see https://github.com/ietf-tools/datatracker/releases):: - - wget https://github.com/ietf-tools/datatracker/releases/download/${releasenumber}/release.tar.gz - tar xzvf release.tar.gz - - 3. Copy ietf/settings_local.py from previous release:: - - cp ../web/ietf/settings_local.py ietf/ - - 4. Setup a new virtual environment and install requirements:: - - python3.9 -mvenv env - source env/bin/activate - pip install -r requirements.txt - pip freeze > frozen-requirements.txt - - (The pip freeze command records the exact versions of the Python libraries that pip installed. - This is used by the celery docker container to ensure it uses the same library versions as - the datatracker service.) - - 5. Move static files into place for CDN (/a/www/www6s/lib/dt): - - ietf/manage.py collectstatic - - 6. Run system checks (which patches the just installed modules):: - - ietf/manage.py check - - 7. Switch to the docker directory and update images as a user in group docker: - - exit - cd /a/docker/datatracker - docker image tag ghcr.io/ietf-tools/datatracker-celery:latest datatracker-celery-fallback - docker image tag ghcr.io/ietf-tools/datatracker-mq:latest datatracker-mq-fallback - docker-compose pull - - 8. Stop and remove the async task containers: - Wait for this to finish cleanly. Usually this will only be a few seconds, but it may take up - to about 10 minutes for the 'down' command to complete if a long-running task is in progress. - - docker-compose down - - 9. Stop the datatracker - - sudo systemctl stop datatracker.socket datatracker.service - - 10. Return to the release directory and run migrations as wwwrun: - - sudo su - -s /bin/bash wwwrun - cd /a/www/ietf-datatracker/${releasenumber} - ietf/manage.py migrate - - Take note if any migrations were executed. - - 11. Back out one directory level, then re-point the 'web' symlink:: - - cd .. - rm ./web; ln -s ${releasenumber} web - - 12. Start the datatracker service (it is no longer necessary to restart apache) :: - - exit - sudo systemctl start datatracker.service datatracker.socket - - 13. Start async task worker and message broker: - - cd /a/docker/datatracker - bash startcommand - - 14. Verify operation: - - http://datatracker.ietf.org/ - - 15. If install failed and there were no migrations at step 9, revert web symlink and docker update and repeat the - restart in steps 11 and 12. To revert the docker update: - - cd /a/docker/datatracker - docker-compose down - docker image rm ghcr.io/ietf-tools/datatracker-celery:latest ghcr.io/ietf-tools/datatracker-mq:latest - docker image tag datatracker-celery-fallback ghcr.io/ietf-tools/datatracker-celery:latest - docker image tag datatracker-mq-fallback ghcr.io/ietf-tools/datatracker-mq:latest - cd - - - If there were migrations at step 10, they will need to be reversed before the restart at step 12. - If it's not obvious what to do to reverse the migrations, contact the dev team. - - -Patching a Production Release -============================= - -Sometimes it can prove necessary to patch an existing release. -The following process should be used: - - 1. Code and test the patch on an copy of the release with any - previously applied patches put in place. - - 2. Produce a patch file, named with date and subject:: - - $ git diff > 2013-03-25-ballot-calculation.patch - - 3. Move the patch file to the production server, and place it in - '/a/www/ietf-datatracker/patches/' - - 4. Make a recursive copy of the production code to a new directory, named with a patch number. - - /a/www/ietf-datatracker $ rsync -a web/ ${releasenumber}.p1/ - - 5. Apply the patch:: - - /a/www/ietf-datatracker $ cd ${releasenumber}.p1/ - /a/www/ietf-datatracker/${releasnumber}.p1 $ patch -p1 \ - < ../patches/2013-03-25-ballot-calculation.patch - - This must not produce any messages about failing to apply any chunks; - if it does, go back to 1. and figure out why. - - 6. Edit ``.../ietf/__init__.py`` in the new patched release to indicate the patch - version in the ``__patch__`` string. - - 7. Stop the async task container (this may take a few minutes if tasks are in progress): - - cd /a/docker/datatracker - docker-compose down - - 8. Change the 'web' symlink, reload etc. as described in - `General Instructions for Deployment of a New Release`_. - - 9. Start async task worker: - - cd /a/docker/datatracker - bash startcommand - - diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile new file mode 100644 index 00000000000..ae59ba1440f --- /dev/null +++ b/dev/build/Dockerfile @@ -0,0 +1,41 @@ +FROM ghcr.io/ietf-tools/datatracker-app-base:20251201T1548 +LABEL maintainer="IETF Tools Team " + +ENV DEBIAN_FRONTEND=noninteractive + +# uid 498 = wwwrun and gid 496 = www on ietfa +RUN groupadd -g 1000 datatracker && \ + useradd -c "Datatracker User" -u 1000 -g datatracker -m -s /bin/false datatracker + +RUN apt-get purge -y imagemagick imagemagick-6-common + +# Install libreoffice (needed via PPT2PDF_COMMAND) +RUN apt-get update && \ + apt-get -qy install libreoffice-nogui + +COPY . . +COPY ./dev/build/start.sh ./start.sh +COPY ./dev/build/datatracker-start.sh ./datatracker-start.sh +COPY ./dev/build/migration-start.sh ./migration-start.sh +COPY ./dev/build/celery-start.sh ./celery-start.sh +COPY ./dev/build/gunicorn.conf.py ./gunicorn.conf.py + +RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt && \ + echo '# empty' > ietf/settings_local.py && \ + ietf/manage.py patch_libraries && \ + rm -f ietf/settings_local.py + +RUN chmod +x start.sh && \ + chmod +x datatracker-start.sh && \ + chmod +x migration-start.sh && \ + chmod +x celery-start.sh && \ + chmod +x docker/scripts/app-create-dirs.sh && \ + sh ./docker/scripts/app-create-dirs.sh + +RUN mkdir -p /a + +VOLUME [ "/a" ] + +EXPOSE 8000 + +CMD ["./start.sh"] diff --git a/dev/build/TARGET_BASE b/dev/build/TARGET_BASE new file mode 100644 index 00000000000..726f080c678 --- /dev/null +++ b/dev/build/TARGET_BASE @@ -0,0 +1 @@ +20251201T1548 diff --git a/dev/build/celery-start.sh b/dev/build/celery-start.sh new file mode 100644 index 00000000000..69dcd7bbda8 --- /dev/null +++ b/dev/build/celery-start.sh @@ -0,0 +1,52 @@ +#!/bin/bash -e +# +# Run a celery worker +# +echo "Running Datatracker checks..." +./ietf/manage.py check + +# Check whether the blobdb database exists - inspectdb will return a false +# status if not. +if ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then + HAVE_BLOBDB="yes" +fi + +migrations_applied_for () { + local DATABASE=${1:-default} + ietf/manage.py migrate --check --database "$DATABASE" +} + +migrations_all_applied () { + if [[ "$HAVE_BLOBDB" == "yes" ]]; then + migrations_applied_for default && migrations_applied_for blobdb + else + migrations_applied_for default + fi +} + +if ! migrations_all_applied; then + echo "Unapplied migrations found, waiting to start..." + sleep 5 + while ! migrations_all_applied ; do + echo "... still waiting for migrations..." + sleep 5 + done +fi + +echo "Starting Celery..." + +cleanup () { + # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit. + if [[ -n "${celery_pid}" ]]; then + echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..." + kill -TERM "${celery_pid}" + wait "${celery_pid}" + fi +} + +trap 'trap "" TERM; cleanup' TERM + +# start celery in the background so we can trap the TERM signal +celery "$@" & +celery_pid=$! +wait "${celery_pid}" diff --git a/dev/build/collectstatics.sh b/dev/build/collectstatics.sh new file mode 100644 index 00000000000..44f1c608a93 --- /dev/null +++ b/dev/build/collectstatics.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Copy temp local settings +cp dev/build/settings_local_collectstatics.py ietf/settings_local.py + +# Install Python dependencies +pip --disable-pip-version-check --no-cache-dir install -r requirements.txt + +# Collect statics +ietf/manage.py collectstatic + +# Delete temp local settings +rm ietf/settings_local.py \ No newline at end of file diff --git a/dev/build/datatracker-start.sh b/dev/build/datatracker-start.sh new file mode 100644 index 00000000000..a676415a261 --- /dev/null +++ b/dev/build/datatracker-start.sh @@ -0,0 +1,60 @@ +#!/bin/bash -e + +echo "Running Datatracker checks..." +./ietf/manage.py check + +# Check whether the blobdb database exists - inspectdb will return a false +# status if not. +if ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then + HAVE_BLOBDB="yes" +fi + +migrations_applied_for () { + local DATABASE=${1:-default} + ietf/manage.py migrate --check --database "$DATABASE" +} + +migrations_all_applied () { + if [[ "$HAVE_BLOBDB" == "yes" ]]; then + migrations_applied_for default && migrations_applied_for blobdb + else + migrations_applied_for default + fi +} + +if ! migrations_all_applied; then + echo "Unapplied migrations found, waiting to start..." + sleep 5 + while ! migrations_all_applied ; do + echo "... still waiting for migrations..." + sleep 5 + done +fi + +echo "Starting Datatracker..." + +# trap TERM and shut down gunicorn +cleanup () { + if [[ -n "${gunicorn_pid}" ]]; then + echo "Terminating gunicorn..." + kill -TERM "${gunicorn_pid}" + wait "${gunicorn_pid}" + fi +} + +trap 'trap "" TERM; cleanup' TERM + +# start gunicorn in the background so we can trap the TERM signal +gunicorn \ + -c /workspace/gunicorn.conf.py \ + --workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \ + --max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \ + --timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \ + --bind :8000 \ + --log-level "${DATATRACKER_GUNICORN_LOG_LEVEL:-info}" \ + --capture-output \ + --access-logfile -\ + ${DATATRACKER_GUNICORN_EXTRA_ARGS} \ + ietf.wsgi:application & +gunicorn_pid=$! +wait "${gunicorn_pid}" diff --git a/dev/deploy/exclude-patterns.txt b/dev/build/exclude-patterns.txt similarity index 100% rename from dev/deploy/exclude-patterns.txt rename to dev/build/exclude-patterns.txt diff --git a/dev/build/gunicorn.conf.py b/dev/build/gunicorn.conf.py new file mode 100644 index 00000000000..c54b24a0546 --- /dev/null +++ b/dev/build/gunicorn.conf.py @@ -0,0 +1,155 @@ +# Copyright The IETF Trust 2024-2025, All Rights Reserved + +import os +import ietf +from opentelemetry import trace +from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter +from opentelemetry.sdk.resources import Resource +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.sdk.trace.export import BatchSpanProcessor +from opentelemetry.instrumentation.django import DjangoInstrumentor +from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor +from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor +from opentelemetry.instrumentation.requests import RequestsInstrumentor + +# Configure security scheme headers for forwarded requests. Cloudflare sets X-Forwarded-Proto +# for us. Don't trust any of the other similar headers. Only trust the header if it's coming +# from localhost, as all legitimate traffic will reach gunicorn via co-located nginx. +secure_scheme_headers = {"X-FORWARDED-PROTO": "https"} +forwarded_allow_ips = "127.0.0.1, ::1" # this is the default + +# Log as JSON on stdout (to distinguish from Django's logs on stderr) +# +# This is applied as an update to gunicorn's glogging.CONFIG_DEFAULTS. +logconfig_dict = { + "version": 1, + "disable_existing_loggers": False, + "root": {"level": "INFO", "handlers": ["console"]}, + "loggers": { + "gunicorn.error": { + "level": "INFO", + "handlers": ["console"], + "propagate": False, + "qualname": "gunicorn.error", + }, + "gunicorn.access": { + "level": "INFO", + "handlers": ["access_console"], + "propagate": False, + "qualname": "gunicorn.access", + }, + }, + "handlers": { + "console": { + "class": "logging.StreamHandler", + "formatter": "json", + "stream": "ext://sys.stdout", + }, + "access_console": { + "class": "logging.StreamHandler", + "formatter": "access_json", + "stream": "ext://sys.stdout", + }, + }, + "formatters": { + "json": { + "class": "ietf.utils.jsonlogger.DatatrackerJsonFormatter", + "style": "{", + "format": "{asctime}{levelname}{message}{name}{process}", + }, + "access_json": { + "class": "ietf.utils.jsonlogger.GunicornRequestJsonFormatter", + "style": "{", + "format": "{asctime}{levelname}{message}{name}{process}", + }, + }, +} + +# Track in-flight requests and emit a list of what was happeningwhen a worker is terminated. +# For the default sync worker, there will only be one request per PID, but allow for the +# possibility of multiple requests in case we switch to a different worker class. +# +# This dict is only visible within a single worker, but key by pid to guarantee no conflicts. +# +# Use a list rather than a set to allow for the possibility of overlapping identical requests. +in_flight_by_pid: dict[str, list[str]] = {} # pid -> list of in-flight requests + + +def _describe_request(req): + """Generate a consistent description of a request + + The return value is used identify in-flight requests, so it must not vary between the + start and end of handling a request. E.g., do not include a timestamp. + """ + client_ip = "-" + asn = "-" + cf_ray = "-" + for header, value in req.headers: + header = header.lower() + if header == "cf-connecting-ip": + client_ip = value + elif header == "x-ip-src-asnum": + asn = value + elif header == "cf-ray": + cf_ray = value + if req.query: + path = f"{req.path}?{req.query}" + else: + path = req.path + return f"{req.method} {path} (client_ip={client_ip}, asn={asn}, cf_ray={cf_ray})" + + +def pre_request(worker, req): + """Log the start of a request and add it to the in-flight list""" + request_description = _describe_request(req) + worker.log.info(f"gunicorn starting to process {request_description}") + in_flight = in_flight_by_pid.setdefault(worker.pid, []) + in_flight.append(request_description) + + +def worker_abort(worker): + """Emit an error log if any requests were in-flight""" + in_flight = in_flight_by_pid.get(worker.pid, []) + if len(in_flight) > 0: + worker.log.error( + f"Aborted worker {worker.pid} with in-flight requests: {', '.join(in_flight)}" + ) + + +def worker_int(worker): + """Emit an error log if any requests were in-flight""" + in_flight = in_flight_by_pid.get(worker.pid, []) + if len(in_flight) > 0: + worker.log.error( + f"Interrupted worker {worker.pid} with in-flight requests: {', '.join(in_flight)}" + ) + + +def post_request(worker, req, environ, resp): + """Remove request from in-flight list when we finish handling it""" + request_description = _describe_request(req) + in_flight = in_flight_by_pid.get(worker.pid, []) + if request_description in in_flight: + in_flight.remove(request_description) + +def post_fork(server, worker): + server.log.info("Worker spawned (pid: %s)", worker.pid) + + resource = Resource.create(attributes={ + "service.name": "datatracker", + "service.version": ietf.__version__, + "service.instance.id": worker.pid, + "service.namespace": "datatracker", + "deployment.environment.name": os.environ.get("DATATRACKER_SERVICE_ENV", "dev") + }) + + trace.set_tracer_provider(TracerProvider(resource=resource)) + otlp_exporter = OTLPSpanExporter(endpoint="https://heimdall-otlp.ietf.org/v1/traces") + + trace.get_tracer_provider().add_span_processor(BatchSpanProcessor(otlp_exporter)) + + # Instrumentations + DjangoInstrumentor().instrument() + Psycopg2Instrumentor().instrument() + PymemcacheInstrumentor().instrument() + RequestsInstrumentor().instrument() diff --git a/dev/build/migration-start.sh b/dev/build/migration-start.sh new file mode 100644 index 00000000000..901026e53b5 --- /dev/null +++ b/dev/build/migration-start.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e + +echo "Running Datatracker migrations..." +./ietf/manage.py migrate --settings=settings_local + +echo "Running Blobdb migrations ..." +./ietf/manage.py migrate --settings=settings_local --database=blobdb + +echo "Done!" diff --git a/dev/build/settings_local_collectstatics.py b/dev/build/settings_local_collectstatics.py new file mode 100644 index 00000000000..ccb4b33979e --- /dev/null +++ b/dev/build/settings_local_collectstatics.py @@ -0,0 +1,8 @@ +# Copyright The IETF Trust 2007-2019, All Rights Reserved +# -*- coding: utf-8 -*- + +from ietf import __version__ +from ietf.settings import * # pyflakes:ignore + +STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__ +STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/") diff --git a/dev/build/start.sh b/dev/build/start.sh new file mode 100644 index 00000000000..3b036370685 --- /dev/null +++ b/dev/build/start.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# +# Environment config: +# +# CONTAINER_ROLE - datatracker, celery, beat, migrations, or replicator (defaults to datatracker) +# +case "${CONTAINER_ROLE:-datatracker}" in + auth) + exec ./datatracker-start.sh + ;; + beat) + exec ./celery-start.sh --app=ietf beat + ;; + celery) + exec ./celery-start.sh --app=ietf worker + ;; + datatracker) + exec ./datatracker-start.sh + ;; + migrations) + exec ./migration-start.sh + ;; + replicator) + exec ./celery-start.sh --app=ietf worker --queues=blobdb --concurrency=1 + ;; + *) + echo "Unknown role '${CONTAINER_ROLE}'" + exit 255 +esac diff --git a/dev/celery/Dockerfile b/dev/celery/Dockerfile index 91f2949a6b0..e69de29bb2d 100644 --- a/dev/celery/Dockerfile +++ b/dev/celery/Dockerfile @@ -1,20 +0,0 @@ -# Dockerfile for celery worker -# -FROM ghcr.io/ietf-tools/datatracker-app-base:latest -LABEL maintainer="IETF Tools Team " - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get purge -y imagemagick imagemagick-6-common - -# Copy the startup file -COPY dev/celery/docker-init.sh /docker-init.sh -RUN sed -i 's/\r$//' /docker-init.sh && \ - chmod +x /docker-init.sh - -# Install current datatracker python dependencies -COPY requirements.txt /tmp/pip-tmp/ -RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt -RUN rm -rf /tmp/pip-tmp - -ENTRYPOINT [ "/docker-init.sh" ] \ No newline at end of file diff --git a/dev/celery/docker-init.sh b/dev/celery/docker-init.sh deleted file mode 100755 index 79671bba81d..00000000000 --- a/dev/celery/docker-init.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -e -# -# Environment parameters: -# -# CELERY_APP - name of application to pass to celery (defaults to ietf) -# -# CELERY_ROLE - 'worker' or 'beat' (defaults to 'worker') -# -# CELERY_UID - numeric uid for the celery worker process -# -# CELERY_GID - numeric gid for the celery worker process -# -# UPDATES_REQUIREMENTS_FROM - path, relative to /workspace mount, to a pip requirements -# file that should be installed at container startup. Default is no package install/update. -# -# DEBUG_TERM_TIMING - if non-empty, writes debug messages during shutdown after a TERM signal -# -WORKSPACEDIR="/workspace" -CELERY_ROLE="${CELERY_ROLE:-worker}" - -cd "$WORKSPACEDIR" || exit 255 - -if [[ -n "${UPDATE_REQUIREMENTS_FROM}" ]]; then - # Need to run as root in the container for this - reqs_file="${WORKSPACEDIR}/${UPDATE_REQUIREMENTS_FROM}" - echo "Updating requirements from ${reqs_file}..." - pip install --upgrade -r "${reqs_file}" -fi - -CELERY_OPTS=( "${CELERY_ROLE}" ) -if [[ -n "${CELERY_UID}" ]]; then - # ensure that a user with the necessary UID exists in container - if ! id "${CELERY_UID}" ; then - adduser --system --uid "${CELERY_UID}" --no-create-home --disabled-login "celery-user-${CELERY_UID}" - fi - CELERY_OPTS+=("--uid=${CELERY_UID}") - CELERY_USERNAME="$(id -nu ${CELERY_UID})" -fi - -if [[ -n "${CELERY_GID}" ]]; then - # ensure that some group with the necessary GID exists in container - if ! getent group "${CELERY_GID}" ; then - addgroup --gid "${CELERY_GID}" "celery-group-${CELERY_GID}" - fi - CELERY_OPTS+=("--gid=${CELERY_GID}") - CELERY_GROUP="$(getent group ${CELERY_GID} | awk -F: '{print $1}')" -fi - -run_as_celery_uid () { - SU_OPTS=() - if [[ -n "${CELERY_GROUP}" ]]; then - SU_OPTS+=("-g" "${CELERY_GROUP}") - fi - su "${SU_OPTS[@]}" "${CELERY_USERNAME:-root}" -s /bin/sh -c "$@" -} - -log_term_timing_msgs () { - # output periodic debug message - while true; do - echo "Waiting for celery worker shutdown ($(date --utc --iso-8601=ns))" - sleep 0.5s - done -} - -cleanup () { - # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit. - if [[ -n "${celery_pid}" ]]; then - echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..." - kill -TERM "${celery_pid}" - if [[ -n "${DEBUG_TERM_TIMING}" ]]; then - log_term_timing_msgs & - fi - wait "${celery_pid}" - fi -} - -echo "Running checks as root to apply patches..." -/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check - -if [[ "${CELERY_ROLE}" == "worker" ]]; then - echo "Running initial checks..." - # Run checks as celery worker if one was specified - run_as_celery_uid /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check -fi - -trap 'trap "" TERM; cleanup' TERM -# start celery in the background so we can trap the TERM signal -celery --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" & -celery_pid=$! -wait "${celery_pid}" diff --git a/dev/coverage-action/action.yml b/dev/coverage-action/action.yml index b8d732a5344..60c8de2d92d 100644 --- a/dev/coverage-action/action.yml +++ b/dev/coverage-action/action.yml @@ -35,7 +35,7 @@ outputs: changelog: description: Changelog with headers prepended and coverage stats + chart appended runs: - using: 'node16' + using: 'node20' main: 'index.js' branding: icon: layers diff --git a/dev/coverage-action/index.js b/dev/coverage-action/index.js index 57249bfdb17..5a1c690be3c 100644 --- a/dev/coverage-action/index.js +++ b/dev/coverage-action/index.js @@ -5,20 +5,20 @@ const find = require('lodash/find') const round = require('lodash/round') const fs = require('fs/promises') const { DateTime } = require('luxon') -const isPlainObject = require('lodash/isPlainObject') +// const isPlainObject = require('lodash/isPlainObject') const dec = new TextDecoder() async function main () { const token = core.getInput('token') - const tokenCommon = core.getInput('tokenCommon') + // const tokenCommon = core.getInput('tokenCommon') const inputCovPath = core.getInput('coverageResultsPath') // 'data/coverage-raw.json' const outputCovPath = core.getInput('coverageResultsPath') // 'data/coverage.json' const outputHistPath = core.getInput('histCoveragePath') // 'data/historical-coverage.json' const relVersionRaw = core.getInput('version') // 'v7.47.0' const relVersion = relVersionRaw.indexOf('v') === 0 ? relVersionRaw.substring(1) : relVersionRaw const gh = github.getOctokit(token) - const ghCommon = github.getOctokit(tokenCommon) + // const ghCommon = github.getOctokit(tokenCommon) const owner = github.context.repo.owner // 'ietf-tools' const repo = github.context.repo.repo // 'datatracker' const sender = github.context.payload.sender.login // 'rjsparks' @@ -116,137 +116,137 @@ async function main () { } // -> Coverage Chart - if (chartsDirListing.some(c => c.name === `${newRelease.id}.svg`)) { - console.info(`Chart SVG already exists for ${newRelease.name}, skipping...`) - } else { - console.info(`Generating chart SVG for ${newRelease.name}...`) + // if (chartsDirListing.some(c => c.name === `${newRelease.id}.svg`)) { + // console.info(`Chart SVG already exists for ${newRelease.name}, skipping...`) + // } else { + // console.info(`Generating chart SVG for ${newRelease.name}...`) - const { ChartJSNodeCanvas } = require('chartjs-node-canvas') - const chartJSNodeCanvas = new ChartJSNodeCanvas({ type: 'svg', width: 850, height: 300, backgroundColour: '#FFFFFF' }) + // const { ChartJSNodeCanvas } = require('chartjs-node-canvas') + // const chartJSNodeCanvas = new ChartJSNodeCanvas({ type: 'svg', width: 850, height: 300, backgroundColour: '#FFFFFF' }) - // -> Reorder versions - const versions = [] - for (const [key, value] of Object.entries(covData)) { - if (isPlainObject(value)) { - const vRel = find(releases, r => r.tag_name === key || r.tag_name === `v${key}`) - if (!vRel) { - continue - } - versions.push({ - tag: key, - time: vRel.created_at, - stats: { - code: round(value.code * 100, 2), - template: round(value.template * 100, 2), - url: round(value.url * 100, 2) - } - }) - } - } - const roVersions = orderBy(versions, ['time', 'tag'], ['asc', 'asc']) + // // -> Reorder versions + // const versions = [] + // for (const [key, value] of Object.entries(covData)) { + // if (isPlainObject(value)) { + // const vRel = find(releases, r => r.tag_name === key || r.tag_name === `v${key}`) + // if (!vRel) { + // continue + // } + // versions.push({ + // tag: key, + // time: vRel.created_at, + // stats: { + // code: round(value.code * 100, 2), + // template: round(value.template * 100, 2), + // url: round(value.url * 100, 2) + // } + // }) + // } + // } + // const roVersions = orderBy(versions, ['time', 'tag'], ['asc', 'asc']) - // -> Fill axis + data points - const labels = [] - const datasetCode = [] - const datasetTemplate = [] - const datasetUrl = [] + // // -> Fill axis + data points + // const labels = [] + // const datasetCode = [] + // const datasetTemplate = [] + // const datasetUrl = [] - for (const ver of roVersions) { - labels.push(ver.tag) - datasetCode.push(ver.stats.code) - datasetTemplate.push(ver.stats.template) - datasetUrl.push(ver.stats.url) - } + // for (const ver of roVersions) { + // labels.push(ver.tag) + // datasetCode.push(ver.stats.code) + // datasetTemplate.push(ver.stats.template) + // datasetUrl.push(ver.stats.url) + // } - // -> Generate chart SVG - const outputStream = chartJSNodeCanvas.renderToBufferSync({ - type: 'line', - options: { - borderColor: '#CCC', - layout: { - padding: 20 - }, - plugins: { - legend: { - position: 'bottom', - labels: { - font: { - size: 11 - } - } - } - }, - scales: { - x: { - ticks: { - font: { - size: 10 - } - } - }, - y: { - ticks: { - callback: (value) => { - return `${value}%` - }, - font: { - size: 10 - } - } - } - } - }, - data: { - labels, - datasets: [ - { - label: 'Code', - data: datasetCode, - borderWidth: 2, - borderColor: '#E53935', - backgroundColor: '#C6282833', - fill: false, - cubicInterpolationMode: 'monotone', - tension: 0.4, - pointRadius: 0 - }, - { - label: 'Templates', - data: datasetTemplate, - borderWidth: 2, - borderColor: '#039BE5', - backgroundColor: '#0277BD33', - fill: false, - cubicInterpolationMode: 'monotone', - tension: 0.4, - pointRadius: 0 - }, - { - label: 'URLs', - data: datasetUrl, - borderWidth: 2, - borderColor: '#7CB342', - backgroundColor: '#558B2F33', - fill: false, - cubicInterpolationMode: 'monotone', - tension: 0.4, - pointRadius: 0 - } - ] - } - }, 'image/svg+xml') - const svg = Buffer.from(outputStream).toString('base64') + // // -> Generate chart SVG + // const outputStream = chartJSNodeCanvas.renderToBufferSync({ + // type: 'line', + // options: { + // borderColor: '#CCC', + // layout: { + // padding: 20 + // }, + // plugins: { + // legend: { + // position: 'bottom', + // labels: { + // font: { + // size: 11 + // } + // } + // } + // }, + // scales: { + // x: { + // ticks: { + // font: { + // size: 10 + // } + // } + // }, + // y: { + // ticks: { + // callback: (value) => { + // return `${value}%` + // }, + // font: { + // size: 10 + // } + // } + // } + // } + // }, + // data: { + // labels, + // datasets: [ + // { + // label: 'Code', + // data: datasetCode, + // borderWidth: 2, + // borderColor: '#E53935', + // backgroundColor: '#C6282833', + // fill: false, + // cubicInterpolationMode: 'monotone', + // tension: 0.4, + // pointRadius: 0 + // }, + // { + // label: 'Templates', + // data: datasetTemplate, + // borderWidth: 2, + // borderColor: '#039BE5', + // backgroundColor: '#0277BD33', + // fill: false, + // cubicInterpolationMode: 'monotone', + // tension: 0.4, + // pointRadius: 0 + // }, + // { + // label: 'URLs', + // data: datasetUrl, + // borderWidth: 2, + // borderColor: '#7CB342', + // backgroundColor: '#558B2F33', + // fill: false, + // cubicInterpolationMode: 'monotone', + // tension: 0.4, + // pointRadius: 0 + // } + // ] + // } + // }, 'image/svg+xml') + // const svg = Buffer.from(outputStream).toString('base64') - // -> Upload to common repo - console.info(`Uploading chart SVG for ${newRelease.name}...`) - await ghCommon.rest.repos.createOrUpdateFileContents({ - owner, - repo: repoCommon, - path: `assets/graphs/datatracker/${newRelease.id}.svg`, - message: `chore: update datatracker release chart for release ${newRelease.name}`, - content: svg - }) - } + // // -> Upload to common repo + // console.info(`Uploading chart SVG for ${newRelease.name}...`) + // await ghCommon.rest.repos.createOrUpdateFileContents({ + // owner, + // repo: repoCommon, + // path: `assets/graphs/datatracker/${newRelease.id}.svg`, + // message: `chore: update datatracker release chart for release ${newRelease.name}`, + // content: svg + // }) + // } // -> Add to changelog body let formattedBody = '' @@ -265,7 +265,7 @@ async function main () { formattedBody += `![](https://img.shields.io/badge/Code-${covInfo.code}%25-${getCoverageColor(covInfo.code)}?style=flat-square)` formattedBody += `![](https://img.shields.io/badge/Templates-${covInfo.template}%25-${getCoverageColor(covInfo.template)}?style=flat-square)` formattedBody += `![](https://img.shields.io/badge/URLs-${covInfo.url}%25-${getCoverageColor(covInfo.url)}?style=flat-square)\n\n` - formattedBody += `![chart](https://raw.githubusercontent.com/${owner}/${repoCommon}/main/assets/graphs/datatracker/${newRelease.id}.svg)` + // formattedBody += `![chart](https://raw.githubusercontent.com/${owner}/${repoCommon}/main/assets/graphs/datatracker/${newRelease.id}.svg)` core.setOutput('changelog', formattedBody) } diff --git a/dev/coverage-action/package-lock.json b/dev/coverage-action/package-lock.json index 15feb073eb9..09570ee0e4b 100644 --- a/dev/coverage-action/package-lock.json +++ b/dev/coverage-action/package-lock.json @@ -9,10553 +9,510 @@ "version": "1.0.0", "license": "BSD-3-Clause", "dependencies": { - "@actions/core": "1.10.0", - "@actions/github": "5.1.1", - "chart.js": "3.5.1", - "chartjs-node-canvas": "4.1.6", + "@actions/core": "1.11.1", + "@actions/github": "6.0.1", "lodash": "4.17.21", - "luxon": "3.3.0" - }, - "devDependencies": { - "eslint": "8.39.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.1.1", - "npm-check-updates": "16.10.8" + "luxon": "3.7.1" } }, "node_modules/@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", + "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", + "dependencies": { + "@actions/exec": "^1.1.1", + "@actions/http-client": "^2.0.1" + } + }, + "node_modules/@actions/exec": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", + "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", "dependencies": { - "@actions/http-client": "^2.0.1", - "uuid": "^8.3.2" + "@actions/io": "^1.0.1" } }, "node_modules/@actions/github": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz", - "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz", + "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==", + "license": "MIT", "dependencies": { - "@actions/http-client": "^2.0.1", - "@octokit/core": "^3.6.0", - "@octokit/plugin-paginate-rest": "^2.17.0", - "@octokit/plugin-rest-endpoint-methods": "^5.13.0" + "@actions/http-client": "^2.2.0", + "@octokit/core": "^5.0.1", + "@octokit/plugin-paginate-rest": "^9.2.2", + "@octokit/plugin-rest-endpoint-methods": "^10.4.0", + "@octokit/request": "^8.4.1", + "@octokit/request-error": "^5.1.1", + "undici": "^5.28.5" } }, "node_modules/@actions/http-client": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", - "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz", + "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==", "dependencies": { - "tunnel": "^0.0.6" + "tunnel": "^0.0.6", + "undici": "^5.25.4" } }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true, + "node_modules/@actions/io": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" + }, + "node_modules/@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", "engines": { - "node": ">=0.1.90" + "node": ">=14" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz", - "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, + "node_modules/@octokit/auth-token": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz", + "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==", + "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">= 18" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz", - "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==", - "dev": true, + "node_modules/@octokit/core": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz", + "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==", + "license": "MIT", + "dependencies": { + "@octokit/auth-token": "^4.0.0", + "@octokit/graphql": "^7.1.0", + "@octokit/request": "^8.4.1", + "@octokit/request-error": "^5.1.1", + "@octokit/types": "^13.0.0", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" + }, "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">= 18" } }, - "node_modules/@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", - "dev": true, + "node_modules/@octokit/endpoint": { + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz", + "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==", + "license": "MIT", "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.5.1", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" + "@octokit/types": "^13.1.0", + "universal-user-agent": "^6.0.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">= 18" } }, - "node_modules/@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", - "dev": true, + "node_modules/@octokit/graphql": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz", + "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==", + "license": "MIT", + "dependencies": { + "@octokit/request": "^8.4.1", + "@octokit/types": "^13.0.0", + "universal-user-agent": "^6.0.0" + }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">= 18" } }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true + "node_modules/@octokit/openapi-types": { + "version": "24.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz", + "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==", + "license": "MIT" }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", - "dev": true, + "node_modules/@octokit/plugin-paginate-rest": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz", + "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==", + "license": "MIT", "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" + "@octokit/types": "^12.6.0" }, "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" + "node": ">= 18" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "peerDependencies": { + "@octokit/core": "5" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", + "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==", + "license": "MIT" }, - "node_modules/@mapbox/node-pre-gyp": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", - "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", + "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", + "license": "MIT", "dependencies": { - "detect-libc": "^1.0.3", - "https-proxy-agent": "^5.0.0", - "make-dir": "^3.1.0", - "node-fetch": "^2.6.5", - "nopt": "^5.0.0", - "npmlog": "^5.0.1", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.11" - }, - "bin": { - "node-pre-gyp": "bin/node-pre-gyp" + "@octokit/openapi-types": "^20.0.0" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz", + "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==", + "license": "MIT", "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "@octokit/types": "^12.6.0" }, "engines": { - "node": ">= 8" + "node": ">= 18" + }, + "peerDependencies": { + "@octokit/core": "5" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", + "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==", + "license": "MIT" }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", + "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", + "license": "MIT", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" + "@octokit/openapi-types": "^20.0.0" } }, - "node_modules/@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "dependencies": { - "semver": "^7.3.5" + "node_modules/@octokit/request": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz", + "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==", + "license": "MIT", + "dependencies": { + "@octokit/endpoint": "^9.0.6", + "@octokit/request-error": "^5.1.1", + "@octokit/types": "^13.1.0", + "universal-user-agent": "^6.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 18" } }, - "node_modules/@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", - "dev": true, + "node_modules/@octokit/request-error": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz", + "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==", + "license": "MIT", "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" + "@octokit/types": "^13.1.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" + "node": ">= 18" } }, - "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, + "node_modules/@octokit/types": { + "version": "13.10.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz", + "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==", + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "@octokit/openapi-types": "^24.2.0" } }, - "node_modules/@npmcli/installed-package-contents": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", - "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", - "dev": true, - "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "bin": { - "installed-package-contents": "lib/index.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "node_modules/before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "license": "Apache-2.0" }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } + "node_modules/deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", + "license": "ISC" }, - "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "dependencies": { - "which": "^3.0.0" - }, + "node_modules/luxon": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz", + "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=12" } }, - "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "wrappy": "1" } }, - "node_modules/@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", - "dev": true, - "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, + "node_modules/tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=0.6.11 <=0.7.0 || >=0.7.3" } }, - "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, + "node_modules/undici": { + "version": "5.29.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", + "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" + "@fastify/busboy": "^2.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=14.0" } }, - "node_modules/@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", - "dependencies": { - "@octokit/types": "^6.0.3" + "node_modules/universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "license": "ISC" + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + } + }, + "dependencies": { + "@actions/core": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", + "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", + "requires": { + "@actions/exec": "^1.1.1", + "@actions/http-client": "^2.0.1" } }, - "node_modules/@octokit/core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz", - "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==", - "dependencies": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.3", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" + "@actions/exec": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", + "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", + "requires": { + "@actions/io": "^1.0.1" } }, - "node_modules/@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", - "dependencies": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" + "@actions/github": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz", + "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==", + "requires": { + "@actions/http-client": "^2.2.0", + "@octokit/core": "^5.0.1", + "@octokit/plugin-paginate-rest": "^9.2.2", + "@octokit/plugin-rest-endpoint-methods": "^10.4.0", + "@octokit/request": "^8.4.1", + "@octokit/request-error": "^5.1.1", + "undici": "^5.28.5" } }, - "node_modules/@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", - "dependencies": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", - "universal-user-agent": "^6.0.0" + "@actions/http-client": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz", + "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==", + "requires": { + "tunnel": "^0.0.6", + "undici": "^5.25.4" } }, - "node_modules/@octokit/openapi-types": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz", - "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==" + "@actions/io": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" }, - "node_modules/@octokit/plugin-paginate-rest": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz", - "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==", - "dependencies": { - "@octokit/types": "^6.34.0" - }, - "peerDependencies": { - "@octokit/core": ">=2" - } + "@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==" }, - "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz", - "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==", - "dependencies": { - "@octokit/types": "^6.34.0", - "deprecation": "^2.3.1" - }, - "peerDependencies": { - "@octokit/core": ">=3" - } + "@octokit/auth-token": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz", + "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==" }, - "node_modules/@octokit/request": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz", - "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==", - "dependencies": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", + "@octokit/core": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz", + "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==", + "requires": { + "@octokit/auth-token": "^4.0.0", + "@octokit/graphql": "^7.1.0", + "@octokit/request": "^8.4.1", + "@octokit/request-error": "^5.1.1", + "@octokit/types": "^13.0.0", + "before-after-hook": "^2.2.0", "universal-user-agent": "^6.0.0" } }, - "node_modules/@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", - "dependencies": { - "@octokit/types": "^6.0.3", - "deprecation": "^2.0.0", - "once": "^1.4.0" + "@octokit/endpoint": { + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz", + "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==", + "requires": { + "@octokit/types": "^13.1.0", + "universal-user-agent": "^6.0.0" } }, - "node_modules/@octokit/types": { - "version": "6.34.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz", - "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==", - "dependencies": { - "@octokit/openapi-types": "^11.2.0" + "@octokit/graphql": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz", + "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==", + "requires": { + "@octokit/request": "^8.4.1", + "@octokit/types": "^13.0.0", + "universal-user-agent": "^6.0.0" } }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.0.0.tgz", - "integrity": "sha512-ZVPVDi1E8oeXlYqkGRtX0CkzLTwE2zt62bjWaWKaAvI8NZqHzlMvGeSNDpW+JB3+aKanYb4UETJOF1/CxGPemA==", - "dev": true, - "engines": { - "node": ">=12.22.0" - } + "@octokit/openapi-types": { + "version": "24.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz", + "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==" }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", - "dev": true, - "dependencies": { - "graceful-fs": "4.2.10" + "@octokit/plugin-paginate-rest": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz", + "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==", + "requires": { + "@octokit/types": "^12.6.0" }, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/@pnpm/npm-conf": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.1.0.tgz", - "integrity": "sha512-Oe6ntvgsMTE3hDIqy6sajqHF+MnzJrOF06qC2QSiUEybLL7cp6tjoKUa32gpd9+KPVl4QyMs3E3nsXrx/Vdnlw==", - "dev": true, "dependencies": { - "@pnpm/config.env-replace": "^1.0.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "@octokit/openapi-types": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", + "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==" + }, + "@octokit/types": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", + "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", + "requires": { + "@octokit/openapi-types": "^20.0.0" + } + } } }, - "node_modules/@sindresorhus/is": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", - "integrity": "sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==", - "dev": true, - "engines": { - "node": ">=14.16" + "@octokit/plugin-rest-endpoint-methods": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz", + "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==", + "requires": { + "@octokit/types": "^12.6.0" }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", - "dev": true, "dependencies": { - "defer-to-connect": "^2.0.1" - }, - "engines": { - "node": ">=14.16" + "@octokit/openapi-types": { + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", + "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==" + }, + "@octokit/types": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", + "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", + "requires": { + "@octokit/openapi-types": "^20.0.0" + } + } } }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" + "@octokit/request": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz", + "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==", + "requires": { + "@octokit/endpoint": "^9.0.6", + "@octokit/request-error": "^5.1.1", + "@octokit/types": "^13.1.0", + "universal-user-agent": "^6.0.0" } }, - "node_modules/@tufjs/models": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.0.tgz", - "integrity": "sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==", - "dev": true, - "dependencies": { - "minimatch": "^6.1.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "@octokit/request-error": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz", + "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==", + "requires": { + "@octokit/types": "^13.1.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" } }, - "node_modules/@tufjs/models/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" + "@octokit/types": { + "version": "13.10.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz", + "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==", + "requires": { + "@octokit/openapi-types": "^24.2.0" } }, - "node_modules/@tufjs/models/node_modules/minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==" }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", - "dev": true + "deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "luxon": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz", + "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==" }, - "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" } }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" + "undici": { + "version": "5.29.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", + "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", + "requires": { + "@fastify/busboy": "^2.0.0" } }, - "node_modules/agentkeepalive": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz", - "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==", - "dev": true, - "dependencies": { - "debug": "^4.1.0", - "depd": "^2.0.0", - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "dependencies": { - "string-width": "^4.1.0" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" - }, - "node_modules/are-we-there-yet": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", - "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/before-after-hook": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz", - "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==" - }, - "node_modules/boxen": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.0.2.tgz", - "integrity": "sha512-1Z4UJabXUP1/R9rLpoU3O2lEMnG3pPLAs/ZD2lF3t2q7qD5lM8rqbtnvtvm4N0wEyNlE+9yZVTVAGmd1V5jabg==", - "dev": true, - "dependencies": { - "ansi-align": "^3.0.1", - "camelcase": "^7.0.0", - "chalk": "^5.0.1", - "cli-boxes": "^3.0.0", - "string-width": "^5.1.2", - "type-fest": "^2.13.0", - "widest-line": "^4.0.1", - "wrap-ansi": "^8.0.1" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/boxen/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/boxen/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/boxen/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/boxen/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "dependencies": { - "semver": "^7.0.0" - } - }, - "node_modules/cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^8.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/cacache/node_modules/fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacache/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", - "dev": true, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.8.tgz", - "integrity": "sha512-IDVO5MJ4LItE6HKFQTqT2ocAQsisOoCTUDu1ddCmnhyiwFQjXNPp4081Xj23N4tO+AFEFNzGuNEf/c8Gwwt15A==", - "dev": true, - "dependencies": { - "@types/http-cache-semantics": "^4.0.1", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.2", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request/node_modules/mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", - "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/canvas": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz", - "integrity": "sha512-vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A==", - "hasInstallScript": true, - "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.0", - "nan": "^2.15.0", - "simple-get": "^3.0.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" - }, - "node_modules/chartjs-node-canvas": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/chartjs-node-canvas/-/chartjs-node-canvas-4.1.6.tgz", - "integrity": "sha512-UQJbPWrvqB/FoLclGA9BaLQmZbzSYlujF4w8NZd6Xzb+sqgACBb2owDX6m7ifCXLjUW5Nz0Qx0qqrTtQkkSoYw==", - "dependencies": { - "canvas": "^2.8.0", - "tslib": "^2.3.1" - }, - "peerDependencies": { - "chart.js": "^3.5.1" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-boxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0" - }, - "engines": { - "node": "10.* || >= 12.*" - }, - "optionalDependencies": { - "@colors/colors": "1.5.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/commander": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", - "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", - "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dev": true, - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/configstore": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", - "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", - "dev": true, - "dependencies": { - "dot-prop": "^6.0.1", - "graceful-fs": "^4.2.6", - "unique-string": "^3.0.0", - "write-file-atomic": "^3.0.3", - "xdg-basedir": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/yeoman/configstore?sponsor=1" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", - "dev": true, - "dependencies": { - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/crypto-random-string/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "dependencies": { - "mimic-response": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dev": true, - "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" - }, - "node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escape-goat": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "peerDependencies": { - "eslint": "^8.0.1", - "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0", - "eslint-plugin-promise": "^6.0.0" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", - "dev": true, - "dependencies": { - "debug": "^3.2.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-n": { - "version": "15.6.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz", - "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==", - "dev": true, - "peer": true, - "dependencies": { - "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", - "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=12.22.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "peer": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-plugin-n/node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-plugin-n/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", - "dev": true, - "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "engines": { - "node": ">=8.10.0" - }, - "peerDependencies": { - "eslint": ">=5.16.0" - } - }, - "node_modules/eslint-plugin-node/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-promise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", - "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - } - }, - "node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", - "dev": true, - "dependencies": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", - "dev": true - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true, - "engines": { - "node": ">= 14.17" - } - }, - "node_modules/fp-and-or": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz", - "integrity": "sha512-wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gauge": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", - "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.2", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.1", - "object-assign": "^4.1.1", - "signal-exit": "^3.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", - "dev": true, - "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/got/node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/got/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" - }, - "node_modules/has-yarn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", - "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/hosted-git-info": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", - "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http2-wrapper": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", - "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", - "dev": true, - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/ignore-walk": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.1.tgz", - "integrity": "sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==", - "dev": true, - "dependencies": { - "minimatch": "^6.1.6" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ignore-walk/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/ignore-walk/node_modules/minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.0.tgz", - "integrity": "sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", - "dev": true - }, - "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-npm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", - "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-yarn-global": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", - "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true - }, - "node_modules/js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "dependencies": { - "jju": "^1.1.0" - } - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/jsonlines": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", - "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", - "dev": true - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ] - }, - "node_modules/keyv": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", - "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/latest-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", - "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", - "dev": true, - "dependencies": { - "package-json": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", - "engines": { - "node": ">=12" - } - }, - "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/make-fetch-happen/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", - "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "node_modules/minipass": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", - "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/normalize-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", - "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", - "dev": true, - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates": { - "version": "16.10.8", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.8.tgz", - "integrity": "sha512-e+p3rUCvaU0iKOvi+/Xiyx+mLe9/aRTu9Zrc7+TR6H2q+uFgmXEwqbXYN9Ngqsta8gdTjpn751UD5MEOogO5cA==", - "dev": true, - "dependencies": { - "chalk": "^5.2.0", - "cli-table3": "^0.6.3", - "commander": "^10.0.0", - "fast-memoize": "^2.5.2", - "find-up": "5.0.0", - "fp-and-or": "^0.1.3", - "get-stdin": "^8.0.0", - "globby": "^11.0.4", - "hosted-git-info": "^5.1.0", - "ini": "^4.0.0", - "js-yaml": "^4.1.0", - "json-parse-helpfulerror": "^1.0.3", - "jsonlines": "^0.1.1", - "lodash": "^4.17.21", - "minimatch": "^8.0.3", - "p-map": "^4.0.0", - "pacote": "15.1.1", - "parse-github-url": "^1.0.2", - "progress": "^2.0.3", - "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.2", - "remote-git-tags": "^3.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.8", - "semver-utils": "^1.1.4", - "source-map-support": "^0.5.21", - "spawn-please": "^2.0.1", - "strip-json-comments": "^5.0.0", - "untildify": "^4.0.0", - "update-notifier": "^6.0.2" - }, - "bin": { - "ncu": "build/src/bin/cli.js", - "npm-check-updates": "build/src/bin/cli.js" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/npm-check-updates/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/npm-check-updates/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/npm-check-updates/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/minipass": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", - "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-check-updates/node_modules/rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", - "dev": true, - "dependencies": { - "glob": "^9.2.0" - }, - "bin": { - "rimraf": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/npm-check-updates/node_modules/strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", - "dev": true, - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", - "dev": true, - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", - "dev": true, - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/npmlog": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", - "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", - "dependencies": { - "are-we-there-yet": "^2.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^3.0.0", - "set-blocking": "^2.0.0" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "dev": true, - "engines": { - "node": ">=12.20" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz", - "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==", - "dev": true, - "dependencies": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pacote": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz", - "integrity": "sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==", - "dev": true, - "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-github-url": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz", - "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==", - "dev": true, - "bin": { - "parse-github-url": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-scurry": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.7.0.tgz", - "integrity": "sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==", - "dev": true, - "dependencies": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz", - "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/prompts-ncu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", - "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", - "dev": true, - "dependencies": { - "kleur": "^4.0.1", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true - }, - "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pupa": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", - "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", - "dev": true, - "dependencies": { - "escape-goat": "^4.0.0" - }, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc-config-loader": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.2.tgz", - "integrity": "sha512-qKTnVWFl9OQYKATPzdfaZIbTxcHziQl92zYSxYC6umhOqyAsoj8H8Gq/+aFjAso68sBdjTz3A7omqeAkkF1MWg==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "js-yaml": "^4.1.0", - "json5": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, - "node_modules/rc-config-loader/node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", - "dev": true, - "dependencies": { - "glob": "^8.0.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/read-package-json/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/read-package-json/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "dependencies": { - "@pnpm/npm-conf": "^2.1.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/registry-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", - "dev": true, - "dependencies": { - "rc": "1.2.8" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/remote-git-tags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", - "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "dependencies": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dev": true, - "dependencies": { - "lowercase-keys": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "optional": true - }, - "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dev": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/semver-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", - "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", - "dev": true - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/sigstore": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.1.1.tgz", - "integrity": "sha512-4hR3tPP1y59YWlaoAgAWFVZ7srTjNWOrrpkQXWu05qP0BvwFYyt3K3l848+IHo+mKhkOzGcNDf7ktASXLEPC+A==", - "dev": true, - "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" - }, - "bin": { - "sigstore": "bin/sigstore.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/sigstore/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/simple-get": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", - "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", - "dependencies": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", - "dev": true, - "dependencies": { - "ip": "^2.0.0", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.13.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/spawn-please": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.1.tgz", - "integrity": "sha512-W+cFbZR2q2mMTfjz5ZGvhBAiX+e/zczFCNlbS9mxiSdYswBXwUuBUT+a0urH+xZZa8f/bs0mXHyZsZHR9hKogA==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", - "dev": true - }, - "node_modules/ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ssri/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, - "node_modules/tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - }, - "node_modules/tuf-js": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.1.tgz", - "integrity": "sha512-WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw==", - "dev": true, - "dependencies": { - "@tufjs/models": "1.0.0", - "make-fetch-happen": "^11.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/tuf-js/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/tuf-js/node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/tuf-js/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "engines": { - "node": ">=0.6.11 <=0.7.0 || >=0.7.3" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", - "dev": true, - "dependencies": { - "crypto-random-string": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/universal-user-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", - "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==" - }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/update-notifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", - "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", - "dev": true, - "dependencies": { - "boxen": "^7.0.0", - "chalk": "^5.0.1", - "configstore": "^6.0.0", - "has-yarn": "^3.0.0", - "import-lazy": "^4.0.0", - "is-ci": "^3.0.1", - "is-installed-globally": "^0.4.0", - "is-npm": "^6.0.0", - "is-yarn-global": "^0.4.0", - "latest-version": "^7.0.0", - "pupa": "^3.1.0", - "semver": "^7.3.7", - "semver-diff": "^4.0.0", - "xdg-basedir": "^5.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "dependencies": { - "builtins": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/widest-line": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", - "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", - "dev": true, - "dependencies": { - "string-width": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/widest-line/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/widest-line/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/widest-line/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/widest-line/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - }, - "dependencies": { - "@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", - "requires": { - "@actions/http-client": "^2.0.1", - "uuid": "^8.3.2" - } - }, - "@actions/github": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz", - "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==", - "requires": { - "@actions/http-client": "^2.0.1", - "@octokit/core": "^3.6.0", - "@octokit/plugin-paginate-rest": "^2.17.0", - "@octokit/plugin-rest-endpoint-methods": "^5.13.0" - } - }, - "@actions/http-client": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz", - "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==", - "requires": { - "tunnel": "^0.0.6" - } - }, - "@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true - }, - "@eslint-community/eslint-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz", - "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^3.3.0" - } - }, - "@eslint-community/regexpp": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz", - "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==", - "dev": true - }, - "@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.5.1", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - } - }, - "@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", - "dev": true - }, - "@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, - "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@mapbox/node-pre-gyp": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", - "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", - "requires": { - "detect-libc": "^1.0.3", - "https-proxy-agent": "^5.0.0", - "make-dir": "^3.1.0", - "node-fetch": "^2.6.5", - "nopt": "^5.0.0", - "npmlog": "^5.0.1", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.11" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - }, - "@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", - "dev": true, - "requires": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@npmcli/installed-package-contents": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", - "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", - "dev": true, - "requires": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - } - }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, - "@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true - }, - "@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "requires": { - "which": "^3.0.0" - }, - "dependencies": { - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", - "dev": true, - "requires": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, - "dependencies": { - "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", - "requires": { - "@octokit/types": "^6.0.3" - } - }, - "@octokit/core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz", - "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==", - "requires": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.3", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", - "requires": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", - "requires": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/openapi-types": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz", - "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==" - }, - "@octokit/plugin-paginate-rest": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz", - "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==", - "requires": { - "@octokit/types": "^6.34.0" - } - }, - "@octokit/plugin-rest-endpoint-methods": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz", - "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==", - "requires": { - "@octokit/types": "^6.34.0", - "deprecation": "^2.3.1" - } - }, - "@octokit/request": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz", - "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==", - "requires": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", - "universal-user-agent": "^6.0.0" - } - }, - "@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", - "requires": { - "@octokit/types": "^6.0.3", - "deprecation": "^2.0.0", - "once": "^1.4.0" - } - }, - "@octokit/types": { - "version": "6.34.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz", - "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==", - "requires": { - "@octokit/openapi-types": "^11.2.0" - } - }, - "@pnpm/config.env-replace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.0.0.tgz", - "integrity": "sha512-ZVPVDi1E8oeXlYqkGRtX0CkzLTwE2zt62bjWaWKaAvI8NZqHzlMvGeSNDpW+JB3+aKanYb4UETJOF1/CxGPemA==", - "dev": true - }, - "@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", - "dev": true, - "requires": { - "graceful-fs": "4.2.10" - }, - "dependencies": { - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - } - } - }, - "@pnpm/npm-conf": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.1.0.tgz", - "integrity": "sha512-Oe6ntvgsMTE3hDIqy6sajqHF+MnzJrOF06qC2QSiUEybLL7cp6tjoKUa32gpd9+KPVl4QyMs3E3nsXrx/Vdnlw==", - "dev": true, - "requires": { - "@pnpm/config.env-replace": "^1.0.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" - } - }, - "@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", - "dev": true - }, - "@sindresorhus/is": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", - "integrity": "sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==", - "dev": true - }, - "@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", - "dev": true, - "requires": { - "defer-to-connect": "^2.0.1" - } - }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "@tufjs/models": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.0.tgz", - "integrity": "sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==", - "dev": true, - "requires": { - "minimatch": "^6.1.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "@types/http-cache-semantics": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", - "dev": true - }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, - "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "requires": { - "debug": "4" - } - }, - "agentkeepalive": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz", - "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "depd": "^2.0.0", - "humanize-ms": "^1.2.1" - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "requires": { - "string-width": "^4.1.0" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" - }, - "are-we-there-yet": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", - "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - } - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - } - }, - "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "is-string": "^1.0.7" - } - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - } - }, - "array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - } - }, - "available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "before-after-hook": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz", - "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==" - }, - "boxen": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.0.2.tgz", - "integrity": "sha512-1Z4UJabXUP1/R9rLpoU3O2lEMnG3pPLAs/ZD2lF3t2q7qD5lM8rqbtnvtvm4N0wEyNlE+9yZVTVAGmd1V5jabg==", - "dev": true, - "requires": { - "ansi-align": "^3.0.1", - "camelcase": "^7.0.0", - "chalk": "^5.0.1", - "cli-boxes": "^3.0.0", - "string-width": "^5.1.2", - "type-fest": "^2.13.0", - "widest-line": "^4.0.1", - "wrap-ansi": "^8.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - }, - "type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", - "dev": true, - "requires": { - "semver": "^7.0.0" - } - }, - "cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", - "dev": true, - "requires": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^8.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - } - } - }, - "cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", - "dev": true - }, - "cacheable-request": { - "version": "10.2.8", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.8.tgz", - "integrity": "sha512-IDVO5MJ4LItE6HKFQTqT2ocAQsisOoCTUDu1ddCmnhyiwFQjXNPp4081Xj23N4tO+AFEFNzGuNEf/c8Gwwt15A==", - "dev": true, - "requires": { - "@types/http-cache-semantics": "^4.0.1", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.2", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, - "dependencies": { - "mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "dev": true - } - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", - "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", - "dev": true - }, - "canvas": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz", - "integrity": "sha512-vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A==", - "requires": { - "@mapbox/node-pre-gyp": "^1.0.0", - "nan": "^2.15.0", - "simple-get": "^3.0.3" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" - }, - "chartjs-node-canvas": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/chartjs-node-canvas/-/chartjs-node-canvas-4.1.6.tgz", - "integrity": "sha512-UQJbPWrvqB/FoLclGA9BaLQmZbzSYlujF4w8NZd6Xzb+sqgACBb2owDX6m7ifCXLjUW5Nz0Qx0qqrTtQkkSoYw==", - "requires": { - "canvas": "^2.8.0", - "tslib": "^2.3.1" - } - }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" - }, - "ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-boxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", - "dev": true - }, - "cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "requires": { - "@colors/colors": "1.5.0", - "string-width": "^4.2.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" - }, - "commander": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", - "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dev": true, - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - }, - "dependencies": { - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - } - } - }, - "configstore": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", - "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", - "dev": true, - "requires": { - "dot-prop": "^6.0.1", - "graceful-fs": "^4.2.6", - "unique-string": "^3.0.0", - "write-file-atomic": "^3.0.3", - "xdg-basedir": "^5.0.1" - } - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", - "dev": true, - "requires": { - "type-fest": "^1.0.1" - }, - "dependencies": { - "type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true - } - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "requires": { - "mimic-response": "^2.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true - }, - "define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dev": true, - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "requires": { - "is-obj": "^2.0.0" - } - }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "optional": true, - "requires": { - "iconv-lite": "^0.6.2" - } - }, - "env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true - }, - "err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", - "dev": true, - "requires": { - "array-buffer-byte-length": "^1.0.0", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" - } - }, - "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - } - }, - "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "escape-goat": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0" - }, - "dependencies": { - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - } - } - }, - "eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", - "dev": true, - "requires": {} - }, - "eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", - "dev": true, - "requires": { - "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", - "dev": true, - "requires": { - "debug": "^3.2.7" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "eslint-plugin-es": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", - "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", - "dev": true, - "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - } - }, - "eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", - "dev": true, - "requires": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "eslint-plugin-n": { - "version": "15.6.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz", - "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==", - "dev": true, - "peer": true, - "requires": { - "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", - "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" - }, - "dependencies": { - "eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", - "dev": true, - "peer": true, - "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "dependencies": { - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "peer": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "peer": true - } - } - }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "peer": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "peer": true - } - } - }, - "eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", - "dev": true, - "requires": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "eslint-plugin-promise": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", - "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", - "dev": true, - "requires": {} - }, - "eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } - } - }, - "eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", - "dev": true - }, - "espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", - "dev": true, - "requires": { - "acorn": "^8.8.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" - } - }, - "esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true - }, - "fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", - "dev": true - }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "requires": { - "is-callable": "^1.1.3" - } - }, - "form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true - }, - "fp-and-or": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz", - "integrity": "sha512-wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==", - "dev": true - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "requires": { - "minipass": "^3.0.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - } - }, - "functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true - }, - "gauge": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", - "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", - "requires": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.2", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.1", - "object-assign": "^4.1.1", - "signal-exit": "^3.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.2" - } - }, - "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, - "get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - } - }, - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "requires": { - "ini": "2.0.0" - }, - "dependencies": { - "ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true - } - } - }, - "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", - "dev": true, - "requires": { - "type-fest": "^0.20.2" - } - }, - "globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.3" - } - }, - "got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", - "dev": true, - "requires": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "dependencies": { - "decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "requires": { - "mimic-response": "^3.1.0" - } - }, - "mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true - } - } - }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" - }, - "has-yarn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", - "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", - "dev": true - }, - "hosted-git-info": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", - "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - } - } - }, - "http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true - }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, - "http2-wrapper": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", - "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", - "dev": true, - "requires": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - } - }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "requires": { - "ms": "^2.0.0" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "ignore-walk": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.1.tgz", - "integrity": "sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==", - "dev": true, - "requires": { - "minimatch": "^6.1.6" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.0.tgz", - "integrity": "sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ==", - "dev": true - }, - "internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dev": true, - "requires": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - } - }, - "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", - "dev": true - }, - "is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - } - }, - "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "requires": { - "has-bigints": "^1.0.1" - } - }, - "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true - }, - "is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "requires": { - "ci-info": "^3.2.0" - } - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "requires": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - } - }, - "is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true - }, - "is-npm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", - "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2" - } - }, - "is-yarn-global": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", - "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true - }, - "js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true - }, - "json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "requires": { - "jju": "^1.1.0" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "jsonlines": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", - "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", - "dev": true - }, - "jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true - }, - "keyv": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", - "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==", - "dev": true, - "requires": { - "json-buffer": "3.0.1" - } - }, - "kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true - }, - "latest-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", - "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", - "dev": true, - "requires": { - "package-json": "^8.1.0" - } - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, - "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "dependencies": { - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - } - } - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", - "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "minipass": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", - "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", - "requires": { - "yallist": "^4.0.0" - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "requires": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true - }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", - "dev": true, - "requires": { - "env-paths": "^2.2.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "dependencies": { - "are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - } - }, - "gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, - "requires": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - } - }, - "nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "requires": { - "abbrev": "^1.0.0" - } - }, - "npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "requires": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - } - } - } - }, - "nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "requires": { - "abbrev": "1" - } - }, - "normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "dependencies": { - "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - } - }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - } - } - }, - "normalize-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", - "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", - "dev": true - }, - "npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", - "dev": true, - "requires": { - "npm-normalize-package-bin": "^3.0.0" - } - }, - "npm-check-updates": { - "version": "16.10.8", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.8.tgz", - "integrity": "sha512-e+p3rUCvaU0iKOvi+/Xiyx+mLe9/aRTu9Zrc7+TR6H2q+uFgmXEwqbXYN9Ngqsta8gdTjpn751UD5MEOogO5cA==", - "dev": true, - "requires": { - "chalk": "^5.2.0", - "cli-table3": "^0.6.3", - "commander": "^10.0.0", - "fast-memoize": "^2.5.2", - "find-up": "5.0.0", - "fp-and-or": "^0.1.3", - "get-stdin": "^8.0.0", - "globby": "^11.0.4", - "hosted-git-info": "^5.1.0", - "ini": "^4.0.0", - "js-yaml": "^4.1.0", - "json-parse-helpfulerror": "^1.0.3", - "jsonlines": "^0.1.1", - "lodash": "^4.17.21", - "minimatch": "^8.0.3", - "p-map": "^4.0.0", - "pacote": "15.1.1", - "parse-github-url": "^1.0.2", - "progress": "^2.0.3", - "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.2", - "remote-git-tags": "^3.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.8", - "semver-utils": "^1.1.4", - "source-map-support": "^0.5.21", - "spawn-please": "^2.0.1", - "strip-json-comments": "^5.0.0", - "untildify": "^4.0.0", - "update-notifier": "^6.0.2" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true - }, - "glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" - } - }, - "minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", - "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", - "dev": true - }, - "rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", - "dev": true, - "requires": { - "glob": "^9.2.0" - } - }, - "strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", - "dev": true - } - } - }, - "npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", - "dev": true, - "requires": { - "semver": "^7.1.1" - } - }, - "npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", - "dev": true - }, - "npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "requires": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "dependencies": { - "hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "requires": { - "lru-cache": "^7.5.1" - } - }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - } - } - }, - "npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "requires": { - "ignore-walk": "^6.0.0" - } - }, - "npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", - "dev": true, - "requires": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - } - }, - "npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", - "dev": true, - "requires": { - "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } - } - }, - "npmlog": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", - "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", - "requires": { - "are-we-there-yet": "^2.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^3.0.0", - "set-blocking": "^2.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - } - }, - "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" - } - }, - "p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "dev": true - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "package-json": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz", - "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==", - "dev": true, - "requires": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" - } - }, - "pacote": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz", - "integrity": "sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==", - "dev": true, - "requires": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "dependencies": { - "fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - } - }, - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - } - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-github-url": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz", - "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-scurry": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.7.0.tgz", - "integrity": "sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==", - "dev": true, - "requires": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz", - "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==", - "dev": true - }, - "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true - } - } - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "requires": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - } - }, - "prompts-ncu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", - "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", - "dev": true, - "requires": { - "kleur": "^4.0.1", - "sisteransi": "^1.0.5" - } - }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true - }, - "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true - }, - "pupa": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", - "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", - "dev": true, - "requires": { - "escape-goat": "^4.0.0" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true - } - } - }, - "rc-config-loader": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.2.tgz", - "integrity": "sha512-qKTnVWFl9OQYKATPzdfaZIbTxcHziQl92zYSxYC6umhOqyAsoj8H8Gq/+aFjAso68sBdjTz3A7omqeAkkF1MWg==", - "dev": true, - "requires": { - "debug": "^4.3.4", - "js-yaml": "^4.1.0", - "json5": "^2.2.2", - "require-from-string": "^2.0.2" - }, - "dependencies": { - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true - } - } - }, - "read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", - "dev": true, - "requires": { - "glob": "^8.0.1", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "dependencies": { - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, - "read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "requires": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" - } - }, - "regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true - }, - "registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "requires": { - "@pnpm/npm-conf": "^2.1.0" - } - }, - "registry-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", - "dev": true, - "requires": { - "rc": "1.2.8" - } - }, - "remote-git-tags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", - "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dev": true, - "requires": { - "lowercase-keys": "^3.0.0" - } - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "optional": true - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "requires": { - "lru-cache": "^6.0.0" - } - }, - "semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dev": true, - "requires": { - "semver": "^7.3.5" - } - }, - "semver-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", - "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "sigstore": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.1.1.tgz", - "integrity": "sha512-4hR3tPP1y59YWlaoAgAWFVZ7srTjNWOrrpkQXWu05qP0BvwFYyt3K3l848+IHo+mKhkOzGcNDf7ktASXLEPC+A==", - "dev": true, - "requires": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } - } - }, - "simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" - }, - "simple-get": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", - "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", - "requires": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true - }, - "socks": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", - "dev": true, - "requires": { - "ip": "^2.0.0", - "smart-buffer": "^4.2.0" - } - }, - "socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "spawn-please": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.1.tgz", - "integrity": "sha512-W+cFbZR2q2mMTfjz5ZGvhBAiX+e/zczFCNlbS9mxiSdYswBXwUuBUT+a0urH+xZZa8f/bs0mXHyZsZHR9hKogA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3" - } - }, - "spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", - "dev": true - }, - "ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", - "dev": true, - "requires": { - "minipass": "^4.0.0" - }, - "dependencies": { - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - } - } - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" - }, - "tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", - "dev": true, - "requires": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - }, - "tuf-js": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.1.tgz", - "integrity": "sha512-WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw==", - "dev": true, - "requires": { - "@tufjs/models": "1.0.0", - "make-fetch-happen": "^11.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", - "dev": true - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } - } - }, - "tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true - }, - "typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - } - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - } - }, - "unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "requires": { - "unique-slug": "^4.0.0" - } - }, - "unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", - "dev": true, - "requires": { - "crypto-random-string": "^4.0.0" - } - }, - "universal-user-agent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz", - "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==" - }, - "untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true - }, - "update-notifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", - "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", - "dev": true, - "requires": { - "boxen": "^7.0.0", - "chalk": "^5.0.1", - "configstore": "^6.0.0", - "has-yarn": "^3.0.0", - "import-lazy": "^4.0.0", - "is-ci": "^3.0.1", - "is-installed-globally": "^0.4.0", - "is-npm": "^6.0.0", - "is-yarn-global": "^0.4.0", - "latest-version": "^7.0.0", - "pupa": "^3.1.0", - "semver": "^7.3.7", - "semver-diff": "^4.0.0", - "xdg-basedir": "^5.1.0" - }, - "dependencies": { - "chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", - "dev": true - } - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "requires": { - "builtins": "^5.0.0" - } - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", - "dev": true, - "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" - } - }, - "wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "requires": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "widest-line": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", - "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", - "dev": true, - "requires": { - "string-width": "^5.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } - } - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true - }, - "ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true - }, - "emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "requires": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - } - }, - "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, - "requires": { - "ansi-regex": "^6.0.1" - } - } - } + "universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==" }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" } } } diff --git a/dev/coverage-action/package.json b/dev/coverage-action/package.json index 05ceac94db1..3f72b78028c 100644 --- a/dev/coverage-action/package.json +++ b/dev/coverage-action/package.json @@ -6,19 +6,9 @@ "author": "IETF Trust", "license": "BSD-3-Clause", "dependencies": { - "@actions/core": "1.10.0", - "@actions/github": "5.1.1", - "chart.js": "3.5.1", - "chartjs-node-canvas": "4.1.6", + "@actions/core": "1.11.1", + "@actions/github": "6.0.1", "lodash": "4.17.21", - "luxon": "3.3.0" - }, - "devDependencies": { - "eslint": "8.39.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.1.1", - "npm-check-updates": "16.10.8" + "luxon": "3.7.1" } } diff --git a/dev/del-old-packages/index.js b/dev/del-old-packages/index.js index 927b2d37ae0..ff5ab649a2c 100644 --- a/dev/del-old-packages/index.js +++ b/dev/del-old-packages/index.js @@ -8,7 +8,7 @@ const octokit = new Octokit({ const oldestDate = DateTime.utc().minus({ days: 7 }) -for (const pkgName of ['datatracker-db', 'datatracker-db-pg']) { +for (const pkgName of ['datatracker-db']) { let hasMore = true let currentPage = 1 diff --git a/dev/del-old-packages/package-lock.json b/dev/del-old-packages/package-lock.json index f40c8036db3..9899b290fb8 100644 --- a/dev/del-old-packages/package-lock.json +++ b/dev/del-old-packages/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@octokit/core": "^4.2.0", - "luxon": "^3.3.0" + "@octokit/core": "^4.2.4", + "luxon": "^3.4.4" } }, "node_modules/@octokit/auth-token": { @@ -25,9 +25,9 @@ } }, "node_modules/@octokit/core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.0.tgz", - "integrity": "sha512-AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", + "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", "dependencies": { "@octokit/auth-token": "^3.0.0", "@octokit/graphql": "^5.0.0", @@ -141,9 +141,9 @@ } }, "node_modules/luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", "engines": { "node": ">=12" } @@ -215,9 +215,9 @@ } }, "@octokit/core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.0.tgz", - "integrity": "sha512-AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", + "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", "requires": { "@octokit/auth-token": "^3.0.0", "@octokit/graphql": "^5.0.0", @@ -315,9 +315,9 @@ "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" }, "luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==" }, "node-fetch": { "version": "2.6.7", diff --git a/dev/del-old-packages/package.json b/dev/del-old-packages/package.json index f141a4e115d..c0b57b7f7b7 100644 --- a/dev/del-old-packages/package.json +++ b/dev/del-old-packages/package.json @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "@octokit/core": "^4.2.0", - "luxon": "^3.3.0" + "@octokit/core": "^4.2.4", + "luxon": "^3.4.4" } } diff --git a/dev/deploy-to-container/cli.js b/dev/deploy-to-container/cli.js index d0d4cef5482..1a2d993ac4b 100644 --- a/dev/deploy-to-container/cli.js +++ b/dev/deploy-to-container/cli.js @@ -3,7 +3,7 @@ import Docker from 'dockerode' import path from 'path' import fs from 'fs-extra' -import tar from 'tar' +import * as tar from 'tar' import yargs from 'yargs/yargs' import { hideBin } from 'yargs/helpers' import slugify from 'slugify' @@ -23,7 +23,7 @@ async function main () { throw new Error('Missing --branch argument!') } if (branch.indexOf('/') >= 0) { - branch = branch.split('/')[1] + branch = branch.split('/').slice(1).join('-') } branch = slugify(branch, { lower: true, strict: true }) if (branch.length < 1) { @@ -67,8 +67,10 @@ async function main () { .replace('__DBHOST__', `dt-db-${branch}`) .replace('__SECRETKEY__', nanoid(36)) .replace('__MQCONNSTR__', `amqp://datatracker:${mqKey}@dt-mq-${branch}/dt`) + .replace('__HOSTNAME__', hostname) ) await fs.copy(path.join(basePath, 'docker/scripts/app-create-dirs.sh'), path.join(releasePath, 'app-create-dirs.sh')) + await fs.copy(path.join(basePath, 'docker/scripts/app-init-celery.sh'), path.join(releasePath, 'app-init-celery.sh')) await fs.copy(path.join(basePath, 'dev/deploy-to-container/start.sh'), path.join(releasePath, 'start.sh')) await fs.copy(path.join(basePath, 'test/data'), path.join(releasePath, 'test/data')) console.info('Updated configuration files.') @@ -97,14 +99,6 @@ async function main () { }) console.info('Pulled latest MQ docker image.') - // Pull latest Celery image - console.info('Pulling latest Celery docker image...') - const celeryImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-celery:latest') - await new Promise((resolve, reject) => { - dock.modem.followProgress(celeryImagePullStream, (err, res) => err ? reject(err) : resolve(res)) - }) - console.info('Pulled latest Celery docker image.') - // Terminate existing containers console.info('Ensuring existing containers with same name are terminated...') const containers = await dock.listContainers({ all: true }) @@ -175,6 +169,9 @@ async function main () { Image: 'ghcr.io/ietf-tools/datatracker-db:latest', name: `dt-db-${branch}`, Hostname: `dt-db-${branch}`, + Labels: { + ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' } + }, HostConfig: { NetworkMode: 'shared', RestartPolicy: { @@ -194,6 +191,9 @@ async function main () { Env: [ `CELERY_PASSWORD=${mqKey}` ], + Labels: { + ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' } + }, HostConfig: { Memory: 4 * (1024 ** 3), // in bytes NetworkMode: 'shared', @@ -214,7 +214,7 @@ async function main () { const celeryContainers = {} for (const conConf of conConfs) { celeryContainers[conConf.name] = await dock.createContainer({ - Image: 'ghcr.io/ietf-tools/datatracker-celery:latest', + Image: 'ghcr.io/ietf-tools/datatracker-app-base:latest', name: `dt-${conConf.name}-${branch}`, Hostname: `dt-${conConf.name}-${branch}`, Env: [ @@ -222,6 +222,9 @@ async function main () { `CELERY_ROLE=${conConf.role}`, 'UPDATE_REQUIREMENTS_FROM=requirements.txt' ], + Labels: { + ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' } + }, HostConfig: { Binds: [ 'dt-assets:/assets', @@ -233,7 +236,7 @@ async function main () { Name: 'unless-stopped' } }, - Cmd: ['--loglevel=INFO'] + Entrypoint: ['bash', '-c', 'chmod +x ./app-init-celery.sh && ./app-init-celery.sh'] }) } console.info('Created Celery docker containers successfully.') @@ -245,7 +248,7 @@ async function main () { name: `dt-app-${branch}`, Hostname: `dt-app-${branch}`, Env: [ - `LETSENCRYPT_HOST=${hostname}`, + // `LETSENCRYPT_HOST=${hostname}`, `VIRTUAL_HOST=${hostname}`, `VIRTUAL_PORT=8000`, `PGHOST=dt-db-${branch}` @@ -254,7 +257,8 @@ async function main () { appversion: `${argv.appversion}` ?? '0.0.0', commit: `${argv.commit}` ?? 'unknown', ghrunid: `${argv.ghrunid}` ?? '0', - hostname + hostname, + ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' } }, HostConfig: { Binds: [ diff --git a/dev/deploy-to-container/package-lock.json b/dev/deploy-to-container/package-lock.json index 13c3680efce..0954ec9af47 100644 --- a/dev/deploy-to-container/package-lock.json +++ b/dev/deploy-to-container/package-lock.json @@ -6,12 +6,12 @@ "": { "name": "deploy-to-container", "dependencies": { - "dockerode": "^3.3.5", - "fs-extra": "^11.1.1", - "nanoid": "4.0.2", - "nanoid-dictionary": "5.0.0-beta.1", + "dockerode": "^4.0.6", + "fs-extra": "^11.3.0", + "nanoid": "5.1.5", + "nanoid-dictionary": "5.0.0", "slugify": "1.6.6", - "tar": "^6.1.14", + "tar": "^7.4.3", "yargs": "^17.7.2" }, "engines": { @@ -23,6 +23,215 @@ "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==" }, + "node_modules/@grpc/grpc-js": { + "version": "1.12.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz", + "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==", + "dependencies": { + "@grpc/proto-loader": "^0.7.13", + "@js-sdsl/ordered-map": "^4.4.2" + }, + "engines": { + "node": ">=12.10.0" + } + }, + "node_modules/@grpc/proto-loader": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, + "node_modules/@types/node": { + "version": "22.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", + "dependencies": { + "undici-types": "~6.20.0" + } + }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -49,10 +258,16 @@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "license": "MIT", "dependencies": { "safer-buffer": "~2.1.0" } }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -70,20 +285,65 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "license": "BSD-3-Clause", "dependencies": { "tweetnacl": "^0.14.3" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true, "engines": { "node": ">=10.0.0" @@ -92,7 +352,8 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" }, "node_modules/cliui": { "version": "8.0.1", @@ -124,25 +385,39 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", "hasInstallScript": true, "optional": true, "dependencies": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.19.0" }, "engines": { "node": ">=10.0.0" } }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -154,32 +429,43 @@ } }, "node_modules/docker-modem": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz", - "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz", + "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.1.1", "readable-stream": "^3.5.0", "split-ca": "^1.0.1", - "ssh2": "^1.4.0" + "ssh2": "^1.15.0" }, "engines": { "node": ">= 8.0" } }, "node_modules/dockerode": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", - "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz", + "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==", + "license": "Apache-2.0", "dependencies": { "@balena/dockerignore": "^1.0.2", - "docker-modem": "^3.0.0", - "tar-fs": "~2.0.1" + "@grpc/grpc-js": "^1.11.1", + "@grpc/proto-loader": "^0.7.13", + "docker-modem": "^5.0.6", + "protobufjs": "^7.3.2", + "tar-fs": "~2.1.2", + "uuid": "^10.0.0" }, "engines": { "node": ">= 8.0" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -189,6 +475,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -201,15 +488,32 @@ "node": ">=6" } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" }, "node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -219,17 +523,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -238,6 +531,27 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/glob": { + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -260,7 +574,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/inherits": { "version": "2.0.4", @@ -275,6 +590,28 @@ "node": ">=8" } }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -286,90 +623,175 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/minipass": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", - "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "node_modules/long": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz", + "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==" + }, + "node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dependencies": { - "yallist": "^4.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", + "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.0.4", + "rimraf": "^5.0.5" }, "engines": { - "node": ">= 8" + "node": ">= 18" } }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", "bin": { - "mkdirp": "bin/cmd.js" + "mkdirp": "dist/cjs/src/bin.js" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", - "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT", "optional": true }, "node_modules/nanoid": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", - "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz", + "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.js" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^18 || >=20" } }, "node_modules/nanoid-dictionary": { - "version": "5.0.0-beta.1", - "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0-beta.1.tgz", - "integrity": "sha512-xBkL9zzkNjzJ/UnmWyiOUDVX/COoi05eS0oU28RYKFFQhdnzO5dTOPbVZ/fCFgIOGr1zNinDHJ68mm/KQfcgcw==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0.tgz", + "integrity": "sha512-/iCyQHwt36XkaIvSE9fcC8p6DiMPCZMTSMj9UT56Cv6T7f5CuxvOMhpNncaNieQ4z4d32p7ruEtAfRsb7Ya8Gw==", + "license": "MIT" }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/protobufjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", + "hasInstallScript": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -396,6 +818,23 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -418,7 +857,38 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/slugify": { "version": "1.6.6", @@ -431,23 +901,24 @@ "node_modules/split-ca": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz", - "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==" + "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==", + "license": "ISC" }, "node_modules/ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "hasInstallScript": true, "dependencies": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2" }, "engines": { "node": ">=10.16.0" }, "optionalDependencies": { - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "node_modules/string_decoder": { @@ -471,6 +942,20 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -482,37 +967,51 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" }, "engines": { - "node": ">=10" + "node": ">=18" } }, "node_modules/tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", + "license": "MIT", "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" } }, "node_modules/tar-stream": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -524,59 +1023,24 @@ "node": ">=6" } }, - "node_modules/tar-stream/node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/tar-stream/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, "node_modules/tar/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", "engines": { - "node": ">=8" + "node": ">=18" } }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "license": "Unlicense" + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" }, "node_modules/universalify": { "version": "2.0.0", @@ -591,6 +1055,32 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -607,10 +1097,28 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, "node_modules/y18n": { "version": "5.0.8", @@ -621,9 +1129,12 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "engines": { + "node": ">=18" + } }, "node_modules/yargs": { "version": "17.7.2", @@ -657,6 +1168,165 @@ "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==" }, + "@grpc/grpc-js": { + "version": "1.12.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz", + "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==", + "requires": { + "@grpc/proto-loader": "^0.7.13", + "@js-sdsl/ordered-map": "^4.4.2" + } + }, + "@grpc/proto-loader": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "requires": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + } + }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } + }, + "@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "requires": { + "minipass": "^7.0.4" + } + }, + "@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==" + }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, + "@types/node": { + "version": "22.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz", + "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", + "requires": { + "undici-types": "~6.20.0" + } + }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -678,6 +1348,11 @@ "safer-buffer": "~2.1.0" } }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -691,10 +1366,37 @@ "tweetnacl": "^0.14.3" } }, + "bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true }, "chownr": { @@ -726,44 +1428,63 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", "optional": true, "requires": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + } + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "requires": { - "ms": "2.1.2" + "ms": "^2.1.3" } }, "docker-modem": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz", - "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz", + "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==", "requires": { "debug": "^4.1.1", "readable-stream": "^3.5.0", "split-ca": "^1.0.1", - "ssh2": "^1.4.0" + "ssh2": "^1.15.0" } }, "dockerode": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", - "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz", + "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==", "requires": { "@balena/dockerignore": "^1.0.2", - "docker-modem": "^3.0.0", - "tar-fs": "~2.0.1" + "@grpc/grpc-js": "^1.11.1", + "@grpc/proto-loader": "^0.7.13", + "docker-modem": "^5.0.6", + "protobufjs": "^7.3.2", + "tar-fs": "~2.1.2", + "uuid": "^10.0.0" } }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -782,34 +1503,47 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, + "foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + } + }, "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "requires": { - "minipass": "^3.0.0" - } - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, + "glob": { + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + } + }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -830,6 +1564,20 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -839,27 +1587,47 @@ "universalify": "^2.0.0" } }, - "minipass": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", - "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "long": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz", + "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==" + }, + "lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==" + }, + "minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "requires": { - "yallist": "^4.0.0" + "brace-expansion": "^2.0.1" } }, + "minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" + }, "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", + "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.0.4", + "rimraf": "^5.0.5" } }, "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==" }, "mkdirp-classic": { "version": "0.5.3", @@ -867,25 +1635,25 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", - "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "optional": true }, "nanoid": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", - "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==" + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz", + "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==" }, "nanoid-dictionary": { - "version": "5.0.0-beta.1", - "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0-beta.1.tgz", - "integrity": "sha512-xBkL9zzkNjzJ/UnmWyiOUDVX/COoi05eS0oU28RYKFFQhdnzO5dTOPbVZ/fCFgIOGr1zNinDHJ68mm/KQfcgcw==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0.tgz", + "integrity": "sha512-/iCyQHwt36XkaIvSE9fcC8p6DiMPCZMTSMj9UT56Cv6T7f5CuxvOMhpNncaNieQ4z4d32p7ruEtAfRsb7Ya8Gw==" }, "once": { "version": "1.4.0", @@ -895,10 +1663,43 @@ "wrappy": "1" } }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-scurry": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "requires": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + } + }, + "protobufjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + } + }, "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -919,6 +1720,14 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, + "rimraf": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "requires": { + "glob": "^10.3.7" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -929,6 +1738,24 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + }, "slugify": { "version": "1.6.6", "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", @@ -940,14 +1767,14 @@ "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==" }, "ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "requires": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2", - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "string_decoder": { @@ -968,6 +1795,16 @@ "strip-ansi": "^6.0.1" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -976,40 +1813,43 @@ "ansi-regex": "^5.0.1" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, "tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" }, "dependencies": { "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" - }, - "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" } } }, "tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" } }, "tar-stream": { @@ -1022,27 +1862,6 @@ "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" - }, - "dependencies": { - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - } } }, "tweetnacl": { @@ -1050,6 +1869,11 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" }, + "undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -1060,6 +1884,19 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, + "uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -1070,6 +1907,16 @@ "strip-ansi": "^6.0.0" } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1081,9 +1928,9 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" }, "yargs": { "version": "17.7.2", diff --git a/dev/deploy-to-container/package.json b/dev/deploy-to-container/package.json index 552ebc0bff9..09716c3094a 100644 --- a/dev/deploy-to-container/package.json +++ b/dev/deploy-to-container/package.json @@ -2,12 +2,12 @@ "name": "deploy-to-container", "type": "module", "dependencies": { - "dockerode": "^3.3.5", - "fs-extra": "^11.1.1", - "nanoid": "4.0.2", - "nanoid-dictionary": "5.0.0-beta.1", + "dockerode": "^4.0.6", + "fs-extra": "^11.3.0", + "nanoid": "5.1.5", + "nanoid-dictionary": "5.0.0", "slugify": "1.6.6", - "tar": "^6.1.14", + "tar": "^7.4.3", "yargs": "^17.7.2" }, "engines": { diff --git a/dev/deploy-to-container/refresh.js b/dev/deploy-to-container/refresh.js index 827d85de6cb..7ea13c885a4 100644 --- a/dev/deploy-to-container/refresh.js +++ b/dev/deploy-to-container/refresh.js @@ -24,7 +24,8 @@ async function main () { const containersToRestart = [] for (const container of containers) { if ( - container.Names.some(n => n.startsWith('/dt-db-')) + container.Names.some(n => n.startsWith('/dt-db-')) && + container.Labels?.nodbrefresh !== '1' ) { console.info(`Terminating DB container ${container.Id}...`) dbContainersToCreate.push(container.Names.find(n => n.startsWith('/dt-db-')).substring(1)) @@ -37,9 +38,11 @@ async function main () { v: true }) } else if ( - container.Names.some(n => n.startsWith('/dt-app-')) || - container.Names.some(n => n.startsWith('/dt-celery-')) || - container.Names.some(n => n.startsWith('/dt-beat-')) + ( + container.Names.some(n => n.startsWith('/dt-app-')) || + container.Names.some(n => n.startsWith('/dt-celery-')) || + container.Names.some(n => n.startsWith('/dt-beat-')) + ) && container.Labels?.nodbrefresh !== '1' ) { if (container.State === 'running') { const appContainer = dock.getContainer(container.Id) diff --git a/dev/deploy-to-container/settings_local.py b/dev/deploy-to-container/settings_local.py index d9bf00f22d5..aacf000093f 100644 --- a/dev/deploy-to-container/settings_local.py +++ b/dev/deploy-to-container/settings_local.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2007-2019, All Rights Reserved # -*- coding: utf-8 -*- -from ietf.settings import * # pyflakes:ignore +from ietf.settings import * # pyflakes:ignore ALLOWED_HOSTS = ['*'] @@ -10,7 +10,7 @@ 'HOST': '__DBHOST__', 'PORT': 5432, 'NAME': 'datatracker', - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'USER': 'django', 'PASSWORD': 'RkTkDPFnKpko', }, @@ -40,7 +40,6 @@ SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/' SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/' -SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/' SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/' SUBMIT_YANG_RFC_MODEL_DIR = '/assets/ietf-ftp/yang/rfcmod/' @@ -53,18 +52,30 @@ # 'ietf.context_processors.sql_debug', # ] -DOCUMENT_PATH_PATTERN = '/assets/ietf-ftp/{doc.type_id}/' +DOCUMENT_PATH_PATTERN = '/assets/ietfdata/doc/{doc.type_id}/' INTERNET_DRAFT_PATH = '/assets/ietf-ftp/internet-drafts/' RFC_PATH = '/assets/ietf-ftp/rfc/' CHARTER_PATH = '/assets/ietf-ftp/charter/' BOFREQ_PATH = '/assets/ietf-ftp/bofreq/' CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/' -INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' -INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' +INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive' +INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id' BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml' +IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH +FTP_DIR = '/assets/ftp' +NFS_METRICS_TMP_DIR = '/assets/tmp' NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/' SLIDE_STAGING_PATH = '/test/staging/' DE_GFM_BINARY = '/usr/local/bin/de-gfm' + +# No real secrets here, these are public testing values _only_ +APP_API_TOKENS = { + "ietf.api.views.ingest_email_test": ["ingestion-test-token"] +} + + +# OIDC configuration +SITE_URL = 'https://__HOSTNAME__' diff --git a/dev/deploy-to-container/start.sh b/dev/deploy-to-container/start.sh index 2257aaf11cd..5d976f80ea6 100644 --- a/dev/deploy-to-container/start.sh +++ b/dev/deploy-to-container/start.sh @@ -27,13 +27,28 @@ if [ -n "$PGHOST" ]; then psql -U django -h $PGHOST -d datatracker -v ON_ERROR_STOP=1 -c '\x' -c 'ALTER USER django set search_path=datatracker,public;' fi +echo "Starting memcached..." +/usr/bin/memcached -d -u root + echo "Running Datatracker checks..." ./ietf/manage.py check # Migrate, adjusting to what the current state of the underlying database might be: +# On production, the blobdb tables are in a separate database. Manipulate migration +# history to ensure that they're created for the sandbox environment that runs it +# all from a single database. +echo "Ensuring blobdb relations exist..." +/usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb zero +if ! /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local blobdb; then + # If we are restarting a sandbox, the migration may already have run and re-running + # it will fail. Assume that happened and fake it. + /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb +fi + +# Now run the migrations for real echo "Running Datatracker migrations..." -/usr/local/bin/python ./ietf/manage.py migrate --fake-initial --settings=settings_local +/usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local echo "Starting Datatracker..." ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local diff --git a/dev/deploy/build.sh b/dev/deploy/build.sh deleted file mode 100644 index a802acb46ba..00000000000 --- a/dev/deploy/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -echo "Compiling native node packages..." -yarn rebuild -echo "Packaging static assets..." -if [ "${SHOULD_DEPLOY}" = "true" ]; then - yarn build --base=https://www.ietf.org/lib/dt/$PKG_VERSION/ -else - yarn build -fi -yarn legacy:build diff --git a/dev/diff/package-lock.json b/dev/diff/package-lock.json index f7824b67a4f..d1c2fbd7639 100644 --- a/dev/diff/package-lock.json +++ b/dev/diff/package-lock.json @@ -6,18 +6,18 @@ "": { "name": "diff", "dependencies": { - "chalk": "^5.2.0", - "dockerode": "^3.3.5", - "enquirer": "^2.3.6", + "chalk": "^5.4.1", + "dockerode": "^4.0.6", + "enquirer": "^2.4.1", "extract-zip": "^2.0.1", - "fs-extra": "^11.1.1", - "got": "^12.6.0", + "fs-extra": "^11.3.0", + "got": "^13.0.0", "keypress": "^0.2.1", - "listr2": "^6.3.1", + "listr2": "^6.6.1", "lodash-es": "^4.17.21", - "luxon": "^3.3.0", - "pretty-bytes": "^6.1.0", - "tar": "^6.1.14", + "luxon": "^3.6.1", + "pretty-bytes": "^6.1.1", + "tar": "^7.4.3", "yargs": "^17.7.2" }, "engines": { @@ -29,6 +29,220 @@ "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==" }, + "node_modules/@grpc/grpc-js": { + "version": "1.12.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz", + "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==", + "license": "Apache-2.0", + "dependencies": { + "@grpc/proto-loader": "^0.7.13", + "@js-sdsl/ordered-map": "^4.4.2" + }, + "engines": { + "node": ">=12.10.0" + } + }, + "node_modules/@grpc/proto-loader": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==", + "license": "BSD-3-Clause" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==", + "license": "BSD-3-Clause" + }, "node_modules/@sindresorhus/is": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", @@ -59,8 +273,7 @@ "node_modules/@types/node": { "version": "18.6.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", - "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==", - "optional": true + "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==" }, "node_modules/@types/yauzl": { "version": "2.10.0", @@ -119,10 +332,16 @@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "license": "MIT", "dependencies": { "safer-buffer": "~2.1.0" } }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -140,16 +359,61 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "license": "BSD-3-Clause", "dependencies": { "tweetnacl": "^0.14.3" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -159,9 +423,9 @@ } }, "node_modules/buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true, "engines": { "node": ">=10.0.0" @@ -193,9 +457,10 @@ } }, "node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", + "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -206,7 +471,8 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" }, "node_modules/cli-cursor": { "version": "4.0.0", @@ -313,24 +579,37 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==" + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" }, "node_modules/cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", "hasInstallScript": true, "optional": true, "dependencies": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.19.0" }, "engines": { "node": ">=10.0.0" } }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -381,27 +660,33 @@ } }, "node_modules/docker-modem": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz", - "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz", + "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.1.1", "readable-stream": "^3.5.0", "split-ca": "^1.0.1", - "ssh2": "^1.4.0" + "ssh2": "^1.15.0" }, "engines": { "node": ">= 8.0" } }, "node_modules/dockerode": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", - "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz", + "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==", + "license": "Apache-2.0", "dependencies": { "@balena/dockerignore": "^1.0.2", - "docker-modem": "^3.0.0", - "tar-fs": "~2.0.1" + "@grpc/grpc-js": "^1.11.1", + "@grpc/proto-loader": "^0.7.13", + "docker-modem": "^5.0.6", + "protobufjs": "^7.3.2", + "tar-fs": "~2.1.2", + "uuid": "^10.0.0" }, "engines": { "node": ">= 8.0" @@ -426,11 +711,12 @@ } }, "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dependencies": { - "ansi-colors": "^4.1.1" + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" }, "engines": { "node": ">=8.6" @@ -445,9 +731,9 @@ } }, "node_modules/eventemitter3": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz", - "integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" }, "node_modules/extract-zip": { "version": "2.0.1", @@ -490,6 +776,32 @@ "pend": "~1.2.0" } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data-encoder": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", @@ -501,12 +813,14 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" }, "node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -516,17 +830,6 @@ "node": ">=14.14" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -546,10 +849,31 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/glob": { + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", + "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==", "dependencies": { "@sindresorhus/is": "^5.2.0", "@szmarczak/http-timer": "^5.0.1", @@ -564,7 +888,7 @@ "responselike": "^3.0.0" }, "engines": { - "node": ">=14.16" + "node": ">=16" }, "funding": { "url": "https://github.com/sindresorhus/got?sponsor=1" @@ -609,7 +933,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/inherits": { "version": "2.0.4", @@ -624,6 +949,28 @@ "node": ">=8" } }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -654,13 +1001,13 @@ } }, "node_modules/listr2": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.3.1.tgz", - "integrity": "sha512-FOTLAjWKYpfONygQ4DQiOFxQRD+YV9fzW7MKcHBSa9E6QD4POnrEkfGMNy4ND0KiUDO/mQcHzxmuZKlbrkOpiw==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", + "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", "dependencies": { "cli-truncate": "^3.1.0", - "colorette": "^2.0.19", - "eventemitter3": "^5.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", "log-update": "^5.0.1", "rfdc": "^1.3.0", "wrap-ansi": "^8.1.0" @@ -755,6 +1102,12 @@ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "license": "MIT" + }, "node_modules/log-update": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", @@ -846,6 +1199,12 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/long": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz", + "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==", + "license": "Apache-2.0" + }, "node_modules/lowercase-keys": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", @@ -857,10 +1216,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz", + "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==", + "license": "MIT", "engines": { "node": ">=12" } @@ -884,44 +1252,59 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/minipass": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", - "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dependencies": { - "yallist": "^4.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", + "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.0.4", + "rimraf": "^5.0.5" }, "engines": { - "node": ">= 8" + "node": ">= 18" } }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", "bin": { - "mkdirp": "bin/cmd.js" + "mkdirp": "dist/cjs/src/bin.js" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" }, "node_modules/ms": { "version": "2.1.2", @@ -929,9 +1312,10 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", - "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT", "optional": true }, "node_modules/normalize-url": { @@ -975,15 +1359,38 @@ "node": ">=12.20" } }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-scurry": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, "node_modules/pretty-bytes": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.0.tgz", - "integrity": "sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz", + "integrity": "sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==", "engines": { "node": "^14.13.1 || >=16.0.0" }, @@ -991,6 +1398,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/protobufjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -1071,6 +1502,23 @@ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" }, + "node_modules/rimraf": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1093,7 +1541,27 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } }, "node_modules/signal-exit": { "version": "3.0.7", @@ -1140,23 +1608,24 @@ "node_modules/split-ca": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz", - "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==" + "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==", + "license": "ISC" }, "node_modules/ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "hasInstallScript": true, "dependencies": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2" }, "engines": { "node": ">=10.16.0" }, "optionalDependencies": { - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "node_modules/string_decoder": { @@ -1180,6 +1649,20 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -1191,37 +1674,51 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" }, "engines": { - "node": ">=10" + "node": ">=18" } }, "node_modules/tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", + "license": "MIT", "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" } }, "node_modules/tar-stream": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -1233,59 +1730,19 @@ "node": ">=6" } }, - "node_modules/tar-stream/node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/tar-stream/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, "node_modules/tar/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", "engines": { - "node": ">=8" + "node": ">=18" } }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "license": "Unlicense" }, "node_modules/type-fest": { "version": "1.4.0", @@ -1311,6 +1768,33 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -1327,6 +1811,23 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1341,9 +1842,12 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "engines": { + "node": ">=18" + } }, "node_modules/yargs": { "version": "17.7.2", @@ -1386,6 +1890,157 @@ "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==" }, + "@grpc/grpc-js": { + "version": "1.12.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz", + "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==", + "requires": { + "@grpc/proto-loader": "^0.7.13", + "@js-sdsl/ordered-map": "^4.4.2" + } + }, + "@grpc/proto-loader": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "requires": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.2.5", + "yargs": "^17.7.2" + } + }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } + }, + "@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "requires": { + "minipass": "^7.0.4" + } + }, + "@js-sdsl/ordered-map": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", + "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==" + }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, "@sindresorhus/is": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", @@ -1407,8 +2062,7 @@ "@types/node": { "version": "18.6.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", - "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==", - "optional": true + "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==" }, "@types/yauzl": { "version": "2.10.0", @@ -1453,6 +2107,11 @@ "safer-buffer": "~2.1.0" } }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -1466,15 +2125,42 @@ "tweetnacl": "^0.14.3" } }, + "bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" }, "buildcheck": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz", - "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz", + "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==", "optional": true }, "cacheable-lookup": { @@ -1497,9 +2183,9 @@ } }, "chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==" + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==" }, "chownr": { "version": "1.1.4", @@ -1577,18 +2263,28 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==" + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" }, "cpu-features": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz", - "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz", + "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==", "optional": true, "requires": { - "buildcheck": "0.0.3", - "nan": "^2.15.0" + "buildcheck": "~0.0.6", + "nan": "^2.19.0" + } + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "debug": { @@ -1620,24 +2316,28 @@ "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==" }, "docker-modem": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz", - "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz", + "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==", "requires": { "debug": "^4.1.1", "readable-stream": "^3.5.0", "split-ca": "^1.0.1", - "ssh2": "^1.4.0" + "ssh2": "^1.15.0" } }, "dockerode": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", - "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz", + "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==", "requires": { "@balena/dockerignore": "^1.0.2", - "docker-modem": "^3.0.0", - "tar-fs": "~2.0.1" + "@grpc/grpc-js": "^1.11.1", + "@grpc/proto-loader": "^0.7.13", + "docker-modem": "^5.0.6", + "protobufjs": "^7.3.2", + "tar-fs": "~2.1.2", + "uuid": "^10.0.0" } }, "eastasianwidth": { @@ -1659,11 +2359,12 @@ } }, "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "requires": { - "ansi-colors": "^4.1.1" + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" } }, "escalade": { @@ -1672,9 +2373,9 @@ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "eventemitter3": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz", - "integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" }, "extract-zip": { "version": "2.0.1", @@ -1705,6 +2406,22 @@ "pend": "~1.2.0" } }, + "foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "dependencies": { + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + } + } + }, "form-data-encoder": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", @@ -1716,23 +2433,15 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "requires": { - "minipass": "^3.0.0" - } - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -1743,10 +2452,22 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, + "glob": { + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "requires": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + } + }, "got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", + "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==", "requires": { "@sindresorhus/is": "^5.2.0", "@szmarczak/http-timer": "^5.0.1", @@ -1795,6 +2516,20 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -1823,13 +2558,13 @@ } }, "listr2": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.3.1.tgz", - "integrity": "sha512-FOTLAjWKYpfONygQ4DQiOFxQRD+YV9fzW7MKcHBSa9E6QD4POnrEkfGMNy4ND0KiUDO/mQcHzxmuZKlbrkOpiw==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", + "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", "requires": { "cli-truncate": "^3.1.0", - "colorette": "^2.0.19", - "eventemitter3": "^5.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", "log-update": "^5.0.1", "rfdc": "^1.3.0", "wrap-ansi": "^8.1.0" @@ -1885,6 +2620,11 @@ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, "log-update": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", @@ -1942,15 +2682,25 @@ } } }, + "long": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz", + "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==" + }, "lowercase-keys": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==" }, + "lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==" + }, "luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz", + "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==" }, "mimic-fn": { "version": "2.1.0", @@ -1962,27 +2712,32 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==" }, - "minipass": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", - "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "requires": { - "yallist": "^4.0.0" + "brace-expansion": "^2.0.1" } }, + "minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" + }, "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", + "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.0.4", + "rimraf": "^5.0.5" } }, "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==" }, "mkdirp-classic": { "version": "0.5.3", @@ -1995,9 +2750,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nan": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", - "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "optional": true }, "normalize-url": { @@ -2026,15 +2781,48 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==" }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-scurry": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "requires": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + } + }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, "pretty-bytes": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.0.tgz", - "integrity": "sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==" + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz", + "integrity": "sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==" + }, + "protobufjs": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + } }, "pump": { "version": "3.0.0", @@ -2092,6 +2880,14 @@ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" }, + "rimraf": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "requires": { + "glob": "^10.3.7" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2102,6 +2898,19 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -2134,14 +2943,14 @@ "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==" }, "ssh2": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz", - "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "requires": { - "asn1": "^0.2.4", + "asn1": "^0.2.6", "bcrypt-pbkdf": "^1.0.2", - "cpu-features": "~0.0.4", - "nan": "^2.16.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "string_decoder": { @@ -2162,6 +2971,16 @@ "strip-ansi": "^6.0.1" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -2170,40 +2989,43 @@ "ansi-regex": "^5.0.1" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, "tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" }, "dependencies": { "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" - }, - "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" } } }, "tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" } }, "tar-stream": { @@ -2216,27 +3038,6 @@ "fs-constants": "^1.0.0", "inherits": "^2.0.3", "readable-stream": "^3.1.1" - }, - "dependencies": { - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - } } }, "tweetnacl": { @@ -2259,6 +3060,19 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, + "uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -2269,6 +3083,16 @@ "strip-ansi": "^6.0.0" } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -2280,9 +3104,9 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" }, "yargs": { "version": "17.7.2", diff --git a/dev/diff/package.json b/dev/diff/package.json index 1143840a49b..a5a7beb0df1 100644 --- a/dev/diff/package.json +++ b/dev/diff/package.json @@ -2,18 +2,18 @@ "name": "diff", "type": "module", "dependencies": { - "chalk": "^5.2.0", - "dockerode": "^3.3.5", - "enquirer": "^2.3.6", + "chalk": "^5.4.1", + "dockerode": "^4.0.6", + "enquirer": "^2.4.1", "extract-zip": "^2.0.1", - "fs-extra": "^11.1.1", - "got": "^12.6.0", + "fs-extra": "^11.3.0", + "got": "^13.0.0", "keypress": "^0.2.1", - "listr2": "^6.3.1", + "listr2": "^6.6.1", "lodash-es": "^4.17.21", - "luxon": "^3.3.0", - "pretty-bytes": "^6.1.0", - "tar": "^6.1.14", + "luxon": "^3.6.1", + "pretty-bytes": "^6.1.1", + "tar": "^7.4.3", "yargs": "^17.7.2" }, "engines": { diff --git a/dev/diff/settings_local.py b/dev/diff/settings_local.py index cd3923d5004..c255cac23dc 100644 --- a/dev/diff/settings_local.py +++ b/dev/diff/settings_local.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2007-2019, All Rights Reserved # -*- coding: utf-8 -*- -from ietf.settings import * # pyflakes:ignore +from ietf.settings import * # pyflakes:ignore ALLOWED_HOSTS = ['*'] @@ -10,7 +10,7 @@ 'HOST': '__DBHOST__', 'PORT': 5432, 'NAME': 'datatracker', - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'USER': 'django', 'PASSWORD': 'RkTkDPFnKpko', }, @@ -37,7 +37,6 @@ SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/' SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/' -SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/' SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/' SUBMIT_YANG_RFC_MODEL_DIR = '/assets/ietf-ftp/yang/rfcmod/' @@ -57,9 +56,11 @@ BOFREQ_PATH = '/assets/ietf-ftp/bofreq/' CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/' -INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' +INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive' INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml' +FTP_DIR = '/assets/ftp' +NFS_METRICS_TMP_DIR = '/assets/tmp' NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/' SLIDE_STAGING_PATH = 'test/staging/' diff --git a/dev/k8s-get-deploy-name/.editorconfig b/dev/k8s-get-deploy-name/.editorconfig new file mode 100644 index 00000000000..fec5c665197 --- /dev/null +++ b/dev/k8s-get-deploy-name/.editorconfig @@ -0,0 +1,7 @@ +[*] +indent_size = 2 +indent_style = space +charset = utf-8 +trim_trailing_whitespace = false +end_of_line = lf +insert_final_newline = true diff --git a/dev/k8s-get-deploy-name/.gitignore b/dev/k8s-get-deploy-name/.gitignore new file mode 100644 index 00000000000..07e6e472cc7 --- /dev/null +++ b/dev/k8s-get-deploy-name/.gitignore @@ -0,0 +1 @@ +/node_modules diff --git a/dev/k8s-get-deploy-name/.npmrc b/dev/k8s-get-deploy-name/.npmrc new file mode 100644 index 00000000000..580a68c499d --- /dev/null +++ b/dev/k8s-get-deploy-name/.npmrc @@ -0,0 +1,3 @@ +audit = false +fund = false +save-exact = true diff --git a/dev/k8s-get-deploy-name/README.md b/dev/k8s-get-deploy-name/README.md new file mode 100644 index 00000000000..a6605e4dd2c --- /dev/null +++ b/dev/k8s-get-deploy-name/README.md @@ -0,0 +1,16 @@ +# Datatracker Get Deploy Name + +This tool process and slugify a git branch into an appropriate subdomain name. + +## Usage + +1. From the `dev/k8s-get-deploy-name` directory, install the dependencies: +```sh +npm install +``` +2. Run the command: (replacing the `branch` argument) +```sh +node /cli.js --branch feat/fooBar-123 +``` + +The subdomain name will be output. It can then be used in a workflow as a namespace name and subdomain value. diff --git a/dev/k8s-get-deploy-name/cli.js b/dev/k8s-get-deploy-name/cli.js new file mode 100644 index 00000000000..b6c3b5119ef --- /dev/null +++ b/dev/k8s-get-deploy-name/cli.js @@ -0,0 +1,22 @@ +#!/usr/bin/env node + +import yargs from 'yargs/yargs' +import { hideBin } from 'yargs/helpers' +import slugify from 'slugify' + +const argv = yargs(hideBin(process.argv)).argv + +let branch = argv.branch +if (!branch) { + throw new Error('Missing --branch argument!') +} +if (branch.indexOf('/') >= 0) { + branch = branch.split('/').slice(1).join('-') +} +branch = slugify(branch, { lower: true, strict: true }) +if (branch.length < 1) { + throw new Error('Branch name is empty!') +} +process.stdout.write(`dt-${branch}`) + +process.exit(0) diff --git a/dev/k8s-get-deploy-name/package-lock.json b/dev/k8s-get-deploy-name/package-lock.json new file mode 100644 index 00000000000..e492a4cd38c --- /dev/null +++ b/dev/k8s-get-deploy-name/package-lock.json @@ -0,0 +1,303 @@ +{ + "name": "k8s-get-deploy-name", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "k8s-get-deploy-name", + "dependencies": { + "slugify": "1.6.6", + "yargs": "17.7.2" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/slugify": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "engines": { + "node": ">=12" + } + } + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" + }, + "slugify": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==" + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" + } + } +} diff --git a/dev/k8s-get-deploy-name/package.json b/dev/k8s-get-deploy-name/package.json new file mode 100644 index 00000000000..849f5d9b8d0 --- /dev/null +++ b/dev/k8s-get-deploy-name/package.json @@ -0,0 +1,8 @@ +{ + "name": "k8s-get-deploy-name", + "type": "module", + "dependencies": { + "slugify": "1.6.6", + "yargs": "17.7.2" + } +} diff --git a/dev/legacy/add-old-drafts-from-archive.py b/dev/legacy/add-old-drafts-from-archive.py new file mode 100644 index 00000000000..f09c3b4558d --- /dev/null +++ b/dev/legacy/add-old-drafts-from-archive.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python +import sys + +print("This is only here as documention - please read the file") +sys.exit(0) + +# #!/usr/bin/env python +# # Copyright The IETF Trust 2017-2019, All Rights Reserved + +# import datetime +# import os +# import sys +# from pathlib import Path +# from contextlib import closing + +# os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" + +# import django +# django.setup() + +# from django.conf import settings +# from django.core.validators import validate_email, ValidationError +# from ietf.utils.draft import PlaintextDraft +# from ietf.submit.utils import update_authors +# from ietf.utils.timezone import date_today + +# import debug # pyflakes:ignore + +# from ietf.doc.models import Document, NewRevisionDocEvent, DocEvent, State +# from ietf.person.models import Person + +# system = Person.objects.get(name="(System)") +# expired = State.objects.get(type='draft',slug='expired') + +# names = set() +# print 'collecting draft names ...' +# versions = 0 +# for p in Path(settings.INTERNET_DRAFT_PATH).glob('draft*.txt'): +# n = str(p).split('/')[-1].split('-') +# if n[-1][:2].isdigit(): +# name = '-'.join(n[:-1]) +# if '--' in name or '.txt' in name or '[' in name or '=' in name or '&' in name: +# continue +# if name.startswith('draft-draft-'): +# continue +# if name == 'draft-ietf-trade-iotp-v1_0-dsig': +# continue +# if len(n[-1]) != 6: +# continue +# if name.startswith('draft-mlee-'): +# continue +# names.add('-'.join(n[:-1])) + +# count=0 +# print 'iterating through names ...' +# for name in sorted(names): +# if not Document.objects.filter(name=name).exists(): +# paths = list(Path(settings.INTERNET_DRAFT_PATH).glob('%s-??.txt'%name)) +# paths.sort() +# doc = None +# for p in paths: +# n = str(p).split('/')[-1].split('-') +# rev = n[-1][:2] +# with open(str(p)) as txt_file: +# raw = txt_file.read() +# try: +# text = raw.decode('utf8') +# except UnicodeDecodeError: +# text = raw.decode('latin1') +# try: +# draft = PlaintextDraft(text, txt_file.name, name_from_source=True) +# except Exception as e: +# print name, rev, "Can't parse", p,":",e +# continue +# if draft.errors and draft.errors.keys()!=['draftname',]: +# print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc), draft.errors, draft.get_title().encode('utf8') +# else: +# time = datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc) +# if not doc: +# doc = Document.objects.create(name=name, +# time=time, +# type_id='draft', +# title=draft.get_title(), +# abstract=draft.get_abstract(), +# rev = rev, +# pages=draft.get_pagecount(), +# words=draft.get_wordcount(), +# expires=time+datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), +# ) +# DocAlias.objects.create(name=doc.name).docs.add(doc) +# doc.states.add(expired) +# # update authors +# authors = [] +# for author in draft.get_author_list(): +# full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author + +# author_name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip() + +# if email: +# try: +# validate_email(email) +# except ValidationError: +# email = "" + +# def turn_into_unicode(s): +# if s is None: +# return u"" + +# if isinstance(s, unicode): +# return s +# else: +# try: +# return s.decode("utf-8") +# except UnicodeDecodeError: +# try: +# return s.decode("latin-1") +# except UnicodeDecodeError: +# return "" + +# author_name = turn_into_unicode(author_name) +# email = turn_into_unicode(email) +# company = turn_into_unicode(company) + +# authors.append({ +# "name": author_name, +# "email": email, +# "affiliation": company, +# "country": country +# }) +# dummysubmission=type('', (), {})() #https://stackoverflow.com/questions/19476816/creating-an-empty-object-in-python +# dummysubmission.authors = authors +# update_authors(doc,dummysubmission) + +# # add a docevent with words explaining where this came from +# events = [] +# e = NewRevisionDocEvent.objects.create( +# type="new_revision", +# doc=doc, +# rev=rev, +# by=system, +# desc="New version available: %s-%s.txt" % (doc.name, doc.rev), +# time=time, +# ) +# events.append(e) +# e = DocEvent.objects.create( +# type="comment", +# doc = doc, +# rev = rev, +# by = system, +# desc = "Revision added from id-archive on %s by %s"%(date_today(),sys.argv[0]), +# time=time, +# ) +# events.append(e) +# doc.time = time +# doc.rev = rev +# doc.save_with_history(events) +# print "Added",name, rev diff --git a/dev/legacy/notes/notes.html b/dev/legacy/notes/notes.html index 85980a5b1bb..cb10a18689d 100644 --- a/dev/legacy/notes/notes.html +++ b/dev/legacy/notes/notes.html @@ -355,7 +355,7 @@

Introduction

in one place.

With my recent investigations of code analysis tools, I thought it might be a good idea to start collecting these in one place for the project.

-
+
Henrik <henrik@levkowetz.com>, 23 Mar 2014
@@ -398,8 +398,9 @@

PyChecker

do the right thing, but once it was made to run on the datatracker code, and ignore the django code, it didn't report anything that PyFlakes hadn't already caught.

-
-Henrik <henrik@levkowetz.com>, 23 Mar 2014
+
+ Henrik <henrik@levkowetz.com>, 23 Mar 2014 +
diff --git a/dev/legacy/recalculate-rfc-authors-snapshot b/dev/legacy/recalculate-rfc-authors-snapshot new file mode 100644 index 00000000000..cbe7a7a2f3b --- /dev/null +++ b/dev/legacy/recalculate-rfc-authors-snapshot @@ -0,0 +1,8346 @@ +#!/bin/sh + +echo "This is only here as documentation. Please read the file" +exit + +# #!/usr/bin/env python + +# """DANGER, WILL ROBINSON + +# This code was used in the construction of person migrations 0016 through 0019 +# and doc migration 0029 The original intent was to provide a utility that could +# be run periodically, but the need for manual inspection of the results was too +# great. It is here as a _starting point_ for future exploration of updating rfc +# documentauthor sets. Be careful to check that assumptions haven't changed in +# the interim. + +# """ + +# import os, sys +# import django +# import argparse +# from collections import namedtuple +# import subprocess +# from tempfile import mkstemp + +# basedir = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../..')) +# sys.path.insert(0, basedir) +# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") + +# django.setup() + +# from ietf.person.models import Email, Person +# from ietf.doc.models import Document +# from ietf import settings + +# import debug + +# # This is a snapshot dump from the RFC Editor in late April 2017 +# rfced_data = """RFC1 || S. Crocker || +# RFC2 || B. Duvall || +# RFC3 || S.D. Crocker || +# RFC4 || E.B. Shapiro || +# RFC5 || J. Rulifson || +# RFC6 || S.D. Crocker || +# RFC7 || G. Deloche || +# RFC8 || G. Deloche || +# RFC9 || G. Deloche || +# RFC10 || S.D. Crocker || +# RFC11 || G. Deloche || +# RFC12 || M. Wingfield || +# RFC13 || V. Cerf || +# RFC14 || || +# RFC15 || C.S. Carr || +# RFC16 || S. Crocker || +# RFC17 || J.E. Kreznar || +# RFC18 || V. Cerf || +# RFC19 || J.E. Kreznar || +# RFC20 || V.G. Cerf || +# RFC21 || V.G. Cerf || +# RFC22 || V.G. Cerf || +# RFC23 || G. Gregg || +# RFC24 || S.D. Crocker || +# RFC25 || S.D. Crocker || +# RFC26 || || +# RFC27 || S.D. Crocker || +# RFC28 || W.K. English || +# RFC29 || R.E. Kahn || +# RFC30 || S.D. Crocker || +# RFC31 || D. Bobrow, W.R. Sutherland || +# RFC32 || J. Cole || +# RFC33 || S.D. Crocker || +# RFC34 || W.K. English || +# RFC35 || S.D. Crocker || +# RFC36 || S.D. Crocker || +# RFC37 || S.D. Crocker || +# RFC38 || S.M. Wolfe || +# RFC39 || E. Harslem, J.F. Heafner || +# RFC40 || E. Harslem, J.F. Heafner || +# RFC41 || J.T. Melvin || +# RFC42 || E. Ancona || +# RFC43 || A.G. Nemeth || +# RFC44 || A. Shoshani, R. Long, A. Landsberg || +# RFC45 || J. Postel, S.D. Crocker || +# RFC46 || E. Meyer || +# RFC47 || J. Postel, S. Crocker || +# RFC48 || J. Postel, S.D. Crocker || +# RFC49 || E. Meyer || +# RFC50 || E. Harslen, J. Heafner || +# RFC51 || M. Elie || +# RFC52 || J. Postel, S.D. Crocker || +# RFC53 || S.D. Crocker || +# RFC54 || S.D. Crocker, J. Postel, J. Newkirk, M. Kraley || +# RFC55 || J. Newkirk, M. Kraley, J. Postel, S.D. Crocker || +# RFC56 || E. Belove, D. Black, R. Flegal, L.G. Farquar || +# RFC57 || M. Kraley, J. Newkirk || +# RFC58 || T.P. Skinner || +# RFC59 || E. Meyer || +# RFC60 || R. Kalin || +# RFC61 || D.C. Walden || +# RFC62 || D.C. Walden || +# RFC63 || V.G. Cerf || +# RFC64 || M. Elie || +# RFC65 || D.C. Walden || +# RFC66 || S.D. Crocker || +# RFC67 || W.R. Crowther || +# RFC68 || M. Elie || +# RFC69 || A.K. Bhushan || +# RFC70 || S.D. Crocker || +# RFC71 || T. Schipper || +# RFC72 || R.D. Bressler || +# RFC73 || S.D. Crocker || +# RFC74 || J.E. White || +# RFC75 || S.D. Crocker || +# RFC76 || J. Bouknight, J. Madden, G.R. Grossman || +# RFC77 || J. Postel || +# RFC78 || E. Harslem, J.F. Heafner, J.E. White || +# RFC79 || E. Meyer || +# RFC80 || E. Harslem, J.F. Heafner || +# RFC81 || J. Bouknight || +# RFC82 || E. Meyer || +# RFC83 || R.H. Anderson, E. Harslem, J.F. Heafner || +# RFC84 || J.B. North || +# RFC85 || S.D. Crocker || +# RFC86 || S.D. Crocker || +# RFC87 || A. Vezza || +# RFC88 || R.T. Braden, S.M. Wolfe || +# RFC89 || R.M. Metcalfe || +# RFC90 || R.T. Braden || +# RFC91 || G.H. Mealy || +# RFC92 || || +# RFC93 || A.M. McKenzie || +# RFC94 || E. Harslem, J.F. Heafner || +# RFC95 || S. Crocker || +# RFC96 || R.W. Watson || +# RFC97 || J.T. Melvin, R.W. Watson || +# RFC98 || E. Meyer, T. Skinner || +# RFC99 || P.M. Karp || +# RFC100 || P.M. Karp || +# RFC101 || R.W. Watson || +# RFC102 || S.D. Crocker || +# RFC103 || R.B. Kalin || +# RFC104 || J.B. Postel, S.D. Crocker || +# RFC105 || J.E. White || +# RFC106 || T.C. O'Sullivan || +# RFC107 || R.D. Bressler, S.D. Crocker, W.R. Crowther, G.R. Grossman, R.S. Tomlinson, J.E. White || +# RFC108 || R.W. Watson || +# RFC109 || J. Winett || +# RFC110 || J. Winett || +# RFC111 || S.D. Crocker || +# RFC112 || T.C. O'Sullivan || +# RFC113 || E. Harslem, J.F. Heafner, J.E. White || +# RFC114 || A.K. Bhushan || +# RFC115 || R.W. Watson, J.B. North || +# RFC116 || S.D. Crocker || +# RFC117 || J. Wong || +# RFC118 || R.W. Watson || +# RFC119 || M. Krilanovich || +# RFC120 || M. Krilanovich || +# RFC121 || M. Krilanovich || +# RFC122 || J.E. White || +# RFC123 || S.D. Crocker || +# RFC124 || J.T. Melvin || +# RFC125 || J. McConnell || +# RFC126 || J. McConnell || +# RFC127 || J. Postel || +# RFC128 || J. Postel || +# RFC129 || E. Harslem, J. Heafner, E. Meyer || +# RFC130 || J.F. Heafner || +# RFC131 || E. Harslem, J.F. Heafner || +# RFC132 || J.E. White || +# RFC133 || R.L. Sunberg || +# RFC134 || A. Vezza || +# RFC135 || W. Hathaway || +# RFC136 || R.E. Kahn || +# RFC137 || T.C. O'Sullivan || +# RFC138 || R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood || +# RFC139 || T.C. O'Sullivan || +# RFC140 || S.D. Crocker || +# RFC141 || E. Harslem, J.F. Heafner || +# RFC142 || C. Kline, J. Wong || +# RFC143 || W. Naylor, J. Wong, C. Kline, J. Postel || +# RFC144 || A. Shoshani || +# RFC145 || J. Postel || +# RFC146 || P.M. Karp, D.B. McKay, D.C.M. Wood || +# RFC147 || J.M. Winett || +# RFC148 || A.K. Bhushan || +# RFC149 || S.D. Crocker || +# RFC150 || R.B. Kalin || +# RFC151 || A. Shoshani || +# RFC152 || M. Wilber || +# RFC153 || J.T. Melvin, R.W. Watson || +# RFC154 || S.D. Crocker || +# RFC155 || J.B. North || +# RFC156 || J. Bouknight || +# RFC157 || V.G. Cerf || +# RFC158 || T.C. O'Sullivan || +# RFC159 || || +# RFC160 || Network Information Center. Stanford Research Institute || +# RFC161 || A. Shoshani || +# RFC162 || M. Kampe || +# RFC163 || V.G. Cerf || +# RFC164 || J.F. Heafner || +# RFC165 || J. Postel || +# RFC166 || R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood || +# RFC167 || A.K. Bhushan, R.M. Metcalfe, J.M. Winett || +# RFC168 || J.B. North || +# RFC169 || S.D. Crocker || +# RFC170 || Network Information Center. Stanford Research Institute || +# RFC171 || A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, J. Melvin, B. Sundberg, D. Watson, J. White || +# RFC172 || A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White || +# RFC173 || P.M. Karp, D.B. McKay || +# RFC174 || J. Postel, V.G. Cerf || +# RFC175 || E. Harslem, J.F. Heafner || +# RFC176 || A.K. Bhushan, R. Kanodia, R.M. Metcalfe, J. Postel || +# RFC177 || J. McConnell || +# RFC178 || I.W. Cotton || +# RFC179 || A.M. McKenzie || +# RFC180 || A.M. McKenzie || +# RFC181 || J. McConnell || +# RFC182 || J.B. North || +# RFC183 || J.M. Winett || +# RFC184 || K.C. Kelley || +# RFC185 || J.B. North || +# RFC186 || J.C. Michener || +# RFC187 || D.B. McKay, D.P. Karp || +# RFC188 || P.M. Karp, D.B. McKay || +# RFC189 || R.T. Braden || +# RFC190 || L.P. Deutsch || +# RFC191 || C.H. Irby || +# RFC192 || R.W. Watson || +# RFC193 || E. Harslem, J.F. Heafner || +# RFC194 || V. Cerf, E. Harslem, J. Heafner, B. Metcalfe, J. White || +# RFC195 || G.H. Mealy || +# RFC196 || R.W. Watson || +# RFC197 || A. Shoshani, E. Harslem || +# RFC198 || J.F. Heafner || +# RFC199 || T. Williams || +# RFC200 || J.B. North || +# RFC201 || || +# RFC202 || S.M. Wolfe, J. Postel || +# RFC203 || R.B. Kalin || +# RFC204 || J. Postel || +# RFC205 || R.T. Braden || +# RFC206 || J. White || +# RFC207 || A. Vezza || +# RFC208 || A.M. McKenzie || +# RFC209 || B. Cosell || +# RFC210 || W. Conrad || +# RFC211 || J.B. North || +# RFC212 || Information Sciences Institute University of Southern California || +# RFC213 || B. Cosell || +# RFC214 || E. Harslem || +# RFC215 || A.M. McKenzie || +# RFC216 || J.E. White || +# RFC217 || J.E. White || +# RFC218 || B. Cosell || +# RFC219 || R. Winter || +# RFC220 || || +# RFC221 || R.W. Watson || +# RFC222 || R.M. Metcalfe || +# RFC223 || J.T. Melvin, R.W. Watson || +# RFC224 || A.M. McKenzie || +# RFC225 || E. Harslem, R. Stoughton || +# RFC226 || P.M. Karp || +# RFC227 || J.F. Heafner, E. Harslem || +# RFC228 || D.C. Walden || +# RFC229 || J. Postel || +# RFC230 || T. Pyke || +# RFC231 || J.F. Heafner, E. Harslem || +# RFC232 || A. Vezza || +# RFC233 || A. Bhushan, R. Metcalfe || +# RFC234 || A. Vezza || +# RFC235 || E. Westheimer || +# RFC236 || J. Postel || +# RFC237 || R.W. Watson || +# RFC238 || R.T. Braden || +# RFC239 || R.T. Braden || +# RFC240 || A.M. McKenzie || +# RFC241 || A.M. McKenzie || +# RFC242 || L. Haibt, A.P. Mullery || +# RFC243 || A.P. Mullery || +# RFC244 || || +# RFC245 || C. Falls || +# RFC246 || A. Vezza || +# RFC247 || P.M. Karp || +# RFC248 || || +# RFC249 || R.F. Borelli || +# RFC250 || H. Brodie || +# RFC251 || D. Stern || +# RFC252 || E. Westheimer || +# RFC253 || J.A. Moorer || +# RFC254 || A. Bhushan || +# RFC255 || E. Westheimer || +# RFC256 || B. Cosell || +# RFC257 || || +# RFC258 || || +# RFC259 || || +# RFC260 || || +# RFC261 || || +# RFC262 || || +# RFC263 || A.M. McKenzie || +# RFC264 || A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, B. Sundberg, D. Watson, J. White || +# RFC265 || A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White || +# RFC266 || E. Westheimer || +# RFC267 || E. Westheimer || +# RFC268 || J. Postel || +# RFC269 || H. Brodie || +# RFC270 || A.M. McKenzie || +# RFC271 || B. Cosell || +# RFC272 || || +# RFC273 || R.W. Watson || +# RFC274 || E. Forman || +# RFC275 || || +# RFC276 || R.W. Watson || +# RFC277 || || +# RFC278 || A.K. Bhushan, R.T. Braden, E. Harslem, J.F. Heafner, A.M. McKenzie, J.T. Melvin, R.L. Sundberg, R.W. Watson, J.E. White || +# RFC279 || || +# RFC280 || R.W. Watson || +# RFC281 || A.M. McKenzie || +# RFC282 || M.A. Padlipsky || +# RFC283 || R.T. Braden || +# RFC284 || || +# RFC285 || D. Huff || +# RFC286 || E. Forman || +# RFC287 || E. Westheimer || +# RFC288 || E. Westheimer || +# RFC289 || R.W. Watson || +# RFC290 || A.P. Mullery || +# RFC291 || D.B. McKay || +# RFC292 || J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer || +# RFC293 || E. Westheimer || +# RFC294 || A.K. Bhushan || +# RFC295 || J. Postel || +# RFC296 || D.E. Liddle || +# RFC297 || D.C. Walden || +# RFC298 || E. Westheimer || +# RFC299 || D. Hopkin || +# RFC300 || J.B. North || +# RFC301 || R. Alter || +# RFC302 || R.F. Bryan || +# RFC303 || Network Information Center. Stanford Research Institute || +# RFC304 || D.B. McKay || +# RFC305 || R. Alter || +# RFC306 || E. Westheimer || +# RFC307 || E. Harslem || +# RFC308 || M. Seriff || +# RFC309 || A.K. Bhushan || +# RFC310 || A.K. Bhushan || +# RFC311 || R.F. Bryan || +# RFC312 || A.M. McKenzie || +# RFC313 || T.C. O'Sullivan || +# RFC314 || I.W. Cotton || +# RFC315 || E. Westheimer || +# RFC316 || D.B. McKay, A.P. Mullery || +# RFC317 || J. Postel || +# RFC318 || J. Postel || +# RFC319 || E. Westheimer || +# RFC320 || R. Reddy || +# RFC321 || P.M. Karp || +# RFC322 || V. Cerf, J. Postel || +# RFC323 || V. Cerf || +# RFC324 || J. Postel || +# RFC325 || G. Hicks || +# RFC326 || E. Westheimer || +# RFC327 || A.K. Bhushan || +# RFC328 || J. Postel || +# RFC329 || Network Information Center. Stanford Research Institute || +# RFC330 || E. Westheimer || +# RFC331 || J.M. McQuillan || +# RFC332 || E. Westheimer || +# RFC333 || R.D. Bressler, D. Murphy, D.C. Walden || +# RFC334 || A.M. McKenzie || +# RFC335 || R.F. Bryan || +# RFC336 || I.W. Cotton || +# RFC337 || || +# RFC338 || R.T. Braden || +# RFC339 || R. Thomas || +# RFC340 || T.C. O'Sullivan || +# RFC341 || || +# RFC342 || E. Westheimer || +# RFC343 || A.M. McKenzie || +# RFC344 || E. Westheimer || +# RFC345 || K.C. Kelley || +# RFC346 || J. Postel || +# RFC347 || J. Postel || +# RFC348 || J. Postel || +# RFC349 || J. Postel || +# RFC350 || R. Stoughton || +# RFC351 || D. Crocker || +# RFC352 || D. Crocker || +# RFC353 || E. Westheimer || +# RFC354 || A.K. Bhushan || +# RFC355 || J. Davidson || +# RFC356 || R. Alter || +# RFC357 || J. Davidson || +# RFC358 || || +# RFC359 || D.C. Walden || +# RFC360 || C. Holland || +# RFC361 || R.D. Bressler || +# RFC362 || E. Westheimer || +# RFC363 || Network Information Center. Stanford Research Institute || +# RFC364 || M.D. Abrams || +# RFC365 || D.C. Walden || +# RFC366 || E. Westheimer || +# RFC367 || E. Westheimer || +# RFC368 || R.T. Braden || +# RFC369 || J.R. Pickens || +# RFC370 || E. Westheimer || +# RFC371 || R.E. Kahn || +# RFC372 || R.W. Watson || +# RFC373 || J. McCarthy || +# RFC374 || A.M. McKenzie || +# RFC375 || || +# RFC376 || E. Westheimer || +# RFC377 || R.T. Braden || +# RFC378 || A.M. McKenzie || +# RFC379 || R. Braden || +# RFC380 || || +# RFC381 || J.M. McQuillan || +# RFC382 || L. McDaniel || +# RFC383 || || +# RFC384 || J.B. North || +# RFC385 || A.K. Bhushan || +# RFC386 || B. Cosell, D.C. Walden || +# RFC387 || K.C. Kelley, J. Meir || +# RFC388 || V. Cerf || +# RFC389 || B. Noble || +# RFC390 || R.T. Braden || +# RFC391 || A.M. McKenzie || +# RFC392 || G. Hicks, B.D. Wessler || +# RFC393 || J.M. Winett || +# RFC394 || J.M. McQuillan || +# RFC395 || J.M. McQuillan || +# RFC396 || S. Bunch || +# RFC397 || || +# RFC398 || J.R. Pickens, E. Faeh || +# RFC399 || M. Krilanovich || +# RFC400 || A.M. McKenzie || +# RFC401 || J. Hansen || +# RFC402 || J.B. North || +# RFC403 || G. Hicks || +# RFC404 || A.M. McKenzie || +# RFC405 || A.M. McKenzie || +# RFC406 || J.M. McQuillan || +# RFC407 || R.D. Bressler, R. Guida, A.M. McKenzie || +# RFC408 || A.D. Owen, J. Postel || +# RFC409 || J.E. White || +# RFC410 || J.M. McQuillan || +# RFC411 || M.A. Padlipsky || +# RFC412 || G. Hicks || +# RFC413 || A.M. McKenzie || +# RFC414 || A.K. Bhushan || +# RFC415 || H. Murray || +# RFC416 || J.C. Norton || +# RFC417 || J. Postel, C. Kline || +# RFC418 || W. Hathaway || +# RFC419 || A. Vezza || +# RFC420 || H. Murray || +# RFC421 || A.M. McKenzie || +# RFC422 || A.M. McKenzie || +# RFC423 || B. Noble || +# RFC424 || || +# RFC425 || R.D. Bressler || +# RFC426 || R. Thomas || +# RFC427 || || +# RFC428 || || +# RFC429 || J. Postel || +# RFC430 || R.T. Braden || +# RFC431 || M. Krilanovich || +# RFC432 || N. Neigus || +# RFC433 || J. Postel || +# RFC434 || A.M. McKenzie || +# RFC435 || B. Cosell, D.C. Walden || +# RFC436 || M. Krilanovich || +# RFC437 || E. Faeh || +# RFC438 || R. Thomas, R. Clements || +# RFC439 || V. Cerf || +# RFC440 || D.C. Walden || +# RFC441 || R.D. Bressler, R. Thomas || +# RFC442 || V. Cerf || +# RFC443 || A.M. McKenzie || +# RFC444 || || +# RFC445 || A.M. McKenzie || +# RFC446 || L.P. Deutsch || +# RFC447 || A.M. McKenzie || +# RFC448 || R.T. Braden || +# RFC449 || D.C. Walden || +# RFC450 || M.A. Padlipsky || +# RFC451 || M.A. Padlipsky || +# RFC452 || J. Winett || +# RFC453 || M.D. Kudlick || +# RFC454 || A.M. McKenzie || +# RFC455 || A.M. McKenzie || +# RFC456 || M.D. Kudlick || +# RFC457 || D.C. Walden || +# RFC458 || R.D. Bressler, R. Thomas || +# RFC459 || W. Kantrowitz || +# RFC460 || C. Kline || +# RFC461 || A.M. McKenzie || +# RFC462 || J. Iseli, D. Crocker || +# RFC463 || A.K. Bhushan || +# RFC464 || M.D. Kudlick || +# RFC465 || || +# RFC466 || J.M. Winett || +# RFC467 || J.D. Burchfiel, R.S. Tomlinson || +# RFC468 || R.T. Braden || +# RFC469 || M.D. Kudlick || +# RFC470 || R. Thomas || +# RFC471 || R. Thomas || +# RFC472 || S. Bunch || +# RFC473 || D.C. Walden || +# RFC474 || S. Bunch || +# RFC475 || A.K. Bhushan || +# RFC476 || A.M. McKenzie || +# RFC477 || M. Krilanovich || +# RFC478 || R.D. Bressler, R. Thomas || +# RFC479 || J.E. White || +# RFC480 || J.E. White || +# RFC481 || || +# RFC482 || A.M. McKenzie || +# RFC483 || M.D. Kudlick || +# RFC484 || || +# RFC485 || J.R. Pickens || +# RFC486 || R.D. Bressler || +# RFC487 || R.D. Bressler || +# RFC488 || M.F. Auerbach || +# RFC489 || J. Postel || +# RFC490 || J.R. Pickens || +# RFC491 || M.A. Padlipsky || +# RFC492 || E. Meyer || +# RFC493 || J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer || +# RFC494 || D.C. Walden || +# RFC495 || A.M. McKenzie || +# RFC496 || M.F. Auerbach || +# RFC497 || A.M. McKenzie || +# RFC498 || R.T. Braden || +# RFC499 || B.R. Reussow || +# RFC500 || A. Shoshani, I. Spiegler || +# RFC501 || K.T. Pogran || +# RFC502 || || +# RFC503 || N. Neigus, J. Postel || +# RFC504 || R. Thomas || +# RFC505 || M.A. Padlipsky || +# RFC506 || M.A. Padlipsky || +# RFC507 || || +# RFC508 || L. Pfeifer, J. McAfee || +# RFC509 || A.M. McKenzie || +# RFC510 || J.E. White || +# RFC511 || J.B. North || +# RFC512 || W. Hathaway || +# RFC513 || W. Hathaway || +# RFC514 || W. Kantrowitz || +# RFC515 || R. Winter || +# RFC516 || J. Postel || +# RFC517 || || +# RFC518 || N. Vaughan, E.J. Feinler || +# RFC519 || J.R. Pickens || +# RFC520 || J.D. Day || +# RFC521 || A.M. McKenzie || +# RFC522 || A.M. McKenzie || +# RFC523 || A.K. Bhushan || +# RFC524 || J.E. White || +# RFC525 || W. Parrish, J.R. Pickens || +# RFC526 || W.K. Pratt || +# RFC527 || R. Merryman || +# RFC528 || J.M. McQuillan || +# RFC529 || A.M. McKenzie, R. Thomas, R.S. Tomlinson, K.T. Pogran || +# RFC530 || A.K. Bhushan || +# RFC531 || M.A. Padlipsky || +# RFC532 || R.G. Merryman || +# RFC533 || D.C. Walden || +# RFC534 || D.C. Walden || +# RFC535 || R. Thomas || +# RFC536 || || +# RFC537 || S. Bunch || +# RFC538 || A.M. McKenzie || +# RFC539 || D. Crocker, J. Postel || +# RFC540 || || +# RFC541 || || +# RFC542 || N. Neigus || +# RFC543 || N.D. Meyer || +# RFC544 || N.D. Meyer, K. Kelley || +# RFC545 || J.R. Pickens || +# RFC546 || R. Thomas || +# RFC547 || D.C. Walden || +# RFC548 || D.C. Walden || +# RFC549 || J.C. Michener || +# RFC550 || L.P. Deutsch || +# RFC551 || Y. Feinroth, R. Fink || +# RFC552 || A.D. Owen || +# RFC553 || C.H. Irby, K. Victor || +# RFC554 || || +# RFC555 || J.E. White || +# RFC556 || A.M. McKenzie || +# RFC557 || B.D. Wessler || +# RFC558 || || +# RFC559 || A.K. Bushan || +# RFC560 || D. Crocker, J. Postel || +# RFC561 || A.K. Bhushan, K.T. Pogran, R.S. Tomlinson, J.E. White || +# RFC562 || A.M. McKenzie || +# RFC563 || J. Davidson || +# RFC564 || || +# RFC565 || D. Cantor || +# RFC566 || A.M. McKenzie || +# RFC567 || L.P. Deutsch || +# RFC568 || J.M. McQuillan || +# RFC569 || M.A. Padlipsky || +# RFC570 || J.R. Pickens || +# RFC571 || R. Braden || +# RFC572 || || +# RFC573 || A. Bhushan || +# RFC574 || M. Krilanovich || +# RFC575 || || +# RFC576 || K. Victor || +# RFC577 || D. Crocker || +# RFC578 || A.K. Bhushan, N.D. Ryan || +# RFC579 || A.M. McKenzie || +# RFC580 || J. Postel || +# RFC581 || D. Crocker, J. Postel || +# RFC582 || R. Clements || +# RFC583 || || +# RFC584 || J. Iseli, D. Crocker, N. Neigus || +# RFC585 || D. Crocker, N. Neigus, E.J. Feinler, J. Iseli || +# RFC586 || A.M. McKenzie || +# RFC587 || J. Postel || +# RFC588 || A. Stokes || +# RFC589 || R.T. Braden || +# RFC590 || M.A. Padlipsky || +# RFC591 || D.C. Walden || +# RFC592 || R.W. Watson || +# RFC593 || A.M. McKenzie, J. Postel || +# RFC594 || J.D. Burchfiel || +# RFC595 || W. Hathaway || +# RFC596 || E.A. Taft || +# RFC597 || N. Neigus, E.J. Feinler || +# RFC598 || Network Information Center. Stanford Research Institute || +# RFC599 || R.T. Braden || +# RFC600 || A. Berggreen || +# RFC601 || A.M. McKenzie || +# RFC602 || R.M. Metcalfe || +# RFC603 || J.D. Burchfiel || +# RFC604 || J. Postel || +# RFC605 || || +# RFC606 || L.P. Deutsch || +# RFC607 || M. Krilanovich, G. Gregg || +# RFC608 || M.D. Kudlick || +# RFC609 || B. Ferguson || +# RFC610 || R. Winter, J. Hill, W. Greiff || +# RFC611 || D.C. Walden || +# RFC612 || A.M. McKenzie || +# RFC613 || A.M. McKenzie || +# RFC614 || K.T. Pogran, N. Neigus || +# RFC615 || D. Crocker || +# RFC616 || D. Walden || +# RFC617 || E.A. Taft || +# RFC618 || E.A. Taft || +# RFC619 || W. Naylor, H. Opderbeck || +# RFC620 || B. Ferguson || +# RFC621 || M.D. Kudlick || +# RFC622 || A.M. McKenzie || +# RFC623 || M. Krilanovich || +# RFC624 || M. Krilanovich, G. Gregg, W. Hathaway, J.E. White || +# RFC625 || M.D. Kudlick, E.J. Feinler || +# RFC626 || L. Kleinrock, H. Opderbeck || +# RFC627 || M.D. Kudlick, E.J. Feinler || +# RFC628 || M.L. Keeney || +# RFC629 || J.B. North || +# RFC630 || J. Sussman || +# RFC631 || A. Danthine || +# RFC632 || H. Opderbeck || +# RFC633 || A.M. McKenzie || +# RFC634 || A.M. McKenzie || +# RFC635 || V. Cerf || +# RFC636 || J.D. Burchfiel, B. Cosell, R.S. Tomlinson, D.C. Walden || +# RFC637 || A.M. McKenzie || +# RFC638 || A.M. McKenzie || +# RFC639 || || +# RFC640 || J. Postel || +# RFC641 || || +# RFC642 || J.D. Burchfiel || +# RFC643 || E. Mader || +# RFC644 || R. Thomas || +# RFC645 || D. Crocker || +# RFC646 || || +# RFC647 || M.A. Padlipsky || +# RFC648 || || +# RFC649 || || +# RFC650 || || +# RFC651 || D. Crocker || +# RFC652 || D. Crocker || +# RFC653 || D. Crocker || +# RFC654 || D. Crocker || +# RFC655 || D. Crocker || +# RFC656 || D. Crocker || +# RFC657 || D. Crocker || +# RFC658 || D. Crocker || +# RFC659 || J. Postel || +# RFC660 || D.C. Walden || +# RFC661 || J. Postel || +# RFC662 || R. Kanodia || +# RFC663 || R. Kanodia || +# RFC664 || || +# RFC665 || || +# RFC666 || M.A. Padlipsky || +# RFC667 || S.G. Chipman || +# RFC668 || || +# RFC669 || D.W. Dodds || +# RFC670 || || +# RFC671 || R. Schantz || +# RFC672 || R. Schantz || +# RFC673 || || +# RFC674 || J. Postel, J.E. White || +# RFC675 || V. Cerf, Y. Dalal, C. Sunshine || +# RFC676 || || +# RFC677 || P.R. Johnson, R. Thomas || +# RFC678 || J. Postel || +# RFC679 || D.W. Dodds || +# RFC680 || T.H. Myer, D.A. Henderson || +# RFC681 || S. Holmgren || +# RFC682 || || +# RFC683 || R. Clements || +# RFC684 || R. Schantz || +# RFC685 || M. Beeler || +# RFC686 || B. Harvey || +# RFC687 || D.C. Walden || +# RFC688 || D.C. Walden || +# RFC689 || R. Clements || +# RFC690 || J. Postel || +# RFC691 || B. Harvey || +# RFC692 || S.M. Wolfe || +# RFC693 || || +# RFC694 || J. Postel || +# RFC695 || M. Krilanovich || +# RFC696 || V.G. Cerf || +# RFC697 || J. Lieb || +# RFC698 || T. Mock || +# RFC699 || J. Postel, J. Vernon || +# RFC700 || E. Mader, W.W. Plummer, R.S. Tomlinson || +# RFC701 || D.W. Dodds || +# RFC702 || D.W. Dodds || +# RFC703 || D.W. Dodds || +# RFC704 || P.J. Santos || +# RFC705 || R.F. Bryan || +# RFC706 || J. Postel || +# RFC707 || J.E. White || +# RFC708 || J.E. White || +# RFC709 || || +# RFC710 || || +# RFC711 || || +# RFC712 || J.E. Donnelley || +# RFC713 || J. Haverty || +# RFC714 || A.M. McKenzie || +# RFC715 || || +# RFC716 || D.C. Walden, J. Levin || +# RFC717 || J. Postel || +# RFC718 || J. Postel || +# RFC719 || J. Postel || +# RFC720 || D. Crocker || +# RFC721 || L.L. Garlick || +# RFC722 || J. Haverty || +# RFC723 || || +# RFC724 || D. Crocker, K.T. Pogran, J. Vittal, D.A. Henderson || +# RFC725 || J.D. Day, G.R. Grossman || +# RFC726 || J. Postel, D. Crocker || +# RFC727 || M.R. Crispin || +# RFC728 || J.D. Day || +# RFC729 || D. Crocker || +# RFC730 || J. Postel || +# RFC731 || J.D. Day || +# RFC732 || J.D. Day || +# RFC733 || D. Crocker, J. Vittal, K.T. Pogran, D.A. Henderson || +# RFC734 || M.R. Crispin || +# RFC735 || D. Crocker, R.H. Gumpertz || +# RFC736 || M.R. Crispin || +# RFC737 || K. Harrenstien || +# RFC738 || K. Harrenstien || +# RFC739 || J. Postel || +# RFC740 || R.T. Braden || +# RFC741 || D. Cohen || +# RFC742 || K. Harrenstien || +# RFC743 || K. Harrenstien || +# RFC744 || J. Sattley || +# RFC745 || M. Beeler || +# RFC746 || R. Stallman || +# RFC747 || M.R. Crispin || +# RFC748 || M.R. Crispin || +# RFC749 || B. Greenberg || +# RFC750 || J. Postel || +# RFC751 || P.D. Lebling || +# RFC752 || M.R. Crispin || +# RFC753 || J. Postel || +# RFC754 || J. Postel || +# RFC755 || J. Postel || +# RFC756 || J.R. Pickens, E.J. Feinler, J.E. Mathis || +# RFC757 || D.P. Deutsch || +# RFC758 || J. Postel || +# RFC759 || J. Postel || +# RFC760 || J. Postel || +# RFC761 || J. Postel || +# RFC762 || J. Postel || +# RFC763 || M.D. Abrams || +# RFC764 || J. Postel || +# RFC765 || J. Postel || +# RFC766 || J. Postel || +# RFC767 || J. Postel || +# RFC768 || J. Postel || +# RFC769 || J. Postel || +# RFC770 || J. Postel || +# RFC771 || V.G. Cerf, J. Postel || +# RFC772 || S. Sluizer, J. Postel || +# RFC773 || V.G. Cerf || +# RFC774 || J. Postel || +# RFC775 || D. Mankins, D. Franklin, A.D. Owen || +# RFC776 || J. Postel || +# RFC777 || J. Postel || +# RFC778 || D.L. Mills || +# RFC779 || E. Killian || +# RFC780 || S. Sluizer, J. Postel || +# RFC781 || Z. Su || +# RFC782 || J. Nabielsky, A.P. Skelton || +# RFC783 || K.R. Sollins || +# RFC784 || S. Sluizer, J. Postel || +# RFC785 || S. Sluizer, J. Postel || +# RFC786 || S. Sluizer, J. Postel || +# RFC787 || A.L. Chapin || +# RFC788 || J. Postel || +# RFC789 || E.C. Rosen || +# RFC790 || J. Postel || +# RFC791 || J. Postel || +# RFC792 || J. Postel || +# RFC793 || J. Postel || +# RFC794 || V.G. Cerf || +# RFC795 || J. Postel || +# RFC796 || J. Postel || +# RFC797 || A.R. Katz || +# RFC798 || A.R. Katz || +# RFC799 || D.L. Mills || +# RFC800 || J. Postel, J. Vernon || +# RFC801 || J. Postel || +# RFC802 || A.G. Malis || +# RFC803 || A. Agarwal, M.J. O'Connor, D.L. Mills || +# RFC804 || International Telegraph and Telephone Consultative Committee of the International Telecommunication Union || +# RFC805 || J. Postel || +# RFC806 || National Bureau of Standards || +# RFC807 || J. Postel || +# RFC808 || J. Postel || +# RFC809 || T. Chang || +# RFC810 || E.J. Feinler, K. Harrenstien, Z. Su, V. White || +# RFC811 || K. Harrenstien, V. White, E.J. Feinler || +# RFC812 || K. Harrenstien, V. White || +# RFC813 || D.D. Clark || +# RFC814 || D.D. Clark || +# RFC815 || D.D. Clark || +# RFC816 || D.D. Clark || +# RFC817 || D.D. Clark || +# RFC818 || J. Postel || +# RFC819 || Z. Su, J. Postel || +# RFC820 || J. Postel || +# RFC821 || J. Postel || +# RFC822 || D. Crocker || +# RFC823 || R.M. Hinden, A. Sheltzer || bob.hinden@gmail.com +# RFC824 || W.I. MacGregor, D.C. Tappan || +# RFC825 || J. Postel || +# RFC826 || D. Plummer || +# RFC827 || E.C. Rosen || +# RFC828 || K. Owen || +# RFC829 || V.G. Cerf || +# RFC830 || Z. Su || +# RFC831 || R.T. Braden || +# RFC832 || D. Smallberg || +# RFC833 || D. Smallberg || +# RFC834 || D. Smallberg || +# RFC835 || D. Smallberg || +# RFC836 || D. Smallberg || +# RFC837 || D. Smallberg || +# RFC838 || D. Smallberg || +# RFC839 || D. Smallberg || +# RFC840 || J. Postel || +# RFC841 || National Bureau of Standards || +# RFC842 || D. Smallberg || +# RFC843 || D. Smallberg || +# RFC844 || R. Clements || +# RFC845 || D. Smallberg || +# RFC846 || D. Smallberg || +# RFC847 || A. Westine, D. Smallberg, J. Postel || +# RFC848 || D. Smallberg || +# RFC849 || M.R. Crispin || +# RFC850 || M.R. Horton || +# RFC851 || A.G. Malis || +# RFC852 || A.G. Malis || +# RFC853 || || +# RFC854 || J. Postel, J.K. Reynolds || +# RFC855 || J. Postel, J.K. Reynolds || +# RFC856 || J. Postel, J. Reynolds || +# RFC857 || J. Postel, J. Reynolds || +# RFC858 || J. Postel, J. Reynolds || +# RFC859 || J. Postel, J. Reynolds || +# RFC860 || J. Postel, J. Reynolds || +# RFC861 || J. Postel, J. Reynolds || +# RFC862 || J. Postel || +# RFC863 || J. Postel || +# RFC864 || J. Postel || +# RFC865 || J. Postel || +# RFC866 || J. Postel || +# RFC867 || J. Postel || +# RFC868 || J. Postel, K. Harrenstien || +# RFC869 || R. Hinden || bob.hinden@gmail.com +# RFC870 || J.K. Reynolds, J. Postel || +# RFC871 || M.A. Padlipsky || +# RFC872 || M.A. Padlipsky || +# RFC873 || M.A. Padlipsky || +# RFC874 || M.A. Padlipsky || +# RFC875 || M.A. Padlipsky || +# RFC876 || D. Smallberg || +# RFC877 || J.T. Korb || +# RFC878 || A.G. Malis || +# RFC879 || J. Postel || +# RFC880 || J.K. Reynolds, J. Postel || +# RFC881 || J. Postel || +# RFC882 || P.V. Mockapetris || +# RFC883 || P.V. Mockapetris || +# RFC884 || M. Solomon, E. Wimmers || +# RFC885 || J. Postel || +# RFC886 || M.T. Rose || +# RFC887 || M. Accetta || +# RFC888 || L. Seamonson, E.C. Rosen || +# RFC889 || D.L. Mills || +# RFC890 || J. Postel || +# RFC891 || D.L. Mills || +# RFC892 || International Organization for Standardization || +# RFC893 || S. Leffler, M.J. Karels || +# RFC894 || C. Hornig || +# RFC895 || J. Postel || +# RFC896 || J. Nagle || +# RFC897 || J. Postel || +# RFC898 || R.M. Hinden, J. Postel, M. Muuss, J.K. Reynolds || bob.hinden@gmail.com +# RFC899 || J. Postel, A. Westine || +# RFC900 || J.K. Reynolds, J. Postel || +# RFC901 || J.K. Reynolds, J. Postel || +# RFC902 || J.K. Reynolds, J. Postel || +# RFC903 || R. Finlayson, T. Mann, J.C. Mogul, M. Theimer || +# RFC904 || D.L. Mills || +# RFC905 || ISO || +# RFC906 || R. Finlayson || +# RFC907 || Bolt Beranek and Newman Laboratories || +# RFC908 || D. Velten, R.M. Hinden, J. Sax || bob.hinden@gmail.com +# RFC909 || C. Welles, W. Milliken || +# RFC910 || H.C. Forsdick || +# RFC911 || P. Kirton || +# RFC912 || M. St. Johns || +# RFC913 || M. Lottor || +# RFC914 || D.J. Farber, G. Delp, T.M. Conte || +# RFC915 || M.A. Elvy, R. Nedved || +# RFC916 || G.G. Finn || +# RFC917 || J.C. Mogul || +# RFC918 || J.K. Reynolds || +# RFC919 || J.C. Mogul || +# RFC920 || J. Postel, J.K. Reynolds || +# RFC921 || J. Postel || +# RFC922 || J.C. Mogul || +# RFC923 || J.K. Reynolds, J. Postel || +# RFC924 || J.K. Reynolds, J. Postel || +# RFC925 || J. Postel || +# RFC926 || International Organization for Standardization || +# RFC927 || B.A. Anderson || +# RFC928 || M.A. Padlipsky || +# RFC929 || J. Lilienkamp, R. Mandell, M.A. Padlipsky || +# RFC930 || M. Solomon, E. Wimmers || +# RFC931 || M. St. Johns || +# RFC932 || D.D. Clark || +# RFC933 || S. Silverman || +# RFC934 || M.T. Rose, E.A. Stefferud || +# RFC935 || J.G. Robinson || +# RFC936 || M.J. Karels || +# RFC937 || M. Butler, J. Postel, D. Chase, J. Goldberger, J.K. Reynolds || +# RFC938 || T. Miller || +# RFC939 || National Research Council || +# RFC940 || Gateway Algorithms and Data Structures Task Force || +# RFC941 || International Organization for Standardization || +# RFC942 || National Research Council || +# RFC943 || J.K. Reynolds, J. Postel || +# RFC944 || J.K. Reynolds, J. Postel || +# RFC945 || J. Postel || +# RFC946 || R. Nedved || +# RFC947 || K. Lebowitz, D. Mankins || +# RFC948 || I. Winston || +# RFC949 || M.A. Padlipsky || +# RFC950 || J.C. Mogul, J. Postel || +# RFC951 || W.J. Croft, J. Gilmore || +# RFC952 || K. Harrenstien, M.K. Stahl, E.J. Feinler || +# RFC953 || K. Harrenstien, M.K. Stahl, E.J. Feinler || +# RFC954 || K. Harrenstien, M.K. Stahl, E.J. Feinler || +# RFC955 || R.T. Braden || +# RFC956 || D.L. Mills || +# RFC957 || D.L. Mills || +# RFC958 || D.L. Mills || +# RFC959 || J. Postel, J. Reynolds || +# RFC960 || J.K. Reynolds, J. Postel || +# RFC961 || J.K. Reynolds, J. Postel || +# RFC962 || M.A. Padlipsky || +# RFC963 || D.P. Sidhu || +# RFC964 || D.P. Sidhu, T. Blumer || +# RFC965 || L. Aguilar || +# RFC966 || S.E. Deering, D.R. Cheriton || +# RFC967 || M.A. Padlipsky || +# RFC968 || V.G. Cerf || +# RFC969 || D.D. Clark, M.L. Lambert, L. Zhang || +# RFC970 || J. Nagle || +# RFC971 || A.L. DeSchon || +# RFC972 || F.J. Wancho || +# RFC973 || P.V. Mockapetris || +# RFC974 || C. Partridge || +# RFC975 || D.L. Mills || +# RFC976 || M.R. Horton || +# RFC977 || B. Kantor, P. Lapsley || +# RFC978 || J.K. Reynolds, R. Gillman, W.A. Brackenridge, A. Witkowski, J. Postel || +# RFC979 || A.G. Malis || +# RFC980 || O.J. Jacobsen, J. Postel || +# RFC981 || D.L. Mills || +# RFC982 || H.W. Braun || +# RFC983 || D.E. Cass, M.T. Rose || +# RFC984 || D.D. Clark, M.L. Lambert || +# RFC985 || National Science Foundation, Network Technical Advisory Group || +# RFC986 || R.W. Callon, H.W. Braun || +# RFC987 || S.E. Kille || +# RFC988 || S.E. Deering || +# RFC989 || J. Linn || +# RFC990 || J.K. Reynolds, J. Postel || +# RFC991 || J.K. Reynolds, J. Postel || +# RFC992 || K.P. Birman, T.A. Joseph || +# RFC993 || D.D. Clark, M.L. Lambert || +# RFC994 || International Organization for Standardization || +# RFC995 || International Organization for Standardization || +# RFC996 || D.L. Mills || +# RFC997 || J.K. Reynolds, J. Postel || +# RFC998 || D.D. Clark, M.L. Lambert, L. Zhang || +# RFC999 || A. Westine, J. Postel || +# RFC1000 || J.K. Reynolds, J. Postel || +# RFC1001 || NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force || +# RFC1002 || NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force || +# RFC1003 || A.R. Katz || +# RFC1004 || D.L. Mills || +# RFC1005 || A. Khanna, A.G. Malis || +# RFC1006 || M.T. Rose, D.E. Cass || +# RFC1007 || W. McCoy || +# RFC1008 || W. McCoy || +# RFC1009 || R.T. Braden, J. Postel || +# RFC1010 || J.K. Reynolds, J. Postel || +# RFC1011 || J.K. Reynolds, J. Postel || +# RFC1012 || J.K. Reynolds, J. Postel || +# RFC1013 || R.W. Scheifler || +# RFC1014 || Sun Microsystems || +# RFC1015 || B.M. Leiner || +# RFC1016 || W. Prue, J. Postel || +# RFC1017 || B.M. Leiner || +# RFC1018 || A.M. McKenzie || +# RFC1019 || D. Arnon || +# RFC1020 || S. Romano, M.K. Stahl || +# RFC1021 || C. Partridge, G. Trewitt || +# RFC1022 || C. Partridge, G. Trewitt || +# RFC1023 || G. Trewitt, C. Partridge || +# RFC1024 || C. Partridge, G. Trewitt || +# RFC1025 || J. Postel || +# RFC1026 || S.E. Kille || +# RFC1027 || S. Carl-Mitchell, J.S. Quarterman || +# RFC1028 || J. Davin, J.D. Case, M. Fedor, M.L. Schoffstall || +# RFC1029 || G. Parr || +# RFC1030 || M.L. Lambert || +# RFC1031 || W.D. Lazear || +# RFC1032 || M.K. Stahl || +# RFC1033 || M. Lottor || +# RFC1034 || P.V. Mockapetris || +# RFC1035 || P.V. Mockapetris || +# RFC1036 || M.R. Horton, R. Adams || +# RFC1037 || B. Greenberg, S. Keene || +# RFC1038 || M. St. Johns || +# RFC1039 || D. Latham || +# RFC1040 || J. Linn || +# RFC1041 || Y. Rekhter || +# RFC1042 || J. Postel, J.K. Reynolds || +# RFC1043 || A. Yasuda, T. Thompson || +# RFC1044 || K. Hardwick, J. Lekashman || +# RFC1045 || D.R. Cheriton || +# RFC1046 || W. Prue, J. Postel || +# RFC1047 || C. Partridge || +# RFC1048 || P.A. Prindeville || +# RFC1049 || M.A. Sirbu || +# RFC1050 || Sun Microsystems || +# RFC1051 || P.A. Prindeville || +# RFC1052 || V.G. Cerf || +# RFC1053 || S. Levy, T. Jacobson || +# RFC1054 || S.E. Deering || +# RFC1055 || J.L. Romkey || +# RFC1056 || M.L. Lambert || +# RFC1057 || Sun Microsystems || +# RFC1058 || C.L. Hedrick || +# RFC1059 || D.L. Mills || +# RFC1060 || J.K. Reynolds, J. Postel || +# RFC1061 || || +# RFC1062 || S. Romano, M.K. Stahl, M. Recker || +# RFC1063 || J.C. Mogul, C.A. Kent, C. Partridge, K. McCloghrie || +# RFC1064 || M.R. Crispin || +# RFC1065 || K. McCloghrie, M.T. Rose || +# RFC1066 || K. McCloghrie, M.T. Rose || +# RFC1067 || J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin || +# RFC1068 || A.L. DeSchon, R.T. Braden || +# RFC1069 || R.W. Callon, H.W. Braun || +# RFC1070 || R.A. Hagens, N.E. Hall, M.T. Rose || hagens@cs.wisc.edu, nhall@cs.wisc.edu +# RFC1071 || R.T. Braden, D.A. Borman, C. Partridge || +# RFC1072 || V. Jacobson, R.T. Braden || +# RFC1073 || D. Waitzman || +# RFC1074 || J. Rekhter || +# RFC1075 || D. Waitzman, C. Partridge, S.E. Deering || +# RFC1076 || G. Trewitt, C. Partridge || +# RFC1077 || B.M. Leiner || +# RFC1078 || M. Lottor || +# RFC1079 || C.L. Hedrick || +# RFC1080 || C.L. Hedrick || +# RFC1081 || M.T. Rose || +# RFC1082 || M.T. Rose || +# RFC1083 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1084 || J.K. Reynolds || JKREYNOLDS@ISI.EDU +# RFC1085 || M.T. Rose || mrose17@gmail.com +# RFC1086 || J.P. Onions, M.T. Rose || JPO@CS.NOTT.AC.UK, mrose17@gmail.com +# RFC1087 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1088 || L.J. McLaughlin || ljm@TWG.COM +# RFC1089 || M. Schoffstall, C. Davin, M. Fedor, J. Case || schoff@stonewall.nyser.net, jrd@ptt.lcs.mit.edu, fedor@patton.NYSER.NET, case@UTKUX1.UTK.EDU +# RFC1090 || R. Ullmann || +# RFC1091 || J. VanBokkelen || +# RFC1092 || J. Rekhter || +# RFC1093 || H.W. Braun || +# RFC1094 || B. Nowicki || +# RFC1095 || U.S. Warrier, L. Besaw || +# RFC1096 || G.A. Marcy || +# RFC1097 || B. Miller || +# RFC1098 || J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin || jrd@ptt.lcs.mit.edu +# RFC1099 || J. Reynolds || JKREY@ISI.EDU +# RFC1100 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1101 || P.V. Mockapetris || +# RFC1102 || D.D. Clark || +# RFC1103 || D. Katz || +# RFC1104 || H.W. Braun || hwb@merit.edu +# RFC1105 || K. Lougheed, Y. Rekhter || +# RFC1106 || R. Fox || rfox@tandem.com +# RFC1107 || K.R. Sollins || SOLLINS@XX.LCS.MIT.EDU +# RFC1108 || S. Kent || +# RFC1109 || V.G. Cerf || CERF@A.ISI.EDU +# RFC1110 || A.M. McKenzie || MCKENZIE@BBN.COM +# RFC1111 || J. Postel || POSTEL@ISI.EDU +# RFC1112 || S.E. Deering || deering@PESCADERO.STANFORD.EDU +# RFC1113 || J. Linn || Linn@ultra.enet.dec.com +# RFC1114 || S.T. Kent, J. Linn || kent@BBN.COM, Linn@ultra.enet.dec.com +# RFC1115 || J. Linn || Linn@ultra.enet.dec.com +# RFC1116 || D.A. Borman || dab@CRAY.COM +# RFC1117 || S. Romano, M.K. Stahl, M. Recker || +# RFC1118 || E. Krol || Krol@UXC.CSO.UIUC.EDU +# RFC1119 || D.L. Mills || +# RFC1120 || V. Cerf || VCERF@NRI.RESTON.VA.US +# RFC1121 || J. Postel, L. Kleinrock, V.G. Cerf, B. Boehm || Postel@ISI.EDU, lk@CS.UCLA.EDU, VCerf@NRI.RESTON.VA.US, boehm@CS.UCLA.EDU +# RFC1122 || R. Braden, Ed. || Braden@ISI.EDU +# RFC1123 || R. Braden, Ed. || Braden@ISI.EDU +# RFC1124 || B.M. Leiner || +# RFC1125 || D. Estrin || +# RFC1126 || M. Little || little@SAIC.COM +# RFC1127 || R.T. Braden || Braden@ISI.EDU +# RFC1128 || D.L. Mills || +# RFC1129 || D.L. Mills || +# RFC1130 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1131 || J. Moy || +# RFC1132 || L.J. McLaughlin || ljm@TWG.COM +# RFC1133 || J.Y. Yu, H.W. Braun || jyy@merit.edu, hwb@merit.edu +# RFC1134 || D. Perkins || rdhobby@ucdavis.edu +# RFC1135 || J.K. Reynolds || JKREY@ISI.EDU +# RFC1136 || S. Hares, D. Katz || +# RFC1137 || S. Kille || S.Kille@Cs.Ucl.AC.UK +# RFC1138 || S.E. Kille || S.Kille@Cs.Ucl.AC.UK +# RFC1139 || R.A. Hagens || hagens@CS.WISC.EDU +# RFC1140 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1141 || T. Mallory, A. Kullberg || tmallory@CCV.BBN.COM, akullberg@BBN.COM +# RFC1142 || D. Oran, Ed. || +# RFC1143 || D.J. Bernstein || +# RFC1144 || V. Jacobson || +# RFC1145 || J. Zweig, C. Partridge || zweig@CS.UIUC.EDU, craig@BBN.COM +# RFC1146 || J. Zweig, C. Partridge || zweig@CS.UIUC.EDU, craig@BBN.COM +# RFC1147 || R.H. Stine || STINE@SPARTA.COM +# RFC1148 || S.E. Kille || S.Kille@Cs.Ucl.AC.UK +# RFC1149 || D. Waitzman || dwaitzman@BBN.COM +# RFC1150 || G.S. Malkin, J.K. Reynolds || gmalkin@proteon.com, jkrey@isi.edu +# RFC1151 || C. Partridge, R.M. Hinden || craig@BBN.COM, bob.hinden@gmail.com +# RFC1152 || C. Partridge || craig@BBN.COM +# RFC1153 || F.J. Wancho || +# RFC1154 || D. Robinson, R. Ullmann || +# RFC1155 || M.T. Rose, K. McCloghrie || mrose17@gmail.com +# RFC1156 || K. McCloghrie, M.T. Rose || mrose17@gmail.com +# RFC1157 || J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin || jrd@ptt.lcs.mit.edu +# RFC1158 || M.T. Rose || +# RFC1159 || R. Nelson || nelson@sun.soe.clarkson.edu +# RFC1160 || V. Cerf || VCERF@NRI.RESTON.VA.US +# RFC1161 || M.T. Rose || +# RFC1162 || G. Satz || +# RFC1163 || K. Lougheed, Y. Rekhter || +# RFC1164 || J.C. Honig, D. Katz, M. Mathis, Y. Rekhter, J.Y. Yu || +# RFC1165 || J. Crowcroft, J.P. Onions || JON@CS.UCL.AC.UK, JPO@CS.NOTT.AC.UK +# RFC1166 || S. Kirkpatrick, M.K. Stahl, M. Recker || +# RFC1167 || V.G. Cerf || vcerf@NRI.Reston.VA.US +# RFC1168 || A. Westine, A.L. DeSchon, J. Postel, C.E. Ward || +# RFC1169 || V.G. Cerf, K.L. Mills || vcerf@nri.reston.va.us, MILLS@ECF.NCSL.NIST.GOV +# RFC1170 || R.B. Fougner || +# RFC1171 || D. Perkins || ddp@andrew.cmu.edu +# RFC1172 || D. Perkins, R. Hobby || rdhobby@ucdavis.edu, ddp@andrew.cmu.edu +# RFC1173 || J. VanBokkelen || jbvb@ftp.com +# RFC1174 || V.G. Cerf || vcerf@nri.reston.va.us +# RFC1175 || K.L. Bowers, T.L. LaQuey, J.K. Reynolds, K. Roubicek, M.K. Stahl, A. Yuan || +# RFC1176 || M.R. Crispin || mrc@Tomobiki-Cho.CAC.Washington.EDU +# RFC1177 || G.S. Malkin, A.N. Marine, J.K. Reynolds || gmalkin@ftp.com, APRIL@NIC.DDN.MIL, jkrey@isi.edu +# RFC1178 || D. Libes || libes@cme.nist.gov +# RFC1179 || L. McLaughlin || ljm@twg.com +# RFC1180 || T.J. Socolofsky, C.J. Kale || TEDS@SPIDER.CO.UK, CLAUDIAK@SPIDER.CO.UK +# RFC1181 || R. Blokzijl || k13@nikhef.nl +# RFC1182 || || +# RFC1183 || C.F. Everhart, L.A. Mamakos, R. Ullmann, P.V. Mockapetris || Craig_Everhart@transarc.com, pvm@isi.edu +# RFC1184 || D.A. Borman || dab@CRAY.COM +# RFC1185 || V. Jacobson, R.T. Braden, L. Zhang || van@CSAM.LBL.GOV, Braden@ISI.EDU, lixia@PARC.XEROX.COM +# RFC1186 || R.L. Rivest || rivest@theory.lcs.mit.edu +# RFC1187 || M.T. Rose, K. McCloghrie, J.R. Davin || mrose17@gmail.com, KZM@HLS.COM, jrd@ptt.lcs.mit.edu +# RFC1188 || D. Katz || dkatz@merit.edu +# RFC1189 || U.S. Warrier, L. Besaw, L. LaBarre, B.D. Handspicker || +# RFC1190 || C. Topolcic || Casner@ISI.Edu, CLynn@BBN.Com, ppark@BBN.COM, Schroder@BBN.Com, Topolcic@BBN.Com +# RFC1191 || J.C. Mogul, S.E. Deering || mogul@decwrl.dec.com, deering@xerox.com +# RFC1192 || B. Kahin || kahin@hulaw.harvard.edu +# RFC1193 || D. Ferrari || ferrari@UCBVAX.BERKELEY.EDU +# RFC1194 || D.P. Zimmerman || dpz@dimacs.rutgers.edu +# RFC1195 || R.W. Callon || +# RFC1196 || D.P. Zimmerman || dpz@dimacs.rutgers.edu +# RFC1197 || M. Sherman || +# RFC1198 || R.W. Scheifler || rws@expo.lcs.mit.edu +# RFC1199 || J. Reynolds || JKREY@ISI.EDU +# RFC1200 || Defense Advanced Research Projects Agency, Internet Activities Board || +# RFC1201 || D. Provan || donp@Novell.Com +# RFC1202 || M.T. Rose || mrose17@gmail.com +# RFC1203 || J. Rice || RICE@SUMEX-AIM.STANFORD.EDU +# RFC1204 || S. Yeh, D. Lee || dlee@netix.com +# RFC1205 || P. Chmielewski || paulc@rchland.iinus1.ibm.com +# RFC1206 || G.S. Malkin, A.N. Marine || gmalkin@ftp.com, APRIL@nic.ddn.mil +# RFC1207 || G.S. Malkin, A.N. Marine, J.K. Reynolds || gmalkin@ftp.com, APRIL@nic.ddn.mil, jkrey@isi.edu +# RFC1208 || O.J. Jacobsen, D.C. Lynch || OLE@CSLI.STANFORD.EDU, Lynch@ISI.EDU +# RFC1209 || D. Piscitello, J. Lawrence || dave@sabre.bellcore.com, jcl@sabre.bellcore.com +# RFC1210 || V.G. Cerf, P.T. Kirstein, B. Randell || +# RFC1211 || A. Westine, J. Postel || Westine@ISI.EDU, Postel@ISI.EDU +# RFC1212 || M.T. Rose, K. McCloghrie || mrose17@gmail.com, kzm@hls.com +# RFC1213 || K. McCloghrie, M. Rose || kzm@hls.com, mrose17@gmail.com +# RFC1214 || L. LaBarre || cel@mbunix.mitre.org +# RFC1215 || M.T. Rose || mrose17@gmail.com +# RFC1216 || P. Richard, P. Kynikos || +# RFC1217 || V.G. Cerf || CERF@NRI.RESTON.VA.US +# RFC1218 || North American Directory Forum || +# RFC1219 || P.F. Tsuchiya || tsuchiya@thumper.bellcore.com +# RFC1220 || F. Baker || fbaker@ACC.COM +# RFC1221 || W. Edmond || wbe@bbn.com +# RFC1222 || H.W. Braun, Y. Rekhter || HWB@SDSC.EDU, Yakov@Watson.IBM.COM +# RFC1223 || J.M. Halpern || +# RFC1224 || L. Steinberg || LOUISS@IBM.COM +# RFC1225 || M.T. Rose || mrose17@gmail.com +# RFC1226 || B. Kantor || brian@UCSD.EDU +# RFC1227 || M.T. Rose || mrose17@gmail.com +# RFC1228 || G. Carpenter, B. Wijnen || +# RFC1229 || K. McCloghrie || kzm@hls.com +# RFC1230 || K. McCloghrie, R. Fox || kzm@hls.com, rfox@synoptics.com +# RFC1231 || K. McCloghrie, R. Fox, E. Decker || kzm@hls.com, rfox@synoptics.com, cire@cisco.com +# RFC1232 || F. Baker, C.P. Kolb || fbaker@acc.com, kolb@psi.com +# RFC1233 || T.A. Cox, K. Tesink || tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com +# RFC1234 || D. Provan || donp@Novell.Com +# RFC1235 || J. Ioannidis, G. Maguire || ji@cs.columbia.edu, maguire@cs.columbia.edu +# RFC1236 || L. Morales, P. Hasse || lmorales@huachuca-emh8.army.mil, phasse@huachuca-emh8.army.mil +# RFC1237 || R. Colella, E. Gardner, R. Callon || colella@osi3.ncsl.nist.gov, epg@gateway.mitre.org +# RFC1238 || G. Satz || +# RFC1239 || J.K. Reynolds || jkrey@isi.edu +# RFC1240 || C. Shue, W. Haggerty, K. Dobbins || chi@osf.org, bill@comm.wang.com +# RFC1241 || R.A. Woodburn, D.L. Mills || woody@cseic.saic.com, mills@udel.edu +# RFC1242 || S. Bradner || SOB@HARVARD.HARVARD.EDU +# RFC1243 || S. Waldbusser || waldbusser@andrew.cmu.edu +# RFC1244 || J.P. Holbrook, J.K. Reynolds || holbrook@cic.net, JKREY@ISI.EDU +# RFC1245 || J. Moy || +# RFC1246 || J. Moy || +# RFC1247 || J. Moy || jmoy@proteon.com +# RFC1248 || F. Baker, R. Coltun || fbaker@acc.com, rcoltun@ni.umd.edu +# RFC1249 || T. Howes, M. Smith, B. Beecher || tim@umich.edu, mcs@umich.edu, bryan@umich.edu +# RFC1250 || J. Postel || +# RFC1251 || G. Malkin || gmalkin@ftp.com +# RFC1252 || F. Baker, R. Coltun || fbaker@acc.com, rcoltun@ni.umd.edu +# RFC1253 || F. Baker, R. Coltun || fbaker@acc.com, rcoltun@ni.umd.edu +# RFC1254 || A. Mankin, K. Ramakrishnan || +# RFC1255 || The North American Directory Forum || +# RFC1256 || S. Deering, Ed. || deering@xerox.com +# RFC1257 || C. Partridge || craig@SICS.SE +# RFC1258 || B. Kantor || brian@UCSD.EDU +# RFC1259 || M. Kapor || mkapor@eff.org +# RFC1260 || || +# RFC1261 || S. Williamson, L. Nobile || scottw@DIIS.DDN.MIL +# RFC1262 || V.G. Cerf || +# RFC1263 || S. O'Malley, L.L. Peterson || llp@cs.arizona.edu, sean@cs.arizona.edu +# RFC1264 || R.M. Hinden || bob.hinden@gmail.com +# RFC1265 || Y. Rekhter || yakov@watson.ibm.com +# RFC1266 || Y. Rekhter || yakov@watson.ibm.com +# RFC1267 || K. Lougheed, Y. Rekhter || +# RFC1268 || Y. Rekhter, P. Gross || yakov@watson.ibm.com +# RFC1269 || S. Willis, J.W. Burruss || +# RFC1270 || F. Kastenholz || +# RFC1271 || S. Waldbusser || waldbusser@andrew.cmu.edu +# RFC1272 || C. Mills, D. Hirsh, G.R. Ruth || +# RFC1273 || M.F. Schwartz || schwartz@cs.colorado.edu +# RFC1274 || P. Barker, S. Kille || P.Barker@cs.ucl.ac.uk, S.Kille@cs.ucl.ac.uk +# RFC1275 || S.E. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1276 || S.E. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1277 || S.E. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1278 || S.E. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1279 || S.E. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1280 || J. Postel || +# RFC1281 || R. Pethia, S. Crocker, B. Fraser || rdp@cert.sei.cmu.edu, crocker@tis.com, byf@cert.sei.cmu.edu +# RFC1282 || B. Kantor || brian@UCSD.EDU +# RFC1283 || M. Rose || +# RFC1284 || J. Cook, Ed. || kasten@europa.clearpoint.com +# RFC1285 || J. Case || case@CS.UTK.EDU +# RFC1286 || E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie || langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com +# RFC1287 || D. Clark, L. Chapin, V. Cerf, R. Braden, R. Hobby || ddc@LCS.MIT.EDU, vcerf@nri.reston.va.us, lyman@BBN.COM, braden@isi.edu, rdhobby@ucdavis.edu +# RFC1288 || D. Zimmerman || dpz@dimacs.rutgers.edu +# RFC1289 || J. Saperia || saperia@enet.dec.com +# RFC1290 || J. Martin || jmartin@magnus.acs.ohio-state.edu +# RFC1291 || V. Aggarwal || +# RFC1292 || R. Lang, R. Wright || +# RFC1293 || T. Bradley, C. Brown || +# RFC1294 || T. Bradley, C. Brown, A. Malis || +# RFC1295 || The North American Directory Forum || 0004454742@mcimail.com +# RFC1296 || M. Lottor || mkl@nisc.sri.com +# RFC1297 || D. Johnson || +# RFC1298 || R. Wormley, S. Bostock || bwormley@novell.com, steveb@novell.com +# RFC1299 || M. Kennedy || MKENNEDY@ISI.EDU +# RFC1300 || S. Greenfield || 0004689513@mcimail.com +# RFC1301 || S. Armstrong, A. Freier, K. Marzullo || armstrong@wrc.xerox.com, freier@apple.com, marzullo@cs.cornell.edu +# RFC1302 || D. Sitzler, P. Smith, A. Marine || +# RFC1303 || K. McCloghrie, M. Rose || kzm@hls.com, mrose17@gmail.com +# RFC1304 || T. Cox, Ed., K. Tesink, Ed. || tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com +# RFC1305 || D. Mills || +# RFC1306 || A. Nicholson, J. Young || droid@cray.com, jsy@cray.com +# RFC1307 || J. Young, A. Nicholson || jsy@cray.com, droid@cray.com +# RFC1308 || C. Weider, J. Reynolds || +# RFC1309 || C. Weider, J. Reynolds, S. Heker || jkrey@isi.edu +# RFC1310 || L. Chapin || +# RFC1311 || J. Postel || +# RFC1312 || R. Nelson, G. Arnold || nelson@crynwr.com, geoff@east.sun.com +# RFC1313 || C. Partridge || craig@aland.bbn.com +# RFC1314 || A. Katz, D. Cohen || Katz@ISI.Edu, Cohen@ISI.Edu +# RFC1315 || C. Brown, F. Baker, C. Carvalho || cbrown@wellfleet.com, fbaker@acc.com, charles@acc.com +# RFC1316 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1317 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1318 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1319 || B. Kaliski || burt@rsa.com +# RFC1320 || R. Rivest || rivest@theory.lcs.mit.edu +# RFC1321 || R. Rivest || rivest@theory.lcs.mit.edu +# RFC1322 || D. Estrin, Y. Rekhter, S. Hotz || estrin@usc.edu, yakov@ibm.com, hotz@usc.edu +# RFC1323 || V. Jacobson, R. Braden, D. Borman || van@CSAM.LBL.GOV, Braden@ISI.EDU +# RFC1324 || D. Reed || +# RFC1325 || G. Malkin, A. Marine || gmalkin@Xylogics.COM, april@nisc.sri.com +# RFC1326 || P. Tsuchiya || tsuchiya@thumper.bellcore.com +# RFC1327 || S. Hardcastle-Kille || +# RFC1328 || S. Hardcastle-Kille || S.Kille@CS.UCL.AC.UK +# RFC1329 || P. Kuehn || thimmela@sniabg.wa.sni.de +# RFC1330 || ESCC X.500/X.400 Task Force, ESnet Site Coordinating Comittee (ESCC), Energy Sciences Network (ESnet) || +# RFC1331 || W. Simpson || bsimpson@ray.lloyd.com +# RFC1332 || G. McGregor || Glenn.McGregor@Merit.edu +# RFC1333 || W. Simpson || bsimpson@ray.lloyd.com +# RFC1334 || B. Lloyd, W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1335 || Z. Wang, J. Crowcroft || z.wang@cs.ucl.ac.uk, j.crowcroft@cs.ucl.ac.uk +# RFC1336 || G. Malkin || gmalkin@Xylogics.COM +# RFC1337 || R. Braden || Braden@ISI.EDU +# RFC1338 || V. Fuller, T. Li, J. Yu, K. Varadhan || +# RFC1339 || S. Dorner, P. Resnick || s-dorner@uiuc.edu, presnick@qti.qualcomm.com +# RFC1340 || J. Reynolds, J. Postel || +# RFC1341 || N. Borenstein, N. Freed || +# RFC1342 || K. Moore || moore@cs.utk.edu +# RFC1343 || N. Borenstein || +# RFC1344 || N. Borenstein || +# RFC1345 || K. Simonsen || +# RFC1346 || P. Jones || +# RFC1347 || R. Callon || +# RFC1348 || B. Manning || bmanning@rice.edu +# RFC1349 || P. Almquist || +# RFC1350 || K. Sollins || SOLLINS@LCS.MIT.EDU +# RFC1351 || J. Davin, J. Galvin, K. McCloghrie || jrd@ptt.lcs.mit.edu, galvin@tis.com, kzm@hls.com +# RFC1352 || J. Galvin, K. McCloghrie, J. Davin || galvin@tis.com, kzm@hls.com, jrd@ptt.lcs.mit.edu +# RFC1353 || K. McCloghrie, J. Davin, J. Galvin || kzm@hls.com, jrd@ptt.lcs.mit.edu, galvin@tis.com +# RFC1354 || F. Baker || fbaker@acc.com +# RFC1355 || J. Curran, A. Marine || jcurran@nnsc.nsf.net, april@nisc.sri.com +# RFC1356 || A. Malis, D. Robinson, R. Ullmann || +# RFC1357 || D. Cohen || Cohen@ISI.EDU +# RFC1358 || L. Chapin || lyman@BBN.COM +# RFC1359 || ACM SIGUCCS || martyne@nr-tech.cit.cornell.edu +# RFC1360 || J. Postel || +# RFC1361 || D. Mills || mills@udel.edu +# RFC1362 || M. Allen || MALLEN@NOVELL.COM, brian@ray.lloyd.com +# RFC1363 || C. Partridge || craig@aland.bbn.com +# RFC1364 || K. Varadhan || kannan@oar.net +# RFC1365 || K. Siyan || 72550.1634@compuserve.com +# RFC1366 || E. Gerich || epg@MERIT.EDU +# RFC1367 || C. Topolcic || topolcic@NRI.Reston.VA.US +# RFC1368 || D. McMaster, K. McCloghrie || mcmaster@synoptics.com, kzm@hls.com +# RFC1369 || F. Kastenholz || kasten@ftp.com +# RFC1370 || Internet Architecture Board, L. Chapin || +# RFC1371 || P. Gross || pgross@ans.net +# RFC1372 || C. Hedrick, D. Borman || +# RFC1373 || T. Tignor || tpt2@isi.edu +# RFC1374 || J. Renwick, A. Nicholson || jkr@CRAY.COM, droid@CRAY.COM +# RFC1375 || P. Robinson || +# RFC1376 || S. Senum || sjs@network.com +# RFC1377 || D. Katz || dkatz@cisco.com +# RFC1378 || B. Parker || brad@cayman.com +# RFC1379 || R. Braden || Braden@ISI.EDU +# RFC1380 || P. Gross, P. Almquist || pgross@ans.net, Almquist@JESSICA.STANFORD.EDU +# RFC1381 || D. Throop, F. Baker || throop@dg-rtp.dg.com, fbaker@acc.com +# RFC1382 || D. Throop, Ed. || throop@dg-rtp.dg.com +# RFC1383 || C. Huitema || Christian.Huitema@MIRSA.INRIA.FR +# RFC1384 || P. Barker, S.E. Hardcastle-Kille || P.Barker@CS.UCL.AC.UK, S.Kille@ISODE.COM +# RFC1385 || Z. Wang || z.wang@cs.ucl.ac.uk +# RFC1386 || A. Cooper, J. Postel || +# RFC1387 || G. Malkin || gmalkin@Xylogics.COM +# RFC1388 || G. Malkin || gmalkin@Xylogics.COM +# RFC1389 || G. Malkin, F. Baker || gmalkin@Xylogics.COM, fbaker@acc.com +# RFC1390 || D. Katz || dkatz@cisco.com +# RFC1391 || G. Malkin || gmalkin@Xylogics.COM +# RFC1392 || G. Malkin, T. LaQuey Parker || gmalkin@Xylogics.COM, tracy@utexas.edu +# RFC1393 || G. Malkin || gmalkin@Xylogics.COM +# RFC1394 || P. Robinson || +# RFC1395 || J. Reynolds || jkrey@isi.edu +# RFC1396 || S. Crocker || +# RFC1397 || D. Haskin || +# RFC1398 || F. Kastenholz || kasten@ftp.com +# RFC1399 || J. Elliott || elliott@isi.edu +# RFC1400 || S. Williamson || scottw@internic.net +# RFC1401 || Internet Architecture Board || +# RFC1402 || J. Martin || nic@osu.edu +# RFC1403 || K. Varadhan || +# RFC1404 || B. Stockman || +# RFC1405 || C. Allocchio || Claudio.Allocchio@elettra.Trieste.it +# RFC1406 || F. Baker, Ed., J. Watt, Ed. || fbaker@acc.com, james@newbridge.com +# RFC1407 || T. Cox, K. Tesink || tacox@mail.bellcore.com, kaj@cc.bellcore.com +# RFC1408 || D. Borman, Ed. || dab@CRAY.COM, stevea@isc.com +# RFC1409 || D. Borman, Ed. || dab@CRAY.COM, stevea@isc.com +# RFC1410 || J. Postel, Ed. || +# RFC1411 || D. Borman, Ed. || dab@CRAY.COM, stevea@isc.com +# RFC1412 || K. Alagappan || kannan@sejour.lkg.dec.com, stevea@isc.com +# RFC1413 || M. St. Johns || stjohns@DARPA.MIL +# RFC1414 || M. St. Johns, M. Rose || stjohns@DARPA.MIL, mrose17@gmail.com +# RFC1415 || J. Mindel, R. Slaski || +# RFC1416 || D. Borman, Ed. || dab@CRAY.COM, stevea@isc.com +# RFC1417 || The North American Directory Forum || 0004454742@mcimail.com +# RFC1418 || M. Rose || mrose17@gmail.com +# RFC1419 || G. Minshall, M. Ritter || minshall@wc.novell.com, MWRITTER@applelink.apple.com +# RFC1420 || S. Bostock || +# RFC1421 || J. Linn || 104-8456@mcimail.com +# RFC1422 || S. Kent || kent@BBN.COM +# RFC1423 || D. Balenson || balenson@tis.com +# RFC1424 || B. Kaliski || burt@rsa.com +# RFC1425 || J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker || +# RFC1426 || J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker || +# RFC1427 || J. Klensin, WG Chair, N. Freed, Ed., K. Moore || +# RFC1428 || G. Vaudreuil || GVaudre@CNRI.Reston.VA.US +# RFC1429 || E. Thomas || +# RFC1430 || S. Hardcastle-Kille, E. Huizer, V. Cerf, R. Hobby, S. Kent || S.Kille@isode.com, vcerf@cnri.reston.va.us, rdhobby@ucdavis.edu, skent@bbn.com +# RFC1431 || P. Barker || +# RFC1432 || J. Quarterman || jsq@tic.com, mids@tic.com +# RFC1433 || J. Garrett, J. Hagan, J. Wong || jwg@garage.att.com, Hagan@UPENN.EDU, jwong@garage.att.com +# RFC1434 || R. Dixon, D. Kushi || rcdixon@ralvmg.vnet.ibm.com, kushi@watson.ibm.com +# RFC1435 || S. Knowles || stev@ftp.com +# RFC1436 || F. Anklesaria, M. McCahill, P. Lindner, D. Johnson, D. Torrey, B. Albert || fxa@boombox.micro.umn.edu, mpm@boombox.micro.umn.edu, lindner@boombox.micro.umn.edu, dmj@boombox.micro.umn.edu, daniel@boombox.micro.umn.edu, alberti@boombox.micro.umn.edu +# RFC1437 || N. Borenstein, M. Linimon || nsb@bellcore.com, linimon@LONESOME.COM +# RFC1438 || A. Lyman Chapin, C. Huitema || Lyman@BBN.COM, Christian.Huitema@MIRSA.INRIA.FR +# RFC1439 || C. Finseth || Craig.A.Finseth-1@umn.edu +# RFC1440 || R. Troth || troth@rice.edu +# RFC1441 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1442 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1443 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1444 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1445 || J. Galvin, K. McCloghrie || galvin@tis.com +# RFC1446 || J. Galvin, K. McCloghrie || galvin@tis.com +# RFC1447 || K. McCloghrie, J. Galvin || galvin@tis.com +# RFC1448 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1449 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1450 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1451 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1452 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1453 || W. Chimiak || chim@relito.medeng.wfu.edu +# RFC1454 || T. Dixon || dixon@rare.nl +# RFC1455 || D. Eastlake 3rd || +# RFC1456 || Vietnamese Standardization Working Group || +# RFC1457 || R. Housley || Housley.McLean_CSD@Xerox.COM +# RFC1458 || R. Braudes, S. Zabele || rebraudes@tasc.com, gszabele@tasc.com +# RFC1459 || J. Oikarinen, D. Reed || +# RFC1460 || M. Rose || mrose17@gmail.com +# RFC1461 || D. Throop || throop@dg-rtp.dg.com +# RFC1462 || E. Krol, E. Hoffman || e-krol@uiuc.edu, ellen@merit.edu +# RFC1463 || E. Hoffman, L. Jackson || +# RFC1464 || R. Rosenbaum || +# RFC1465 || D. Eppenberger || Eppenberger@switch.ch +# RFC1466 || E. Gerich || epg@MERIT.EDU +# RFC1467 || C. Topolcic || topolcic@CNRI.Reston.VA.US +# RFC1468 || J. Murai, M. Crispin, E. van der Poel || jun@wide.ad.jp, MRC@PANDA.COM, erik@poel.juice.or.jp +# RFC1469 || T. Pusateri || pusateri@cs.duke.edu +# RFC1470 || R. Enger, J. Reynolds || enger@reston.ans.net +# RFC1471 || F. Kastenholz || kasten@ftp.com +# RFC1472 || F. Kastenholz || kasten@ftp.com +# RFC1473 || F. Kastenholz || kasten@ftp.com +# RFC1474 || F. Kastenholz || kasten@ftp.com +# RFC1475 || R. Ullmann || +# RFC1476 || R. Ullmann || +# RFC1477 || M. Steenstrup || +# RFC1478 || M. Steenstrup || +# RFC1479 || M. Steenstrup || +# RFC1480 || A. Cooper, J. Postel || +# RFC1481 || C. Huitema || Christian.Huitema@MIRSA.INRIA.FR +# RFC1482 || M. Knopper, S. Richardson || +# RFC1483 || Juha Heinanen || +# RFC1484 || S. Hardcastle-Kille || S.Kille@ISODE.COM +# RFC1485 || S. Hardcastle-Kille || S.Kille@ISODE.COM +# RFC1486 || M. Rose, C. Malamud || mrose17@gmail.com, carl@malamud.com +# RFC1487 || W. Yeong, T. Howes, S. Kille || yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com +# RFC1488 || T. Howes, S. Kille, W. Yeong, C. Robbins || tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com +# RFC1489 || A. Chernov || ache@astral.msk.su +# RFC1490 || T. Bradley, C. Brown, A. Malis || +# RFC1491 || C. Weider, R. Wright || clw@merit.edu, wright@lbl.gov +# RFC1492 || C. Finseth || Craig.A.Finseth-1@umn.edu +# RFC1493 || E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie || langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com +# RFC1494 || H. Alvestrand, S. Thompson || Harald.Alvestrand@delab.sintef.no, sjt@gateway.ssw.com +# RFC1495 || H. Alvestrand, S. Kille, R. Miles, M. Rose, S. Thompson || Harald.Alvestrand@delab.sintef.no, S.Kille@ISODE.COM, rsm@spyder.ssw.com, mrose17@gmail.com, sjt@gateway.ssw.com +# RFC1496 || H. Alvestrand, J. Romaguera, K. Jordan || Harald.T.Alvestrand@delab.sintef.no, Kevin.E.Jordan@mercury.oss.arh.cpg.cdc.com, Romaguera@netconsult.ch +# RFC1497 || J. Reynolds || jkrey@isi.edu +# RFC1498 || J. Saltzer || Saltzer@MIT.EDU +# RFC1499 || J. Elliott || elliott@isi.edu +# RFC1500 || J. Postel || +# RFC1501 || E. Brunsen || BRUNSENE@EMAIL.ENMU.EDU +# RFC1502 || H. Alvestrand || Harald.Alvestrand@delab.sintef.no +# RFC1503 || K. McCloghrie, M. Rose || kzm@hls.com, mrose17@gmail.com +# RFC1504 || A. Oppenheimer || Oppenheime1@applelink.apple.com +# RFC1505 || A. Costanzo, D. Robinson, R. Ullmann || +# RFC1506 || J. Houttuin || +# RFC1507 || C. Kaufman || +# RFC1508 || J. Linn || +# RFC1509 || J. Wray || Wray@tuxedo.enet.dec.com +# RFC1510 || J. Kohl, C. Neuman || jtkohl@zk3.dec.com, bcn@isi.edu +# RFC1511 || J. Linn || +# RFC1512 || J. Case, A. Rijsinghani || case@CS.UTK.EDU, anil@levers.enet.dec.com +# RFC1513 || S. Waldbusser || waldbusser@cmu.edu +# RFC1514 || P. Grillo, S. Waldbusser || pl0143@mail.psi.net, waldbusser@cmu.edu +# RFC1515 || D. McMaster, K. McCloghrie, S. Roberts || mcmaster@synoptics.com, kzm@hls.com, sroberts@farallon.com +# RFC1516 || D. McMaster, K. McCloghrie || mcmaster@synoptics.com, kzm@hls.com +# RFC1517 || Internet Engineering Steering Group, R. Hinden || bob.hinden@gmail.com +# RFC1518 || Y. Rekhter, T. Li || yakov@watson.ibm.com, tli@cisco.com +# RFC1519 || V. Fuller, T. Li, J. Yu, K. Varadhan || vaf@Stanford.EDU, tli@cisco.com, jyy@merit.edu, kannan@oar.net +# RFC1520 || Y. Rekhter, C. Topolcic || yakov@watson.ibm.com, topolcic@CNRI.Reston.VA.US +# RFC1521 || N. Borenstein, N. Freed || gvaudre@cnri.reston.va.us +# RFC1522 || K. Moore || moore@cs.utk.edu +# RFC1523 || N. Borenstein || nsb@bellcore.com +# RFC1524 || N. Borenstein || nsb@bellcore.com +# RFC1525 || E. Decker, K. McCloghrie, P. Langille, A. Rijsinghani || kzm@hls.com, langille@edwin.enet.dec.com, anil@levers.enet.dec.com +# RFC1526 || D. Piscitello || dave@mail.bellcore.com +# RFC1527 || G. Cook || cook@path.net +# RFC1528 || C. Malamud, M. Rose || +# RFC1529 || C. Malamud, M. Rose || +# RFC1530 || C. Malamud, M. Rose || +# RFC1531 || R. Droms || droms@bucknell.edu +# RFC1532 || W. Wimer || Walter.Wimer@CMU.EDU +# RFC1533 || S. Alexander, R. Droms || stevea@lachman.com, droms@bucknell.edu +# RFC1534 || R. Droms || droms@bucknell.edu +# RFC1535 || E. Gavron || gavron@aces.com +# RFC1536 || A. Kumar, J. Postel, C. Neuman, P. Danzig, S. Miller || anant@isi.edu, postel@isi.edu, bcn@isi.edu, danzig@caldera.usc.edu, smiller@caldera.usc.edu +# RFC1537 || P. Beertema || Piet.Beertema@cwi.nl, anant@isi.edu +# RFC1538 || W. Behl, B. Sterling, W. Teskey || +# RFC1539 || G. Malkin || gmalkin@Xylogics.COM +# RFC1540 || J. Postel || +# RFC1541 || R. Droms || droms@bucknell.edu +# RFC1542 || W. Wimer || Walter.Wimer@CMU.EDU +# RFC1543 || J. Postel || Postel@ISI.EDU, dwaitzman@BBN.COM +# RFC1544 || M. Rose || mrose17@gmail.com +# RFC1545 || D. Piscitello || dave@mail.bellcore.com +# RFC1546 || C. Partridge, T. Mendez, W. Milliken || craig@bbn.com, tmendez@bbn.com, milliken@bbn.com +# RFC1547 || D. Perkins || Bill.Simpson@um.cc.umich.edu +# RFC1548 || W. Simpson || +# RFC1549 || W. Simpson, Ed. || +# RFC1550 || S. Bradner, A. Mankin || sob@harvard.edu, mankin@cmf.nrl.navy.mil +# RFC1551 || M. Allen || mallen@novell.com, fbaker@acc.com +# RFC1552 || W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1553 || S. Mathur, M. Lewis || mathur@telebit.com, Mark.S.Lewis@telebit.com +# RFC1554 || M. Ohta, K. Handa || mohta@cc.titech.ac.jp, handa@etl.go.jp +# RFC1555 || H. Nussbacher, Y. Bourvine || hank@vm.tau.ac.il, yehavi@vms.huji.ac.il +# RFC1556 || H. Nussbacher || hank@vm.tau.ac.il +# RFC1557 || U. Choi, K. Chon, H. Park || uhhyung@kaist.ac.kr, chon@cosmos.kaist.ac.kr, hjpark@dino.media.co.kr +# RFC1558 || T. Howes || tim@umich.edu +# RFC1559 || J. Saperia || saperia@tay.dec.com +# RFC1560 || B. Leiner, Y. Rekhter || leiner@nsipo.nasa.gov, yakov@watson.ibm.com +# RFC1561 || D. Piscitello || wk04464@worldlink.com +# RFC1562 || G. Michaelson, M. Prior || G.Michaelson@cc.uq.oz.au, mrp@itd.adelaide.edu.au +# RFC1563 || N. Borenstein || nsb@bellcore.com +# RFC1564 || P. Barker, R. Hedberg || P.Barker@cs.ucl.ac.uk, Roland.Hedberg@rc.tudelft.nl, Roland.Hedberg@umdac.umu.se +# RFC1565 || S. Kille, N. Freed || S.Kille@isode.com, ned@innosoft.com +# RFC1566 || S. Kille, N. Freed || S.Kille@isode.com, ned@innosoft.com +# RFC1567 || G. Mansfield, S. Kille || glenn@aic.co.jp, S.Kille@isode.com +# RFC1568 || A. Gwinn || allen@mail.cox.smu.edu +# RFC1569 || M. Rose || mrose17@gmail.com +# RFC1570 || W. Simpson, Ed. || +# RFC1571 || D. Borman || dab@CRAY.COM +# RFC1572 || S. Alexander, Ed. || +# RFC1573 || K. McCloghrie, F. Kastenholz || kzm@hls.com, kasten@ftp.com +# RFC1574 || S. Hares, C. Wittbrodt || skh@merit.edu, cjw@magnolia.Stanford.EDU +# RFC1575 || S. Hares, C. Wittbrodt || skh@merit.edu, cjw@magnolia.Stanford.EDU +# RFC1576 || J. Penner || jjp@bscs.com +# RFC1577 || M. Laubach || laubach@hpl.hp.com +# RFC1578 || J. Sellers || sellers@quest.arc.nasa.gov +# RFC1579 || S. Bellovin || smb@research.att.com +# RFC1580 || EARN Staff || earndoc@earncc.earn.net +# RFC1581 || G. Meyer || gerry@spider.co.uk +# RFC1582 || G. Meyer || gerry@spider.co.uk +# RFC1583 || J. Moy || +# RFC1584 || J. Moy || +# RFC1585 || J. Moy || jmoy@proteon.com +# RFC1586 || O. deSouza, M. Rodrigues || osmund.desouza@att.com, manoel.rodrigues@att.com +# RFC1587 || R. Coltun, V. Fuller || rcoltun@rainbow-bridge.com, vaf@Valinor.Stanford.EDU +# RFC1588 || J. Postel, C. Anderson || +# RFC1589 || D. Mills || mills@udel.edu +# RFC1590 || J. Postel || Postel@ISI.EDU +# RFC1591 || J. Postel || Postel@ISI.EDU +# RFC1592 || B. Wijnen, G. Carpenter, K. Curran, A. Sehgal, G. Waters || +# RFC1593 || W. McKenzie, J. Cheng || mckenzie@ralvma.vnet.ibm.com, cheng@ralvm6.vnet.ibm.com +# RFC1594 || A. Marine, J. Reynolds, G. Malkin || amarine@atlas.arc.nasa.gov, jkrey@isi.edu, gmalkin@Xylogics.COM +# RFC1595 || T. Brown, K. Tesink || tacox@mail.bellcore.com, kaj@cc.bellcore.com +# RFC1596 || T. Brown, Ed. || tacox@mail.bellcore.com +# RFC1597 || Y. Rekhter, B. Moskowitz, D. Karrenberg, G. de Groot || yakov@watson.ibm.com, 3858921@mcimail.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net +# RFC1598 || W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1599 || M. Kennedy || MKENNEDY@ISI.EDU +# RFC1600 || J. Postel || +# RFC1601 || C. Huitema || Christian.Huitema@sophia.inria.fr +# RFC1602 || Internet Architecture Board, Internet Engineering Steering Group || Christian.Huitema@MIRSA.INRIA.FR, 0006423401@mcimail.com +# RFC1603 || E. Huizer, D. Crocker || +# RFC1604 || T. Brown, Ed. || tacox@mail.bellcore.com +# RFC1605 || W. Shakespeare || +# RFC1606 || J. Onions || j.onions@nexor.co.uk +# RFC1607 || V. Cerf || vcerf@isoc.org, vinton_cerf@mcimail.com +# RFC1608 || T. Johannsen, G. Mansfield, M. Kosters, S. Sataluri || Thomas.Johannsen@ifn.et.tu-dresden.de, glenn@aic.co.jp, markk@internic.net, sri@qsun.att.com +# RFC1609 || G. Mansfield, T. Johannsen, M. Knopper || glenn@aic.co.jp, Thomas.Johannsen@ifn.et.tu-dresden.de, mak@merit.edu +# RFC1610 || J. Postel || +# RFC1611 || R. Austein, J. Saperia || sra@epilogue.com, saperia@zko.dec.com +# RFC1612 || R. Austein, J. Saperia || sra@epilogue.com, saperia@zko.dec.com +# RFC1613 || J. Forster, G. Satz, G. Glick, R. Day || forster@cisco.com, satz@cisco.com, gglick@cisco.com, R.Day@jnt.ac.uk +# RFC1614 || C. Adie || C.J.Adie@edinburgh.ac.uk +# RFC1615 || J. Houttuin, J. Craigie || +# RFC1616 || RARE WG-MSG Task Force 88, E. Huizer, Ed., J. Romaguera, Ed. || +# RFC1617 || P. Barker, S. Kille, T. Lenggenhager || p.barker@cs.ucl.ac.uk, s.kille@isode.com, lenggenhager@switch.ch +# RFC1618 || W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1619 || W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1620 || B. Braden, J. Postel, Y. Rekhter || Braden@ISI.EDU, Postel@ISI.EDU, Yakov@WATSON.IBM.COM +# RFC1621 || P. Francis || francis@cactus.ntt.jp +# RFC1622 || P. Francis || francis@cactus.ntt.jp +# RFC1623 || F. Kastenholz || kasten@ftp.com +# RFC1624 || A. Rijsinghani, Ed. || anil@levers.enet.dec.com +# RFC1625 || M. St. Pierre, J. Fullton, K. Gamiel, J. Goldman, B. Kahle, J. Kunze, H. Morris, F. Schiettecatte || saint@wais.com, jim.fullton@cnidr.org, kevin.gamiel@cnidr.org, jonathan@think.com, brewster@wais.com, jak@violet.berkeley.edu, morris@wais.com, francois@wais.com +# RFC1626 || R. Atkinson || atkinson@itd.nrl.navy.mil +# RFC1627 || E. Lear, E. Fair, D. Crocker, T. Kessler || +# RFC1628 || J. Case, Ed. || case@SNMP.COM +# RFC1629 || R. Colella, R. Callon, E. Gardner, Y. Rekhter || colella@nist.gov, callon@wellfleet.com, epg@gateway.mitre.org, yakov@watson.ibm.com +# RFC1630 || T. Berners-Lee || timbl@info.cern.ch +# RFC1631 || K. Egevang, P. Francis || kbe@craycom.dk, francis@cactus.ntt.jp +# RFC1632 || A. Getchell, Ed., S. Sataluri, Ed. || +# RFC1633 || R. Braden, D. Clark, S. Shenker || Braden@ISI.EDU, ddc@LCS.MIT.EDU, Shenker@PARC.XEROX.COM +# RFC1634 || M. Allen || mallen@novell.com, fbaker@acc.com +# RFC1635 || P. Deutsch, A. Emtage, A. Marine || peterd@bunyip.com, bajan@bunyip.com, amarine@atlas.arc.nasa.gov +# RFC1636 || R. Braden, D. Clark, S. Crocker, C. Huitema || Braden@ISI.EDU, ddc@lcs.mit.edu, crocker@tis.com, Christian.Huitema@MIRSA.INRIA.FR +# RFC1637 || B. Manning, R. Colella || bmanning@rice.edu, colella@nist.gov +# RFC1638 || F. Baker, R. Bowen || Rich_Bowen@vnet.ibm.com +# RFC1639 || D. Piscitello || dave@corecom.com +# RFC1640 || S. Crocker || crocker@TIS.COM +# RFC1641 || D. Goldsmith, M. Davis || david_goldsmith@taligent.com, mark_davis@taligent.com +# RFC1642 || D. Goldsmith, M. Davis || david_goldsmith@taligent.com, mark_davis@taligent.com +# RFC1643 || F. Kastenholz || kasten@ftp.com +# RFC1644 || R. Braden || Braden@ISI.EDU +# RFC1645 || A. Gwinn || allen@mail.cox.smu.edu +# RFC1646 || C. Graves, T. Butts, M. Angel || cvg@oc.com, tom@oc.com, angel@oc.com +# RFC1647 || B. Kelly || kellywh@mail.auburn.edu +# RFC1648 || A. Cargille || +# RFC1649 || R. Hagens, A. Hansen || hagens@ans.net, Alf.Hansen@uninett.no +# RFC1650 || F. Kastenholz || kasten@ftp.com +# RFC1651 || J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker || klensin@mci.net, ned@innosoft.com, mrose17@gmail.com, stef@nma.com, dcrocker@sgi.com +# RFC1652 || J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker || klensin@mci.net, ned@innosoft.com, mrose17@gmail.com, stef@nma.com, dcrocker@sgi.com +# RFC1653 || J. Klensin, N. Freed, K. Moore || klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu +# RFC1654 || Y. Rekhter, Ed., T. Li, Ed. || +# RFC1655 || Y. Rekhter, Ed., P. Gross, Ed. || yakov@watson.ibm.com, 0006423401@mcimail.com +# RFC1656 || P. Traina || pst@cisco.com +# RFC1657 || S. Willis, J. Burruss, J. Chu, Ed. || swillis@wellfleet.com, jburruss@wellfleet.com, jychu@watson.ibm.com +# RFC1658 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1659 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1660 || B. Stewart || rlstewart@eng.xyplex.com +# RFC1661 || W. Simpson, Ed. || +# RFC1662 || W. Simpson, Ed. || +# RFC1663 || D. Rand || dave_rand@novell.com +# RFC1664 || C. Allocchio, A. Bonito, B. Cole, S. Giordano, R. Hagens || +# RFC1665 || Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed. || zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com +# RFC1666 || Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed. || zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com +# RFC1667 || S. Symington, D. Wood, M. Pullen || susan@gateway.mitre.org, wood@mitre.org, mpullen@cs.gmu.edu +# RFC1668 || D. Estrin, T. Li, Y. Rekhter || estrin@usc.edu, tli@cisco.com, yakov@watson.ibm.com +# RFC1669 || J. Curran || jcurran@near.net +# RFC1670 || D. Heagerty || denise@dxcoms.cern.ch +# RFC1671 || B. Carpenter || brian@dxcoms.cern.ch +# RFC1672 || N. Brownlee || n.brownlee@auckland.ac.nz +# RFC1673 || R. Skelton || RSKELTON@msm.epri.com +# RFC1674 || M. Taylor || mark.s.taylor@airdata.com +# RFC1675 || S. Bellovin || smb@research.att.com +# RFC1676 || A. Ghiselli, D. Salomoni, C. Vistoli || Salomoni@infn.it, Vistoli@infn.it, Ghiselli@infn.it +# RFC1677 || B. Adamson || adamson@itd.nrl.navy.mil +# RFC1678 || E. Britton, J. Tavs || brittone@vnet.ibm.com, tavs@vnet.ibm.com +# RFC1679 || D. Green, P. Irey, D. Marlow, K. O'Donoghue || dtgreen@relay.nswc.navy.mil, pirey@relay.nswc.navy.mil, dmarlow@relay.nswc.navy.mil, kodonog@relay.nswc.navy.mil +# RFC1680 || C. Brazdziunas || crb@faline.bellcore.com +# RFC1681 || S. Bellovin || smb@research.att.com +# RFC1682 || J. Bound || bound@zk3.dec.com +# RFC1683 || R. Clark, M. Ammar, K. Calvert || rjc@cc.gatech.edu, ammar@cc.gatech.edu, calvert@cc.gatech.edu +# RFC1684 || P. Jurg || +# RFC1685 || H. Alvestrand || +# RFC1686 || M. Vecchi || mpvecchi@twcable.com +# RFC1687 || E. Fleischman || ericf@atc.boeing.com +# RFC1688 || W. Simpson || Bill.Simpson@um.cc.umich.edu +# RFC1689 || J. Foster, Ed. || +# RFC1690 || G. Huston || Geoff.Huston@aarnet.edu.au +# RFC1691 || W. Turner || wrt1@cornell.edu +# RFC1692 || P. Cameron, D. Crocker, D. Cohen, J. Postel || cameron@xylint.co.uk, dcrocker@sgi.com, Cohen@myricom.com, Postel@ISI.EDU +# RFC1693 || T. Connolly, P. Amer, P. Conrad || connolly@udel.edu, amer@udel.edu, pconrad@udel.edu +# RFC1694 || T. Brown, Ed., K. Tesink, Ed. || tacox@mail.bellcore.com, kaj@cc.bellcore.com +# RFC1695 || M. Ahmed, Ed., K. Tesink, Ed. || mxa@mail.bellcore.com, kaj@cc.bellcore.com +# RFC1696 || J. Barnes, L. Brown, R. Royston, S. Waldbusser || barnes@xylogics.com, brown_l@msm.cdx.mot.com, rroyston@usr.com, swol@andrew.cmu.edu +# RFC1697 || D. Brower, Ed., B. Purvy, A. Daniel, M. Sinykin, J. Smith || daveb@ingres.com, bpurvy@us.oracle.com, anthony@informix.com, msinykin@us.oracle.com, jaysmith@us.oracle.com +# RFC1698 || P. Furniss || P.Furniss@ulcc.ac.uk +# RFC1699 || J. Elliott || elliott@isi.edu +# RFC1700 || J. Reynolds, J. Postel || jkrey@isi.edu, postel@isi.edu +# RFC1701 || S. Hanks, T. Li, D. Farinacci, P. Traina || stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com +# RFC1702 || S. Hanks, T. Li, D. Farinacci, P. Traina || stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com +# RFC1703 || M. Rose || mrose17@gmail.com +# RFC1704 || N. Haller, R. Atkinson || +# RFC1705 || R. Carlson, D. Ficarella || RACarlson@anl.gov, ficarell@cpdmfg.cig.mot.com +# RFC1706 || B. Manning, R. Colella || bmanning@isi.edu, colella@nist.gov +# RFC1707 || M. McGovern, R. Ullmann || scrivner@world.std.com, rullmann@crd.lotus.com +# RFC1708 || D. Gowin || drg508@crane-ns.nwscc.sea06.navy.MIL +# RFC1709 || J. Gargano, D. Wasley || jcgargano@ucdavis.edu, dlw@berkeley.edu +# RFC1710 || R. Hinden || bob.hinden@gmail.com +# RFC1711 || J. Houttuin || houttuin@rare.nl +# RFC1712 || C. Farrell, M. Schulze, S. Pleitner, D. Baldoni || craig@cs.curtin.edu.au, mike@cs.curtin.edu.au, pleitner@cs.curtin.edu.au, flint@cs.curtin.edu.au +# RFC1713 || A. Romao || artur@fct.unl.pt +# RFC1714 || S. Williamson, M. Kosters || scottw@internic.net, markk@internic.net +# RFC1715 || C. Huitema || Christian.Huitema@MIRSA.INRIA.FR +# RFC1716 || P. Almquist, F. Kastenholz || +# RFC1717 || K. Sklower, B. Lloyd, G. McGregor, D. Carr || sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM +# RFC1718 || IETF Secretariat, G. Malkin || ietf-info@cnri.reston.va.us, gmalkin@Xylogics.COM +# RFC1719 || P. Gross || phill_gross@mcimail.com +# RFC1720 || J. Postel || +# RFC1721 || G. Malkin || gmalkin@Xylogics.COM +# RFC1722 || G. Malkin || gmalkin@Xylogics.COM +# RFC1723 || G. Malkin || gmalkin@Xylogics.COM +# RFC1724 || G. Malkin, F. Baker || gmalkin@Xylogics.COM, fred@cisco.com +# RFC1725 || J. Myers, M. Rose || mrose17@gmail.com +# RFC1726 || C. Partridge, F. Kastenholz || craig@aland.bbn.com, kasten@ftp.com +# RFC1727 || C. Weider, P. Deutsch || clw@bunyip.com, peterd@bunyip.com +# RFC1728 || C. Weider || clw@bunyip.com +# RFC1729 || C. Lynch || clifford.lynch@ucop.edu +# RFC1730 || M. Crispin || MRC@CAC.Washington.EDU +# RFC1731 || J. Myers || +# RFC1732 || M. Crispin || MRC@CAC.Washington.EDU +# RFC1733 || M. Crispin || MRC@CAC.Washington.EDU +# RFC1734 || J. Myers || +# RFC1735 || J. Heinanen, R. Govindan || Juha.Heinanen@datanet.tele.fi, govindan@isi.edu +# RFC1736 || J. Kunze || jak@violet.berkeley.edu +# RFC1737 || K. Sollins, L. Masinter || masinter@parc.xerox.com, sollins@lcs.mit.edu +# RFC1738 || T. Berners-Lee, L. Masinter, M. McCahill || +# RFC1739 || G. Kessler, S. Shepard || kumquat@hill.com, sds@hill.com +# RFC1740 || P. Faltstrom, D. Crocker, E. Fair || paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com +# RFC1741 || P. Faltstrom, D. Crocker, E. Fair || paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com +# RFC1742 || S. Waldbusser, K. Frisa || waldbusser@cmu.edu, kfrisa@fore.com +# RFC1743 || K. McCloghrie, E. Decker || kzm@cisco.com, cire@cisco.com +# RFC1744 || G. Huston || Geoff.Huston@aarnet.edu.au +# RFC1745 || K. Varadhan, S. Hares, Y. Rekhter || kannan@isi.edu, skh@merit.edu, yakov@watson.ibm.com +# RFC1746 || B. Manning, D. Perkins || bmanning@isi.edu, dperkins@tenet.edu +# RFC1747 || J. Hilgeman, Chair, S. Nix, A. Bartky, W. Clark, Ed. || jeffh@apertus.com, snix@metaplex.com, alan@sync.com, wclark@cisco.com +# RFC1748 || K. McCloghrie, E. Decker || kzm@cisco.com, cire@cisco.com +# RFC1749 || K. McCloghrie, F. Baker, E. Decker || kzm@cisco.com, fred@cisco.com, cire@cisco.com +# RFC1750 || D. Eastlake 3rd, S. Crocker, J. Schiller || dee@lkg.dec.com, crocker@cybercash.com, jis@mit.edu +# RFC1751 || D. McDonald || danmcd@itd.nrl.navy.mil +# RFC1752 || S. Bradner, A. Mankin || sob@harvard.edu, mankin@isi.edu +# RFC1753 || N. Chiappa || jnc@lcs.mit.edu +# RFC1754 || M. Laubach || laubach@com21.com +# RFC1755 || M. Perez, F. Liaw, A. Mankin, E. Hoffman, D. Grossman, A. Malis || perez@isi.edu, fong@fore.com, mankin@isi.edu, hoffman@isi.edu, dan@merlin.dev.cdx.mot.com, malis@maelstrom.timeplex.com +# RFC1756 || T. Rinne || Timo.Rinne@hut.fi +# RFC1757 || S. Waldbusser || waldbusser@cmu.edu +# RFC1758 || The North American Directory Forum || 0004454742@mcimail.com +# RFC1759 || R. Smith, F. Wright, T. Hastings, S. Zilles, J. Gyllenskog || rlsmith@nb.ppd.ti.com, don@lexmark.com, tom.hastings@alum.mit.edu, szilles@mv.us.adobe.com, jgyllens@hpdmd48.boi.hp.com +# RFC1760 || N. Haller || nmh@bellcore.com +# RFC1761 || B. Callaghan, R. Gilligan || brent.callaghan@eng.sun.com, bob.gilligan@eng.sun.com +# RFC1762 || S. Senum || sjs@digibd.com +# RFC1763 || S. Senum || sjs@digibd.com +# RFC1764 || S. Senum || sjs@digibd.com +# RFC1765 || J. Moy || jmoy@casc.com +# RFC1766 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC1767 || D. Crocker || +# RFC1768 || D. Marlow || dmarlow@relay.nswc.navy.mil +# RFC1769 || D. Mills || mills@udel.edu +# RFC1770 || C. Graff || bud@fotlan5.fotlan.army.mil +# RFC1771 || Y. Rekhter, T. Li || +# RFC1772 || Y. Rekhter, P. Gross || yakov@watson.ibm.com, 0006423401@mcimail.com +# RFC1773 || P. Traina || pst@cisco.com +# RFC1774 || P. Traina, Ed. || +# RFC1775 || D. Crocker || dcrocker@mordor.stanford.edu +# RFC1776 || S. Crocker || crocker@cybercash.com +# RFC1777 || W. Yeong, T. Howes, S. Kille || yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com +# RFC1778 || T. Howes, S. Kille, W. Yeong, C. Robbins || tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com +# RFC1779 || S. Kille || S.Kille@ISODE.COM +# RFC1780 || J. Postel, Ed. || +# RFC1781 || S. Kille || S.Kille@ISODE.COM +# RFC1782 || G. Malkin, A. Harkin || gmalkin@xylogics.com, ash@cup.hp.com +# RFC1783 || G. Malkin, A. Harkin || gmalkin@xylogics.com, ash@cup.hp.com +# RFC1784 || G. Malkin, A. Harkin || gmalkin@xylogics.com, ash@cup.hp.com +# RFC1785 || G. Malkin, A. Harkin || gmalkin@xylogics.com, ash@cup.hp.com +# RFC1786 || T. Bates, E. Gerich, L. Joncheray, J-M. Jouanigot, D. Karrenberg, M. Terpstra, J. Yu || +# RFC1787 || Y. Rekhter || +# RFC1788 || W. Simpson || +# RFC1789 || C. Yang || cqyang@cs.unt.edu +# RFC1790 || V. Cerf || vcerf@isoc.org +# RFC1791 || T. Sung || tae@novell.Com +# RFC1792 || T. Sung || tae@novell.Com +# RFC1793 || J. Moy || jmoy@casc.com +# RFC1794 || T. Brisco || brisco@rutgers.edu +# RFC1795 || L. Wells, Chair, A. Bartky, Ed. || +# RFC1796 || C. Huitema, J. Postel, S. Crocker || Christian.Huitema@MIRSA.INRIA.FR, Postel@ISI.EDU, crocker@cybercash.com +# RFC1797 || Internet Assigned Numbers Authority (IANA) || iana@isi.edu +# RFC1798 || A. Young || A.Young@isode.com +# RFC1799 || M. Kennedy || MKENNEDY@ISI.EDU +# RFC1800 || J. Postel, Ed. || +# RFC1801 || S. Kille || S.Kille@ISODE.COM +# RFC1802 || H. Alvestrand, K. Jordan, S. Langlois, J. Romaguera || Harald.T.Alvestrand@uninett.no, Kevin.E.Jordan@cdc.com, Sylvain.Langlois@der.edf.fr, Romaguera@NetConsult.ch +# RFC1803 || R. Wright, A. Getchell, T. Howes, S. Sataluri, P. Yee, W. Yeong || +# RFC1804 || G. Mansfield, P. Rajeev, S. Raghavan, T. Howes || glenn@aic.co.jp, rajeev%hss@lando.hns.com, svr@iitm.ernet.in, tim@umich.edu +# RFC1805 || A. Rubin || rubin@bellcore.com +# RFC1806 || R. Troost, S. Dorner || rens@century.com, sdorner@qualcomm.com +# RFC1807 || R. Lasher, D. Cohen || rlasher@forsythe.stanford.edu, Cohen@myri.com +# RFC1808 || R. Fielding || fielding@ics.uci.edu +# RFC1809 || C. Partridge || craig@aland.bbn.com +# RFC1810 || J. Touch || touch@isi.edu +# RFC1811 || Federal Networking Council || execdir@fnc.gov +# RFC1812 || F. Baker, Ed. || +# RFC1813 || B. Callaghan, B. Pawlowski, P. Staubach || brent.callaghan@eng.sun.com, beepy@netapp.com, peter.staubach@eng.sun.com +# RFC1814 || E. Gerich || epg@merit.edu +# RFC1815 || M. Ohta || mohta@cc.titech.ac.jp +# RFC1816 || Federal Networking Council || execdir@fnc.gov +# RFC1817 || Y. Rekhter || yakov@cisco.com +# RFC1818 || J. Postel, T. Li, Y. Rekhter || postel@isi.edu, yakov@cisco.com, tli@cisco.com +# RFC1819 || L. Delgrossi, Ed., L. Berger, Ed. || lberger@bbn.com, luca@andersen.fr, dat@bbn.com, stevej@syzygycomm.com, schaller@heidelbg.ibm.com +# RFC1820 || E. Huizer || Erik.Huizer@SURFnet.nl +# RFC1821 || M. Borden, E. Crawley, B. Davie, S. Batsell || +# RFC1822 || J. Lowe || +# RFC1823 || T. Howes, M. Smith || tim@umich.edu, mcs@umich.edu +# RFC1824 || H. Danisch || danisch@ira.uka.de +# RFC1825 || R. Atkinson || +# RFC1826 || R. Atkinson || +# RFC1827 || R. Atkinson || +# RFC1828 || P. Metzger, W. Simpson || +# RFC1829 || P. Karn, P. Metzger, W. Simpson || +# RFC1830 || G. Vaudreuil || Greg.Vaudreuil@Octel.com +# RFC1831 || R. Srinivasan || raj@eng.sun.com +# RFC1832 || R. Srinivasan || raj@eng.sun.com +# RFC1833 || R. Srinivasan || raj@eng.sun.com +# RFC1834 || J. Gargano, K. Weiss || jcgargano@ucdavis.edu, krweiss@ucdavis.edu +# RFC1835 || P. Deutsch, R. Schoultz, P. Faltstrom, C. Weider || peterd@bunyip.com, schoultz@sunet.se, paf@bunyip.com, clw@bunyip.com +# RFC1836 || S. Kille || S.Kille@ISODE.COM +# RFC1837 || S. Kille || S.Kille@ISODE.COM +# RFC1838 || S. Kille || S.Kille@ISODE.COM +# RFC1839 || || +# RFC1840 || || +# RFC1841 || J. Chapman, D. Coli, A. Harvey, B. Jensen, K. Rowett || joelle@cisco.com, dcoli@cisco.com, agh@cisco.com, bent@cisco.com, krowett@cisco.com +# RFC1842 || Y. Wei, Y. Zhang, J. Li, J. Ding, Y. Jiang || HZRFC@usai.asiainfo.com, zhang@orion.harvard.edu, jian@is.rice.edu, ding@Beijing.AsiaInfo.com, yjj@eng.umd.edu +# RFC1843 || F. Lee || lee@csl.stanford.edu +# RFC1844 || E. Huizer || Erik.Huizer@SURFnet.nl +# RFC1845 || D. Crocker, N. Freed, A. Cargille || dcrocker@mordor.stanford.edu, ned@innosoft.com +# RFC1846 || A. Durand, F. Dupont || Alain.Durand@imag.fr, Francis.Dupont@inria.fr +# RFC1847 || J. Galvin, S. Murphy, S. Crocker, N. Freed || galvin@tis.com, sandy@tis.com, crocker@cybercash.com, ned@innosoft.com +# RFC1848 || S. Crocker, N. Freed, J. Galvin, S. Murphy || crocker@cybercash.com, galvin@tis.com, murphy@tis.com, ned@innosoft.com +# RFC1849 || H. Spencer || henry@zoo.utoronto.ca +# RFC1850 || F. Baker, R. Coltun || fred@cisco.com, rcoltun@rainbow-bridge.com +# RFC1851 || P. Karn, P. Metzger, W. Simpson || +# RFC1852 || P. Metzger, W. Simpson || +# RFC1853 || W. Simpson || +# RFC1854 || N. Freed || ned@innosoft.com +# RFC1855 || S. Hambridge || sallyh@ludwig.sc.intel.com +# RFC1856 || H. Clark || henryc@bbnplanet.com +# RFC1857 || M. Lambert || lambert@psc.edu +# RFC1858 || G. Ziemba, D. Reed, P. Traina || paul@alantec.com, darrenr@cyber.com.au, pst@cisco.com +# RFC1859 || Y. Pouffary || pouffary@taec.enet.dec.com +# RFC1860 || T. Pummill, B. Manning || trop@alantec.com, bmanning@isi.edu +# RFC1861 || A. Gwinn || allen@mail.cox.smu.edu +# RFC1862 || M. McCahill, J. Romkey, M. Schwartz, K. Sollins, T. Verschuren, C. Weider || mpm@boombox.micro.umn.edu, romkey@apocalypse.org, schwartz@cs.colorado.edu, sollins@lcs.mit.edu, Ton.Verschuren@surfnet.nl, clw@bunyip.com +# RFC1863 || D. Haskin || dhaskin@baynetworks.com +# RFC1864 || J. Myers, M. Rose || mrose17@gmail.com +# RFC1865 || W. Houser, J. Griffin, C. Hage || houser.walt@forum.va.gov, agriffin@cpcug.org, carl@chage.com +# RFC1866 || T. Berners-Lee, D. Connolly || timbl@w3.org, connolly@w3.org +# RFC1867 || E. Nebel, L. Masinter || masinter@parc.xerox.com, nebel@xsoft.sd.xerox.com +# RFC1868 || G. Malkin || gmalkin@xylogics.com +# RFC1869 || J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker || klensin@mci.net, ned@innosoft.com, mrose17@gmail.com, stef@nma.com, dcrocker@mordor.stanford.edu +# RFC1870 || J. Klensin, N. Freed, K. Moore || klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu +# RFC1871 || J. Postel || postel@isi.edu +# RFC1872 || E. Levinson || ELevinson@Accurate.com +# RFC1873 || E. Levinson || +# RFC1874 || E. Levinson || ELevinson@Accurate.com +# RFC1875 || N. Berge || Nils.Harald.Berge@nr.no +# RFC1876 || C. Davis, P. Vixie, T. Goodwin, I. Dickinson || ckd@kei.com, paul@vix.com, tim@pipex.net, idickins@fore.co.uk +# RFC1877 || S. Cobb || stevec@microsoft.com +# RFC1878 || T. Pummill, B. Manning || trop@alantec.com, bmanning@isi.edu +# RFC1879 || B. Manning, Ed. || +# RFC1880 || J. Postel, Ed. || +# RFC1881 || IAB, IESG || +# RFC1882 || B. Hancock || hancock@network-1.com +# RFC1883 || S. Deering, R. Hinden || bob.hinden@gmail.com +# RFC1884 || R. Hinden, Ed., S. Deering, Ed. || bob.hinden@gmail.com +# RFC1885 || A. Conta, S. Deering || deering@parc.xerox.com +# RFC1886 || S. Thomson, C. Huitema || set@thumper.bellcore.com, Christian.Huitema@MIRSA.INRIA.FR +# RFC1887 || Y. Rekhter, Ed., T. Li, Ed. || +# RFC1888 || J. Bound, B. Carpenter, D. Harrington, J. Houldsworth, A. Lloyd || +# RFC1889 || Audio-Video Transport Working Group, H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson || schulzrinne@fokus.gmd.de, casner@precept.com, frederic@parc.xerox.com, van@ee.lbl.gov +# RFC1890 || Audio-Video Transport Working Group, H. Schulzrinne || schulzrinne@fokus.gmd.de +# RFC1891 || K. Moore || moore@cs.utk.edu +# RFC1892 || G. Vaudreuil || Greg.Vaudreuil@Octel.com +# RFC1893 || G. Vaudreuil || Greg.Vaudreuil@Octel.com +# RFC1894 || K. Moore, G. Vaudreuil || moore@cs.utk.edu, Greg.Vaudreuil@Octel.Com +# RFC1895 || E. Levinson || ELevinson@Accurate.com +# RFC1896 || P. Resnick, A. Walker || presnick@qti.qualcomm.com, amanda@intercon.com +# RFC1897 || R. Hinden, J. Postel || bob.hinden@gmail.com, postel@isi.edu +# RFC1898 || D. Eastlake 3rd, B. Boesch, S. Crocker, M. Yesil || dee@cybercash.com, boesch@cybercash.com, crocker@cybercash.com, magdalen@cybercash.com +# RFC1899 || J. Elliott || elliott@isi.edu +# RFC1900 || B. Carpenter, Y. Rekhter || brian@dxcoms.cern.ch, yakov@cisco.com +# RFC1901 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1902 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1903 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1904 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1905 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1906 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1907 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1908 || J. Case, K. McCloghrie, M. Rose, S. Waldbusser || +# RFC1909 || K. McCloghrie, Ed. || +# RFC1910 || G. Waters, Ed. || +# RFC1911 || G. Vaudreuil || Greg.Vaudreuil@Octel.Com +# RFC1912 || D. Barr || barr@math.psu.edu +# RFC1913 || C. Weider, J. Fullton, S. Spero || clw@bunyip.com, fullton@cnidr.org, ses@eit.com +# RFC1914 || P. Faltstrom, R. Schoultz, C. Weider || paf@bunyip.com, schoultz@sunet.se, clw@bunyip.com +# RFC1915 || F. Kastenholz || kasten@ftp.com +# RFC1916 || H. Berkowitz, P. Ferguson, W. Leland, P. Nesser || hcb@clark.net, pferguso@cisco.com, wel@bellcore.com, pjnesser@rocket.com +# RFC1917 || P. Nesser II || pjnesser@martigny.ai.mit.edu +# RFC1918 || Y. Rekhter, B. Moskowitz, D. Karrenberg, G. J. de Groot, E. Lear || yakov@cisco.com, rgm3@is.chrysler.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net, lear@sgi.com +# RFC1919 || M. Chatel || mchatel@pax.eunet.ch +# RFC1920 || J. Postel || +# RFC1921 || J. Dujonc || J.Y.Dujonc@frcl.bull.fr +# RFC1922 || HF. Zhu, DY. Hu, ZG. Wang, TC. Kao, WCH. Chang, M. Crispin || zhf@net.tsinghua.edu.cn, hdy@tsinghua.edu.cn, tckao@iiidns.iii.org.tw, chung@iiidns.iii.org.tw, MRC@CAC.Washington.EDU +# RFC1923 || J. Halpern, S. Bradner || jhalpern@newbridge.com, sob@harvard.edu +# RFC1924 || R. Elz || kre@munnari.OZ.AU +# RFC1925 || R. Callon || rcallon@baynetworks.com +# RFC1926 || J. Eriksson || bygg@sunet.se +# RFC1927 || C. Rogers || rogers@isi.edu +# RFC1928 || M. Leech, M. Ganis, Y. Lee, R. Kuris, D. Koblas, L. Jones || mleech@bnr.ca +# RFC1929 || M. Leech || mleech@bnr.ca +# RFC1930 || J. Hawkinson, T. Bates || jhawk@bbnplanet.com, Tony.Bates@mci.net +# RFC1931 || D. Brownell || dbrownell@sun.com +# RFC1932 || R. Cole, D. Shur, C. Villamizar || rgc@qsun.att.com, d.shur@att.com, curtis@ans.net +# RFC1933 || R. Gilligan, E. Nordmark || Bob.Gilligan@Eng.Sun.COM, Erik.Nordmark@Eng.Sun.COM +# RFC1934 || K. Smith || ksmith@ascend.com +# RFC1935 || J. Quarterman, S. Carl-Mitchell || tic@tic.com +# RFC1936 || J. Touch, B. Parham || touch@isi.edu, bparham@isi.edu +# RFC1937 || Y. Rekhter, D. Kandlur || yakov@cisco.com, kandlur@watson.ibm.com +# RFC1938 || N. Haller, C. Metz || +# RFC1939 || J. Myers, M. Rose || mrose17@gmail.com +# RFC1940 || D. Estrin, T. Li, Y. Rekhter, K. Varadhan, D. Zappala || estrin@isi.edu, tli@cisco.com, yakov@cisco.com, kannan@isi.edu, daniel@isi.edu +# RFC1941 || J. Sellers, J. Robichaux || julier@internic.net, sellers@quest.arc.nasa.gov +# RFC1942 || D. Raggett || dsr@w3.org +# RFC1943 || B. Jennings || jennings@sandia.gov +# RFC1944 || S. Bradner, J. McQuaid || +# RFC1945 || T. Berners-Lee, R. Fielding, H. Frystyk || timbl@w3.org, fielding@ics.uci.edu, frystyk@w3.org +# RFC1946 || S. Jackowski || Stevej@NetManage.com +# RFC1947 || D. Spinellis || D.Spinellis@senanet.com +# RFC1948 || S. Bellovin || smb@research.att.com +# RFC1949 || A. Ballardie || A.Ballardie@cs.ucl.ac.uk +# RFC1950 || P. Deutsch, J-L. Gailly || +# RFC1951 || P. Deutsch || +# RFC1952 || P. Deutsch || +# RFC1953 || P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall || bob.hinden@gmail.com +# RFC1954 || P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall || bob.hinden@gmail.com +# RFC1955 || R. Hinden || bob.hinden@gmail.com +# RFC1956 || D. Engebretson, R. Plzak || engebred@ncr.disa.mil, plzak@nic.ddn.mil +# RFC1957 || R. Nelson || nelson@crynwr.com +# RFC1958 || B. Carpenter, Ed. || +# RFC1959 || T. Howes, M. Smith || tim@umich.edu, mcs@umich.edu +# RFC1960 || T. Howes || tim@umich.edu +# RFC1961 || P. McMahon || p.v.mcmahon@rea0803.wins.icl.co.uk +# RFC1962 || D. Rand || dlr@daver.bungi.com +# RFC1963 || K. Schneider, S. Venters || kevin@adtran.com, sventers@adtran.com +# RFC1964 || J. Linn || +# RFC1965 || P. Traina || pst@cisco.com +# RFC1966 || T. Bates, R. Chandra || tbates@cisco.com, rchandra@cisco.com +# RFC1967 || K. Schneider, R. Friend || kschneider@adtran.com, rfriend@stac.com +# RFC1968 || G. Meyer || gerry@spider.co.uk +# RFC1969 || K. Sklower, G. Meyer || sklower@CS.Berkeley.EDU, gerry@spider.co.uk +# RFC1970 || T. Narten, E. Nordmark, W. Simpson || +# RFC1971 || S. Thomson, T. Narten || +# RFC1972 || M. Crawford || crawdad@fnal.gov +# RFC1973 || W. Simpson || +# RFC1974 || R. Friend, W. Simpson || rfriend@stac.com +# RFC1975 || D. Schremp, J. Black, J. Weiss || dhs@magna.telco.com, jtb@magna.telco.com, jaw@magna.telco.com +# RFC1976 || K. Schneider, S. Venters || kevin@adtran.com, sventers@adtran.com +# RFC1977 || V. Schryver || vjs@rhyolite.com +# RFC1978 || D. Rand || dave_rand@novell.com +# RFC1979 || J. Woods || jfw@funhouse.com +# RFC1980 || J. Seidman || jim@spyglass.com +# RFC1981 || J. McCann, S. Deering, J. Mogul || deering@parc.xerox.com, mogul@pa.dec.com +# RFC1982 || R. Elz, R. Bush || randy@psg.com +# RFC1983 || G. Malkin, Ed. || +# RFC1984 || IAB, IESG || brian@dxcoms.cern.ch, fred@cisco.com +# RFC1985 || J. De Winter || jack@wildbear.on.ca +# RFC1986 || W. Polites, W. Wollman, D. Woo, R. Langan || +# RFC1987 || P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall || bob.hinden@gmail.com +# RFC1988 || G. McAnally, D. Gilbert, J. Flick || johnf@hprnd.rose.hp.com +# RFC1989 || W. Simpson || +# RFC1990 || K. Sklower, B. Lloyd, G. McGregor, D. Carr, T. Coradetti || sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM, 70761.1664@compuserve.com +# RFC1991 || D. Atkins, W. Stallings, P. Zimmermann || warlord@MIT.EDU, stallings@ACM.org, prz@acm.org +# RFC1992 || I. Castineyra, N. Chiappa, M. Steenstrup || isidro@bbn.com, gnc@ginger.lcs.mit.edu, msteenst@bbn.com +# RFC1993 || A. Barbir, D. Carr, W. Simpson || +# RFC1994 || W. Simpson || +# RFC1995 || M. Ohta || mohta@necom830.hpcl.titech.ac.jp +# RFC1996 || P. Vixie || paul@vix.com +# RFC1997 || R. Chandra, P. Traina, T. Li || pst@cisco.com, rchandra@cisco.com, tli@skat.usc.edu +# RFC1998 || E. Chen, T. Bates || enke@mci.net, tbates@cisco.com +# RFC1999 || J. Elliott || elliott@isi.edu +# RFC2000 || J. Postel, Ed. || +# RFC2001 || W. Stevens || rstevens@noao.edu +# RFC2002 || C. Perkins, Ed. || +# RFC2003 || C. Perkins || perk@watson.ibm.com, solomon@comm.mot.com +# RFC2004 || C. Perkins || perk@watson.ibm.com, solomon@comm.mot.com +# RFC2005 || J. Solomon || solomon@comm.mot.com +# RFC2006 || D. Cong, M. Hamlen, C. Perkins || +# RFC2007 || J. Foster, M. Isaacs, M. Prior || Jill.Foster@newcastle.ac.uk, mmi@dcs.gla.ac.uk, mrp@connect.com.au +# RFC2008 || Y. Rekhter, T. Li || yakov@cisco.com, tli@cisco.com +# RFC2009 || T. Imielinski, J. Navas || +# RFC2010 || B. Manning, P. Vixie || bmanning@isi.edu, paul@vix.com +# RFC2011 || K. McCloghrie, Ed. || +# RFC2012 || K. McCloghrie, Ed. || +# RFC2013 || K. McCloghrie, Ed. || +# RFC2014 || A. Weinrib, J. Postel || +# RFC2015 || M. Elkins || +# RFC2016 || L. Daigle, P. Deutsch, B. Heelan, C. Alpaugh, M. Maclachlan || ura-bunyip@bunyip.com +# RFC2017 || N. Freed, K. Moore, A. Cargille || ned@innosoft.com, moore@cs.utk.edu +# RFC2018 || M. Mathis, J. Mahdavi, S. Floyd, A. Romanow || +# RFC2019 || M. Crawford || crawdad@fnal.gov +# RFC2020 || J. Flick || +# RFC2021 || S. Waldbusser || waldbusser@ins.com +# RFC2022 || G. Armitage || gja@thumper.bellcore.com +# RFC2023 || D. Haskin, E. Allen || +# RFC2024 || D. Chen, Ed., P. Gayek, S. Nix || dchen@vnet.ibm.com, gayek@vnet.ibm.com, snix@metaplex.com +# RFC2025 || C. Adams || cadams@bnr.ca +# RFC2026 || S. Bradner || +# RFC2027 || J. Galvin || +# RFC2028 || R. Hovey, S. Bradner || hovey@wnpv01.enet.dec.com, sob@harvard.edu +# RFC2029 || M. Speer, D. Hoffman || michael.speer@eng.sun.com, don.hoffman@eng.sun.com +# RFC2030 || D. Mills || +# RFC2031 || E. Huizer || +# RFC2032 || T. Turletti, C. Huitema || turletti@sophia.inria.fr, huitema@bellcore.com +# RFC2033 || J. Myers || +# RFC2034 || N. Freed || +# RFC2035 || L. Berc, W. Fenner, R. Frederick, S. McCanne || berc@pa.dec.com, fenner@cmf.nrl.navy.mil, frederick@parc.xerox.com, mccanne@ee.lbl.gov +# RFC2036 || G. Huston || +# RFC2037 || K. McCloghrie, A. Bierman || kzm@cisco.com, andy@yumaworks.com +# RFC2038 || D. Hoffman, G. Fernando, V. Goyal || gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com +# RFC2039 || C. Kalbfleisch || +# RFC2040 || R. Baldwin, R. Rivest || baldwin@rsa.com, rivest@theory.lcs.mit.edu +# RFC2041 || B. Noble, G. Nguyen, M. Satyanarayanan, R. Katz || bnoble@cs.cmu.edu, gnguyen@cs.berkeley.edu, satya@cs.cmu.edu, randy@cs.berkeley.edu +# RFC2042 || B. Manning || bmanning@isi.edu +# RFC2043 || A. Fuqua || fuqua@vnet.ibm.com +# RFC2044 || F. Yergeau || fyergeau@alis.com +# RFC2045 || N. Freed, N. Borenstein || ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com +# RFC2046 || N. Freed, N. Borenstein || ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com +# RFC2047 || K. Moore || moore@cs.utk.edu +# RFC2048 || N. Freed, J. Klensin, J. Postel || ned@innosoft.com, klensin@mci.net, Postel@ISI.EDU +# RFC2049 || N. Freed, N. Borenstein || ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com +# RFC2050 || K. Hubbard, M. Kosters, D. Conrad, D. Karrenberg, J. Postel || kimh@internic.net, markk@internic.net, davidc@APNIC.NET, dfk@RIPE.NET, Postel@ISI.EDU +# RFC2051 || M. Allen, B. Clouston, Z. Kielczewski, W. Kwan, B. Moore || mallen@hq.walldata.com, clouston@cisco.com, zbig@cisco.com, billk@jti.com, remoore@ralvm6.vnet.ibm.com +# RFC2052 || A. Gulbrandsen, P. Vixie || agulbra@troll.no, paul@vix.com +# RFC2053 || E. Der-Danieliantz || edd@acm.org +# RFC2054 || B. Callaghan || brent.callaghan@eng.sun.com +# RFC2055 || B. Callaghan || brent.callaghan@eng.sun.com +# RFC2056 || R. Denenberg, J. Kunze, D. Lynch || +# RFC2057 || S. Bradner || sob@harvard.edu +# RFC2058 || C. Rigney, A. Rubens, W. Simpson, S. Willens || cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com +# RFC2059 || C. Rigney || cdr@livingston.com +# RFC2060 || M. Crispin || MRC@CAC.Washington.EDU +# RFC2061 || M. Crispin || MRC@CAC.Washington.EDU +# RFC2062 || M. Crispin || MRC@CAC.Washington.EDU +# RFC2063 || N. Brownlee, C. Mills, G. Ruth || cmills@bbn.com, gruth@gte.com +# RFC2064 || N. Brownlee || +# RFC2065 || D. Eastlake 3rd, C. Kaufman || dee@cybercash.com, charlie_kaufman@iris.com +# RFC2066 || R. Gellens || Randy@MV.Unisys.Com +# RFC2067 || J. Renwick || jkr@NetStar.com +# RFC2068 || R. Fielding, J. Gettys, J. Mogul, H. Frystyk, T. Berners-Lee || fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, timbl@w3.org +# RFC2069 || J. Franks, P. Hallam-Baker, J. Hostetler, P. Leach, A. Luotonen, E. Sink, L. Stewart || john@math.nwu.edu, hallam@w3.org, jeff@spyglass.com, paulle@microsoft.com, luotonen@netscape.com, eric@spyglass.com, stewart@OpenMarket.com +# RFC2070 || F. Yergeau, G. Nicol, G. Adams, M. Duerst || fyergeau@alis.com, gtn@ebt.com, glenn@spyglass.com, mduerst@ifi.unizh.ch +# RFC2071 || P. Ferguson, H. Berkowitz || pferguso@cisco.com, hcb@clark.net +# RFC2072 || H. Berkowitz || hcb@clark.net +# RFC2073 || Y. Rekhter, P. Lothberg, R. Hinden, S. Deering, J. Postel || bob.hinden@gmail.com +# RFC2074 || A. Bierman, R. Iddon || andy@yumaworks.com, robin_iddon@3mail.3com.com +# RFC2075 || C. Partridge || craig@bbn.com +# RFC2076 || J. Palme || +# RFC2077 || S. Nelson, C. Parks, Mitra || +# RFC2078 || J. Linn || John.Linn@ov.com +# RFC2079 || M. Smith || mcs@netscape.com +# RFC2080 || G. Malkin, R. Minnear || gmalkin@Xylogics.COM, minnear@ipsilon.com +# RFC2081 || G. Malkin || gmalkin@xylogics.com +# RFC2082 || F. Baker, R. Atkinson || rja@cisco.com +# RFC2083 || T. Boutell || boutell@boutell.com +# RFC2084 || G. Bossert, S. Cooper, W. Drummond || bossert@corp.sgi.com, sc@corp.sgi.com, drummond@ieee.org +# RFC2085 || M. Oehler, R. Glenn || mjo@tycho.ncsc.mil, rob.glenn@nist.gov +# RFC2086 || J. Myers || +# RFC2087 || J. Myers || +# RFC2088 || J. Myers || +# RFC2089 || B. Wijnen, D. Levi || +# RFC2090 || A. Emberson || tom@lanworks.com +# RFC2091 || G. Meyer, S. Sherry || +# RFC2092 || S. Sherry, G. Meyer || +# RFC2093 || H. Harney, C. Muckenhirn || +# RFC2094 || H. Harney, C. Muckenhirn || +# RFC2095 || J. Klensin, R. Catoe, P. Krumviede || klensin@mci.net, randy@mci.net, paul@mci.net +# RFC2096 || F. Baker || fred@cisco.com +# RFC2097 || G. Pall || gurdeep@microsoft.com +# RFC2098 || Y. Katsube, K. Nagami, H. Esaki || +# RFC2099 || J. Elliott || elliott@isi.edu +# RFC2100 || J. Ashworth || jra@scfn.thpl.lib.fl.us +# RFC2101 || B. Carpenter, J. Crowcroft, Y. Rekhter || brian@dxcoms.cern.ch, j.crowcroft@cs.ucl.ac.uk, yakov@cisco.com +# RFC2102 || R. Ramanathan || ramanath@bbn.com +# RFC2103 || R. Ramanathan || +# RFC2104 || H. Krawczyk, M. Bellare, R. Canetti || hugo@watson.ibm.com, mihir@cs.ucsd.edu, canetti@watson.ibm.com +# RFC2105 || Y. Rekhter, B. Davie, D. Katz, E. Rosen, G. Swallow || yakov@cisco.com, bsd@cisco.com, dkatz@cisco.com, erosen@cisco.com, swallow@cisco.com +# RFC2106 || S. Chiang, J. Lee, H. Yasuda || schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp +# RFC2107 || K. Hamzeh || kory@ascend.com +# RFC2108 || K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie || kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com +# RFC2109 || D. Kristol, L. Montulli || +# RFC2110 || J. Palme, A. Hopmann || +# RFC2111 || E. Levinson || +# RFC2112 || E. Levinson || +# RFC2113 || D. Katz || +# RFC2114 || S. Chiang, J. Lee, H. Yasuda || schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp +# RFC2115 || C. Brown, F. Baker || +# RFC2116 || C. Apple, K. Rossen || +# RFC2117 || D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei || +# RFC2118 || G. Pall || +# RFC2119 || S. Bradner || +# RFC2120 || D. Chadwick || +# RFC2121 || G. Armitage || gja@thumper.bellcore.com +# RFC2122 || D. Mavrakis, H. Layec, K. Kartmann || +# RFC2123 || N. Brownlee || +# RFC2124 || P. Amsden, J. Amweg, P. Calato, S. Bensley, G. Lyons || amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com +# RFC2125 || C. Richards, K. Smith || +# RFC2126 || Y. Pouffary, A. Young || pouffary@taec.enet.dec.com, A.Young@isode.com +# RFC2127 || G. Roeck, Ed. || groeck@cisco.com +# RFC2128 || G. Roeck, Ed. || groeck@cisco.com +# RFC2129 || K. Nagami, Y. Katsube, Y. Shobatake, A. Mogi, S. Matsuzawa, T. Jinmei, H. Esaki || +# RFC2130 || C. Weider, C. Preston, K. Simonsen, H. Alvestrand, R. Atkinson, M. Crispin, P. Svanberg || cweider@microsoft.com, cecilia@well.com, Keld@dkuug.dk, Harald.T.Alvestrand@uninett.no, rja@cisco.com, mrc@cac.washington.edu, psv@nada.kth.se +# RFC2131 || R. Droms || droms@bucknell.edu +# RFC2132 || S. Alexander, R. Droms || sca@engr.sgi.com, droms@bucknell.edu +# RFC2133 || R. Gilligan, S. Thomson, J. Bound, W. Stevens || gilligan@freegate.net, set@thumper.bellcore.com, rstevens@kohala.com +# RFC2134 || ISOC Board of Trustees || +# RFC2135 || ISOC Board of Trustees || +# RFC2136 || P. Vixie, Ed., S. Thomson, Y. Rekhter, J. Bound || yakov@cisco.com, set@thumper.bellcore.com, bound@zk3.dec.com, paul@vix.com +# RFC2137 || D. Eastlake 3rd || dee@cybercash.com +# RFC2138 || C. Rigney, A. Rubens, W. Simpson, S. Willens || cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com +# RFC2139 || C. Rigney || cdr@livingston.com +# RFC2140 || J. Touch || +# RFC2141 || R. Moats || +# RFC2142 || D. Crocker || +# RFC2143 || B. Elliston || +# RFC2144 || C. Adams || +# RFC2145 || J. C. Mogul, R. Fielding, J. Gettys, H. Frystyk || +# RFC2146 || Federal Networking Council || execdir@fnc.gov +# RFC2147 || D. Borman || +# RFC2148 || H. Alvestrand, P. Jurg || +# RFC2149 || R. Talpade, M. Ammar || +# RFC2150 || J. Max, W. Stickle || jlm@rainfarm.com, wls@rainfarm.com +# RFC2151 || G. Kessler, S. Shepard || +# RFC2152 || D. Goldsmith, M. Davis || goldsmith@apple.com, mark_davis@taligent.com +# RFC2153 || W. Simpson || +# RFC2154 || S. Murphy, M. Badger, B. Wellington || +# RFC2155 || B. Clouston, B. Moore || +# RFC2156 || S. Kille || +# RFC2157 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2158 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2159 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2160 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2161 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2162 || C. Allocchio || Claudio.Allocchio@elettra.Trieste.it +# RFC2163 || C. Allocchio || +# RFC2164 || S. Kille || S.Kille@ISODE.COM +# RFC2165 || J. Veizades, E. Guttman, C. Perkins, S. Kaplan || cperkins@Corp.sun.com +# RFC2166 || D. Bryant, P. Brittain || +# RFC2167 || S. Williamson, M. Kosters, D. Blacka, J. Singh, K. Zeilstra || +# RFC2168 || R. Daniel, M. Mealling || +# RFC2169 || R. Daniel || +# RFC2170 || W. Almesberger, J. Le Boudec, P. Oechslin || +# RFC2171 || K. Murakami, M. Maruyama || +# RFC2172 || M. Maruyama, K. Murakami || +# RFC2173 || K. Murakami, M. Maruyama || +# RFC2174 || K. Murakami, M. Maruyama || +# RFC2175 || K. Murakami, M. Maruyama || +# RFC2176 || K. Murakami, M. Maruyama || +# RFC2177 || B. Leiba || +# RFC2178 || J. Moy || jmoy@casc.com +# RFC2179 || A. Gwinn || allen@mail.cox.smu.edu, ssh@wwsi.com +# RFC2180 || M. Gahrns || mikega@microsoft.com +# RFC2181 || R. Elz, R. Bush || kre@munnari.OZ.AU, randy@psg.com +# RFC2182 || R. Elz, R. Bush, S. Bradner, M. Patton || kre@munnari.OZ.AU, randy@psg.com, sob@harvard.edu, MAP@POBOX.COM +# RFC2183 || R. Troost, S. Dorner, K. Moore, Ed. || rens@century.com, sdorner@qualcomm.com +# RFC2184 || N. Freed, K. Moore || +# RFC2185 || R. Callon, D. Haskin || +# RFC2186 || D. Wessels, K. Claffy || wessels@nlanr.net, kc@nlanr.net +# RFC2187 || D. Wessels, K. Claffy || wessels@nlanr.net, kc@nlanr.net +# RFC2188 || M. Banan, M. Taylor, J. Cheng || +# RFC2189 || A. Ballardie || +# RFC2190 || C. Zhu || czhu@ibeam.intel.com +# RFC2191 || G. Armitage || gja@dnrc.bell-labs.com +# RFC2192 || C. Newman || chris.newman@innosoft.com +# RFC2193 || M. Gahrns || mikega@microsoft.com +# RFC2194 || B. Aboba, J. Lu, J. Alsop, J. Ding, W. Wang || bernarda@microsoft.com, juanlu@aimnet.net, jalsop@ipass.com, ding@bjai.asiainfo.com, weiwang@merit.edu +# RFC2195 || J. Klensin, R. Catoe, P. Krumviede || klensin@mci.net, randy@mci.net, paul@mci.net +# RFC2196 || B. Fraser || +# RFC2197 || N. Freed || ned.freed@innosoft.com +# RFC2198 || C. Perkins, I. Kouvelas, O. Hodson, V. Hardman, M. Handley, J.C. Bolot, A. Vega-Garcia, S. Fosse-Parisis || mjh@isi.edu +# RFC2199 || A. Ramos || ramos@isi.edu +# RFC2200 || J. Postel || +# RFC2201 || A. Ballardie || +# RFC2202 || P. Cheng, R. Glenn || pau@watson.ibm.com, rob.glenn@nist.gov +# RFC2203 || M. Eisler, A. Chiu, L. Ling || mre@eng.sun.com, hacker@eng.sun.com, lling@eng.sun.com +# RFC2204 || D. Nash || dnash@ford.com +# RFC2205 || R. Braden, Ed., L. Zhang, S. Berson, S. Herzog, S. Jamin || Braden@ISI.EDU, lixia@cs.ucla.edu, Berson@ISI.EDU, Herzog@WATSON.IBM.COM, jamin@EECS.UMICH.EDU +# RFC2206 || F. Baker, J. Krawczyk, A. Sastry || fred@cisco.com, jjk@tiac.net, arun@cisco.com +# RFC2207 || L. Berger, T. O'Malley || timo@bbn.com +# RFC2208 || A. Mankin, Ed., F. Baker, B. Braden, S. Bradner, M. O'Dell, A. Romanow, A. Weinrib, L. Zhang || aweinrib@ibeam.intel.com, braden@isi.edu, lixia@cs.ucla.edu, allyn@eng.sun.com, mo@uu.net +# RFC2209 || R. Braden, L. Zhang || Braden@ISI.EDU, lixia@cs.ucla.edu +# RFC2210 || J. Wroclawski || jtw@lcs.mit.edu +# RFC2211 || J. Wroclawski || jtw@lcs.mit.edu +# RFC2212 || S. Shenker, C. Partridge, R. Guerin || shenker@parc.xerox.com, craig@bbn.com, guerin@watson.ibm.com +# RFC2213 || F. Baker, J. Krawczyk, A. Sastry || fred@cisco.com, jjk@tiac.net, arun@cisco.com +# RFC2214 || F. Baker, J. Krawczyk, A. Sastry || fred@cisco.com, jjk@tiac.net, arun@cisco.com +# RFC2215 || S. Shenker, J. Wroclawski || shenker@parc.xerox.com, jtw@lcs.mit.edu +# RFC2216 || S. Shenker, J. Wroclawski || shenker@parc.xerox.com, jtw@lcs.mit.edu +# RFC2217 || G. Clark || glenc@cisco.com +# RFC2218 || T. Genovese, B. Jennings || TonyG@Microsoft.com, jennings@sandia.gov +# RFC2219 || M. Hamilton, R. Wright || m.t.hamilton@lut.ac.uk, wright@lbl.gov +# RFC2220 || R. Guenther || rgue@loc.gov +# RFC2221 || M. Gahrns || mikega@microsoft.com +# RFC2222 || J. Myers || jgmyers@netscape.com +# RFC2223 || J. Postel, J. Reynolds || Postel@ISI.EDU, jkrey@isi.edu, dwaitzman@BBN.COM +# RFC2224 || B. Callaghan || brent.callaghan@eng.sun.com +# RFC2225 || M. Laubach, J. Halpern || +# RFC2226 || T. Smith, G. Armitage || tjsmith@vnet.ibm.com, gja@lucent.com +# RFC2227 || J. Mogul, P. Leach || mogul@wrl.dec.com, paulle@microsoft.com +# RFC2228 || M. Horowitz, S. Lunt || marc@cygnus.com +# RFC2229 || R. Faith, B. Martin || faith@cs.unc.edu, bamartin@miranda.org +# RFC2230 || R. Atkinson || +# RFC2231 || N. Freed, K. Moore || ned.freed@innosoft.com, moore@cs.utk.edu +# RFC2232 || B. Clouston, Ed., B. Moore, Ed. || clouston@cisco.com, remoore@ralvm6.vnet.ibm.com +# RFC2233 || K. McCloghrie, F. Kastenholz || kzm@cisco.com, kasten@ftp.com +# RFC2234 || D. Crocker, Ed., P. Overell || dcrocker@bbiw.net, paul@bayleaf.org.uk +# RFC2235 || R. Zakon || zakon@info.isoc.org +# RFC2236 || W. Fenner || fenner@parc.xerox.com +# RFC2237 || K. Tamaru || kenzat@microsoft.com +# RFC2238 || B. Clouston, Ed., B. Moore, Ed. || clouston@cisco.com, remoore@ralvm6.vnet.ibm.com +# RFC2239 || K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts || kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com +# RFC2240 || O. Vaughan || owain@vaughan.com +# RFC2241 || D. Provan || donp@Novell.Com +# RFC2242 || R. Droms, K. Fong || +# RFC2243 || C. Metz || +# RFC2244 || C. Newman, J. G. Myers || +# RFC2245 || C. Newman || +# RFC2246 || T. Dierks, C. Allen || tdierks@certicom.com, pck@netcom.com, relyea@netscape.com, jar@netscape.com, msabin@netcom.com, dansimon@microsoft.com, tomw@netscape.com, hugo@watson.ibm.com +# RFC2247 || S. Kille, M. Wahl, A. Grimstad, R. Huber, S. Sataluri || S.Kille@ISODE.COM, M.Wahl@critical-angle.com, alg@att.com, rvh@att.com, sri@att.com +# RFC2248 || N. Freed, S. Kille || ned.freed@innosoft.com, S.Kille@isode.com +# RFC2249 || N. Freed, S. Kille || ned.freed@innosoft.com, S.Kille@isode.com +# RFC2250 || D. Hoffman, G. Fernando, V. Goyal, M. Civanlar || gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com, civanlar@research.att.com +# RFC2251 || M. Wahl, T. Howes, S. Kille || M.Wahl@critical-angle.com, howes@netscape.com, S.Kille@isode.com +# RFC2252 || M. Wahl, A. Coulbeck, T. Howes, S. Kille || M.Wahl@critical-angle.com, A.Coulbeck@isode.com, howes@netscape.com, S.Kille@isode.com +# RFC2253 || M. Wahl, S. Kille, T. Howes || M.Wahl@critical-angle.com, S.Kille@ISODE.COM, howes@netscape.com +# RFC2254 || T. Howes || howes@netscape.com +# RFC2255 || T. Howes, M. Smith || howes@netscape.com, mcs@netscape.com +# RFC2256 || M. Wahl || M.Wahl@critical-angle.com +# RFC2257 || M. Daniele, B. Wijnen, D. Francisco || daniele@zk3.dec.com, wijnen@vnet.ibm.com, dfrancis@cisco.com +# RFC2258 || J. Ordille || joann@bell-labs.com +# RFC2259 || J. Elliott, J. Ordille || jim@apocalypse.org, joann@bell-labs.com +# RFC2260 || T. Bates, Y. Rekhter || tbates@cisco.com, yakov@cisco.com +# RFC2261 || D. Harrington, R. Presuhn, B. Wijnen || +# RFC2262 || J. Case, D. Harrington, R. Presuhn, B. Wijnen || +# RFC2263 || D. Levi, P. Meyer, B. Stewart || +# RFC2264 || U. Blumenthal, B. Wijnen || +# RFC2265 || B. Wijnen, R. Presuhn, K. McCloghrie || +# RFC2266 || J. Flick || +# RFC2267 || P. Ferguson, D. Senie || ferguson@cisco.com, dts@senie.com +# RFC2268 || R. Rivest || rsa-labs@rsa.com +# RFC2269 || G. Armitage || gja@lucent.com +# RFC2270 || J. Stewart, T. Bates, R. Chandra, E. Chen || jstewart@isi.edu, tbates@cisco.com, rchandra@cisco.com, enkechen@cisco.com +# RFC2271 || D. Harrington, R. Presuhn, B. Wijnen || +# RFC2272 || J. Case, D. Harrington, R. Presuhn, B. Wijnen || +# RFC2273 || D. Levi, P. Meyer, B. Stewart || +# RFC2274 || U. Blumenthal, B. Wijnen || +# RFC2275 || B. Wijnen, R. Presuhn, K. McCloghrie || +# RFC2276 || K. Sollins || sollins@lcs.mit.edu +# RFC2277 || H. Alvestrand || Harald.T.Alvestrand@uninett.no +# RFC2278 || N. Freed, J. Postel || ned.freed@innosoft.com, Postel@ISI.EDU +# RFC2279 || F. Yergeau || fyergeau@alis.com +# RFC2280 || C. Alaettinoglu, T. Bates, E. Gerich, D. Karrenberg, D. Meyer, M. Terpstra, C. Villamizar || cengiz@isi.edu, tbates@cisco.com, epg@home.net, dfk@ripe.net, meyer@antc.uoregon.edu, marten@BayNetworks.com, curtis@ans.net +# RFC2281 || T. Li, B. Cole, P. Morton, D. Li || tli@juniper.net, cole@juniper.net, pmorton@cisco.com, dawnli@cisco.com +# RFC2282 || J. Galvin || +# RFC2283 || T. Bates, R. Chandra, D. Katz, Y. Rekhter || +# RFC2284 || L. Blunk, J. Vollbrecht || ljb@merit.edu, jrv@merit.edu +# RFC2285 || R. Mandeville || bob.mandeville@eunet.fr +# RFC2286 || J. Kapp || skapp@reapertech.com +# RFC2287 || C. Krupczak, J. Saperia || cheryl@empiretech.com +# RFC2288 || C. Lynch, C. Preston, R. Daniel || cliff@cni.org, cecilia@well.com, rdaniel@acl.lanl.gov +# RFC2289 || N. Haller, C. Metz, P. Nesser, M. Straw || +# RFC2290 || J. Solomon, S. Glass || solomon@comm.mot.com, glass@ftp.com +# RFC2291 || J. Slein, F. Vitali, E. Whitehead, D. Durand || slein@wrc.xerox.com, fabio@cs.unibo.it, ejw@ics.uci.edu, dgd@cs.bu.edu +# RFC2292 || W. Stevens, M. Thomas || rstevens@kohala.com, matt.thomas@altavista-software.com +# RFC2293 || S. Kille || S.Kille@ISODE.COM +# RFC2294 || S. Kille || S.Kille@ISODE.COM +# RFC2295 || K. Holtman, A. Mutz || koen@win.tue.nl, mutz@hpl.hp.com +# RFC2296 || K. Holtman, A. Mutz || koen@win.tue.nl, mutz@hpl.hp.com +# RFC2297 || P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall || bob.hinden@gmail.com +# RFC2298 || R. Fajman || raf@cu.nih.gov +# RFC2299 || A. Ramos || ramos@isi.edu +# RFC2300 || J. Postel || Postel@ISI.EDU +# RFC2301 || L. McIntyre, S. Zilles, R. Buckley, D. Venable, G. Parsons, J. Rafferty || +# RFC2302 || G. Parsons, J. Rafferty, S. Zilles || +# RFC2303 || C. Allocchio || +# RFC2304 || C. Allocchio || +# RFC2305 || K. Toyoda, H. Ohno, J. Murai, D. Wing || +# RFC2306 || G. Parsons, J. Rafferty || +# RFC2307 || L. Howard || lukeh@xedoc.com +# RFC2308 || M. Andrews || Mark.Andrews@cmis.csiro.au +# RFC2309 || B. Braden, D. Clark, J. Crowcroft, B. Davie, S. Deering, D. Estrin, S. Floyd, V. Jacobson, G. Minshall, C. Partridge, L. Peterson, K. Ramakrishnan, S. Shenker, J. Wroclawski, L. Zhang || Braden@ISI.EDU, DDC@lcs.mit.edu, Jon.Crowcroft@cs.ucl.ac.uk, bdavie@cisco.com, deering@cisco.com, Estrin@usc.edu, Floyd@ee.lbl.gov, Van@ee.lbl.gov, Minshall@fiberlane.com, craig@bbn.com, LLP@cs.arizona.edu, KKRama@research.att.com, Shenker@parc.xerox.com, JTW@lcs.mit.edu, Lixia@cs.ucla.edu +# RFC2310 || K. Holtman || koen@win.tue.nl +# RFC2311 || S. Dusse, P. Hoffman, B. Ramsdell, L. Lundblade, L. Repka || spock@rsa.com, phoffman@imc.org, blaker@deming.com, lgl@qualcomm.com, repka@netscape.com +# RFC2312 || S. Dusse, P. Hoffman, B. Ramsdell, J. Weinstein || spock@rsa.com, phoffman@imc.org, blaker@deming.com, jsw@netscape.com +# RFC2313 || B. Kaliski || burt@rsa.com +# RFC2314 || B. Kaliski || burt@rsa.com +# RFC2315 || B. Kaliski || burt@rsa.com +# RFC2316 || S. Bellovin || +# RFC2317 || H. Eidnes, G. de Groot, P. Vixie || Havard.Eidnes@runit.sintef.no, GeertJan.deGroot@bsdi.com, paul@vix.com +# RFC2318 || H. Lie, B. Bos, C. Lilley || howcome@w3.org, bert@w3.org, chris@w3.org +# RFC2319 || KOI8-U Working Group || +# RFC2320 || M. Greene, J. Luciani, K. White, T. Kuo || maria@xedia.com, luciani@baynetworks.com, kennethw@vnet.ibm.com, ted_kuo@Baynetworks.com +# RFC2321 || A. Bressen || bressen@leftbank.com +# RFC2322 || K. van den Hout, A. Koopal, R. van Mook || koos@cetis.hvu.nl, andre@NL.net, remco@sateh.com +# RFC2323 || A. Ramos || ramos@isi.edu +# RFC2324 || L. Masinter || masinter@parc.xerox.com +# RFC2325 || M. Slavitch || slavitch@loran.com +# RFC2326 || H. Schulzrinne, A. Rao, R. Lanphier || schulzrinne@cs.columbia.edu, anup@netscape.com, robla@real.com +# RFC2327 || M. Handley, V. Jacobson || +# RFC2328 || J. Moy || jmoy@casc.com +# RFC2329 || J. Moy || jmoy@casc.com +# RFC2330 || V. Paxson, G. Almes, J. Mahdavi, M. Mathis || vern@ee.lbl.gov, almes@advanced.org, mahdavi@psc.edu, mathis@psc.edu +# RFC2331 || M. Maher || maher@isi.edu +# RFC2332 || J. Luciani, D. Katz, D. Piscitello, B. Cole, N. Doraswamy || dkatz@cisco.com, luciani@baynetworks.com, bcole@jnx.com, naganand@baynetworks.com +# RFC2333 || D. Cansever || dcansever@gte.com +# RFC2334 || J. Luciani, G. Armitage, J. Halpern, N. Doraswamy || luciani@baynetworks.com, gja@lucent.com, jhalpern@Newbridge.COM, naganand@baynetworks.com +# RFC2335 || J. Luciani || luciani@baynetworks.com +# RFC2336 || J. Luciani || +# RFC2337 || D. Farinacci, D. Meyer, Y. Rekhter || +# RFC2338 || S. Knight, D. Weaver, D. Whipple, R. Hinden, D. Mitzel, P. Hunt, P. Higginson, M. Shand, A. Lindem || Steven.Knight@ascend.com, Doug.Weaver@ascend.com, dwhipple@microsoft.com, bob.hinden@gmail.com, mitzel@iprg.nokia.com, hunt@iprg.nokia.com, higginson@mail.dec.com, shand@mail.dec.com +# RFC2339 || The Internet Society, Sun Microsystems || +# RFC2340 || B. Jamoussi, D. Jamieson, D. Williston, S. Gabe || jamoussi@Nortel.ca, djamies@Nortel.ca, danwil@Nortel.ca, spgabe@Nortel.ca +# RFC2341 || A. Valencia, M. Littlewood, T. Kolar || tkolar@cisco.com, littlewo@cisco.com, valencia@cisco.com +# RFC2342 || M. Gahrns, C. Newman || mikega@microsoft.com, chris.newman@innosoft.com +# RFC2343 || M. Civanlar, G. Cash, B. Haskell || civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com +# RFC2344 || G. Montenegro, Ed. || +# RFC2345 || J. Klensin, T. Wolf, G. Oglesby || klensin@mci.net, ted@usa.net, gary@mci.net +# RFC2346 || J. Palme || jpalme@dsv.su.se +# RFC2347 || G. Malkin, A. Harkin || gmalkin@baynetworks.com, ash@cup.hp.com +# RFC2348 || G. Malkin, A. Harkin || gmalkin@baynetworks.com, ash@cup.hp.com +# RFC2349 || G. Malkin, A. Harkin || gmalkin@baynetworks.com, ash@cup.hp.com +# RFC2350 || N. Brownlee, E. Guttman || n.brownlee@auckland.ac.nz, Erik.Guttman@sun.com +# RFC2351 || A. Robert || arobert@par1.par.sita.int +# RFC2352 || O. Vaughan || owain@vaughan.com +# RFC2353 || G. Dudley || dudleyg@us.ibm.com +# RFC2354 || C. Perkins, O. Hodson || c.perkins@cs.ucl.ac.uk, o.hodson@cs.ucl.ac.uk +# RFC2355 || B. Kelly || kellywh@mail.auburn.edu +# RFC2356 || G. Montenegro, V. Gupta || gabriel.montenegro@Eng.Sun.COM, vipul.gupta@Eng.Sun.COM +# RFC2357 || A. Mankin, A. Romanow, S. Bradner, V. Paxson || mankin@east.isi.edu, allyn@mci.net, sob@harvard.edu, vern@ee.lbl.gov +# RFC2358 || J. Flick, J. Johnson || johnf@hprnd.rose.hp.com, jeff@redbacknetworks.com +# RFC2359 || J. Myers || jgmyers@netscape.com +# RFC2360 || G. Scott || +# RFC2361 || E. Fleischman || ericfl@microsoft.com, Eric.Fleischman@PSS.Boeing.com +# RFC2362 || D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei || estrin@usc.edu, dino@cisco.com, ahelmy@catarina.usc.edu, thalerd@eecs.umich.edu, deering@parc.xerox.com, m.handley@cs.ucl.ac.uk, van@ee.lbl.gov, charley@catarina.usc.edu, puneet@catarina.usc.edu, lwei@cisco.com +# RFC2363 || G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens || gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com +# RFC2364 || G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens || gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com +# RFC2365 || D. Meyer || dmm@cisco.com +# RFC2366 || C. Chung, M. Greene || cchung@tieo.saic.com +# RFC2367 || D. McDonald, C. Metz, B. Phan || danmcd@eng.sun.com, cmetz@inner.net, phan@itd.nrl.navy.mil +# RFC2368 || P. Hoffman, L. Masinter, J. Zawinski || +# RFC2369 || G. Neufeld, J. Baer || +# RFC2370 || R. Coltun || +# RFC2371 || J. Lyon, K. Evans, J. Klein || JimLyon@Microsoft.Com, Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com +# RFC2372 || K. Evans, J. Klein, J. Lyon || Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com, JimLyon@Microsoft.Com +# RFC2373 || R. Hinden, S. Deering || bob.hinden@gmail.com +# RFC2374 || R. Hinden, M. O'Dell, S. Deering || bob.hinden@gmail.com, mo@uunet.uu.net, deering@cisco.com +# RFC2375 || R. Hinden, S. Deering || bob.hinden@gmail.com, deering@cisco.com +# RFC2376 || E. Whitehead, M. Murata || +# RFC2377 || A. Grimstad, R. Huber, S. Sataluri, M. Wahl || alg@att.com, rvh@att.com, srs@lucent.com, M.Wahl@critical-angle.com +# RFC2378 || R. Hedberg, P. Pomes || Roland.Hedberg@umdac.umu.se, ppomes@qualcomm.com +# RFC2379 || L. Berger || lberger@fore.com +# RFC2380 || L. Berger || lberger@fore.com +# RFC2381 || M. Garrett, M. Borden || mwg@bellcore.com, mborden@baynetworks.com +# RFC2382 || E. Crawley, Ed., L. Berger, S. Berson, F. Baker, M. Borden, J. Krawczyk || esc@argon.com, lberger@fore.com, berson@isi.edu, fred@cisco.com, mborden@baynetworks.com, jj@arrowpoint.com +# RFC2383 || M. Suzuki || suzuki@nal.ecl.net +# RFC2384 || R. Gellens || Randy@Qualcomm.Com +# RFC2385 || A. Heffernan || ahh@cisco.com +# RFC2386 || E. Crawley, R. Nair, B. Rajagopalan, H. Sandick || +# RFC2387 || E. Levinson || XIson@cnj.digex.com +# RFC2388 || L. Masinter || masinter@parc.xerox.com +# RFC2389 || P. Hethmon, R. Elz || +# RFC2390 || T. Bradley, C. Brown, A. Malis || tbradley@avici.com, cbrown@juno.com, malis@ascend.com +# RFC2391 || P. Srisuresh, D. Gan || suresh@ra.lucent.com, dhg@juniper.net +# RFC2392 || E. Levinson || XIson@cnj.digex.net +# RFC2393 || A. Shacham, R. Monsour, R. Pereira, M. Thomas || shacham@cisco.com, rmonsour@hifn.com, rpereira@timestep.com, matt.thomas@altavista-software.com, naganand@baynetworks.com +# RFC2394 || R. Pereira || +# RFC2395 || R. Friend, R. Monsour || rfriend@hifn.com, rmonsour@hifn.com +# RFC2396 || T. Berners-Lee, R. Fielding, L. Masinter || timbl@w3.org, fielding@ics.uci.edu, masinter@parc.xerox.com +# RFC2397 || L. Masinter || +# RFC2398 || S. Parker, C. Schmechel || sparker@eng.sun.com, cschmec@eng.sun.com +# RFC2399 || A. Ramos || ramos@isi.edu +# RFC2400 || J. Postel, J. Reynolds || Postel@ISI.EDU, JKRey@ISI.EDU +# RFC2401 || S. Kent, R. Atkinson || +# RFC2402 || S. Kent, R. Atkinson || +# RFC2403 || C. Madson, R. Glenn || +# RFC2404 || C. Madson, R. Glenn || +# RFC2405 || C. Madson, N. Doraswamy || +# RFC2406 || S. Kent, R. Atkinson || +# RFC2407 || D. Piper || ddp@network-alchemy.com +# RFC2408 || D. Maughan, M. Schertler, M. Schneider, J. Turner || wdm@tycho.ncsc.mil, mss@tycho.ncsc.mil, mjs@securify.com, jeff.turner@raba.com +# RFC2409 || D. Harkins, D. Carrel || dharkins@cisco.com, carrel@ipsec.org +# RFC2410 || R. Glenn, S. Kent || +# RFC2411 || R. Thayer, N. Doraswamy, R. Glenn || naganand@baynetworks.com, rob.glenn@nist.gov +# RFC2412 || H. Orman || ho@darpa.mil +# RFC2413 || S. Weibel, J. Kunze, C. Lagoze, M. Wolf || weibel@oclc.org, jak@ckm.ucsf.edu, lagoze@cs.cornell.edu, misha.wolf@reuters.com +# RFC2414 || M. Allman, S. Floyd, C. Partridge || mallman@lerc.nasa.gov, floyd@ee.lbl.gov, craig@bbn.com +# RFC2415 || K. Poduri, K. Nichols || kpoduri@Baynetworks.com, knichols@baynetworks.com +# RFC2416 || T. Shepard, C. Partridge || shep@alum.mit.edu, craig@bbn.com +# RFC2417 || C. Chung, M. Greene || chihschung@aol.com, maria@xedia.com +# RFC2418 || S. Bradner || +# RFC2419 || K. Sklower, G. Meyer || sklower@CS.Berkeley.EDU +# RFC2420 || H. Kummert || kummert@nentec.de +# RFC2421 || G. Vaudreuil, G. Parsons || Glenn.Parsons@Nortel.ca, GregV@Lucent.Com +# RFC2422 || G. Vaudreuil, G. Parsons || Glenn.Parsons@Nortel.ca, GregV@Lucent.Com +# RFC2423 || G. Vaudreuil, G. Parsons || Glenn.Parsons@Nortel.ca, GregV@Lucent.Com +# RFC2424 || G. Vaudreuil, G. Parsons || Glenn.Parsons@Nortel.ca, GregV@Lucent.Com +# RFC2425 || T. Howes, M. Smith, F. Dawson || howes@netscape.com, mcs@netscape.com, frank_dawson@lotus.com +# RFC2426 || F. Dawson, T. Howes || +# RFC2427 || C. Brown, A. Malis || cbrown@juno.com, malis@ascend.com +# RFC2428 || M. Allman, S. Ostermann, C. Metz || mallman@lerc.nasa.gov, ostermann@cs.ohiou.edu, cmetz@inner.net +# RFC2429 || C. Bormann, L. Cline, G. Deisher, T. Gardos, C. Maciocco, D. Newell, J. Ott, G. Sullivan, S. Wenger, C. Zhu || +# RFC2430 || T. Li, Y. Rekhter || tli@juniper.net, yakov@cisco.com +# RFC2431 || D. Tynan || dtynan@claddagh.ie +# RFC2432 || K. Dubray || kdubray@ironbridgenetworks.com +# RFC2433 || G. Zorn, S. Cobb || glennz@microsoft.com, stevec@microsoft.com +# RFC2434 || T. Narten, H. Alvestrand || narten@raleigh.ibm.com, Harald@Alvestrand.no +# RFC2435 || L. Berc, W. Fenner, R. Frederick, S. McCanne, P. Stewart || berc@pa.dec.com, fenner@parc.xerox.com, frederick@parc.xerox.com, mccanne@cs.berkeley.edu, stewart@parc.xerox.com +# RFC2436 || R. Brett, S. Bradner, G. Parsons || rfbrett@nortel.ca, sob@harvard.edu, Glenn.Parsons@Nortel.ca +# RFC2437 || B. Kaliski, J. Staddon || burt@rsa.com, jstaddon@rsa.com +# RFC2438 || M. O'Dell, H. Alvestrand, B. Wijnen, S. Bradner || mo@uu.net, Harald.Alvestrand@maxware.no, wijnen@vnet.ibm.com, sob@harvard.edu +# RFC2439 || C. Villamizar, R. Chandra, R. Govindan || curtis@ans.net, rchandra@cisco.com, govindan@isi.edu +# RFC2440 || J. Callas, L. Donnerhacke, H. Finney, R. Thayer || +# RFC2441 || D. Cohen || cohen@myri.com +# RFC2442 || N. Freed, D. Newman, J. Belissent, M. Hoy || ned.freed@innosoft.com, dan.newman@innosoft.com, jacques.belissent@eng.sun.com +# RFC2443 || J. Luciani, A. Gallo || luciani@baynetworks.com, gallo@raleigh.ibm.com +# RFC2444 || C. Newman || chris.newman@innosoft.com +# RFC2445 || F. Dawson, D. Stenerson || +# RFC2446 || S. Silverberg, S. Mansour, F. Dawson, R. Hopson || +# RFC2447 || F. Dawson, S. Mansour, S. Silverberg || +# RFC2448 || M. Civanlar, G. Cash, B. Haskell || civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com +# RFC2449 || R. Gellens, C. Newman, L. Lundblade || randy@qualcomm.com, chris.newman@innosoft.com, lgl@qualcomm.com +# RFC2450 || R. Hinden || bob.hinden@gmail.com +# RFC2451 || R. Pereira, R. Adams || +# RFC2452 || M. Daniele || daniele@zk3.dec.com +# RFC2453 || G. Malkin || gmalkin@baynetworks.com +# RFC2454 || M. Daniele || daniele@zk3.dec.com +# RFC2455 || B. Clouston, B. Moore || clouston@cisco.com, remoore@us.ibm.com +# RFC2456 || B. Clouston, B. Moore || clouston@cisco.com, remoore@us.ibm.com +# RFC2457 || B. Clouston, B. Moore || clouston@cisco.com, remoore@us.ibm.com +# RFC2458 || H. Lu, M. Krishnaswamy, L. Conroy, S. Bellovin, F. Burg, A. DeSimone, K. Tewani, P. Davidson, H. Schulzrinne, K. Vishwanathan || smb@research.att.com, fburg@hogpb.att.com, lwc@roke.co.uk, pauldav@nortel.ca, murali@bell-labs.com, hui-lan.lu@bell-labs.com, schulzrinne@cs.columbia.edu, tewani@att.com, kumar@isochrone.com +# RFC2459 || R. Housley, W. Ford, W. Polk, D. Solo || housley@spyrus.com, wford@verisign.com, wpolk@nist.gov, david.solo@citicorp.com +# RFC2460 || S. Deering, R. Hinden || deering@cisco.com, bob.hinden@gmail.com +# RFC2461 || T. Narten, E. Nordmark, W. Simpson || narten@raleigh.ibm.com, nordmark@sun.com, Bill.Simpson@um.cc.umich.edu +# RFC2462 || S. Thomson, T. Narten || +# RFC2463 || A. Conta, S. Deering || aconta@lucent.com, deering@cisco.com +# RFC2464 || M. Crawford || crawdad@fnal.gov +# RFC2465 || D. Haskin, S. Onishi || dhaskin@baynetworks.com, sonishi@baynetworks.com +# RFC2466 || D. Haskin, S. Onishi || dhaskin@baynetworks.com, sonishi@baynetworks.com +# RFC2467 || M. Crawford || crawdad@fnal.gov +# RFC2468 || V. Cerf || vcerf@mci.net +# RFC2469 || T. Narten, C. Burton || narten@raleigh.ibm.com, burton@rtp.vnet.ibm.com +# RFC2470 || M. Crawford, T. Narten, S. Thomas || crawdad@fnal.gov, narten@raleigh.ibm.com, stephen.thomas@transnexus.com +# RFC2471 || R. Hinden, R. Fink, J. Postel || bob.hinden@gmail.com, rlfink@lbl.gov +# RFC2472 || D. Haskin, E. Allen || dhaskin@baynetworks.com, eallen@baynetworks.com +# RFC2473 || A. Conta, S. Deering || aconta@lucent.com, deering@cisco.com +# RFC2474 || K. Nichols, S. Blake, F. Baker, D. Black || kmn@cisco.com, slblake@torrentnet.com, fred@cisco.com, black_david@emc.com +# RFC2475 || S. Blake, D. Black, M. Carlson, E. Davies, Z. Wang, W. Weiss || slblake@torrentnet.com, black_david@emc.com, mark.carlson@sun.com, elwynd@nortel.co.uk, zhwang@bell-labs.com, wweiss@lucent.com +# RFC2476 || R. Gellens, J. Klensin || Randy@Qualcomm.Com, klensin@mci.net +# RFC2477 || B. Aboba, G. Zorn || bernarda@microsoft.com, glennz@microsoft.com +# RFC2478 || E. Baize, D. Pinkas || +# RFC2479 || C. Adams || cadams@entrust.com +# RFC2480 || N. Freed || ned.freed@innosoft.com +# RFC2481 || K. Ramakrishnan, S. Floyd || +# RFC2482 || K. Whistler, G. Adams || kenw@sybase.com, glenn@spyglass.com +# RFC2483 || M. Mealling, R. Daniel || michaelm@rwhois.net, rdaniel@lanl.gov +# RFC2484 || G. Zorn || glennz@microsoft.com +# RFC2485 || S. Drach || drach@sun.com +# RFC2486 || B. Aboba, M. Beadles || bernarda@microsoft.com, mbeadles@wcom.net +# RFC2487 || P. Hoffman || phoffman@imc.org +# RFC2488 || M. Allman, D. Glover, L. Sanchez || mallman@lerc.nasa.gov, Daniel.R.Glover@lerc.nasa.gov, lsanchez@ir.bbn.com +# RFC2489 || R. Droms || droms@bucknell.edu +# RFC2490 || M. Pullen, R. Malghan, L. Lavu, G. Duan, J. Ma, H. Nah || mpullen@gmu.edu, rmalghan@bacon.gmu.edu, llavu@bacon.gmu.edu, gduan@us.oracle.com, jma@newbridge.com, hnah@bacon.gmu.edu +# RFC2491 || G. Armitage, P. Schulter, M. Jork, G. Harter || gja@lucent.com, paschulter@acm.org, jork@kar.dec.com, harter@zk3.dec.com +# RFC2492 || G. Armitage, P. Schulter, M. Jork || gja@lucent.com, paschulter@acm.org, jork@kar.dec.com +# RFC2493 || K. Tesink, Ed. || kaj@bellcore.com +# RFC2494 || D. Fowler, Ed. || davef@newbridge.com +# RFC2495 || D. Fowler, Ed. || davef@newbridge.com +# RFC2496 || D. Fowler, Ed. || davef@newbridge.com +# RFC2497 || I. Souvatzis || is@netbsd.org +# RFC2498 || J. Mahdavi, V. Paxson || mahdavi@psc.edu, vern@ee.lbl.gov +# RFC2499 || A. Ramos || ramos@isi.edu +# RFC2500 || J. Reynolds, R. Braden || +# RFC2501 || S. Corson, J. Macker || corson@isr.umd.edu, macker@itd.nrl.navy.mil +# RFC2502 || M. Pullen, M. Myjak, C. Bouwens || mpullen@gmu.edu, mmyjak@virtualworkshop.com, christina.bouwens@cpmx.mail.saic.com +# RFC2503 || R. Moulton, M. Needleman || ruth@muswell.demon.co.uk +# RFC2504 || E. Guttman, L. Leong, G. Malkin || erik.guttman@sun.com, lorna@colt.net, gmalkin@baynetworks.com +# RFC2505 || G. Lindberg || +# RFC2506 || K. Holtman, A. Mutz, T. Hardie || koen@win.tue.nl, andy_mutz@hp.com, hardie@equinix.com +# RFC2507 || M. Degermark, B. Nordgren, S. Pink || micke@sm.luth.se, bcn@lulea.trab.se, steve@sm.luth.se +# RFC2508 || S. Casner, V. Jacobson || casner@cisco.com, van@cisco.com +# RFC2509 || M. Engan, S. Casner, C. Bormann || engan@effnet.com, casner@cisco.com, cabo@tzi.org +# RFC2510 || C. Adams, S. Farrell || cadams@entrust.com, stephen.farrell@sse.ie +# RFC2511 || M. Myers, C. Adams, D. Solo, D. Kemp || mmyers@verisign.com, cadams@entrust.com, david.solo@citicorp.com, dpkemp@missi.ncsc.mil +# RFC2512 || K. McCloghrie, J. Heinanen, W. Greene, A. Prasad || kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com +# RFC2513 || K. McCloghrie, J. Heinanen, W. Greene, A. Prasad || kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com +# RFC2514 || M. Noto, E. Spiegel, K. Tesink || mspiegel@cisco.com, kaj@bellcore.com +# RFC2515 || K. Tesink, Ed || kaj@bellcore.com +# RFC2516 || L. Mamakos, K. Lidl, J. Evarts, D. Carrel, D. Simone, R. Wheeler || louie@uu.net, lidl@uu.net, jde@uu.net, carrel@RedBack.net, dan@RedBack.net, ross@routerware.com +# RFC2517 || R. Moats, R. Huber || jayhawk@att.com, rvh@att.com +# RFC2518 || Y. Goland, E. Whitehead, A. Faizi, S. Carter, D. Jensen || yarong@microsoft.com, ejw@ics.uci.edu, asad@netscape.com, srcarter@novell.com, dcjensen@novell.com +# RFC2519 || E. Chen, J. Stewart || enkechen@cisco.com, jstewart@juniper.net +# RFC2520 || J. Luciani, H. Suzuki, N. Doraswamy, D. Horton || luciani@baynetworks.com, hsuzuki@cisco.com, naganand@baynetworks.com, d.horton@citr.com.au +# RFC2521 || P. Karn, W. Simpson || +# RFC2522 || P. Karn, W. Simpson || +# RFC2523 || P. Karn, W. Simpson || +# RFC2524 || M. Banan || +# RFC2525 || V. Paxson, M. Allman, S. Dawson, W. Fenner, J. Griner, I. Heavens, K. Lahey, J. Semke, B. Volz || vern@aciri.org, sdawson@eecs.umich.edu, fenner@parc.xerox.com, jgriner@grc.nasa.gov, ian@spider.com, kml@nas.nasa.gov, semke@psc.edu, volz@process.com +# RFC2526 || D. Johnson, S. Deering || dbj@cs.cmu.edu, deering@cisco.com +# RFC2527 || S. Chokhani, W. Ford || +# RFC2528 || R. Housley, W. Polk || housley@spyrus.com, wpolk@nist.gov +# RFC2529 || B. Carpenter, C. Jung || brian@hursley.ibm.com, cmj@3Com.com +# RFC2530 || D. Wing || dwing-ietf@fuggles.com +# RFC2531 || G. Klyne, L. McIntyre || GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com +# RFC2532 || L. Masinter, D. Wing || masinter@parc.xerox.com, dwing-ietf@fuggles.com +# RFC2533 || G. Klyne || GK@ACM.ORG +# RFC2534 || L. Masinter, D. Wing, A. Mutz, K. Holtman || masinter@parc.xerox.com, dwing-ietf@fuggles.com, koen@win.tue.nl +# RFC2535 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2536 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2537 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2538 || D. Eastlake 3rd, O. Gudmundsson || dee3@us.ibm.com, ogud@tislabs.com +# RFC2539 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2540 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2541 || D. Eastlake 3rd || dee3@us.ibm.com +# RFC2542 || L. Masinter || masinter@parc.xerox.com +# RFC2543 || M. Handley, H. Schulzrinne, E. Schooler, J. Rosenberg || +# RFC2544 || S. Bradner, J. McQuaid || +# RFC2545 || P. Marques, F. Dupont || +# RFC2546 || A. Durand, B. Buclin || Alain.Durand@imag.fr, Bertrand.Buclin@ch.att.com +# RFC2547 || E. Rosen, Y. Rekhter || erosen@cisco.com, yakov@cisco.com +# RFC2548 || G. Zorn || +# RFC2549 || D. Waitzman || djw@vineyard.net +# RFC2550 || S. Glassman, M. Manasse, J. Mogul || steveg@pa.dec.com, msm@pa.dec.com, mogul@pa.dec.com +# RFC2551 || S. Bradner || +# RFC2552 || M. Blinov, M. Bessonov, C. Clissmann || mch@net-cs.ucd.ie, mikeb@net-cs.ucd.ie, ciaranc@net-cs.ucd.ie +# RFC2553 || R. Gilligan, S. Thomson, J. Bound, W. Stevens || gilligan@freegate.com, set@thumper.bellcore.com, bound@zk3.dec.com, rstevens@kohala.com +# RFC2554 || J. Myers || jgmyers@netscape.com +# RFC2555 || RFC Editor, et al. || braden@isi.edu, jkrey@isi.edu, crocker@mbl.edu, vcerf@mci.net, feinler@juno.com, celeste@isi.edu +# RFC2556 || S. Bradner || sob@harvard.edu +# RFC2557 || J. Palme, A. Hopmann, N. Shelness || jpalme@dsv.su.se, alexhop@microsoft.com, Shelness@lotus.com, stef@nma.com +# RFC2558 || K. Tesink || kaj@research.telcordia.com +# RFC2559 || S. Boeyen, T. Howes, P. Richard || sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com +# RFC2560 || M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams || mmyers@verisign.com, rankney@erols.com, ambarish@valicert.com, galperin@mycfo.com, cadams@entrust.com +# RFC2561 || K. White, R. Moore || kennethw@vnet.ibm.com, remoore@us.ibm.com +# RFC2562 || K. White, R. Moore || kennethw@vnet.ibm.com, remoore@us.ibm.com +# RFC2563 || R. Troll || rtroll@corp.home.net +# RFC2564 || C. Kalbfleisch, C. Krupczak, R. Presuhn, J. Saperia || cwk@verio.net, cheryl@empiretech.com, randy_presuhn@bmc.com, saperia@mediaone.net +# RFC2565 || R. Herriot, Ed., S. Butler, P. Moore, R. Turner || rherriot@pahv.xerox.com, sbutler@boi.hp.com, paulmo@microsoft.com, rturner@sharplabs.com, rherriot@pahv.xerox.com +# RFC2566 || R. deBry, T. Hastings, R. Herriot, S. Isaacson, P. Powell || sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com +# RFC2567 || F. Wright || +# RFC2568 || S. Zilles || +# RFC2569 || R. Herriot, Ed., T. Hastings, N. Jacobs, J. Martin || rherriot@pahv.xerox.com, Norm.Jacobs@Central.sun.com, tom.hastings@alum.mit.edu, jkm@underscore.com +# RFC2570 || J. Case, R. Mundy, D. Partain, B. Stewart || +# RFC2571 || B. Wijnen, D. Harrington, R. Presuhn || +# RFC2572 || J. Case, D. Harrington, R. Presuhn, B. Wijnen || +# RFC2573 || D. Levi, P. Meyer, B. Stewart || +# RFC2574 || U. Blumenthal, B. Wijnen || +# RFC2575 || B. Wijnen, R. Presuhn, K. McCloghrie || +# RFC2576 || R. Frye, D. Levi, S. Routhier, B. Wijnen || +# RFC2577 || M. Allman, S. Ostermann || mallman@grc.nasa.gov, ostermann@cs.ohiou.edu +# RFC2578 || K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed. || +# RFC2579 || K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed. || +# RFC2580 || K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed. || +# RFC2581 || M. Allman, V. Paxson, W. Stevens || mallman@grc.nasa.gov, vern@aciri.org, rstevens@kohala.com +# RFC2582 || S. Floyd, T. Henderson || +# RFC2583 || R. Carlson, L. Winkler || RACarlson@anl.gov, lwinkler@anl.gov +# RFC2584 || B. Clouston, B. Moore || clouston@cisco.com, remoore@us.ibm.com +# RFC2585 || R. Housley, P. Hoffman || housley@spyrus.com, phoffman@imc.org +# RFC2586 || J. Salsman, H. Alvestrand || James@bovik.org, Harald.T.Alvestrand@uninett.no +# RFC2587 || S. Boeyen, T. Howes, P. Richard || sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com +# RFC2588 || R. Finlayson || finlayson@live.com +# RFC2589 || Y. Yaacovi, M. Wahl, T. Genovese || yoramy@microsoft.com, tonyg@microsoft.com +# RFC2590 || A. Conta, A. Malis, M. Mueller || aconta@lucent.com, malis@ascend.com, memueller@lucent.com +# RFC2591 || D. Levi, J. Schoenwaelder || +# RFC2592 || D. Levi, J. Schoenwaelder || +# RFC2593 || J. Schoenwaelder, J. Quittek || schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de +# RFC2594 || H. Hazewinkel, C. Kalbfleisch, J. Schoenwaelder || +# RFC2595 || C. Newman || chris.newman@innosoft.com +# RFC2596 || M. Wahl, T. Howes || M.Wahl@innosoft.com, howes@netscape.com +# RFC2597 || J. Heinanen, F. Baker, W. Weiss, J. Wroclawski || jh@telia.fi, fred@cisco.com, wweiss@lucent.com, jtw@lcs.mit.edu +# RFC2598 || V. Jacobson, K. Nichols, K. Poduri || van@cisco.com, kmn@cisco.com, kpoduri@baynetworks.com +# RFC2599 || A. DeLaCruz || delacruz@isi.edu +# RFC2600 || J. Reynolds, R. Braden || +# RFC2601 || M. Davison || mike.davison@cisco.com +# RFC2602 || M. Davison || mike.davison@cisco.com +# RFC2603 || M. Davison || mike.davison@cisco.com +# RFC2604 || R. Gellens || randy@qualcomm.com +# RFC2605 || G. Mansfield, S. Kille || glenn@cysols.com, Steve.Kille@MessagingDirect.com +# RFC2606 || D. Eastlake 3rd, A. Panitz || dee3@us.ibm.com, buglady@fuschia.net +# RFC2607 || B. Aboba, J. Vollbrecht || bernarda@microsoft.com, jrv@merit.edu +# RFC2608 || E. Guttman, C. Perkins, J. Veizades, M. Day || Erik.Guttman@sun.com, cperkins@sun.com, veizades@home.net, mday@vinca.com +# RFC2609 || E. Guttman, C. Perkins, J. Kempf || erik.guttman@sun.com, cperkins@sun.com, james.kempf@sun.com +# RFC2610 || C. Perkins, E. Guttman || Charles.Perkins@Sun.Com, Erik.Guttman@Sun.Com +# RFC2611 || L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom || leslie@thinkingcat.com, Dirk.vanGulik@jrc.it, renato@dstc.edu.au, paf@swip.net +# RFC2612 || C. Adams, J. Gilchrist || carlisle.adams@entrust.com, jeff.gilchrist@entrust.com +# RFC2613 || R. Waterman, B. Lahaye, D. Romascanu, S. Waldbusser || rich@allot.com, dromasca@gmail.com , waldbusser@ins.com +# RFC2614 || J. Kempf, E. Guttman || james.kempf@sun.com, erik.guttman@sun.com +# RFC2615 || A. Malis, W. Simpson || malis@ascend.com, wsimpson@GreenDragon.com +# RFC2616 || R. Fielding, J. Gettys, J. Mogul, H. Frystyk, L. Masinter, P. Leach, T. Berners-Lee || fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, masinter@parc.xerox.com, paulle@microsoft.com, timbl@w3.org +# RFC2617 || J. Franks, P. Hallam-Baker, J. Hostetler, S. Lawrence, P. Leach, A. Luotonen, L. Stewart || john@math.nwu.edu, pbaker@verisign.com, jeff@AbiSource.com, lawrence@agranat.com, paulle@microsoft.com, stewart@OpenMarket.com +# RFC2618 || B. Aboba, G. Zorn || bernarda@microsoft.com, glennz@microsoft.com +# RFC2619 || G. Zorn, B. Aboba || bernarda@microsoft.com, glennz@microsoft.com +# RFC2620 || B. Aboba, G. Zorn || bernarda@microsoft.com, glennz@microsoft.com +# RFC2621 || G. Zorn, B. Aboba || bernarda@microsoft.com, glennz@microsoft.com +# RFC2622 || C. Alaettinoglu, C. Villamizar, E. Gerich, D. Kessens, D. Meyer, T. Bates, D. Karrenberg, M. Terpstra || cengiz@isi.edu, curtis@avici.com, epg@home.net, David.Kessens@qwest.net, meyer@antc.uoregon.edu, tbates@cisco.com, dfk@ripe.net, marten@BayNetworks.com +# RFC2623 || M. Eisler || mre@eng.sun.com +# RFC2624 || S. Shepler || spencer.shepler@eng.sun.com +# RFC2625 || M. Rajagopal, R. Bhagwat, W. Rickard || murali@gadzoox.com, raj@gadzoox.com, wayne@gadzoox.com +# RFC2626 || P. Nesser II || +# RFC2627 || D. Wallner, E. Harder, R. Agee || dmwalln@orion.ncsc.mil, ejh@tycho.ncsc.mil +# RFC2628 || V. Smyslov || svan@trustworks.com +# RFC2629 || M. Rose || mrose17@gmail.com +# RFC2630 || R. Housley || housley@spyrus.com +# RFC2631 || E. Rescorla || ekr@rtfm.com +# RFC2632 || B. Ramsdell, Ed. || +# RFC2633 || B. Ramsdell, Ed. || +# RFC2634 || P. Hoffman, Ed. || phoffman@imc.org +# RFC2635 || S. Hambridge, A. Lunde || +# RFC2636 || R. Gellens || randy@qualcomm.com +# RFC2637 || K. Hamzeh, G. Pall, W. Verthein, J. Taarud, W. Little, G. Zorn || kory@ascend.com, gurdeep@microsoft.com, glennz@microsoft.com +# RFC2638 || K. Nichols, V. Jacobson, L. Zhang || kmn@cisco.com, van@cisco.com, lixia@cs.ucla.edu +# RFC2639 || T. Hastings, C. Manros || tom.hastings@alum.mit.edu, manros@cp10.es.xerox.com +# RFC2640 || B. Curtin || curtinw@ftm.disa.mil +# RFC2641 || D. Hamilton, D. Ruffen || daveh@ctron.com, ruffen@ctron.com +# RFC2642 || L. Kane || lkane@ctron.com +# RFC2643 || D. Ruffen, T. Len, J. Yanacek || ruffen@ctron.com, len@ctron.com, jyanacek@ctron.com +# RFC2644 || D. Senie || dts@senie.com +# RFC2645 || R. Gellens || randy@qualcomm.com +# RFC2646 || R. Gellens, Ed. || +# RFC2647 || D. Newman || +# RFC2648 || R. Moats || jayhawk@att.com +# RFC2649 || B. Greenblatt, P. Richard || bgreenblatt@directory-applications.com, patr@xcert.com +# RFC2650 || D. Meyer, J. Schmitz, C. Orange, M. Prior, C. Alaettinoglu || dmm@cisco.com, SchmitzJo@aol.com, orange@spiritone.com, mrp@connect.com.au, cengiz@isi.edu +# RFC2651 || J. Allen, M. Mealling || jeff.allen@acm.org, michael.mealling@RWhois.net +# RFC2652 || J. Allen, M. Mealling || jeff.allen@acm.org, michael.mealling@RWhois.net +# RFC2653 || J. Allen, P. Leach, R. Hedberg || jeff.allen@acm.org, paulle@microsoft.com, roland@catalogix.ac.se +# RFC2654 || R. Hedberg, B. Greenblatt, R. Moats, M. Wahl || roland@catalogix.ac.se, bgreenblatt@directory-applications.com, jayhawk@att.com +# RFC2655 || T. Hardie, M. Bowman, D. Hardy, M. Schwartz, D. Wessels || hardie@equinix.com, mic@transarc.com, dhardy@netscape.com, wessels@nlanr.net +# RFC2656 || T. Hardie || hardie@equinix.com +# RFC2657 || R. Hedberg || roland@catalogix.ac.se +# RFC2658 || K. McKay || kylem@qualcomm.com +# RFC2659 || E. Rescorla, A. Schiffman || ekr@rtfm.com, ams@terisa.com +# RFC2660 || E. Rescorla, A. Schiffman || ekr@rtfm.com, ams@terisa.com +# RFC2661 || W. Townsley, A. Valencia, A. Rubens, G. Pall, G. Zorn, B. Palter || gurdeep@microsoft.com, palter@zev.net, acr@del.com, townsley@cisco.com, vandys@cisco.com, gwz@acm.org +# RFC2662 || G. Bathrick, F. Ly || bathricg@agcs.com, faye@coppermountain.com +# RFC2663 || P. Srisuresh, M. Holdrege || srisuresh@lucent.com, holdrege@lucent.com +# RFC2664 || R. Plzak, A. Wells, E. Krol || plzakr@saic.com, awel@cs.wisc.edu, krol@uiuc.edu +# RFC2665 || J. Flick, J. Johnson || johnf@rose.hp.com, jeff@redbacknetworks.com +# RFC2666 || J. Flick || johnf@rose.hp.com +# RFC2667 || D. Thaler || dthaler@microsoft.com +# RFC2668 || A. Smith, J. Flick, K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts || andrew@extremenetworks.com, johnf@rose.hp.com, kdegraaf@argon.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com +# RFC2669 || M. St. Johns, Ed. || stjohns@corp.home.net +# RFC2670 || M. St. Johns, Ed. || stjohns@corp.home.net +# RFC2671 || P. Vixie || vixie@isc.org +# RFC2672 || M. Crawford || crawdad@fnal.gov +# RFC2673 || M. Crawford || crawdad@fnal.gov +# RFC2674 || E. Bell, A. Smith, P. Langille, A. Rijhsinghani, K. McCloghrie || Les_Bell@3Com.com, andrew@extremenetworks.com, langille@newbridge.com, anil@cabletron.com, kzm@cisco.com +# RFC2675 || D. Borman, S. Deering, R. Hinden || dab@bsdi.com, deering@cisco.com, bob.hinden@gmail.com +# RFC2676 || G. Apostolopoulos, S. Kama, D. Williams, R. Guerin, A. Orda, T. Przygienda || georgeap@watson.ibm.com, guerin@ee.upenn.edu, ariel@ee.technion.ac.il, dougw@watson.ibm.com +# RFC2677 || M. Greene, J. Cucchiara, J. Luciani || luciani@baynetworks.com, maria@xedia.com, joan@ironbridgenetworks.com +# RFC2678 || J. Mahdavi, V. Paxson || mahdavi@psc.edu, vern@ee.lbl.gov +# RFC2679 || G. Almes, S. Kalidindi, M. Zekauskas || almes@advanced.org, kalidindi@advanced.org, matt@advanced.org +# RFC2680 || G. Almes, S. Kalidindi, M. Zekauskas || almes@advanced.org, kalidindi@advanced.org, matt@advanced.org +# RFC2681 || G. Almes, S. Kalidindi, M. Zekauskas || almes@advanced.org, kalidindi@advanced.org, matt@advanced.org +# RFC2682 || I. Widjaja, A. Elwalid || indra.widjaja@fnc.fujitsu.com, anwar@lucent.com +# RFC2683 || B. Leiba || leiba@watson.ibm.com +# RFC2684 || D. Grossman, J. Heinanen || dan@dma.isg.mot.com, jh@telia.fi +# RFC2685 || B. Fox, B. Gleeson || barbarafox@lucent.com, bgleeson@shastanets.com +# RFC2686 || C. Bormann || cabo@tzi.org +# RFC2687 || C. Bormann || cabo@tzi.org +# RFC2688 || S. Jackowski, D. Putzolu, E. Crawley, B. Davie || stevej@DeterministicNetworks.com, David.Putzolu@intel.com, esc@argon.com, bdavie@cisco.com +# RFC2689 || C. Bormann || cabo@tzi.org +# RFC2690 || S. Bradner || +# RFC2691 || S. Bradner || +# RFC2692 || C. Ellison || carl.m.ellison@intel.com +# RFC2693 || C. Ellison, B. Frantz, B. Lampson, R. Rivest, B. Thomas, T. Ylonen || carl.m.ellison@intel.com, frantz@netcom.com, blampson@microsoft.com, rivest@theory.lcs.mit.edu, bt0008@sbc.com, ylo@ssh.fi +# RFC2694 || P. Srisuresh, G. Tsirtsis, P. Akkiraju, A. Heffernan || srisuresh@yahoo.com, george@gideon.bt.co.uk, spa@cisco.com, ahh@juniper.net +# RFC2695 || A. Chiu || +# RFC2696 || C. Weider, A. Herron, A. Anantha, T. Howes || cweider@microsoft.com, andyhe@microsoft.com, anoopa@microsoft.com, howes@netscape.com +# RFC2697 || J. Heinanen, R. Guerin || jh@telia.fi, guerin@ee.upenn.edu +# RFC2698 || J. Heinanen, R. Guerin || jh@telia.fi, guerin@ee.upenn.edu +# RFC2699 || S. Ginoza || ginoza@isi.edu +# RFC2700 || J. Reynolds, R. Braden || +# RFC2701 || G. Malkin || +# RFC2702 || D. Awduche, J. Malcolm, J. Agogbua, M. O'Dell, J. McManus || awduche@uu.net, jmalcolm@uu.net, ja@uu.net, mo@uu.net, jmcmanus@uu.net +# RFC2703 || G. Klyne || GK@ACM.ORG +# RFC2704 || M. Blaze, J. Feigenbaum, J. Ioannidis, A. Keromytis || mab@research.att.com, jf@research.att.com, ji@research.att.com, angelos@dsl.cis.upenn.edu +# RFC2705 || M. Arango, A. Dugan, I. Elliott, C. Huitema, S. Pickett || marango@rslcom.com, andrew.dugan@l3.com, ike.elliott@l3.com, huitema@research.telcordia.com, ScottP@vertical.com +# RFC2706 || D. Eastlake 3rd, T. Goldstein || dee3@us.ibm.com, tgoldstein@brodia.com +# RFC2707 || R. Bergman, T. Hastings, S. Isaacson, H. Lewis || rbergma@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com +# RFC2708 || R. Bergman || rbergman@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com, bpenteco@boi.hp.com +# RFC2709 || P. Srisuresh || srisuresh@lucent.com +# RFC2710 || S. Deering, W. Fenner, B. Haberman || deering@cisco.com, fenner@research.att.com, haberman@raleigh.ibm.com +# RFC2711 || C. Partridge, A. Jackson || craig@bbn.com, awjacks@bbn.com +# RFC2712 || A. Medvinsky, M. Hur || amedvins@excitecorp.com, matt.hur@cybersafe.com +# RFC2713 || V. Ryan, S. Seligman, R. Lee || vincent.ryan@ireland.sun.com, scott.seligman@eng.sun.com, rosanna.lee@eng.sun.com +# RFC2714 || V. Ryan, R. Lee, S. Seligman || vincent.ryan@ireland.sun.com, rosanna.lee@eng.sun.com, scott.seligman@eng.sun.com +# RFC2715 || D. Thaler || dthaler@microsoft.com +# RFC2716 || B. Aboba, D. Simon || bernarda@microsoft.com, dansimon@microsoft.com +# RFC2717 || R. Petke, I. King || rpetke@wcom.net, iking@microsoft.com +# RFC2718 || L. Masinter, H. Alvestrand, D. Zigmond, R. Petke || masinter@parc.xerox.com, harald.alvestrand@maxware.no, djz@corp.webtv.net, rpetke@wcom.net +# RFC2719 || L. Ong, I. Rytina, M. Garcia, H. Schwarzbauer, L. Coene, H. Lin, I. Juhasz, M. Holdrege, C. Sharp || long@nortelnetworks.com, ian.rytina@ericsson.com, holdrege@lucent.com, lode.coene@siemens.atea.be, Miguel.A.Garcia@ericsson.com, chsharp@cisco.com, imre.i.juhasz@telia.se, hlin@research.telcordia.com, HannsJuergen.Schwarzbauer@icn.siemens.de +# RFC2720 || N. Brownlee || n.brownlee@auckland.ac.nz +# RFC2721 || N. Brownlee || n.brownlee@auckland.ac.nz +# RFC2722 || N. Brownlee, C. Mills, G. Ruth || n.brownlee@auckland.ac.nz, cmills@gte.com, gruth@bbn.com +# RFC2723 || N. Brownlee || n.brownlee@auckland.ac.nz +# RFC2724 || S. Handelman, S. Stibler, N. Brownlee, G. Ruth || swhandel@us.ibm.com, stibler@us.ibm.com, n.brownlee@auckland.ac.nz, gruth@bbn.com +# RFC2725 || C. Villamizar, C. Alaettinoglu, D. Meyer, S. Murphy || curtis@avici.com, cengiz@ISI.EDU, dmm@cisco.com, sandy@tis.com +# RFC2726 || J. Zsako || zsako@banknet.net +# RFC2727 || J. Galvin || +# RFC2728 || R. Panabaker, S. Wegerif, D. Zigmond || +# RFC2729 || P. Bagnall, R. Briscoe, A. Poppitt || pete@surfaceeffect.com, bob.briscoe@bt.com, apoppitt@jungle.bt.co.uk +# RFC2730 || S. Hanna, B. Patel, M. Shah || steve.hanna@sun.com, baiju.v.patel@intel.com, munils@microsoft.com +# RFC2731 || J. Kunze || jak@ckm.ucsf.edu +# RFC2732 || R. Hinden, B. Carpenter, L. Masinter || bob.hinden@gmail.com, brian@icair.org, LMM@acm.org +# RFC2733 || J. Rosenberg, H. Schulzrinne || schulzrinne@cs.columbia.edu +# RFC2734 || P. Johansson || +# RFC2735 || B. Fox, B. Petri || bfox@equipecom.com, bernhard.petri@icn.siemens.de +# RFC2736 || M. Handley, C. Perkins || mjh@aciri.org, C.Perkins@cs.ucl.ac.uk +# RFC2737 || K. McCloghrie, A. Bierman || kzm@cisco.com, andy@yumaworks.com +# RFC2738 || G. Klyne || GK@ACM.ORG +# RFC2739 || T. Small, D. Hennessy, F. Dawson || +# RFC2740 || R. Coltun, D. Ferguson, J. Moy || rcoltun@siara.com, dennis@juniper.com, jmoy@sycamorenet.com +# RFC2741 || M. Daniele, B. Wijnen, M. Ellison, D. Francisco || daniele@zk3.dec.com, wijnen@vnet.ibm.com, ellison@world.std.com, dfrancis@cisco.com +# RFC2742 || L. Heintz, S. Gudur, M. Ellison || lheintz@cisco.com, sgudur@hotmail.com +# RFC2743 || J. Linn || +# RFC2744 || J. Wray || John_Wray@Iris.com +# RFC2745 || A. Terzis, B. Braden, S. Vincent, L. Zhang || terzis@cs.ucla.edu, braden@isi.edu, svincent@cisco.com, lixia@cs.ucla.edu +# RFC2746 || A. Terzis, J. Krawczyk, J. Wroclawski, L. Zhang || jj@arrowpoint.com, jtw@lcs.mit.edu, lixia@cs.ucla.edu, terzis@cs.ucla.edu +# RFC2747 || F. Baker, B. Lindell, M. Talwar || fred@cisco.com, lindell@ISI.EDU, mohitt@microsoft.com +# RFC2748 || D. Durham, Ed., J. Boyle, R. Cohen, S. Herzog, R. Rajan, A. Sastry || +# RFC2749 || S. Herzog, Ed., J. Boyle, R. Cohen, D. Durham, R. Rajan, A. Sastry || +# RFC2750 || S. Herzog || +# RFC2751 || S. Herzog || +# RFC2752 || S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog || +# RFC2753 || R. Yavatkar, D. Pendarakis, R. Guerin || raj.yavatkar@intel.com, dimitris@watson.ibm.com, guerin@ee.upenn.edu +# RFC2754 || C. Alaettinoglu, C. Villamizar, R. Govindan || cengiz@isi.edu, curtis@avici.com, govindan@isi.edu +# RFC2755 || A. Chiu, M. Eisler, B. Callaghan || alex.chiu@Eng.sun.com, michael.eisler@Eng.sun.com, brent.callaghan@Eng.sun.com +# RFC2756 || P. Vixie, D. Wessels || vixie@isc.org, wessels@nlanr.net +# RFC2757 || G. Montenegro, S. Dawkins, M. Kojo, V. Magret, N. Vaidya || gab@sun.com, sdawkins@nortel.com, kojo@cs.helsinki.fi, vincent.magret@aud.alcatel.com, vaidya@cs.tamu.edu +# RFC2758 || K. White || wkenneth@us.ibm.com +# RFC2759 || G. Zorn || gwz@acm.org +# RFC2760 || M. Allman, Ed., S. Dawkins, D. Glover, J. Griner, D. Tran, T. Henderson, J. Heidemann, J. Touch, H. Kruse, S. Ostermann, K. Scott, J. Semke || mallman@grc.nasa.gov, Spencer.Dawkins.sdawkins@nt.com, Daniel.R.Glover@grc.nasa.gov, jgriner@grc.nasa.gov, dtran@grc.nasa.gov, tomh@cs.berkeley.edu, johnh@isi.edu, touch@isi.edu, hkruse1@ohiou.edu, ostermann@cs.ohiou.edu, kscott@mitre.org, semke@psc.edu +# RFC2761 || J. Dunn, C. Martin || +# RFC2762 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC2763 || N. Shen, H. Smit || naiming@siara.com, hsmit@cisco.com +# RFC2764 || B. Gleeson, A. Lin, J. Heinanen, G. Armitage, A. Malis || +# RFC2765 || E. Nordmark || nordmark@sun.com +# RFC2766 || G. Tsirtsis, P. Srisuresh || george.tsirtsis@bt.com, srisuresh@yahoo.com +# RFC2767 || K. Tsuchiya, H. Higuchi, Y. Atarashi || tsuchi@ebina.hitachi.co.jp, h-higuti@ebina.hitachi.co.jp, atarashi@ebina.hitachi.co.jp +# RFC2768 || B. Aiken, J. Strassner, B. Carpenter, I. Foster, C. Lynch, J. Mambretti, R. Moore, B. Teitelbaum || raiken@cisco.com, raiken@cisco.com, johns@cisco.com, brian@hursley.ibm.com, foster@mcs.anl.gov, cliff@cni.org, j-mambretti@nwu.edu, moore@sdsc.edu, ben@internet2.edu +# RFC2769 || C. Villamizar, C. Alaettinoglu, R. Govindan, D. Meyer || curtis@avici.com, cengiz@ISI.EDU, govindan@ISI.EDU, dmm@cisco.com +# RFC2770 || D. Meyer, P. Lothberg || dmm@cisco.com, roll@sprint.net +# RFC2771 || R. Finlayson || finlayson@live.com +# RFC2772 || R. Rockell, R. Fink || rrockell@sprint.net, fink@es.net +# RFC2773 || R. Housley, P. Yee, W. Nace || housley@spyrus.com, yee@spyrus.com +# RFC2774 || H. Nielsen, P. Leach, S. Lawrence || frystyk@microsoft.com, paulle@microsoft.com, lawrence@agranat.com +# RFC2775 || B. Carpenter || brian@icair.org +# RFC2776 || M. Handley, D. Thaler, R. Kermode || mjh@aciri.org, dthaler@microsoft.com, Roger.Kermode@motorola.com +# RFC2777 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC2778 || M. Day, J. Rosenberg, H. Sugano || mday@alum.mit.edu, suga@flab.fujitsu.co.jp +# RFC2779 || M. Day, S. Aggarwal, G. Mohr, J. Vincent || mday@alum.mit.edu, sonuag@microsoft.com, gojomo@usa.net, jesse@intonet.com +# RFC2780 || S. Bradner, V. Paxson || sob@harvard.edu, vern@aciri.org +# RFC2781 || P. Hoffman, F. Yergeau || phoffman@imc.org, fyergeau@alis.com +# RFC2782 || A. Gulbrandsen, P. Vixie, L. Esibov || arnt@troll.no, levone@microsoft.com +# RFC2783 || J. Mogul, D. Mills, J. Brittenson, J. Stone, U. Windl || mogul@wrl.dec.com, mills@udel.edu, jonathan@dsg.stanford.edu, ulrich.windl@rz.uni-regensburg.de +# RFC2784 || D. Farinacci, T. Li, S. Hanks, D. Meyer, P. Traina || dino@procket.com, tony1@home.net, stan_hanks@enron.net, dmm@cisco.com, pst@juniper.net +# RFC2785 || R. Zuccherato || robert.zuccherato@entrust.com +# RFC2786 || M. St. Johns || stjohns@corp.home.net +# RFC2787 || B. Jewell, D. Chuang || bjewell@coppermountain.com, david_chuang@cosinecom.com +# RFC2788 || N. Freed, S. Kille || ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com +# RFC2789 || N. Freed, S. Kille || ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com +# RFC2790 || S. Waldbusser, P. Grillo || waldbusser@ins.com +# RFC2791 || J. Yu || jyy@cosinecom.com +# RFC2792 || M. Blaze, J. Ioannidis, A. Keromytis || +# RFC2793 || G. Hellstrom || gunnar.hellstrom@omnitor.se +# RFC2794 || P. Calhoun, C. Perkins || +# RFC2795 || S. Christey || steqve@shore.net +# RFC2796 || T. Bates, R. Chandra, E. Chen || tbates@cisco.com, rchandra@redback.com, enke@redback.com +# RFC2797 || M. Myers, X. Liu, J. Schaad, J. Weinstein || mmyers@verisign.com, xliu@cisco.com, jimsch@nwlink.com, jsw@meer.net +# RFC2798 || M. Smith || mcs@netscape.com +# RFC2799 || S. Ginoza || ginoza@isi.edu +# RFC2800 || J. Reynolds, R. Braden, S. Ginoza || +# RFC2801 || D. Burdett || david.burdett@commerceone.com +# RFC2802 || K. Davidson, Y. Kawatsura || kent@differential.com, kawatura@bisd.hitachi.co.jp +# RFC2803 || H. Maruyama, K. Tamura, N. Uramoto || maruyama@jp.ibm.com, kent@trl.ibm.co.jp, uramoto@jp.ibm.com +# RFC2804 || IAB, IESG || fred@cisco.com, brian@icair.org +# RFC2805 || N. Greene, M. Ramalho, B. Rosen || ngreene@nortelnetworks.com, mramalho@cisco.com, brosen@eng.fore.com +# RFC2806 || A. Vaha-Sipila || avs@iki.fi +# RFC2807 || J. Reagle || reagle@w3.org +# RFC2808 || M. Nystrom || magnus@rsasecurity.com +# RFC2809 || B. Aboba, G. Zorn || bernarda@microsoft.com, gwz@cisco.com +# RFC2810 || C. Kalt || Christophe.Kalt@gmail.com +# RFC2811 || C. Kalt || Christophe.Kalt@gmail.com +# RFC2812 || C. Kalt || Christophe.Kalt@gmail.com +# RFC2813 || C. Kalt || Christophe.Kalt@gmail.com +# RFC2814 || R. Yavatkar, D. Hoffman, Y. Bernet, F. Baker, M. Speer || yavatkar@ibeam.intel.com, yoramb@microsoft.com, fred@cisco.com, speer@Eng.Sun.COM +# RFC2815 || M. Seaman, A. Smith, E. Crawley, J. Wroclawski || andrew@extremenetworks.com, jtw@lcs.mit.edu +# RFC2816 || A. Ghanwani, J. Pace, V. Srinivasan, A. Smith, M. Seaman || aghanwan@nortelnetworks.com, pacew@us.ibm.com, vijay@cosinecom.com, andrew@extremenetworks.com +# RFC2817 || R. Khare, S. Lawrence || rohit@4K-associates.com, lawrence@agranat.com +# RFC2818 || E. Rescorla || ekr@rtfm.com +# RFC2819 || S. Waldbusser || +# RFC2820 || E. Stokes, D. Byrne, B. Blakley, P. Behera || blakley@dascom.com, stokes@austin.ibm.com, djbyrne@us.ibm.com, prasanta@netscape.com +# RFC2821 || J. Klensin, Ed. || +# RFC2822 || P. Resnick, Ed. || presnick@qti.qualcomm.com +# RFC2823 || J. Carlson, P. Langner, E. Hernandez-Valencia, J. Manchester || james.d.carlson@sun.com, plangner@lucent.com, enrique@lucent.com, sterling@hotair.hobl.lucent.com +# RFC2824 || J. Lennox, H. Schulzrinne || lennox@cs.columbia.edu, schulzrinne@cs.columbia.edu +# RFC2825 || IAB, L. Daigle, Ed. || iab@iab.org +# RFC2826 || Internet Architecture Board || iab@iab.org +# RFC2827 || P. Ferguson, D. Senie || ferguson@cisco.com, dts@senie.com +# RFC2828 || R. Shirey || rshirey@bbn.com +# RFC2829 || M. Wahl, H. Alvestrand, J. Hodges, R. Morgan || M.Wahl@innosoft.com, Harald@Alvestrand.no, JHodges@oblix.com, rlmorgan@washington.edu +# RFC2830 || J. Hodges, R. Morgan, M. Wahl || JHodges@oblix.com, rlmorgan@washington.edu, M.Wahl@innosoft.com +# RFC2831 || P. Leach, C. Newman || paulle@microsoft.com, chris.newman@innosoft.com +# RFC2832 || S. Hollenbeck, M. Srivastava || shollenb@netsol.com, manojs@netsol.com +# RFC2833 || H. Schulzrinne, S. Petrack || schulzrinne@cs.columbia.edu, scott.petrack@metatel.com +# RFC2834 || J.-M. Pittet || jmp@sgi.com +# RFC2835 || J.-M. Pittet || jmp@sgi.com +# RFC2836 || S. Brim, B. Carpenter, F. Le Faucheur || sbrim@cisco.com, brian@icair.org, flefauch@cisco.com +# RFC2837 || K. Teow || +# RFC2838 || D. Zigmond, M. Vickers || djz@corp.webtv.net, mav@liberate.com +# RFC2839 || F. da Cruz, J. Altman || +# RFC2840 || J. Altman, F. da Cruz || +# RFC2841 || P. Metzger, W. Simpson || +# RFC2842 || R. Chandra, J. Scudder || rchandra@redback.com, jgs@cisco.com +# RFC2843 || P. Droz, T. Przygienda || dro@zurich.ibm.com, prz@siara.com +# RFC2844 || T. Przygienda, P. Droz, R. Haas || prz@siara.com, dro@zurich.ibm.com, rha@zurich.ibm.com +# RFC2845 || P. Vixie, O. Gudmundsson, D. Eastlake 3rd, B. Wellington || vixie@isc.org, ogud@tislabs.com, dee3@torque.pothole.com, Brian.Wellington@nominum.com +# RFC2846 || C. Allocchio || +# RFC2847 || M. Eisler || mike@eisler.com +# RFC2848 || S. Petrack, L. Conroy || scott.petrack@metatel.com, lwc@roke.co.uk +# RFC2849 || G. Good || ggood@netscape.com +# RFC2850 || Internet Architecture Board, B. Carpenter, Ed. || brian@icair.org +# RFC2851 || M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder || daniele@zk3.dec.com, haberman@nortelnetworks.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de +# RFC2852 || D. Newman || dan.newman@sun.com +# RFC2853 || J. Kabat, M. Upadhyay || jackk@valicert.com, mdu@eng.sun.com +# RFC2854 || D. Connolly, L. Masinter || connolly@w3.org, LM@att.com +# RFC2855 || K. Fujisawa || fujisawa@sm.sony.co.jp +# RFC2856 || A. Bierman, K. McCloghrie, R. Presuhn || andy@yumaworks.com, kzm@cisco.com, rpresuhn@bmc.com +# RFC2857 || A. Keromytis, N. Provos || angelos@dsl.cis.upenn.edu, provos@citi.umich.edu, rgm@icsa.net, tytso@valinux.com +# RFC2858 || T. Bates, Y. Rekhter, R. Chandra, D. Katz || tbates@cisco.com, rchandra@redback.com, dkatz@jnx.com, yakov@cisco.com +# RFC2859 || W. Fang, N. Seddigh, B. Nandy || wfang@cs.princeton.edu, nseddigh@nortelnetworks.com, bnandy@nortelnetworks.com +# RFC2860 || B. Carpenter, F. Baker, M. Roberts || brian@icair.org, fred@cisco.com, roberts@icann.org +# RFC2861 || M. Handley, J. Padhye, S. Floyd || mjh@aciri.org, padhye@aciri.org, floyd@aciri.org +# RFC2862 || M. Civanlar, G. Cash || civanlar@research.att.com, glenn@research.att.com +# RFC2863 || K. McCloghrie, F. Kastenholz || kzm@cisco.com, kasten@argon.com +# RFC2864 || K. McCloghrie, G. Hanson || kzm@cisco.com, gary_hanson@adc.com +# RFC2865 || C. Rigney, S. Willens, A. Rubens, W. Simpson || cdr@telemancy.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com +# RFC2866 || C. Rigney || cdr@telemancy.com +# RFC2867 || G. Zorn, B. Aboba, D. Mitton || gwz@cisco.com, dmitton@nortelnetworks.com, aboba@internaut.com +# RFC2868 || G. Zorn, D. Leifer, A. Rubens, J. Shriver, M. Holdrege, I. Goyret || gwz@cisco.com, leifer@del.com, John.Shriver@intel.com, acr@del.com, matt@ipverse.com, igoyret@lucent.com +# RFC2869 || C. Rigney, W. Willats, P. Calhoun || cdr@telemancy.com, ward@cyno.com, pcalhoun@eng.sun.com, arubens@tutsys.com, bernarda@microsoft.com +# RFC2870 || R. Bush, D. Karrenberg, M. Kosters, R. Plzak || randy@psg.com, daniel.karrenberg@ripe.net, markk@netsol.com, plzakr@saic.com +# RFC2871 || J. Rosenberg, H. Schulzrinne || +# RFC2872 || Y. Bernet, R. Pabbati || yoramb@microsoft.com, rameshpa@microsoft.com +# RFC2873 || X. Xiao, A. Hannan, V. Paxson, E. Crabbe || xipeng@gblx.net, alan@ivmg.net, edc@explosive.net, vern@aciri.org +# RFC2874 || M. Crawford, C. Huitema || crawdad@fnal.gov, huitema@microsoft.com +# RFC2875 || H. Prafullchandra, J. Schaad || hemma@cp.net, jimsch@exmsft.com +# RFC2876 || J. Pawling || john.pawling@wang.com +# RFC2877 || T. Murphy Jr., P. Rieth, J. Stevens || murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com +# RFC2878 || M. Higashiyama, F. Baker || Mitsuru.Higashiyama@yy.anritsu.co.jp, fred.baker@cisco.com +# RFC2879 || G. Klyne, L. McIntyre || GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com +# RFC2880 || L. McIntyre, G. Klyne || Lloyd.McIntyre@pahv.xerox.com, GK@ACM.ORG +# RFC2881 || D. Mitton, M. Beadles || dmitton@nortelnetworks.com, mbeadles@smartpipes.com +# RFC2882 || D. Mitton || dmitton@nortelnetworks.com +# RFC2883 || S. Floyd, J. Mahdavi, M. Mathis, M. Podolsky || floyd@aciri.org, mahdavi@novell.com, mathis@psc.edu, podolsky@eecs.berkeley.edu +# RFC2884 || J. Hadi Salim, U. Ahmed || hadi@nortelnetworks.com, ahmed@sce.carleton.ca +# RFC2885 || F. Cuervo, N. Greene, C. Huitema, A. Rayhan, B. Rosen, J. Segers || +# RFC2886 || T. Taylor || tom.taylor.stds@gmail.com +# RFC2887 || M. Handley, S. Floyd, B. Whetten, R. Kermode, L. Vicisano, M. Luby || mjh@aciri.org, floyd@aciri.org, whetten@talarian.com, Roger.Kermode@motorola.com, lorenzo@cisco.com, luby@digitalfountain.com +# RFC2888 || P. Srisuresh || srisuresh@yahoo.com +# RFC2889 || R. Mandeville, J. Perser || bob@cqos.com, jerry_perser@netcomsystems.com +# RFC2890 || G. Dommety || gdommety@cisco.com +# RFC2891 || T. Howes, M. Wahl, A. Anantha || anoopa@microsoft.com, howes@loudcloud.com, Mark.Wahl@sun.com +# RFC2892 || D. Tsiang, G. Suwala || tsiang@cisco.com, gsuwala@cisco.com +# RFC2893 || R. Gilligan, E. Nordmark || gilligan@freegate.com, nordmark@eng.sun.com +# RFC2894 || M. Crawford || crawdad@fnal.gov +# RFC2895 || A. Bierman, C. Bucci, R. Iddon || andy@yumaworks.com, cbucci@cisco.com +# RFC2896 || A. Bierman, C. Bucci, R. Iddon || andy@yumaworks.com, cbucci@cisco.com +# RFC2897 || D. Cromwell || cromwell@nortelnetworks.com +# RFC2898 || B. Kaliski || bkaliski@rsasecurity.com +# RFC2899 || S. Ginoza || ginoza@isi.edu +# RFC2900 || J. Reynolds, R. Braden, S. Ginoza || +# RFC2901 || Z. Wenzel, J. Klensin, R. Bush, S. Huter || zita@nsrc.org, klensin@nsrc.org, randy@nsrc.org, sghuter@nsrc.org +# RFC2902 || S. Deering, S. Hares, C. Perkins, R. Perlman || deering@cisco.com, skh@nexthop.com, Radia.Perlman@sun.com, Charles.Perkins@nokia.com +# RFC2903 || C. de Laat, G. Gross, L. Gommans, J. Vollbrecht, D. Spence || delaat@phys.uu.nl, gmgross@lucent.com, jrv@interlinknetworks.com, dspence@interlinknetworks.com +# RFC2904 || J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence || pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com +# RFC2905 || J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence || jrv@interlinknetworks.com, pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com +# RFC2906 || S. Farrell, J. Vollbrecht, P. Calhoun, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence || stephen.farrell@baltimore.ie, jrv@interlinknetworks.com, pcalhoun@eng.sun.com, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com +# RFC2907 || R. Kermode || Roger.Kermode@motorola.com +# RFC2908 || D. Thaler, M. Handley, D. Estrin || dthaler@microsoft.com, mjh@aciri.org, estrin@usc.edu +# RFC2909 || P. Radoslavov, D. Estrin, R. Govindan, M. Handley, S. Kumar, D. Thaler || pavlin@catarina.usc.edu, estrin@isi.edu, govindan@isi.edu, mjh@aciri.org, kkumar@usc.edu, dthaler@microsoft.com +# RFC2910 || R. Herriot, Ed., S. Butler, P. Moore, R. Turner, J. Wenn || robert.herriot@pahv.xerox.com, sbutler@boi.hp.com, pmoore@peerless.com, jwenn@cp10.es.xerox.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com +# RFC2911 || T. Hastings, Ed., R. Herriot, R. deBry, S. Isaacson, P. Powell || sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com +# RFC2912 || G. Klyne || GK@ACM.ORG +# RFC2913 || G. Klyne || GK@ACM.ORG +# RFC2914 || S. Floyd || +# RFC2915 || M. Mealling, R. Daniel || michaelm@netsol.com, rdaniel@datafusion.net +# RFC2916 || P. Faltstrom || paf@cisco.com +# RFC2917 || K. Muthukrishnan, A. Malis || mkarthik@lucent.com, Andy.Malis@vivacenetworks.com +# RFC2918 || E. Chen || enke@redback.com +# RFC2919 || R. Chandhok, G. Wenger || chandhok@qualcomm.com, gwenger@qualcomm.com +# RFC2920 || N. Freed || ned.freed@innosoft.com +# RFC2921 || B. Fink || fink@es.net +# RFC2922 || A. Bierman, K. Jones || andy@yumaworks.com, kejones@nortelnetworks.com +# RFC2923 || K. Lahey || +# RFC2924 || N. Brownlee, A. Blount || n.brownlee@auckland.ac.nz, blount@alum.mit.edu +# RFC2925 || K. White || wkenneth@us.ibm.com +# RFC2926 || J. Kempf, R. Moats, P. St. Pierre || james.kempf@sun.com, rmoats@coreon.net, Pete.StPierre@Eng.Sun.COM +# RFC2927 || M. Wahl || Mark.Wahl@sun.com +# RFC2928 || R. Hinden, S. Deering, R. Fink, T. Hain || bob.hinden@gmail.com, deering@cisco.com, rlfink@lbl.gov, tonyhain@microsoft.com +# RFC2929 || D. Eastlake 3rd, E. Brunner-Williams, B. Manning || Donald.Eastlake@motorola.com, brunner@engage.com, bmanning@isi.edu +# RFC2930 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC2931 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC2932 || K. McCloghrie, D. Farinacci, D. Thaler || kzm@cisco.com, dthaler@microsoft.com +# RFC2933 || K. McCloghrie, D. Farinacci, D. Thaler || kzm@cisco.com, dthaler@microsoft.com +# RFC2934 || K. McCloghrie, D. Farinacci, D. Thaler, B. Fenner || kzm@cisco.com, dthaler@microsoft.com, fenner@research.att.com +# RFC2935 || D. Eastlake 3rd, C. Smith || Donald.Eastlake@motorola.com, chris.smith@royalbank.com +# RFC2936 || D. Eastlake 3rd, C. Smith, D. Soroka || Donald.Eastlake@motorola.com, chris.smith@royalbank.com, dsoroka@us.ibm.com +# RFC2937 || C. Smith || cs@Eng.Sun.COM +# RFC2938 || G. Klyne, L. Masinter || GK@ACM.ORG, LMM@acm.org +# RFC2939 || R. Droms || droms@bucknell.edu +# RFC2940 || A. Smith, D. Partain, J. Seligson || David.Partain@ericsson.com, jseligso@nortelnetworks.com +# RFC2941 || T. Ts'o, Ed., J. Altman || tytso@mit.edu, jaltman@columbia.edu +# RFC2942 || T. Ts'o || +# RFC2943 || R. Housley, T. Horting, P. Yee || housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com +# RFC2944 || T. Wu || tjw@cs.Stanford.EDU +# RFC2945 || T. Wu || tjw@cs.Stanford.EDU +# RFC2946 || T. Ts'o || tytso@mit.edu +# RFC2947 || J. Altman || jaltman@columbia.edu +# RFC2948 || J. Altman || jaltman@columbia.edu +# RFC2949 || J. Altman || jaltman@columbia.edu +# RFC2950 || J. Altman || jaltman@columbia.edu +# RFC2951 || R. Housley, T. Horting, P. Yee || housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com +# RFC2952 || T. Ts'o || tytso@mit.edu +# RFC2953 || T. Ts'o || tytso@mit.edu +# RFC2954 || K. Rehbehn, D. Fowler || krehbehn@megisto.com, fowler@syndesis.com +# RFC2955 || K. Rehbehn, O. Nicklass, G. Mouradian || krehbehn@megisto.com, orly_n@rad.co.il, gvm@att.com +# RFC2956 || M. Kaat || Marijke.Kaat@surfnet.nl +# RFC2957 || L. Daigle, P. Faltstrom || paf@cisco.com +# RFC2958 || L. Daigle, P. Faltstrom || paf@cisco.com +# RFC2959 || M. Baugher, B. Strahm, I. Suconick || mbaugher@passedge.com, Bill.Strahm@intel.com, irina@ennovatenetworks.com +# RFC2960 || R. Stewart, Q. Xie, K. Morneault, C. Sharp, H. Schwarzbauer, T. Taylor, I. Rytina, M. Kalla, L. Zhang, V. Paxson || randall@lakerest.net, qxie1@email.mot.com, kmorneau@cisco.com, chsharp@cisco.com, HannsJuergen.Schwarzbauer@icn.siemens.de, tom.taylor.stds@gmail.com, ian.rytina@ericsson.com, mkalla@telcordia.com, lixia@cs.ucla.edu, vern@aciri.org +# RFC2961 || L. Berger, D. Gan, G. Swallow, P. Pan, F. Tommasi, S. Molendini || lberger@labn.net, swallow@cisco.com, franco.tommasi@unile.it, molendini@ultra5.unile.it +# RFC2962 || D. Raz, J. Schoenwaelder, B. Sugla || raz@lucent.com, schoenw@ibr.cs.tu-bs.de, sugla@ispsoft.com +# RFC2963 || O. Bonaventure, S. De Cnodder || Olivier.Bonaventure@info.fundp.ac.be, stefaan.de_cnodder@alcatel.be +# RFC2964 || K. Moore, N. Freed || moore@cs.utk.edu, ned.freed@innosoft.com +# RFC2965 || D. Kristol, L. Montulli || +# RFC2966 || T. Li, T. Przygienda, H. Smit || tli@procket.com, prz@redback.com, henk@procket.com +# RFC2967 || L. Daigle, R. Hedberg || leslie@thinkingcat.com, Roland@catalogix.se +# RFC2968 || L. Daigle, T. Eklof || leslie@thinkingcat.com, thommy.eklof@hotsip.com +# RFC2969 || T. Eklof, L. Daigle || thommy.eklof@hotsip.com, leslie@thinkingcat.com +# RFC2970 || L. Daigle, T. Eklof || leslie@thinkingcat.com, thommy.eklof@hotsip.com +# RFC2971 || T. Showalter || tjs@mirapoint.com +# RFC2972 || N. Popp, M. Mealling, L. Masinter, K. Sollins || LMM@acm.org, michaelm@netsol.com, nico@realnames.com, sollins@lcs.mit.edu +# RFC2973 || R. Balay, D. Katz, J. Parker || Rajesh.Balay@cosinecom.com, dkatz@juniper.net, jparker@axiowave.com +# RFC2974 || M. Handley, C. Perkins, E. Whelan || mjh@aciri.org, csp@isi.edu, e.whelan@cs.ucl.ac.uk +# RFC2975 || B. Aboba, J. Arkko, D. Harrington || bernarda@microsoft.com, Jari.Arkko@ericsson.com, dbh@cabletron.com +# RFC2976 || S. Donovan || +# RFC2977 || S. Glass, T. Hiller, S. Jacobs, C. Perkins || +# RFC2978 || N. Freed, J. Postel || ned.freed@innosoft.com +# RFC2979 || N. Freed || ned.freed@innosoft.com +# RFC2980 || S. Barber || sob@academ.com +# RFC2981 || R. Kavasseri, Ed. || ramk@cisco.com +# RFC2982 || R. Kavasseri, Ed. || ramk@cisco.com +# RFC2983 || D. Black || black_david@emc.com +# RFC2984 || C. Adams || cadams@entrust.com +# RFC2985 || M. Nystrom, B. Kaliski || magnus@rsasecurity.com, bkaliski@rsasecurity.com +# RFC2986 || M. Nystrom, B. Kaliski || magnus@rsasecurity.com, bkaliski@rsasecurity.com +# RFC2987 || P. Hoffman || phoffman@imc.org +# RFC2988 || V. Paxson, M. Allman || vern@aciri.org, mallman@grc.nasa.gov +# RFC2989 || B. Aboba, P. Calhoun, S. Glass, T. Hiller, P. McCann, H. Shiino, P. Walsh, G. Zorn, G. Dommety, C. Perkins, B. Patil, D. Mitton, S. Manning, M. Beadles, X. Chen, S. Sivalingham, A. Hameed, M. Munson, S. Jacobs, B. Lim, B. Hirschman, R. Hsu, H. Koo, M. Lipford, E. Campbell, Y. Xu, S. Baba, E. Jaques || bernarda@microsoft.com, pcalhoun@eng.sun.com, steven.glass@sun.com, tom.hiller@lucent.com, mccap@lucent.com, hshiino@lucent.com, walshp@lucent.com, gwz@cisco.com, gdommety@cisco.com, charliep@iprg.nokia.com, Basavaraj.Patil@nokia.com, dmitton@nortelnetworks.com, smanning@nortelnetworks.com, mbeadles@smartpipes.com, xing.chen@usa.alcatel.com, s.sivalingham@ericsson.com, none, mmunson@mobilnet.gte.com, sjacobs@gte.com, bklim@lgic.co.kr, qa4053@email.mot.com, rhsu@qualcomm.com, hskoo@sta.samsung.com, mlipfo01@sprintspectrum.com, ed_campbell@3com.com, yxu@watercove.com, sbaba@tari.toshiba.com, ejaques@akamail.com +# RFC2990 || G. Huston || gih@telstra.net +# RFC2991 || D. Thaler, C. Hopps || dthaler@dthaler.microsoft.com, chopps@nexthop.com +# RFC2992 || C. Hopps || chopps@nexthop.com +# RFC2993 || T. Hain || tonyhain@microsoft.com +# RFC2994 || H. Ohta, M. Matsui || hidenori@iss.isl.melco.co.jp, matsui@iss.isl.melco.co.jp +# RFC2995 || H. Lu, Ed., I. Faynberg, J. Voelker, M. Weissman, W. Zhang, S. Rhim, J. Hwang, S. Ago, S. Moeenuddin, S. Hadvani, S. Nyckelgard, J. Yoakum, L. Robart || faynberg@lucent.com, huilanlu@lucent.com, jvoelker@lucent.com, maw1@lucent.com, wzz@lucent.com, syrhim@kt.co.kr, jkhwang@kt.co.kr, ago@ssf.abk.nec.co.jp, moeen@asl.dl.nec.com, hadvani@asl.dl.nec.com, soren.m.nyckelgard@telia.se, yoakum@nortelnetworks.com, robart@nortelnetworks.com +# RFC2996 || Y. Bernet || yoramb@microsoft.com +# RFC2997 || Y. Bernet, A. Smith, B. Davie || Yoramb@microsoft.com, bsd@cisco.com +# RFC2998 || Y. Bernet, P. Ford, R. Yavatkar, F. Baker, L. Zhang, M. Speer, R. Braden, B. Davie, J. Wroclawski, E. Felstaine || yoramb@microsoft.com, raj.yavatkar@intel.com, peterf@microsoft.com, fred@cisco.com, lixia@cs.ucla.edu, speer@Eng.Sun.COM, braden@isi.edu, bsd@cisco.com, jtw@lcs.mit.edu +# RFC2999 || S. Ginoza || ginoza@isi.edu +# RFC3000 || J. Reynolds, R. Braden, S. Ginoza, L. Shiota || +# RFC3001 || M. Mealling || michaelm@netsol.com +# RFC3002 || D. Mitzel || mitzel@iprg.nokia.com +# RFC3003 || M. Nilsson || nilsson@id3.org +# RFC3004 || G. Stump, R. Droms, Y. Gu, R. Vyaghrapuri, A. Demirtjis, B. Beser, J. Privat || stumpga@us.ibm.com, rdroms@cisco.com, yegu@microsoft.com, rameshv@microsoft.com, annd@microsoft.com +# RFC3005 || S. Harris || srh@merit.edu +# RFC3006 || B. Davie, C. Iturralde, D. Oran, S. Casner, J. Wroclawski || bsd@cisco.com, cei@cisco.com, oran@cisco.com, casner@acm.org, jtw@lcs.mit.edu +# RFC3007 || B. Wellington || Brian.Wellington@nominum.com +# RFC3008 || B. Wellington || Brian.Wellington@nominum.com +# RFC3009 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3010 || S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck || beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, david.robinson@sun.com, robert.thurlow@sun.com +# RFC3011 || G. Waters || +# RFC3012 || C. Perkins, P. Calhoun || +# RFC3013 || T. Killalea || tomk@neart.org +# RFC3014 || R. Kavasseri || ramk@cisco.com +# RFC3015 || F. Cuervo, N. Greene, A. Rayhan, C. Huitema, B. Rosen, J. Segers || +# RFC3016 || Y. Kikuchi, T. Nomura, S. Fukunaga, Y. Matsui, H. Kimata || yoshihiro.kikuchi@toshiba.co.jp, matsui@drl.mei.co.jp, t-nomura@ccm.cl.nec.co.jp, fukunaga444@oki.co.jp, kimata@nttvdt.hil.ntt.co.jp +# RFC3017 || M. Riegel, G. Zorn || maximilian.riegel@icn.siemens.de, gwz@cisco.com +# RFC3018 || A. Bogdanov || a_bogdanov@iname.ru +# RFC3019 || B. Haberman, R. Worzella || haberman@nortelnetworks.com, worzella@us.ibm.com +# RFC3020 || P. Pate, B. Lynch, K. Rehbehn || prayson.pate@overturenetworks.com, bob.lynch@overturenetworks.com, krehbehn@megisto.com +# RFC3021 || A. Retana, R. White, V. Fuller, D. McPherson || aretana@cisco.com, riw@cisco.com, vaf@valinor.barrnet.net, danny@ambernetworks.com +# RFC3022 || P. Srisuresh, K. Egevang || srisuresh@yahoo.com, kjeld.egevang@intel.com +# RFC3023 || M. Murata, S. St. Laurent, D. Kohn || mmurata@trl.ibm.co.jp, simonstl@simonstl.com, dan@dankohn.com +# RFC3024 || G. Montenegro, Ed. || +# RFC3025 || G. Dommety, K. Leung || gdommety@cisco.com, kleung@cisco.com +# RFC3026 || R. Blane || Roy_Blane@inmarsat.com +# RFC3027 || M. Holdrege, P. Srisuresh || matt@ipverse.com, srisuresh@yahoo.com +# RFC3028 || T. Showalter || tjs@mirapoint.com +# RFC3029 || C. Adams, P. Sylvester, M. Zolotarev, R. Zuccherato || cadams@entrust.com, mzolotarev@baltimore.com, peter.sylvester@edelweb.fr, robert.zuccherato@entrust.com +# RFC3030 || G. Vaudreuil || GregV@ieee.org +# RFC3031 || E. Rosen, A. Viswanathan, R. Callon || erosen@cisco.com, arun@force10networks.com, rcallon@juniper.net +# RFC3032 || E. Rosen, D. Tappan, G. Fedorkow, Y. Rekhter, D. Farinacci, T. Li, A. Conta || erosen@cisco.com, tappan@cisco.com, yakov@juniper.net, fedorkow@cisco.com, dino@procket.com, tli@procket.com, aconta@txc.com +# RFC3033 || M. Suzuki || suzuki.muneyoshi@lab.ntt.co.jp +# RFC3034 || A. Conta, P. Doolan, A. Malis || aconta@txc.com, pdoolan@ennovatenetworks.com, Andy.Malis@vivacenetworks.com +# RFC3035 || B. Davie, J. Lawrence, K. McCloghrie, E. Rosen, G. Swallow, Y. Rekhter, P. Doolan || bsd@cisco.com, pdoolan@ennovatenetworks.com, jlawrenc@cisco.com, kzm@cisco.com, yakov@juniper.net, erosen@cisco.com, swallow@cisco.com +# RFC3036 || L. Andersson, P. Doolan, N. Feldman, A. Fredette, B. Thomas || loa.andersson@nortelnetworks.com, pdoolan@ennovatenetworks.com, nkf@us.ibm.com, fredette@photonex.com, rhthomas@cisco.com +# RFC3037 || B. Thomas, E. Gray || ewgray@mindspring.com, rhthomas@cisco.com +# RFC3038 || K. Nagami, Y. Katsube, N. Demizu, H. Esaki, P. Doolan || ken.nagami@toshiba.co.jp, demizu@dd.iij4u.or.jp, hiroshi@wide.ad.jp, yasuhiro.katsube@toshiba.co.jp, pdoolan@ennovatenetworks.com +# RFC3039 || S. Santesson, W. Polk, P. Barzin, M. Nystrom || stefan@addtrust.com, wpolk@nist.gov, barzin@secude.com, magnus@rsasecurity.com +# RFC3040 || I. Cooper, I. Melve, G. Tomlinson || icooper@equinix.com, Ingrid.Melve@uninett.no, gary.tomlinson@cacheflow.com +# RFC3041 || T. Narten, R. Draves || narten@raleigh.ibm.com, richdr@microsoft.com +# RFC3042 || M. Allman, H. Balakrishnan, S. Floyd || mallman@grc.nasa.gov, hari@lcs.mit.edu, floyd@aciri.org +# RFC3043 || M. Mealling || michaelm@netsol.com +# RFC3044 || S. Rozenfeld || +# RFC3045 || M. Meredith || mark_meredith@novell.com +# RFC3046 || M. Patrick || michael.patrick@motorola.com +# RFC3047 || P. Luthi || luthip@pictel.com +# RFC3048 || B. Whetten, L. Vicisano, R. Kermode, M. Handley, S. Floyd, M. Luby || whetten@talarian.com, lorenzo@cisco.com, Roger.Kermode@motorola.com, mjh@aciri.org, luby@digitalfountain.com +# RFC3049 || J. Naugle, K. Kasthurirangan, G. Ledford || jnaugle@us.ibm.com, kasthuri@us.ibm.com, gledford@zephyrcorp.com +# RFC3050 || J. Lennox, H. Schulzrinne, J. Rosenberg || lennox@cs.columbia.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3051 || J. Heath, J. Border || jheath@hns.com, border@hns.com +# RFC3052 || M. Eder, S. Nag || michael.eder@nokia.com, thinker@monmouth.com +# RFC3053 || A. Durand, P. Fasano, I. Guardini, D. Lento || Alain.Durand@sun.com, paolo.fasano@cselt.it, ivano.guardini@cselt.it, dlento@mail.tim.it +# RFC3054 || P. Blatherwick, R. Bell, P. Holland || blather@nortelnetworks.com, rtbell@cisco.com, phil.holland@circa.ca +# RFC3055 || M. Krishnaswamy, D. Romascanu || murali@lucent.com, dromasca@gmail.com +# RFC3056 || B. Carpenter, K. Moore || brian@icair.org, moore@cs.utk.edu +# RFC3057 || K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom || kmorneau@cisco.com, mkalla@telcordia.com, srengasa@telcordia.com, gregside@nortelnetworks.com +# RFC3058 || S. Teiwes, P. Hartmann, D. Kuenzi || stephan.teiwes@it-sec.com, peter.hartmann@it-sec.com, dkuenzi@724.com +# RFC3059 || E. Guttman || Erik.Guttman@sun.com +# RFC3060 || B. Moore, E. Ellesson, J. Strassner, A. Westerinen || eellesson@lboard.com, remoore@us.ibm.com, johns@cisco.com, andreaw@cisco.com +# RFC3061 || M. Mealling || michaelm@netsol.com +# RFC3062 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3063 || Y. Ohba, Y. Katsube, E. Rosen, P. Doolan || yoshihiro.ohba@toshiba.co.jp, yasuhiro.katsube@toshiba.co.jp, erosen@cisco.com, pdoolan@ennovatenetworks.com +# RFC3064 || B. Foster || bfoster@cisco.com +# RFC3065 || P. Traina, D. McPherson, J. Scudder || danny@ambernetworks.com, jgs@cisco.com +# RFC3066 || H. Alvestrand || Harald@Alvestrand.no +# RFC3067 || J. Arvidsson, A. Cormack, Y. Demchenko, J. Meijer || Jimmy.J.Arvidsson@telia.se, Andrew.Cormack@ukerna.ac.uk, demch@terena.nl, jan.meijer@surfnet.nl +# RFC3068 || C. Huitema || huitema@microsoft.com +# RFC3069 || D. McPherson, B. Dykes || danny@ambernetworks.com, bdykes@onesecure.com +# RFC3070 || V. Rawat, R. Tio, S. Nanji, R. Verma || vrawat@oni.com, tor@redback.com, rverma@dc.com, suhail@redback.com +# RFC3071 || J. Klensin || klensin@jck.com +# RFC3072 || M. Wildgrube || max@wildgrube.com +# RFC3073 || J. Collins || jcollins@bitstream.com +# RFC3074 || B. Volz, S. Gonczi, T. Lemon, R. Stevens || bernie.volz@ericsson.com, steve.gonczi@networkengines.com, ted.lemon@nominum.com, robs@join.com +# RFC3075 || D. Eastlake 3rd, J. Reagle, D. Solo || Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu +# RFC3076 || J. Boyer || jboyer@PureEdge.com +# RFC3077 || E. Duros, W. Dabbous, H. Izumiyama, N. Fujii, Y. Zhang || +# RFC3078 || G. Pall, G. Zorn || gurdeep@microsoft.com, gwz@cisco.com +# RFC3079 || G. Zorn || gwz@cisco.com +# RFC3080 || M. Rose || mrose17@gmail.com +# RFC3081 || M. Rose || mrose17@gmail.com +# RFC3082 || J. Kempf, J. Goldschmidt || james.kempf@sun.com, jason.goldschmidt@sun.com +# RFC3083 || R. Woundy || rwoundy@cisco.com +# RFC3084 || K. Chan, J. Seligson, D. Durham, S. Gai, K. McCloghrie, S. Herzog, F. Reichmeyer, R. Yavatkar, A. Smith || khchan@nortelnetworks.com, sgai@cisco.com, Herzog@iphighway.com, kzm@cisco.com, franr@pfn.com, raj.yavatkar@intel.com, andrew@allegronetworks.com +# RFC3085 || A. Coates, D. Allen, D. Rivers-Moore || tony.coates@reuters.com, ho73@dial.pipex.com, daniel.rivers-moore@rivcom.com +# RFC3086 || K. Nichols, B. Carpenter || nichols@packetdesign.com, brian@icair.org +# RFC3087 || B. Campbell, R. Sparks || bcampbell@dynamicsoft.com, rsparks@dynamicsoft.com +# RFC3088 || K. Zeilenga || kurt@openldap.org +# RFC3089 || H. Kitamura || kitamura@da.jp.nec.com +# RFC3090 || E. Lewis || lewis@tislabs.com +# RFC3091 || H. Kennedy || kennedyh@engin.umich.edu +# RFC3092 || D. Eastlake 3rd, C. Manros, E. Raymond || Donald.Eastlake@motorola.com, manros@cp10.es.xerox.com, esr@thyrsus.com +# RFC3093 || M. Gaynor, S. Bradner || +# RFC3094 || D. Sprague, R. Benedyk, D. Brendes, J. Keller || david.sprague@tekelec.com, dan.brendes@tekelec.com, robby.benedyk@tekelec.com, joe.keller@tekelec.com +# RFC3095 || C. Bormann, C. Burmeister, M. Degermark, H. Fukushima, H. Hannu, L-E. Jonsson, R. Hakenberg, T. Koren, K. Le, Z. Liu, A. Martensson, A. Miyazaki, K. Svanbro, T. Wiebke, T. Yoshimura, H. Zheng || cabo@tzi.org, burmeister@panasonic.de, micke@cs.arizona.edu, fukusima@isl.mei.co.jp, hans.hannu@ericsson.com, lars-erik.jonsson@ericsson.com, hakenberg@panasonic.de, tmima@cisco.com, khiem.le@nokia.com, zhigang.liu@nokia.com, anton.martensson@era.ericsson.se, akihiro@isl.mei.co.jp, krister.svanbro@ericsson.com, wiebke@panasonic.de, yoshi@spg.yrp.nttdocomo.co.jp, haihong.zheng@nokia.com +# RFC3096 || M. Degermark, Ed. || +# RFC3097 || R. Braden, L. Zhang || Braden@ISI.EDU, lixia@cs.ucla.edu +# RFC3098 || T. Gavin, D. Eastlake 3rd, S. Hambridge || tedgavin@newsguy.com, Donald.Eastlake@motorola.com, sallyh@ludwig.sc.intel.com +# RFC3099 || S. Ginoza || ginoza@isi.edu +# RFC3100 || || +# RFC3101 || P. Murphy || pmurphy@noc.usgs.net +# RFC3102 || M. Borella, J. Lo, D. Grabelsky, G. Montenegro || mike_borella@commworks.com, yidarlo@yahoo.com, david_grabelsky@commworks.com, gab@sun.com +# RFC3103 || M. Borella, D. Grabelsky, J. Lo, K. Taniguchi || mike_borella@commworks.com, david_grabelsky@commworks.com, yidarlo@yahoo.com, taniguti@ccrl.sj.nec.com +# RFC3104 || G. Montenegro, M. Borella || gab@sun.com, mike_borella@commworks.com +# RFC3105 || J. Kempf, G. Montenegro || gab@sun.com +# RFC3106 || D. Eastlake 3rd, T. Goldstein || Donald.Eastlake@motorola.com, tgoldstein@brodia.com +# RFC3107 || Y. Rekhter, E. Rosen || yakov@juniper.net, erosen@cisco.com +# RFC3108 || R. Kumar, M. Mostafa || rkumar@cisco.com, mmostafa@cisco.com +# RFC3109 || R. Braden, R. Bush, J. Klensin || braden@isi.edu, randy@psg.com, klensin@jck.com +# RFC3110 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC3111 || E. Guttman || Erik.Guttman@germany.sun.com +# RFC3112 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3113 || K. Rosenbrock, R. Sanmugam, S. Bradner, J. Klensin || rosenbrock@etsi.fr, sob@harvard.edu, 3GPPContact@etsi.fr +# RFC3114 || W. Nicolls || wnicolls@forsythesolutions.com +# RFC3115 || G. Dommety, K. Leung || gdommety@cisco.com, kleung@cisco.com +# RFC3116 || J. Dunn, C. Martin || Jeffrey.Dunn@worldnet.att.net, Cynthia.E.Martin@worldnet.att.net +# RFC3117 || M. Rose || mrose17@gmail.com +# RFC3118 || R. Droms, Ed., W. Arbaugh, Ed. || +# RFC3119 || R. Finlayson || finlayson@live.com +# RFC3120 || K. Best, N. Walsh || karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM +# RFC3121 || K. Best, N. Walsh || karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM +# RFC3122 || A. Conta || aconta@txc.com +# RFC3123 || P. Koch || pk@TechFak.Uni-Bielefeld.DE +# RFC3124 || H. Balakrishnan, S. Seshan || hari@lcs.mit.edu, srini@cmu.edu +# RFC3125 || J. Ross, D. Pinkas, N. Pope || harri.rasilainen@etsi.fr, ross@secstan.com, Denis.Pinkas@bull.net, pope@secstan.com +# RFC3126 || D. Pinkas, J. Ross, N. Pope || harri.rasilainen@etsi.fr, Denis.Pinkas@bull.net, ross@secstan.com, pope@secstan.com +# RFC3127 || D. Mitton, M. St.Johns, S. Barkley, D. Nelson, B. Patil, M. Stevens, B. Wolff || dmitton@nortelnetworks.com, stjohns@rainmakertechnologies.com, stuartb@uu.net, dnelson@enterasys.com, Basavaraj.Patil@nokia.com, mstevens@ellacoya.com, barney@databus.com +# RFC3128 || I. Miller || Ian_Miller@singularis.ltd.uk +# RFC3129 || M. Thomas || mat@cisco.com +# RFC3130 || E. Lewis || +# RFC3131 || S. Bradner, P. Calhoun, H. Cuschieri, S. Dennett, G. Flynn, M. Lipford, M. McPheters || sob@harvard.edu, pcalhoun@eng.sun.com, hcuschie@tia.eia.org, S.Dennett@motorola.com, gerry.flynn@verizonwireless.com, mjmcpheters@lucent.com +# RFC3132 || J. Kempf || +# RFC3133 || J. Dunn, C. Martin || +# RFC3134 || J. Dunn, C. Martin || +# RFC3135 || J. Border, M. Kojo, J. Griner, G. Montenegro, Z. Shelby || border@hns.com, kojo@cs.helsinki.fi, jgriner@grc.nasa.gov, gab@sun.com, zach.shelby@ee.oulu.fi +# RFC3136 || L. Slutsman, Ed., I. Faynberg, H. Lu, M. Weissman || faynberg@lucent.com, huilanlu@lucent.com, maw1@lucent.com, lslutsman@att.com +# RFC3137 || A. Retana, L. Nguyen, R. White, A. Zinin, D. McPherson || aretana@cisco.com, lhnguyen@cisco.com, riw@cisco.com, azinin@nexsi.com, danny@ambernetworks.com +# RFC3138 || D. Meyer || dmm@sprint.net +# RFC3139 || L. Sanchez, K. McCloghrie, J. Saperia || kzm@cisco.com, lsanchez@megisto.com, saperia@jdscons.com +# RFC3140 || D. Black, S. Brim, B. Carpenter, F. Le Faucheur || black_david@emc.com, sbrim@cisco.com, brian@icair.org, flefauch@cisco.com +# RFC3141 || T. Hiller, P. Walsh, X. Chen, M. Munson, G. Dommety, S. Sivalingham, B. Lim, P. McCann, H. Shiino, B. Hirschman, S. Manning, R. Hsu, H. Koo, M. Lipford, P. Calhoun, C. Lo, E. Jaques, E. Campbell, Y.Xu,S.Baba,T.Ayaki,T.Seki,A.Hameed || pcalhoun@eng.sun.com, gdommety@cisco.com, tom.hiller@lucent.com, rhsu@qualcomm.com, mlipfo01@sprintspectrum.com, serge@awardsolutions.com, mccap@lucent.com, mmunson@gte.net, hskoo@sta.samsung.com, walshp@lucent.com, yxu@watercove.com, qa4053@email.mot.com, ejaques@akamail.com, s.sivalingham@ericsson.com, xing.chen@usa.alcatel.com, bklim@lge.com, hshiino@lucent.com, sbaba@tari.toshiba.com, ayaki@ddi.co.jp, Charles.Lo@vodafone-us.com, t-seki@kddi.com +# RFC3142 || J. Hagino, K. Yamamoto || itojun@iijlab.net, kazu@iijlab.net +# RFC3143 || I. Cooper, J. Dilley || icooper@equinix.com, jad@akamai.com +# RFC3144 || D. Romascanu || dromasca@gmail.com +# RFC3145 || R. Verma, M. Verma, J. Carlson || rverma@dc.com, Madhvi_Verma@3com.com, james.d.carlson@sun.com +# RFC3146 || K. Fujisawa, A. Onoe || fujisawa@sm.sony.co.jp, onoe@sm.sony.co.jp +# RFC3147 || P. Christian || christi@nortelnetworks.com +# RFC3148 || M. Mathis, M. Allman || mathis@psc.edu, mallman@bbn.com +# RFC3149 || A. Srinath, G. Levendel, K. Fritz, R. Kalyanaram || Ashok.Srinath@sylantro.com, Gil.Levendel@sylantro.com, Kent.Fritz@sylantro.com, Raghuraman.Kal@wipro.com +# RFC3150 || S. Dawkins, G. Montenegro, M. Kojo, V. Magret || spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com +# RFC3151 || N. Walsh, J. Cowan, P. Grosso || Norman.Walsh@East.Sun.COM, jcowan@reutershealth.com, pgrosso@arbortext.com +# RFC3152 || R. Bush || randy@psg.com +# RFC3153 || R. Pazhyannur, I. Ali, C. Fox || pazhynnr@cig.mot.com, fia225@email.mot.com, fox@cisco.com +# RFC3154 || J. Kempf, C. Castelluccia, P. Mutaf, N. Nakajima, Y. Ohba, R. Ramjee, Y. Saifullah, B. Sarikaya, X. Xu || James.Kempf@Sun.COM, pars.mutaf@inria.fr, claude.castelluccia@inria.fr, nnakajima@tari.toshiba.com, yohba@tari.toshiba.com, ramjee@bell-labs.com, Yousuf.Saifullah@nokia.com, Behcet.Sarikaya@usa.alcatel.com +# RFC3155 || S. Dawkins, G. Montenegro, M. Kojo, V. Magret, N. Vaidya || spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com +# RFC3156 || M. Elkins, D. Del Torto, R. Levien, T. Roessler || +# RFC3157 || A. Arsenault, S. Farrell || aarsenault@dvnet.com, stephen.farrell@baltimore.ie +# RFC3158 || C. Perkins, J. Rosenberg, H. Schulzrinne || csp@isi.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3159 || K. McCloghrie, M. Fine, J. Seligson, K. Chan, S. Hahn, R. Sahita, A. Smith, F. Reichmeyer || mfine@cisco.com, jseligso@nortelnetworks.com, khchan@nortelnetworks.com, scott.hahn@intel.com, ravi.sahita@intel.com, andrew@allegronetworks.com, franr@pfn.com +# RFC3160 || S. Harris || +# RFC3161 || C. Adams, P. Cain, D. Pinkas, R. Zuccherato || cadams@entrust.com, pcain@bbn.com, Denis.Pinkas@bull.net, robert.zuccherato@entrust.com +# RFC3162 || B. Aboba, G. Zorn, D. Mitton || bernarda@microsoft.com, gwz@cisco.com +# RFC3163 || R. Zuccherato, M. Nystrom || robert.zuccherato@entrust.com, magnus@rsasecurity.com +# RFC3164 || C. Lonvick || clonvick@cisco.com +# RFC3165 || D. Levi, J. Schoenwaelder || +# RFC3166 || D. Meyer, J. Scudder || dmm@sprint.net, jgs@cisco.com +# RFC3167 || D. Meyer, J. Scudder || dmm@sprint.net, jgs@cisco.com +# RFC3168 || K. Ramakrishnan, S. Floyd, D. Black || kk@teraoptic.com, floyd@aciri.org, black_david@emc.com +# RFC3169 || M. Beadles, D. Mitton || dmitton@nortelnetworks.com +# RFC3170 || B. Quinn, K. Almeroth || bquinn@celoxnetworks.com, almeroth@cs.ucsb.edu +# RFC3171 || Z. Albanna, K. Almeroth, D. Meyer, M. Schipper || zaid@juniper.net, almeroth@cs.ucsb.edu, dmm@sprint.net, iana@iana.org +# RFC3172 || G. Huston, Ed. || +# RFC3173 || A. Shacham, B. Monsour, R. Pereira, M. Thomas || shacham@shacham.net, bob@bobmonsour.com, royp@cisco.com, matt@3am-software.com +# RFC3174 || D. Eastlake 3rd, P. Jones || Donald.Eastlake@motorola.com, paulej@packetizer.com +# RFC3175 || F. Baker, C. Iturralde, F. Le Faucheur, B. Davie || fred@cisco.com, cei@cisco.com, flefauch@cisco.com, bdavie@cisco.com +# RFC3176 || P. Phaal, S. Panchen, N. McKee || peter_phaal@INMON.COM, sonia_panchen@INMON.COM, neil_mckee@INMON.COM +# RFC3177 || IAB, IESG || +# RFC3178 || J. Hagino, H. Snyder || itojun@iijlab.net, hal@vailsys.com +# RFC3179 || J. Schoenwaelder, J. Quittek || schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de +# RFC3180 || D. Meyer, P. Lothberg || dmm@sprint.net, roll@sprint.net +# RFC3181 || S. Herzog || herzog@policyconsulting.com +# RFC3182 || S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog, R. Hess || Satyendra.Yadav@intel.com, Raj.Yavatkar@intel.com, rameshpa@microsoft.com, peterf@microsoft.com, timmoore@microsoft.com, herzog@policyconsulting.com, rodney.hess@intel.com +# RFC3183 || T. Dean, W. Ottaway || tbdean@QinetiQ.com, wjottaway@QinetiQ.com +# RFC3184 || S. Harris || srh@merit.edu +# RFC3185 || S. Farrell, S. Turner || stephen.farrell@baltimore.ie, turners@ieca.com +# RFC3186 || S. Shimizu, T. Kawano, K. Murakami, E. Beier || shimizu@ntt-20.ecl.net, kawano@core.ecl.net, murakami@ntt-20.ecl.net, Beier@bina.de +# RFC3187 || J. Hakala, H. Walravens || juha.hakala@helsinki.fi, hartmut.walravens@sbb.spk-berlin.de +# RFC3188 || J. Hakala || juha.hakala@helsinki.fi +# RFC3189 || K. Kobayashi, A. Ogawa, S. Casner, C. Bormann || ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org +# RFC3190 || K. Kobayashi, A. Ogawa, S. Casner, C. Bormann || ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org +# RFC3191 || C. Allocchio || +# RFC3192 || C. Allocchio || +# RFC3193 || B. Patel, B. Aboba, W. Dixon, G. Zorn, S. Booth || baiju.v.patel@intel.com, bernarda@microsoft.com, wdixon@microsoft.com, gwz@cisco.com, ebooth@cisco.com +# RFC3194 || A. Durand, C. Huitema || +# RFC3195 || D. New, M. Rose || dnew@san.rr.com, mrose17@gmail.com +# RFC3196 || T. Hastings, C. Manros, P. Zehler, C. Kugler, H. Holst || tom.hastings@alum.mit.edu, Kugler@us.ibm.com, hh@I-data.com, Peter.Zehler@xerox.com +# RFC3197 || R. Austein || sra@hactrn.net +# RFC3198 || A. Westerinen, J. Schnizlein, J. Strassner, M. Scherling, B. Quinn, S. Herzog, A. Huynh, M. Carlson, J. Perry, S. Waldbusser || andreaw@cisco.com, john.schnizlein@cisco.com, john.strassner@intelliden.com, mscherling@xcert.com, bquinn@celoxnetworks.com, jay.perry@netapp.com, herzog@PolicyConsulting.com, mark.carlson@sun.com, waldbusser@nextbeacon.com +# RFC3199 || S. Ginoza || ginoza@isi.edu +# RFC3200 || || +# RFC3201 || R. Steinberger, O. Nicklass || robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il +# RFC3202 || R. Steinberger, O. Nicklass || robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il +# RFC3203 || Y. T'Joens, C. Hublet, P. De Schrijver || yves.tjoens@alcatel.be, p2@mind.be, Christian.Hublet@alcatel.be +# RFC3204 || E. Zimmerer, J. Peterson, A. Vemuri, L. Ong, F. Audet, M. Watson, M. Zonoun || eric_zimmerer@yahoo.com, Aparna.Vemuri@Qwest.com, jon.peterson@neustar.com, lyndon_ong@yahoo.com, mzonoun@nortelnetworks.com, audet@nortelnetworks.com, mwatson@nortelnetworks.com +# RFC3205 || K. Moore || moore@cs.utk.edu +# RFC3206 || R. Gellens || randy@qualcomm.com +# RFC3207 || P. Hoffman || phoffman@imc.org +# RFC3208 || T. Speakman, J. Crowcroft, J. Gemmell, D. Farinacci, S. Lin, D. Leshchiner, M. Luby, T. Montgomery, L. Rizzo, A. Tweedly, N. Bhaskar, R. Edmonstone, R. Sumanasekera, L. Vicisano || speakman@cisco.com, dino@procket.com, steven@juniper.net, agt@cisco.com, nbhaskar@cisco.com, redmonst@cisco.com, rajitha@cisco.com, lorenzo@cisco.com, j.crowcroft@cs.ucl.ac.uk, jgemmell@microsoft.com, dleshc@tibco.com, luby@digitalfountain.com, todd@talarian.com, luigi@iet.unipi.it +# RFC3209 || D. Awduche, L. Berger, D. Gan, T. Li, V. Srinivasan, G. Swallow || awduche@movaz.com, lberger@movaz.com, dhg@juniper.net, tli@procket.com, vsriniva@cosinecom.com, swallow@cisco.com +# RFC3210 || D. Awduche, A. Hannan, X. Xiao || awduche@movaz.com, alan@routingloop.com, xxiao@photuris.com +# RFC3211 || P. Gutmann || pgut001@cs.auckland.ac.nz +# RFC3212 || B. Jamoussi, Ed., L. Andersson, R. Callon, R. Dantu, L. Wu, P. Doolan, T. Worster, N. Feldman, A. Fredette, M. Girish, E. Gray, J. Heinanen, T. Kilty, A. Malis || loa.andersson@utfors.se, rcallon@juniper.net, rdantu@netrake.com, pdoolan@acm.org, Nkf@us.ibm.com, afredette@charter.net, eric.gray@sandburst.com, jh@song.fi, tim-kilty@mediaone.net, Andy.Malis@vivacenetworks.com, muckai@atoga.com, fsb@thefsb.org, liwwu@cisco.com +# RFC3213 || J. Ash, M. Girish, E. Gray, B. Jamoussi, G. Wright || gash@att.com, eric.gray@sandburst.com, gwright@nortelnetworks.com, muckai@atoga.com, Jamoussi@nortelnetworks.com +# RFC3214 || J. Ash, Y. Lee, P. Ashwood-Smith, B. Jamoussi, D. Fedyk, D. Skalecki, L. Li || gash@att.com, jamoussi@NortelNetworks.com, petera@NortelNetworks.com, dareks@nortelnetworks.com, ylee@ceterusnetworks.com, lili@ss8networks.com, dwfedyk@nortelnetworks.com +# RFC3215 || C. Boscher, P. Cheval, L. Wu, E. Gray || christophe.boscher@alcatel.fr, pierrick.cheval@space.alcatel.fr, liwwu@cisco.com, eric.gray@sandburst.com +# RFC3216 || C. Elliott, D. Harrington, J. Jason, J. Schoenwaelder, F. Strauss, W. Weiss || chelliot@cisco.com, dbh@enterasys.com, jamie.jason@intel.com, schoenw@ibr.cs.tu-bs.de, strauss@ibr.cs.tu-bs.de, wweiss@ellacoya.com +# RFC3217 || R. Housley || rhousley@rsasecurity.com +# RFC3218 || E. Rescorla || ekr@rtfm.com +# RFC3219 || J. Rosenberg, H. Salama, M. Squire || jdrosen@dynamicsoft.com, hsalama@cisco.com, mattsquire@acm.org +# RFC3220 || C. Perkins, Ed. || charliep@iprg.nokia.com +# RFC3221 || G. Huston || +# RFC3222 || G. Trotter || Guy_Trotter@agilent.com +# RFC3223 || || +# RFC3224 || E. Guttman || erik.guttman@sun.com +# RFC3225 || D. Conrad || david.conrad@nominum.com +# RFC3226 || O. Gudmundsson || ogud@ogud.com +# RFC3227 || D. Brezinski, T. Killalea || dbrezinski@In-Q-Tel.org, tomk@neart.org +# RFC3228 || B. Fenner || fenner@research.att.com +# RFC3229 || J. Mogul, B. Krishnamurthy, F. Douglis, A. Feldmann, Y. Goland, A. van Hoff, D. Hellerstein || +# RFC3230 || J. Mogul, A. Van Hoff || JeffMogul@acm.org, avh@marimba.com +# RFC3231 || D. Levi, J. Schoenwaelder || +# RFC3232 || J. Reynolds, Ed. || rfc-editor@rfc-editor.org +# RFC3233 || P. Hoffman, S. Bradner || +# RFC3234 || B. Carpenter, S. Brim || brian@hursley.ibm.com, sbrim@cisco.com +# RFC3235 || D. Senie || dts@senie.com +# RFC3236 || M. Baker, P. Stark || mbaker@planetfred.com, distobj@acm.org, Peter.Stark@ecs.ericsson.com +# RFC3237 || M. Tuexen, Q. Xie, R. Stewart, M. Shore, L. Ong, J. Loughney, M. Stillman || Michael.Tuexen@icn.siemens.de, qxie1@email.mot.com, randall@lakerest.net, mshore@cisco.com, lyong@ciena.com, john.loughney@nokia.com, maureen.stillman@nokia.com +# RFC3238 || S. Floyd, L. Daigle || iab@iab.org +# RFC3239 || C. Kugler, H. Lewis, T. Hastings || kugler@us.ibm.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com +# RFC3240 || D. Clunie, E. Cordonnier || dclunie@dclunie.com, emmanuel.cordonnier@etiam.com +# RFC3241 || C. Bormann || cabo@tzi.org +# RFC3242 || L-E. Jonsson, G. Pelletier || lars-erik.jonsson@ericsson.com, ghyslain.pelletier@epl.ericsson.se +# RFC3243 || L-E. Jonsson || lars-erik.jonsson@ericsson.com +# RFC3244 || M. Swift, J. Trostle, J. Brezak || mikesw@cs.washington.edu, john3725@world.std.com, jbrezak@microsoft.com +# RFC3245 || J. Klensin, Ed., IAB || iab@iab.org, sob@harvard.edu, paf@cisco.com +# RFC3246 || B. Davie, A. Charny, J.C.R. Bennet, K. Benson, J.Y. Le Boudec, W. Courtney, S. Davari, V. Firoiu, D. Stiliadis || bsd@cisco.com, acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, stiliadi@bell-labs.com +# RFC3247 || A. Charny, J. Bennet, K. Benson, J. Boudec, A. Chiu, W. Courtney, S. Davari, V. Firoiu, C. Kalmanek, K. Ramakrishnan || acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, angela.chiu@celion.com, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, crk@research.att.com, kk@teraoptic.com +# RFC3248 || G. Armitage, B. Carpenter, A. Casati, J. Crowcroft, J. Halpern, B. Kumar, J. Schnizlein || +# RFC3249 || V. Cancio, M. Moldovan, H. Tamura, D. Wing || vcancio@pacbell.net, mmoldovan@g3nova.com, tamura@toda.ricoh.co.jp, dwing-ietf@fuggles.com +# RFC3250 || L. McIntyre, G. Parsons, J. Rafferty || lmcintyre@pahv.xerox.com, gparsons@nortelnetworks.com, jraff@brooktrout.com +# RFC3251 || B. Rajagopalan || braja@tellium.com +# RFC3252 || H. Kennedy || kennedyh@engin.umich.edu +# RFC3253 || G. Clemm, J. Amsden, T. Ellison, C. Kaler, J. Whitehead || geoffrey.clemm@rational.com, jamsden@us.ibm.com, tim_ellison@uk.ibm.com, ckaler@microsoft.com, ejw@cse.ucsc.edu +# RFC3254 || H. Alvestrand || Harald@alvestrand.no +# RFC3255 || N. Jones, C. Murton || nrjones@agere.com, murton@nortelnetworks.com +# RFC3256 || D. Jones, R. Woundy || doug@yas.com, rwoundy@broadband.att.com +# RFC3257 || L. Coene || +# RFC3258 || T. Hardie || Ted.Hardie@nominum.com +# RFC3259 || J. Ott, C. Perkins, D. Kutscher || jo@tzi.uni-bremen.de, csp@isi.edu, dku@tzi.uni-bremen.de +# RFC3260 || D. Grossman || dan@dma.isg.mot.com +# RFC3261 || J. Rosenberg, H. Schulzrinne, G. Camarillo, A. Johnston, J. Peterson, R. Sparks, M. Handley, E. Schooler || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com, alan.johnston@wcom.com, jon.peterson@neustar.com, rsparks@dynamicsoft.com, mjh@icir.org, schooler@research.att.com +# RFC3262 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3263 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3264 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3265 || A. B. Roach || adam@dynamicsoft.com +# RFC3266 || S. Olson, G. Camarillo, A. B. Roach || seanol@microsoft.com, Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com +# RFC3267 || J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie || Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, qxie1@email.mot.com +# RFC3268 || P. Chown || pc@skygate.co.uk +# RFC3269 || R. Kermode, L. Vicisano || Roger.Kermode@motorola.com, lorenzo@cisco.com +# RFC3270 || F. Le Faucheur, L. Wu, B. Davie, S. Davari, P. Vaananen, R. Krishnan, P. Cheval, J. Heinanen || flefauch@cisco.com, liwwu@cisco.com, bsd@cisco.com, davari@ieee.org, pasi.vaananen@nokia.com, ram@axiowave.com, pierrick.cheval@space.alcatel.fr, jh@song.fi +# RFC3271 || V. Cerf || vinton.g.cerf@wcom.com +# RFC3272 || D. Awduche, A. Chiu, A. Elwalid, I. Widjaja, X. Xiao || awduche@movaz.com, angela.chiu@celion.com, anwar@lucent.com, iwidjaja@research.bell-labs.com, xipeng@redback.com +# RFC3273 || S. Waldbusser || waldbusser@nextbeacon.com +# RFC3274 || P. Gutmann || pgut001@cs.auckland.ac.nz +# RFC3275 || D. Eastlake 3rd, J. Reagle, D. Solo || Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu +# RFC3276 || B. Ray, R. Abbi || rray@pesa.com, Rajesh.Abbi@alcatel.com +# RFC3277 || D. McPherson || danny@tcb.net +# RFC3278 || S. Blake-Wilson, D. Brown, P. Lambert || sblakewi@certicom.com, dbrown@certicom.com, plambert@sprintmail.com +# RFC3279 || L. Bassham, W. Polk, R. Housley || tim.polk@nist.gov, rhousley@rsasecurity.com, lbassham@nist.gov +# RFC3280 || R. Housley, W. Polk, W. Ford, D. Solo || rhousley@rsasecurity.com, wford@verisign.com, wpolk@nist.gov, dsolo@alum.mit.edu +# RFC3281 || S. Farrell, R. Housley || stephen.farrell@baltimore.ie, rhousley@rsasecurity.com +# RFC3282 || H. Alvestrand || Harald@Alvestrand.no +# RFC3283 || B. Mahoney, G. Babics, A. Taler || bobmah@mit.edu, georgeb@steltor.com, alex@0--0.org +# RFC3284 || D. Korn, J. MacDonald, J. Mogul, K. Vo || kpv@research.att.com, dgk@research.att.com, JeffMogul@acm.org, jmacd@cs.berkeley.edu +# RFC3285 || M. Gahrns, T. Hain || mikega@microsoft.com, ahain@cisco.com +# RFC3286 || L. Ong, J. Yoakum || lyong@ciena.com, yoakum@nortelnetworks.com +# RFC3287 || A. Bierman || andy@yumaworks.com +# RFC3288 || E. O'Tuathail, M. Rose || eamon.otuathail@clipcode.com, mrose17@gmail.com +# RFC3289 || F. Baker, K. Chan, A. Smith || fred@cisco.com, khchan@nortelnetworks.com, ah_smith@acm.org +# RFC3290 || Y. Bernet, S. Blake, D. Grossman, A. Smith || ybernet@msn.com, steven.blake@ericsson.com, dan@dma.isg.mot.com, ah_smith@acm.org +# RFC3291 || M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder || md@world.std.com, bkhabs@nc.rr.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de +# RFC3292 || A. Doria, F. Hellstrand, K. Sundell, T. Worster || avri@acm.org, fiffi@nortelnetworks.com, ksundell@nortelnetworks.com, fsb@thefsb.org +# RFC3293 || T. Worster, A. Doria, J. Buerkle || fsb@thefsb.org, avri@acm.com, Joachim.Buerkle@nortelnetworks.com +# RFC3294 || A. Doria, K. Sundell || avri@acm.org, sundell@nortelnetworks.com +# RFC3295 || H. Sjostrand, J. Buerkle, B. Srinivasan || hans@ipunplugged.com, joachim.buerkle@nortelnetworks.com, balaji@cplane.com +# RFC3296 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3297 || G. Klyne, R. Iwazaki, D. Crocker || GK@ACM.ORG, iwa@rdl.toshibatec.co.jp, dcrocker@brandenburg.com +# RFC3298 || I. Faynberg, J. Gato, H. Lu, L. Slutsman || lslutsman@att.com, faynberg@lucent.com, jgato@airtel.es, huilanlu@lucent.com +# RFC3299 || S. Ginoza || ginoza@isi.edu +# RFC3300 || J. Reynolds, R. Braden, S. Ginoza, A. De La Cruz || +# RFC3301 || Y. T'Joens, P. Crivellari, B. Sales || paolo.crivellari@belgacom.be +# RFC3302 || G. Parsons, J. Rafferty || gparsons@nortelnetworks.com, jraff@brooktrout.com +# RFC3303 || P. Srisuresh, J. Kuthan, J. Rosenberg, A. Molitor, A. Rayhan || srisuresh@yahoo.com, kuthan@fokus.fhg.de, jdrosen@dynamicsoft.com, amolitor@visi.com, rayhan@ee.ryerson.ca +# RFC3304 || R. P. Swale, P. A. Mart, P. Sijben, S. Brim, M. Shore || richard.swale@bt.com, paul.sijben@picopoint.com, philip.mart@marconi.com, sbrim@cisco.com, mshore@cisco.com +# RFC3305 || M. Mealling, Ed., R. Denenberg, Ed. || michael@verisignlabs.com, rden@loc.gov +# RFC3306 || B. Haberman, D. Thaler || bkhabs@nc.rr.com, dthaler@microsoft.com +# RFC3307 || B. Haberman || bkhabs@nc.rr.com +# RFC3308 || P. Calhoun, W. Luo, D. McPherson, K. Peirce || pcalhoun@bstormnetworks.com, luo@cisco.com, danny@tcb.net, Ken@malibunetworks.com +# RFC3309 || J. Stone, R. Stewart, D. Otis || jonathan@dsg.stanford.edu, randall@lakerest.net, dotis@sanlight.net +# RFC3310 || A. Niemi, J. Arkko, V. Torvinen || aki.niemi@nokia.com, jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi +# RFC3311 || J. Rosenberg || jdrosen@dynamicsoft.com +# RFC3312 || G. Camarillo, Ed., W. Marshall, Ed., J. Rosenberg || Gonzalo.Camarillo@ericsson.com, wtm@research.att.com, jdrosen@dynamicsoft.com +# RFC3313 || W. Marshall, Ed. || +# RFC3314 || M. Wasserman, Ed. || +# RFC3315 || R. Droms, Ed., J. Bound, B. Volz, T. Lemon, C. Perkins, M. Carney || Jim.Bound@hp.com, volz@metrocast.net, Ted.Lemon@nominum.com, charles.perkins@nokia.com, michael.carney@sun.com +# RFC3316 || J. Arkko, G. Kuijpers, H. Soliman, J. Loughney, J. Wiljakka || jari.arkko@ericsson.com, gerben.a.kuijpers@ted.ericsson.se, john.loughney@nokia.com, hesham.soliman@era.ericsson.se, juha.wiljakka@nokia.com +# RFC3317 || K. Chan, R. Sahita, S. Hahn, K. McCloghrie || khchan@nortelnetworks.com, ravi.sahita@intel.com, scott.hahn@intel.com, kzm@cisco.com +# RFC3318 || R. Sahita, Ed., S. Hahn, K. Chan, K. McCloghrie || ravi.sahita@intel.com, scott.hahn@intel.com, khchan@nortelnetworks.com, kzm@cisco.com +# RFC3319 || H. Schulzrinne, B. Volz || schulzrinne@cs.columbia.edu, volz@metrocast.net +# RFC3320 || R. Price, C. Bormann, J. Christoffersson, H. Hannu, Z. Liu, J. Rosenberg || richard.price@roke.co.uk, cabo@tzi.org, jan.christoffersson@epl.ericsson.se, hans.hannu@epl.ericsson.se, zhigang.c.liu@nokia.com, jdrosen@dynamicsoft.com +# RFC3321 || H. Hannu, J. Christoffersson, S. Forsgren, K.-C. Leung, Z. Liu, R. Price || hans.hannu@epl.ericsson.se, jan.christoffersson@epl.ericsson.se, StefanForsgren@alvishagglunds.se, kcleung@cs.ttu.edu, zhigang.c.liu@nokia.com, richard.price@roke.co.uk +# RFC3322 || H. Hannu || hans.hannu@epl.ericsson.se +# RFC3323 || J. Peterson || jon.peterson@neustar.biz +# RFC3324 || M. Watson || mwatson@nortelnetworks.com +# RFC3325 || C. Jennings, J. Peterson, M. Watson || fluffy@cisco.com, Jon.Peterson@NeuStar.biz, mwatson@nortelnetworks.com +# RFC3326 || H. Schulzrinne, D. Oran, G. Camarillo || schulzrinne@cs.columbia.edu, oran@cisco.com, Gonzalo.Camarillo@ericsson.com +# RFC3327 || D. Willis, B. Hoeneisen || dean.willis@softarmor.com, hoeneisen@switch.ch +# RFC3328 || || +# RFC3329 || J. Arkko, V. Torvinen, G. Camarillo, A. Niemi, T. Haukka || jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi, Gonzalo.Camarillo@ericsson.com, aki.niemi@nokia.com, tao.haukka@nokia.com +# RFC3330 || IANA || iana@iana.org +# RFC3331 || K. Morneault, R. Dantu, G. Sidebottom, B. Bidulock, J. Heitz || kmorneau@cisco.com, rdantu@netrake.com, greg@signatustechnologies.com, bidulock@openss7.org, jheitz@lucent.com +# RFC3332 || G. Sidebottom, Ed., K. Morneault, Ed., J. Pastor-Balbas, Ed. || +# RFC3334 || T. Zseby, S. Zander, C. Carle || zseby@fokus.fhg.de, zander@fokus.fhg.de, carle@fokus.fhg.de +# RFC3335 || T. Harding, R. Drummond, C. Shih || tharding@cyclonecommerce.com, chuck.shih@gartner.com, rik@drummondgroup.com +# RFC3336 || B. Thompson, T. Koren, B. Buffam || brucet@cisco.com, tmima@cisco.com, bruce@seawaynetworks.com +# RFC3337 || B. Thompson, T. Koren, B. Buffam || brucet@cisco.com, bruce@seawaynetworks.com, tmima@cisco.com +# RFC3338 || S. Lee, M-K. Shin, Y-J. Kim, E. Nordmark, A. Durand || syl@pec.etri.re.kr, mkshin@pec.etri.re.kr, yjkim@pec.etri.re.kr, Alain.Durand@sun.com, erik.nordmark@sun.com +# RFC3339 || G. Klyne, C. Newman || chris.newman@sun.com, GK@ACM.ORG +# RFC3340 || M. Rose, G. Klyne, D. Crocker || mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com +# RFC3341 || M. Rose, G. Klyne, D. Crocker || mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com +# RFC3342 || E. Dixon, H. Franklin, J. Kint, G. Klyne, D. New, S. Pead, M. Rose, M. Schwartz || Graham.Klyne@MIMEsweeper.com, mrose17@gmail.com, schwartz@CodeOnTheRoad.com, edixon@myrealbox.com, huston@franklin.ro, d20@icosahedron.org, dnew@san.rr.com, spead@fiber.net +# RFC3343 || M. Rose, G. Klyne, D. Crocker || mrose17@gmail.com, gk@ninebynine.org, dcrocker@brandenburg.com +# RFC3344 || C. Perkins, Ed. || Basavaraj.Patil@nokia.com, PRoberts@MEGISTO.com, charliep@iprg.nokia.com +# RFC3345 || D. McPherson, V. Gill, D. Walton, A. Retana || danny@tcb.net, vijay@umbc.edu, dwalton@cisco.com, aretana@cisco.com +# RFC3346 || J. Boyle, V. Gill, A. Hannan, D. Cooper, D. Awduche, B. Christian, W.S. Lai || jboyle@pdnets.com, vijay@umbc.edu, alan@routingloop.com, dcooper@gblx.net, awduche@movaz.com, blaine@uu.net, wlai@att.com +# RFC3347 || M. Krueger, R. Haagens || marjorie_krueger@hp.com, Randy_Haagens@hp.com, csapuntz@stanford.edu, mbakke@cisco.com +# RFC3348 || M. Gahrns, R. Cheng || mikega@microsoft.com, raych@microsoft.com +# RFC3349 || M. Rose || mrose17@gmail.com +# RFC3351 || N. Charlton, M. Gasson, G. Gybels, M. Spanner, A. van Wijk || nathan@millpark.com, michael.gasson@korusolutions.com, Guido.Gybels@rnid.org.uk, mike.spanner@rnid.org.uk, Arnoud.van.Wijk@eln.ericsson.se +# RFC3352 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3353 || D. Ooms, B. Sales, W. Livens, A. Acharya, F. Griffoul, F. Ansari || Dirk.Ooms@alcatel.be, Bernard.Sales@alcatel.be, WLivens@colt-telecom.be, arup@us.ibm.com, griffoul@ulticom.com, furquan@dnrc.bell-labs.com +# RFC3354 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC3355 || A. Singh, R. Turner, R. Tio, S. Nanji || rturner@eng.paradyne.com, tor@redback.com, asingh1@motorola.com, suhail@redback.com +# RFC3356 || G. Fishman, S. Bradner || +# RFC3357 || R. Koodli, R. Ravikanth || rajeev.koodli@nokia.com, rravikanth@axiowave.com +# RFC3358 || T. Przygienda || prz@xebeo.com +# RFC3359 || T. Przygienda || +# RFC3360 || S. Floyd || floyd@icir.org +# RFC3361 || H. Schulzrinne || schulzrinne@cs.columbia.edu +# RFC3362 || G. Parsons || gparsons@nortelnetworks.com +# RFC3363 || R. Bush, A. Durand, B. Fink, O. Gudmundsson, T. Hain || +# RFC3364 || R. Austein || sra@hactrn.net +# RFC3365 || J. Schiller || jis@mit.edu +# RFC3366 || G. Fairhurst, L. Wood || gorry@erg.abdn.ac.uk, lwood@cisco.com +# RFC3367 || N. Popp, M. Mealling, M. Moseley || npopp@verisign.com, michael@verisignlabs.com, marshall@netword.com +# RFC3368 || M. Mealling || michael@verisignlabs.com +# RFC3369 || R. Housley || rhousley@rsasecurity.com +# RFC3370 || R. Housley || rhousley@rsasecurity.com +# RFC3371 || E. Caves, P. Calhoun, R. Wheeler || evan@occamnetworks.com, pcalhoun@bstormnetworks.com +# RFC3372 || A. Vemuri, J. Peterson || Aparna.Vemuri@Qwest.com, jon.peterson@neustar.biz +# RFC3373 || D. Katz, R. Saluja || dkatz@juniper.net, rajesh.saluja@tenetindia.com +# RFC3374 || J. Kempf, Ed. || henrik@levkowetz.com, pcalhoun@bstormnetworks.com, kempf@docomolabs-usa.com, gkenward@nortelnetworks.com, hmsyed@nortelnetworks.com, jmanner@cs.helsinki.fi, madjid.nakhjiri@motorola.com, govind.krishnamurthi@nokia.com, rajeev.koodli@nokia.com, kulwinder.atwal@zucotto.com, mat@cisco.com, mat.horan@comdev.cc, phil_neumiller@3com.com +# RFC3375 || S. Hollenbeck || +# RFC3376 || B. Cain, S. Deering, I. Kouvelas, B. Fenner, A. Thyagarajan || deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com +# RFC3377 || J. Hodges, R. Morgan || Jeff.Hodges@sun.com, rlmorgan@washington.edu +# RFC3378 || R. Housley, S. Hollenbeck || rhousley@rsasecurity.com, shollenbeck@verisign.com +# RFC3379 || D. Pinkas, R. Housley || Denis.Pinkas@bull.net, rhousley@rsasecurity.com +# RFC3380 || T. Hastings, R. Herriot, C. Kugler, H. Lewis || kugler@us.ibm.com, tom.hastings@alum.mit.edu, bob@Herriot.com, harryl@us.ibm.com +# RFC3381 || T. Hastings, H. Lewis, R. Bergman || tom.hastings@alum.mit.edu, harryl@us.ibm.com, rbergma@hitachi-hkis.com +# RFC3382 || R. deBry, T. Hastings, R. Herriot, K. Ocke, P. Zehler || debryro@uvsc.edu, tom.hastings@alum.mit.edu, bob@herriot.com, KOcke@crt.xerox.com, Peter.Zehler@xerox.com +# RFC3383 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3384 || E. Stokes, R. Weiser, R. Moats, R. Huber || rweiser@trustdst.com, stokese@us.ibm.com, rmoats@lemurnetworks.net, rvh@att.com +# RFC3385 || D. Sheinwald, J. Satran, P. Thaler, V. Cavanna || julian_satran@il.ibm.com, Dafna_Sheinwald@il.ibm.com, pat_thaler@agilent.com, vince_cavanna@agilent.com +# RFC3386 || W. Lai, Ed., D. McDysan, Ed. || +# RFC3387 || M. Eder, H. Chaskar, S. Nag || Michael.eder@nokia.com, thinker@monmouth.com, hemant.chaskar@nokia.com +# RFC3388 || G. Camarillo, G. Eriksson, J. Holler, H. Schulzrinne || Gonzalo.Camarillo@ericsson.com, Jan.Holler@era.ericsson.se, Goran.AP.Eriksson@era.ericsson.se, schulzrinne@cs.columbia.edu +# RFC3389 || R. Zopf || zopf@lucent.com +# RFC3390 || M. Allman, S. Floyd, C. Partridge || mallman@bbn.com, floyd@icir.org, craig@bbn.com +# RFC3391 || R. Herriot || bob@herriot.com +# RFC3392 || R. Chandra, J. Scudder || rchandra@redback.com, jgs@cisco.com +# RFC3393 || C. Demichelis, P. Chimento || carlo.demichelis@tilab.com, chimento@torrentnet.com +# RFC3394 || J. Schaad, R. Housley || jimsch@exmsft.com, rhousley@rsasecurity.com +# RFC3395 || A. Bierman, C. Bucci, R. Dietz, A. Warth || andy@yumaworks.com, cbucci@cisco.com, rdietz@hifn.com, dahoss@earthlink.net +# RFC3396 || T. Lemon, S. Cheshire || mellon@nominum.com, rfc@stuartcheshire.org +# RFC3397 || B. Aboba, S. Cheshire || bernarda@microsoft.com, rfc@stuartcheshire.org +# RFC3398 || G. Camarillo, A. B. Roach, J. Peterson, L. Ong || Gonzalo.Camarillo@Ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyOng@ciena.com +# RFC3400 || || +# RFC3401 || M. Mealling || michael@neonym.net +# RFC3402 || M. Mealling || michael@neonym.net +# RFC3403 || M. Mealling || michael@neonym.net +# RFC3404 || M. Mealling || michael@neonym.net +# RFC3405 || M. Mealling || michael@neonym.net +# RFC3406 || L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom || leslie@thinkingcat.com, renato@iprsystems.com, paf@cisco.com +# RFC3407 || F. Andreasen || fandreas@cisco.com +# RFC3408 || Z. Liu, K. Le || khiem.le@nokia.com +# RFC3409 || K. Svanbro || krister.svanbro@ericsson.com +# RFC3410 || J. Case, R. Mundy, D. Partain, B. Stewart || +# RFC3411 || D. Harrington, R. Presuhn, B. Wijnen || +# RFC3412 || J. Case, D. Harrington, R. Presuhn, B. Wijnen || +# RFC3413 || D. Levi, P. Meyer, B. Stewart || +# RFC3414 || U. Blumenthal, B. Wijnen || +# RFC3415 || B. Wijnen, R. Presuhn, K. McCloghrie || +# RFC3416 || R. Presuhn, Ed. || +# RFC3417 || R. Presuhn, Ed. || +# RFC3418 || R. Presuhn, Ed. || +# RFC3419 || M. Daniele, J. Schoenwaelder || md@world.std.com, schoenw@ibr.cs.tu-bs.de +# RFC3420 || R. Sparks || rsparks@dynamicsoft.com +# RFC3421 || W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome || zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com +# RFC3422 || O. Okamoto, M. Maruyama, T. Sajima || okamoto.osamu@lab.ntt.co.jp, mitsuru@core.ecl.net, tjs@sun.com +# RFC3423 || K. Zhang, E. Elkin || kevinzhang@ieee.org, eitan@xacct.com +# RFC3424 || L. Daigle, Ed., IAB || iab@iab.org +# RFC3425 || D. Lawrence || tale@nominum.com +# RFC3426 || S. Floyd || iab@iab.org +# RFC3427 || A. Mankin, S. Bradner, R. Mahy, D. Willis, J. Ott, B. Rosen || mankin@psg.com, sob@harvard.edu, rohan@cisco.com, dean.willis@softarmor.com, brian.rosen@marconi.com, jo@ipdialog.com +# RFC3428 || B. Campbell, Ed., J. Rosenberg, H. Schulzrinne, C. Huitema, D. Gurle || bcampbell@dynamicsoft.com, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, huitema@microsoft.com, dgurle@microsoft.com +# RFC3429 || H. Ohta || ohta.hiroshi@lab.ntt.co.jp +# RFC3430 || J. Schoenwaelder || schoenw@ibr.cs.tu-bs.de +# RFC3431 || W. Segmuller || whs@watson.ibm.com +# RFC3432 || V. Raisanen, G. Grotefeld, A. Morton || Vilho.Raisanen@nokia.com, g.grotefeld@motorola.com, acmorton@att.com +# RFC3433 || A. Bierman, D. Romascanu, K.C. Norseth || andy@yumaworks.com, dromasca@gmail.com , kenyon.c.norseth@L-3com.com +# RFC3434 || A. Bierman, K. McCloghrie || andy@yumaworks.com, kzm@cisco.com +# RFC3435 || F. Andreasen, B. Foster || fandreas@cisco.com, bfoster@cisco.com +# RFC3436 || A. Jungmaier, E. Rescorla, M. Tuexen || ajung@exp-math.uni-essen.de, ekr@rtfm.com, Michael.Tuexen@siemens.com +# RFC3437 || W. Palter, W. Townsley || mark@townsley.net, palter.ietf@zev.net +# RFC3438 || W. Townsley || mark@townsley.net +# RFC3439 || R. Bush, D. Meyer || randy@psg.com, dmm@maoz.com +# RFC3440 || F. Ly, G. Bathrick || faye@pedestalnetworks.com, greg.bathrick@nokia.com +# RFC3441 || R. Kumar || rkumar@cisco.com +# RFC3442 || T. Lemon, S. Cheshire, B. Volz || Ted.Lemon@nominum.com, rfc@stuartcheshire.org, bernie.volz@ericsson.com +# RFC3443 || P. Agarwal, B. Akyol || puneet@acm.org, bora@cisco.com +# RFC3444 || A. Pras, J. Schoenwaelder || pras@ctit.utwente.nl, schoenw@informatik.uni-osnabrueck.de +# RFC3445 || D. Massey, S. Rose || masseyd@isi.edu, scott.rose@nist.gov +# RFC3446 || D. Kim, D. Meyer, H. Kilmer, D. Farinacci || dorian@blackrose.org, hank@rem.com, dino@procket.com, dmm@maoz.com +# RFC3447 || J. Jonsson, B. Kaliski || jonsson@mathematik.uni-marburg.de, bkaliski@rsasecurity.com +# RFC3448 || M. Handley, S. Floyd, J. Padhye, J. Widmer || mjh@icir.org, floyd@icir.org, padhye@microsoft.com, widmer@informatik.uni-mannheim.de +# RFC3449 || H. Balakrishnan, V. Padmanabhan, G. Fairhurst, M. Sooriyabandara || hari@lcs.mit.edu, padmanab@microsoft.com, gorry@erg.abdn.ac.uk, mahesh@erg.abdn.ac.uk +# RFC3450 || M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, J. Crowcroft || luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, Jon.Crowcroft@cl.cam.ac.uk +# RFC3451 || M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, M. Handley, J. Crowcroft || luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk +# RFC3452 || M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft || luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk +# RFC3453 || M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft || luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk +# RFC3454 || P. Hoffman, M. Blanchet || paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca +# RFC3455 || M. Garcia-Martin, E. Henrikson, D. Mills || miguel.a.garcia@ericsson.com, ehenrikson@lucent.com, duncan.mills@vf.vodafone.co.uk +# RFC3456 || B. Patel, B. Aboba, S. Kelly, V. Gupta || baiju.v.patel@intel.com, bernarda@microsoft.com, scott@hyperthought.com, vipul.gupta@sun.com +# RFC3457 || S. Kelly, S. Ramamoorthi || +# RFC3458 || E. Burger, E. Candell, C. Eliot, G. Klyne || e.burger@ieee.org, emily.candell@comverse.com, GK-IETF@ninebynine.org, charle@Microsoft.com +# RFC3459 || E. Burger || e.burger@ieee.org +# RFC3460 || B. Moore, Ed. || remoore@us.ibm.com +# RFC3461 || K. Moore || moore@cs.utk.edu +# RFC3462 || G. Vaudreuil || GregV@ieee.org +# RFC3463 || G. Vaudreuil || GregV@ieee.org +# RFC3464 || K. Moore, G. Vaudreuil || moore@cs.utk.edu, GregV@ieee.org +# RFC3465 || M. Allman || mallman@bbn.com +# RFC3466 || M. Day, B. Cain, G. Tomlinson, P. Rzewski || mday@alum.mit.edu, bcain@storigen.com, gary@tomlinsongroup.net, philrz@yahoo.com +# RFC3467 || J. Klensin || +# RFC3468 || L. Andersson, G. Swallow || loa@pi.se, swallow@cisco.com +# RFC3469 || V. Sharma, Ed., F. Hellstrand, Ed. || +# RFC3470 || S. Hollenbeck, M. Rose, L. Masinter || shollenbeck@verisign.com, mrose17@gmail.com, LMM@acm.org +# RFC3471 || L. Berger, Ed. || lberger@movaz.com +# RFC3472 || P. Ashwood-Smith, Ed., L. Berger, Ed. || petera@nortelnetworks.com, lberger@movaz.com +# RFC3473 || L. Berger, Ed. || lberger@movaz.com +# RFC3474 || Z. Lin, D. Pendarakis || zhiwlin@nyct.com, dpendarakis@tellium.com +# RFC3475 || O. Aboul-Magd || osama@nortelnetworks.com +# RFC3476 || B. Rajagopalan || braja@tellium.com +# RFC3477 || K. Kompella, Y. Rekhter || kireeti@juniper.net, yakov@juniper.net +# RFC3478 || M. Leelanivas, Y. Rekhter, R. Aggarwal || manoj@juniper.net, yakov@juniper.net, rahul@redback.com +# RFC3479 || A. Farrel, Ed. || afarrel@movaz.com, pjb@dataconnection.com, pmatthews@hyperchip.com, ewgray@GraIyMage.com, jack.shaio@vivacenetworks.com, tob@laurelnetworks.com, andy.malis@vivacenetworks.com +# RFC3480 || K. Kompella, Y. Rekhter, A. Kullberg || kireeti@juniper.net, yakov@juniper.net, akullber@netplane.com +# RFC3481 || H. Inamura, Ed., G. Montenegro, Ed., R. Ludwig, A. Gurtov, F. Khafizov || inamura@mml.yrp.nttdocomo.co.jp, gab@sun.com, Reiner.Ludwig@Ericsson.com, andrei.gurtov@sonera.com, faridk@nortelnetworks.com +# RFC3482 || M. Foster, T. McGarry, J. Yu || mark.foster@neustar.biz, tom.mcgarry@neustar.biz, james.yu@neustar.biz +# RFC3483 || D. Rawlins, A. Kulkarni, M. Bokaemper, K. Chan || Diana.Rawlins@wcom.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net +# RFC3484 || R. Draves || richdr@microsoft.com +# RFC3485 || M. Garcia-Martin, C. Bormann, J. Ott, R. Price, A. B. Roach || miguel.a.garcia@ericsson.com, cabo@tzi.org, jo@tzi.org, richard.price@roke.co.uk, adam@dynamicsoft.com +# RFC3486 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC3487 || H. Schulzrinne || schulzrinne@cs.columbia.edu +# RFC3488 || I. Wu, T. Eckert || iwu@cisco.com +# RFC3489 || J. Rosenberg, J. Weinberger, C. Huitema, R. Mahy || jdrosen@dynamicsoft.com, jweinberger@dynamicsoft.com, huitema@microsoft.com, rohan@cisco.com +# RFC3490 || P. Faltstrom, P. Hoffman, A. Costello || paf@cisco.com, phoffman@imc.org +# RFC3491 || P. Hoffman, M. Blanchet || paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca +# RFC3492 || A. Costello || +# RFC3493 || R. Gilligan, S. Thomson, J. Bound, J. McCann, W. Stevens || gilligan@intransa.com, sethomso@cisco.com, Jim.Bound@hp.com, Jack.McCann@hp.com +# RFC3494 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3495 || B. Beser, P. Duffy, Ed. || burcak@juniper.net, paduffy@cisco.com +# RFC3496 || A. G. Malis, T. Hsiao || Andy.Malis@vivacenetworks.com, Tony.Hsiao@VivaceNetworks.com +# RFC3497 || L. Gharai, C. Perkins, G. Goncher, A. Mankin || ladan@isi.edu, csp@csperkins.org, mankin@psg.com, Gary.Goncher@tek.com +# RFC3498 || J. Kuhfeld, J. Johnson, M. Thatcher || +# RFC3499 || S. Ginoza || ginoza@isi.edu +# RFC3500 || || +# RFC3501 || M. Crispin || MRC@CAC.Washington.EDU +# RFC3502 || M. Crispin || MRC@CAC.Washington.EDU +# RFC3503 || A. Melnikov || mel@messagingdirect.com +# RFC3504 || D. Eastlake || Donald.Eastlake@motorola.com +# RFC3505 || D. Eastlake || Donald.Eastlake@motorola.com +# RFC3506 || K. Fujimura, D. Eastlake || fujimura@isl.ntt.co.jp, Donald.Eastlake@motorola.com +# RFC3507 || J. Elson, A. Cerpa || jelson@cs.ucla.edu, cerpa@cs.ucla.edu +# RFC3508 || O. Levin || orit@radvision.com +# RFC3509 || A. Zinin, A. Lindem, D. Yeung || zinin@psg.com, myeung@procket.com, acee@redback.com +# RFC3510 || R. Herriot, I. McDonald || bob@herriot.com, imcdonald@sharplabs.com +# RFC3511 || B. Hickman, D. Newman, S. Tadjudin, T. Martin || brooks.hickman@spirentcom.com, dnewman@networktest.com, Saldju.Tadjudin@spirentcom.com, tmartin@gvnw.com +# RFC3512 || M. MacFaden, D. Partain, J. Saperia, W. Tackabury || +# RFC3513 || R. Hinden, S. Deering || bob.hinden@gmail.com, deering@cisco.com +# RFC3514 || S. Bellovin || bellovin@acm.org +# RFC3515 || R. Sparks || rsparks@dynamicsoft.com +# RFC3516 || L. Nerenberg || lyndon@orthanc.ab.ca +# RFC3517 || E. Blanton, M. Allman, K. Fall, L. Wang || eblanton@cs.purdue.edu, mallman@bbn.com, kfall@intel-research.net, lwang0@uky.edu +# RFC3518 || M. Higashiyama, F. Baker, T. Liao || Mitsuru.Higashiyama@yy.anritsu.co.jp, fred@cisco.com, tawei@cisco.com +# RFC3519 || H. Levkowetz, S. Vaarala || henrik@levkowetz.com, sami.vaarala@iki.fi +# RFC3520 || L-N. Hamer, B. Gage, B. Kosinski, H. Shieh || nhamer@nortelnetworks.com, brettk@invidi.com, gageb@nortelnetworks.com, hugh.shieh@attws.com +# RFC3521 || L-N. Hamer, B. Gage, H. Shieh || nhamer@nortelnetworks.com, gageb@nortelnetworks.com, hugh.shieh@attws.com +# RFC3522 || R. Ludwig, M. Meyer || Reiner.Ludwig@eed.ericsson.se, Michael.Meyer@eed.ericsson.se +# RFC3523 || J. Polk || jmpolk@cisco.com +# RFC3524 || G. Camarillo, A. Monrad || Gonzalo.Camarillo@ericsson.com, atle.monrad@ericsson.com +# RFC3525 || C. Groves, Ed., M. Pantaleo, Ed., T. Anderson, Ed., T. Taylor, Ed. || tlatla@verizon.net, Christian.Groves@ericsson.com.au, Marcello.Pantaleo@eed.ericsson.se, tom.taylor.stds@gmail.com +# RFC3526 || T. Kivinen, M. Kojo || kivinen@ssh.fi, mika.kojo@helsinki.fi +# RFC3527 || K. Kinnear, M. Stapp, R. Johnson, J. Kumarasamy || kkinnear@cisco.com, mjs@cisco.com, jayk@cisco.com, raj@cisco.com +# RFC3528 || W. Zhao, H. Schulzrinne, E. Guttman || zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com +# RFC3529 || W. Harold || wharold@us.ibm.com +# RFC3530 || S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck || beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, dnoveck@netapp.com, david.robinson@sun.com, robert.thurlow@sun.com +# RFC3531 || M. Blanchet || Marc.Blanchet@viagenie.qc.ca +# RFC3532 || T. Anderson, J. Buerkle || todd.a.anderson@intel.com, joachim.buerkle@nortelnetworks.com +# RFC3533 || S. Pfeiffer || Silvia.Pfeiffer@csiro.au +# RFC3534 || L. Walleij || triad@df.lth.se +# RFC3535 || J. Schoenwaelder || j.schoenwaelder@iu-bremen.de +# RFC3536 || P. Hoffman || paul.hoffman@imc.org +# RFC3537 || J. Schaad, R. Housley || jimsch@exmsft.com, housley@vigilsec.com +# RFC3538 || Y. Kawatsura || kawatura@bisd.hitachi.co.jp +# RFC3539 || B. Aboba, J. Wood || bernarda@microsoft.com, jonwood@speakeasy.net +# RFC3540 || N. Spring, D. Wetherall, D. Ely || nspring@cs.washington.edu, djw@cs.washington.edu, ely@cs.washington.edu +# RFC3541 || A. Walsh || aaron@mantiscorp.com +# RFC3542 || W. Stevens, M. Thomas, E. Nordmark, T. Jinmei || matt@3am-software.com, Erik.Nordmark@sun.com, jinmei@isl.rdc.toshiba.co.jp +# RFC3543 || S. Glass, M. Chandra || steven.glass@sun.com, mchandra@cisco.com +# RFC3544 || T. Koren, S. Casner, C. Bormann || tmima@cisco.com, casner@packetdesign.com, cabo@tzi.org +# RFC3545 || T. Koren, S. Casner, J. Geevarghese, B. Thompson, P. Ruddy || tmima@cisco.com, casner@acm.org, geevjohn@hotmail.com, brucet@cisco.com, pruddy@cisco.com +# RFC3546 || S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright || sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@zetnet.co.uk, janm@transactionware.com, timothy.wright@vodafone.com +# RFC3547 || M. Baugher, B. Weis, T. Hardjono, H. Harney || mbaugher@cisco.com, thardjono@verisign.com, hh@sparta.com, bew@cisco.com +# RFC3548 || S. Josefsson, Ed. || +# RFC3549 || J. Salim, H. Khosravi, A. Kleen, A. Kuznetsov || hadi@znyx.com, hormuzd.m.khosravi@intel.com, ak@suse.de, kuznet@ms2.inr.ac.ru +# RFC3550 || H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson || schulzrinne@cs.columbia.edu, casner@acm.org, ronf@bluecoat.com, van@packetdesign.com +# RFC3551 || H. Schulzrinne, S. Casner || schulzrinne@cs.columbia.edu, casner@acm.org +# RFC3552 || E. Rescorla, B. Korver || ekr@rtfm.com, briank@xythos.com, iab@iab.org +# RFC3553 || M. Mealling, L. Masinter, T. Hardie, G. Klyne || michael@verisignlabs.com, LMM@acm.org, hardie@qualcomm.com, GK-IETF@ninebynine.org +# RFC3554 || S. Bellovin, J. Ioannidis, A. Keromytis, R. Stewart || smb@research.att.com, ji@research.att.com, angelos@cs.columbia.edu, randall@lakerest.net +# RFC3555 || S. Casner, P. Hoschka || casner@acm.org, ph@w3.org +# RFC3556 || S. Casner || casner@acm.org +# RFC3557 || Q. Xie, Ed. || bdp003@motorola.com, Senaka.Balasuriya@motorola.com, yoonie@verbaltek.com, stephane.maes@oracle.com, hgarudad@qualcomm.com, Qiaobing.Xie@motorola.com +# RFC3558 || A. Li || adamli@icsl.ucla.edu +# RFC3559 || D. Thaler || dthaler@microsoft.com +# RFC3560 || R. Housley || housley@vigilsec.com +# RFC3561 || C. Perkins, E. Belding-Royer, S. Das || Charles.Perkins@nokia.com, ebelding@cs.ucsb.edu, sdas@ececs.uc.edu +# RFC3562 || M. Leech || mleech@nortelnetworks.com +# RFC3563 || A. Zinin || zinin@psg.com +# RFC3564 || F. Le Faucheur, W. Lai || +# RFC3565 || J. Schaad || jimsch@exmsft.com +# RFC3566 || S. Frankel, H. Herbert || sheila.frankel@nist.gov, howard.c.herbert@intel.com +# RFC3567 || T. Li, R. Atkinson || tli@procket.net, rja@extremenetworks.com +# RFC3568 || A. Barbir, B. Cain, R. Nair, O. Spatscheck || abbieb@nortelnetworks.com, bcain@storigen.com, nair_raj@yahoo.com, spatsch@research.att.com +# RFC3569 || S. Bhattacharyya, Ed. || +# RFC3570 || P. Rzewski, M. Day, D. Gilletti || mday@alum.mit.edu, dgilletti@yahoo.com, philrz@yahoo.com +# RFC3571 || D. Rawlins, A. Kulkarni, K. Ho Chan, M. Bokaemper, D. Dutt || Diana.Rawlins@mci.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net, ddutt@cisco.com +# RFC3572 || T. Ogura, M. Maruyama, T. Yoshida || ogura@core.ecl.net, mitsuru@core.ecl.net, yoshida@peta.arch.ecl.net +# RFC3573 || I. Goyret || igoyret@lucent.com +# RFC3574 || J. Soininen, Ed. || +# RFC3575 || B. Aboba || bernarda@microsoft.com +# RFC3576 || M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba || mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com +# RFC3577 || S. Waldbusser, R. Cole, C. Kalbfleisch, D. Romascanu || waldbusser@nextbeacon.com, cwk@verio.net, rgcole@att.com, dromasca@gmail.com +# RFC3578 || G. Camarillo, A. B. Roach, J. Peterson, L. Ong || Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyong@ciena.com +# RFC3579 || B. Aboba, P. Calhoun || bernarda@microsoft.com, pcalhoun@airespace.com +# RFC3580 || P. Congdon, B. Aboba, A. Smith, G. Zorn, J. Roese || paul_congdon@hp.com, bernarda@microsoft.com, ah_smith@acm.org, jjr@enterasys.com, gwz@cisco.com +# RFC3581 || J. Rosenberg, H. Schulzrinne || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu +# RFC3582 || J. Abley, B. Black, V. Gill || jabley@isc.org, ben@layer8.net, vijaygill9@aol.com +# RFC3583 || H. Chaskar, Ed. || john.loughney@nokia.com, hemant.chaskar@nokia.com +# RFC3584 || R. Frye, D. Levi, S. Routhier, B. Wijnen || +# RFC3585 || J. Jason, L. Rafalow, E. Vyncke || jamie.jason@intel.com, rafalow@watson.ibm.com, evyncke@cisco.com +# RFC3586 || M. Blaze, A. Keromytis, M. Richardson, L. Sanchez || mab@crypto.com, angelos@cs.columbia.edu, mcr@sandelman.ottawa.on.ca, lsanchez@xapiens.com +# RFC3587 || R. Hinden, S. Deering, E. Nordmark || bob.hinden@gmail.com, erik.nordmark@sun.com +# RFC3588 || P. Calhoun, J. Loughney, E. Guttman, G. Zorn, J. Arkko || pcalhoun@airespace.com, john.Loughney@nokia.com, Jari.Arkko@ericsson.com, erik.guttman@sun.com +# RFC3589 || J. Loughney || john.Loughney@Nokia.com +# RFC3590 || B. Haberman || brian@innovationslab.net +# RFC3591 || H-K. Lam, M. Stewart, A. Huynh || mstewart1@nc.rr.com, a_n_huynh@yahoo.com, hklam@lucent.com +# RFC3592 || K. Tesink || kaj@research.telcordia.com +# RFC3593 || K. Tesink, Ed. || +# RFC3594 || P. Duffy || paduffy@cisco.com +# RFC3595 || B. Wijnen || bwijnen@lucent.com +# RFC3596 || S. Thomson, C. Huitema, V. Ksinant, M. Souissi || sethomso@cisco.com, huitema@microsoft.com, vladimir.ksinant@6wind.com, Mohsen.Souissi@nic.fr +# RFC3597 || A. Gustafsson || gson@nominum.com +# RFC3598 || K. Murchison || ken@oceana.com +# RFC3599 || S. Ginoza || ginoza@isi.edu +# RFC3600 || J. Reynolds, Ed., S. Ginoza, Ed. || +# RFC3601 || C. Allocchio || Claudio.Allocchio@garr.it +# RFC3602 || S. Frankel, R. Glenn, S. Kelly || sheila.frankel@nist.gov, scott@hyperthought.com, rob.glenn@nist.gov +# RFC3603 || W. Marshall, Ed., F. Andreasen, Ed. || +# RFC3604 || H. Khosravi, G. Kullgren, S. Shew, J. Sadler, A. Watanabe || hormuzd.m.khosravi@intel.com, geku@nortelnetworks.com, Jonathan.Sadler@tellabs.com, sdshew@nortelnetworks.com, Shiomoto.Kohei@lab.ntt.co.jp, atsushi@exa.onlab.ntt.co.jp, okamoto@exa.onlab.ntt.co.jp +# RFC3605 || C. Huitema || huitema@microsoft.com +# RFC3606 || F. Ly, M. Noto, A. Smith, E. Spiegel, K. Tesink || faye@pedestalnetworks.com, mnoto@cisco.com, ah_smith@acm.org, mspiegel@cisco.com, kaj@research.telcordia.com +# RFC3607 || M. Leech || mleech@nortelnetworks.com +# RFC3608 || D. Willis, B. Hoeneisen || dean.willis@softarmor.com, hoeneisen@switch.ch +# RFC3609 || R. Bonica, K. Kompella, D. Meyer || ronald.p.bonica@mci.com, kireeti@juniper.net, dmm@maoz.com +# RFC3610 || D. Whiting, R. Housley, N. Ferguson || dwhiting@hifn.com, housley@vigilsec.com, niels@macfergus.com +# RFC3611 || T. Friedman, Ed., R. Caceres, Ed., A. Clark, Ed. || almeroth@cs.ucsb.edu, caceres@watson.ibm.com, alan@telchemy.com, robert.cole@jhuapl.edu, duffield@research.att.com, timur.friedman@lip6.fr, khedayat@brixnet.com, ksarac@utdallas.edu, magnus.westerlund@ericsson.com +# RFC3612 || A. Farrel || adrian@olddog.co.uk +# RFC3613 || R. Morgan, K. Hazelton || rlmorgan@washington.edu, hazelton@doit.wisc.edu +# RFC3614 || J. Smith || jrsmith@watson.ibm.com +# RFC3615 || J. Gustin, A. Goyens || jean-marc.gustin@swift.com, andre.goyens@swift.com +# RFC3616 || F. Bellifemine, I. Constantinescu, S. Willmott || Fabio.Bellifemine@TILAB.COM, ion.constantinescu@epfl.ch, steve@lsi.upc.es +# RFC3617 || E. Lear || lear@cisco.com +# RFC3618 || B. Fenner, Ed., D. Meyer, Ed. || +# RFC3619 || S. Shah, M. Yip || sshah@extremenetworks.com, my@extremenetworks.com +# RFC3620 || D. New || dnew@san.rr.com +# RFC3621 || A. Berger, D. Romascanu || avib@PowerDsine.com, dromasca@gmail.com +# RFC3622 || M. Mealling || michael@neonym.net +# RFC3623 || J. Moy, P. Pillay-Esnault, A. Lindem || jmoy@sycamorenet.com, padma@juniper.net, acee@redback.com +# RFC3624 || B. Foster, D. Auerbach, F. Andreasen || fandreas@cisco.com, dea@cisco.com, bfoster@cisco.com +# RFC3625 || R. Gellens, H. Garudadri || +# RFC3626 || T. Clausen, Ed., P. Jacquet, Ed. || T.Clausen@computer.org, Philippe.Jacquet@inria.fr +# RFC3627 || P. Savola || psavola@funet.fi +# RFC3628 || D. Pinkas, N. Pope, J. Ross || Denis.Pinkas@bull.net, pope@secstan.com, ross@secstan.com, claire.desclercs@etsi.org +# RFC3629 || F. Yergeau || fyergeau@alis.com +# RFC3630 || D. Katz, K. Kompella, D. Yeung || dkatz@juniper.net, myeung@procket.com, kireeti@juniper.net +# RFC3631 || S. Bellovin, Ed., J. Schiller, Ed., C. Kaufman, Ed. || +# RFC3632 || S. Hollenbeck, S. Veeramachaneni, S. Yalamanchilli || shollenbeck@verisign.com, sveerama@verisign.com, syalamanchilli@verisign.com +# RFC3633 || O. Troan, R. Droms || ot@cisco.com, rdroms@cisco.com +# RFC3634 || K. Luehrs, R. Woundy, J. Bevilacqua, N. Davoust || k.luehrs@cablelabs.com, richard_woundy@cable.comcast.com, john@yas.com, nancy@yas.com +# RFC3635 || J. Flick || johnf@rose.hp.com +# RFC3636 || J. Flick || johnf@rose.hp.com +# RFC3637 || C.M. Heard, Ed. || +# RFC3638 || J. Flick, C. M. Heard || johnf@rose.hp.com, heard@pobox.com +# RFC3639 || M. St. Johns, Ed., G. Huston, Ed., IAB || +# RFC3640 || J. van der Meer, D. Mackie, V. Swaminathan, D. Singer, P. Gentric || jan.vandermeer@philips.com, dmackie@apple.com, viswanathan.swaminathan@sun.com, singer@apple.com, philippe.gentric@philips.com +# RFC3641 || S. Legg || steven.legg@adacel.com.au +# RFC3642 || S. Legg || steven.legg@adacel.com.au +# RFC3643 || R. Weber, M. Rajagopal, F. Travostino, M. O'Donnell, C. Monia, M. Merhar || roweber@ieee.org, muralir@broadcom.com, travos@nortelnetworks.com, cmonia@pacbell.net, milan.merhar@sun.com +# RFC3644 || Y. Snir, Y. Ramberg, J. Strassner, R. Cohen, B. Moore || yramberg@cisco.com, ysnir@cisco.com, john.strassner@intelliden.com, ronc@lyciumnetworks.com, remoore@us.ibm.com +# RFC3645 || S. Kwan, P. Garg, J. Gilroy, L. Esibov, J. Westhead, R. Hall || skwan@microsoft.com, praeritg@microsoft.com, jamesg@microsoft.com, levone@microsoft.com, randyhall@lucent.com, jwesth@microsoft.com +# RFC3646 || R. Droms, Ed. || rdroms@cisco.com +# RFC3647 || S. Chokhani, W. Ford, R. Sabett, C. Merrill, S. Wu || chokhani@orionsec.com, wford@verisign.com, rsabett@cooley.com, cmerrill@mccarter.com, swu@infoliance.com +# RFC3648 || J. Whitehead, J. Reschke, Ed. || ejw@cse.ucsc.edu, julian.reschke@greenbytes.de +# RFC3649 || S. Floyd || floyd@acm.org +# RFC3650 || S. Sun, L. Lannom, B. Boesch || ssun@cnri.reston.va.us, llannom@cnri.reston.va.us, bboesch@cnri.reston.va.us +# RFC3651 || S. Sun, S. Reilly, L. Lannom || ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us +# RFC3652 || S. Sun, S. Reilly, L. Lannom, J. Petrone || ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us, jpetrone@cnri.reston.va.us +# RFC3653 || J. Boyer, M. Hughes, J. Reagle || jboyer@PureEdge.com, Merlin.Hughes@betrusted.com, reagle@mit.edu +# RFC3654 || H. Khosravi, Ed., T. Anderson, Ed. || edbowen@us.ibm.com, rdantu@unt.edu, avri@acm.org, ram.gopal@nokia.com, hadi@znyx.com, muneyb@avaya.com, margaret.wasserman@nokia.com, hormuzd.m.khosravi@intel.com, todd.a.anderson@intel.com +# RFC3655 || B. Wellington, O. Gudmundsson || Brian.Wellington@nominum.com, ogud@ogud.com +# RFC3656 || R. Siemborski || +# RFC3657 || S. Moriai, A. Kato || camellia@isl.ntt.co.jp, akato@po.ntts.co.jp +# RFC3658 || O. Gudmundsson || ds-rfc@ogud.com +# RFC3659 || P. Hethmon || phethmon@hethmon.com +# RFC3660 || B. Foster, F. Andreasen || bfoster@cisco.com, fandreas@cisco.com +# RFC3661 || B. Foster, C. Sivachelvan || chelliah@cisco.com, bfoster@cisco.com +# RFC3662 || R. Bless, K. Nichols, K. Wehrle || bless@tm.uka.de, knichols@ieee.org, Klaus.Wehrle@uni-tuebingen.de +# RFC3663 || A. Newton || anewton@verisignlabs.com +# RFC3664 || P. Hoffman || paul.hoffman@vpnc.org +# RFC3665 || A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers || alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com +# RFC3666 || A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers || alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com +# RFC3667 || S. Bradner || +# RFC3668 || S. Bradner || +# RFC3669 || S. Brim || sbrim@cisco.com +# RFC3670 || B. Moore, D. Durham, J. Strassner, A. Westerinen, W. Weiss || remoore@us.ibm.com, david.durham@intel.com, john.strassner@intelliden.com, andreaw@cisco.com, walterweiss@attbi.com +# RFC3671 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3672 || K. Zeilenga || Kurt@OpenLDAP.org, steven.legg@adacel.com.au +# RFC3673 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3674 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3675 || D. Eastlake 3rd || dee3@torque.pothole.com +# RFC3676 || R. Gellens || randy@qualcomm.com +# RFC3677 || L. Daigle, Ed., Internet Architecture Board || iab@iab.org +# RFC3678 || D. Thaler, B. Fenner, B. Quinn || dthaler@microsoft.com, fenner@research.att.com, rcq@ipmulticast.com +# RFC3679 || R. Droms || rdroms@cisco.com +# RFC3680 || J. Rosenberg || jdrosen@dynamicsoft.com +# RFC3681 || R. Bush, R. Fink || randy@psg.com, bob@thefinks.com +# RFC3682 || V. Gill, J. Heasley, D. Meyer || vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net +# RFC3683 || M. Rose || mrose17@gmail.com +# RFC3684 || R. Ogier, F. Templin, M. Lewis || ogier@erg.sri.com, ftemplin@iprg.nokia.com, lewis@erg.sri.com +# RFC3685 || C. Daboo || daboo@cyrusoft.com +# RFC3686 || R. Housley || housley@vigilsec.com +# RFC3687 || S. Legg || steven.legg@adacel.com.au +# RFC3688 || M. Mealling || michael@verisignlabs.com +# RFC3689 || K. Carlberg, R. Atkinson || k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com +# RFC3690 || K. Carlberg, R. Atkinson || k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com +# RFC3691 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC3692 || T. Narten || narten@us.ibm.com +# RFC3693 || J. Cuellar, J. Morris, D. Mulligan, J. Peterson, J. Polk || Jorge.Cuellar@siemens.com, jmorris@cdt.org, dmulligan@law.berkeley.edu, jon.peterson@neustar.biz, jmpolk@cisco.com +# RFC3694 || M. Danley, D. Mulligan, J. Morris, J. Peterson || mre213@nyu.edu, dmulligan@law.berkeley.edu, jmorris@cdt.org, jon.peterson@neustar.biz +# RFC3695 || M. Luby, L. Vicisano || luby@digitalfountain.com, lorenzo@cisco.com +# RFC3696 || J. Klensin || john-ietf@jck.com +# RFC3697 || J. Rajahalme, A. Conta, B. Carpenter, S. Deering || jarno.rajahalme@nokia.com, aconta@txc.com, brc@zurich.ibm.com +# RFC3698 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC3700 || J. Reynolds, Ed., S. Ginoza, Ed. || +# RFC3701 || R. Fink, R. Hinden || bob@thefinks.com, bob.hinden@gmail.com +# RFC3702 || J. Loughney, G. Camarillo || John.Loughney@nokia.com, Gonzalo.Camarillo@ericsson.com +# RFC3703 || J. Strassner, B. Moore, R. Moats, E. Ellesson || john.strassner@intelliden.com, remoore@us.ibm.com, rmoats@lemurnetworks.net, ellesson@mindspring.com +# RFC3704 || F. Baker, P. Savola || fred@cisco.com, psavola@funet.fi +# RFC3705 || B. Ray, R. Abbi || rray@pesa.com, Rajesh.Abbi@alcatel.com +# RFC3706 || G. Huang, S. Beaulieu, D. Rochefort || +# RFC3707 || A. Newton || anewton@verisignlabs.com +# RFC3708 || E. Blanton, M. Allman || eblanton@cs.purdue.edu, mallman@icir.org +# RFC3709 || S. Santesson, R. Housley, T. Freeman || stefans@microsoft.com, housley@vigilsec.com, trevorf@microsoft.com +# RFC3710 || H. Alvestrand || harald@alvestrand.no +# RFC3711 || M. Baugher, D. McGrew, M. Naslund, E. Carrara, K. Norrman || mbaugher@cisco.com, elisabetta.carrara@ericsson.com, mcgrew@cisco.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com +# RFC3712 || P. Fleming, I. McDonald || flemingp@us.ibm.com, flemingp@us.ibm.com, flemingp@us.ibm.com +# RFC3713 || M. Matsui, J. Nakajima, S. Moriai || matsui@iss.isl.melco.co.jp, june15@iss.isl.melco.co.jp, shiho@rd.scei.sony.co.jp +# RFC3714 || S. Floyd, Ed., J. Kempf, Ed. || iab@iab.org +# RFC3715 || B. Aboba, W. Dixon || bernarda@microsoft.com, ietf-wd@v6security.com +# RFC3716 || IAB Advisory Committee || iab@iab.org +# RFC3717 || B. Rajagopalan, J. Luciani, D. Awduche || braja@tellium.com, james_luciani@mindspring.com, awduche@awduche.com +# RFC3718 || R. McGowan || +# RFC3719 || J. Parker, Ed. || jparker@axiowave.com +# RFC3720 || J. Satran, K. Meth, C. Sapuntzakis, M. Chadalapaka, E. Zeidner || Julian_Satran@il.ibm.com, meth@il.ibm.com, csapuntz@alum.mit.edu, efri@xiv.co.il, cbm@rose.hp.com +# RFC3721 || M. Bakke, J. Hafner, J. Hufferd, K. Voruganti, M. Krueger || kaladhar@us.ibm.com, mbakke@cisco.com, hafner@almaden.ibm.com, hufferd@us.ibm.com, marjorie_krueger@hp.com +# RFC3722 || M. Bakke || mbakke@cisco.com +# RFC3723 || B. Aboba, J. Tseng, J. Walker, V. Rangan, F. Travostino || bernarda@microsoft.com, joshtseng@yahoo.com, jesse.walker@intel.com, vrangan@brocade.com, travos@nortelnetworks.com +# RFC3724 || J. Kempf, Ed., R. Austein, Ed., IAB || +# RFC3725 || J. Rosenberg, J. Peterson, H. Schulzrinne, G. Camarillo || jdrosen@dynamicsoft.com, jon.peterson@neustar.biz, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com +# RFC3726 || M. Brunner, Ed. || brunner@netlab.nec.de, robert.hancock@roke.co.uk, eleanor.hepworth@roke.co.uk, cornelia.kappler@siemens.com, Hannes.Tschofenig@mchp.siemens.de +# RFC3727 || S. Legg || steven.legg@adacel.com.au +# RFC3728 || B. Ray, R. Abbi || rray@pesa.com, Rajesh.Abbi@alcatel.com +# RFC3729 || S. Waldbusser || waldbusser@nextbeacon.com +# RFC3730 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3731 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3732 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3733 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3734 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3735 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3736 || R. Droms || rdroms@cisco.com +# RFC3737 || B. Wijnen, A. Bierman || bwijnen@lucent.com, andy@yumaworks.com +# RFC3738 || M. Luby, V. Goyal || luby@digitalfountain.com, v.goyal@ieee.org +# RFC3739 || S. Santesson, M. Nystrom, T. Polk || stefans@microsoft.com, wpolk@nist.gov, magnus@rsasecurity.com +# RFC3740 || T. Hardjono, B. Weis || thardjono@verisign.com, bew@cisco.com +# RFC3741 || J. Boyer, D. Eastlake 3rd, J. Reagle || jboyer@PureEdge.com, Donald.Eastlake@motorola.com, reagle@mit.edu +# RFC3742 || S. Floyd || floyd@icir.org +# RFC3743 || K. Konishi, K. Huang, H. Qian, Y. Ko || konishi@jp.apan.net, huangk@alum.sinica.edu, Hlqian@cnnic.net.cn, yw@mrko.pe.kr, jseng@pobox.org.sg, rickard@rickardgroup.com +# RFC3744 || G. Clemm, J. Reschke, E. Sedlar, J. Whitehead || geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de, eric.sedlar@oracle.com, ejw@cse.ucsc.edu +# RFC3745 || D. Singer, R. Clark, D. Lee || singer@apple.com, richard@elysium.ltd.uk, dlee@yahoo-inc.com +# RFC3746 || L. Yang, R. Dantu, T. Anderson, R. Gopal || lily.l.yang@intel.com, rdantu@unt.edu, todd.a.anderson@intel.com, ram.gopal@nokia.com +# RFC3747 || H. Hazewinkel, Ed., D. Partain, Ed. || +# RFC3748 || B. Aboba, L. Blunk, J. Vollbrecht, J. Carlson, H. Levkowetz, Ed. || bernarda@microsoft.com, ljb@merit.edu, jrv@umich.edu, james.d.carlson@sun.com, henrik@levkowetz.com +# RFC3749 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3750 || C. Huitema, R. Austein, S. Satapati, R. van der Pol || huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl +# RFC3751 || S. Bradner || sob@harvard.edu +# RFC3752 || A. Barbir, E. Burger, R. Chen, S. McHenry, H. Orman, R. Penno || abbieb@nortelnetworks.com, e.burger@ieee.org, chen@research.att.com, stephen@mchenry.net, ho@alum.mit.edu, rpenno@nortelnetworks.com +# RFC3753 || J. Manner, Ed., M. Kojo, Ed. || jmanner@cs.helsinki.fi, kojo@cs.helsinki.fi +# RFC3754 || R. Bless, K. Wehrle || bless@tm.uka.de, Klaus.Wehrle@uni-tuebingen.de +# RFC3755 || S. Weiler || weiler@tislabs.com +# RFC3756 || P. Nikander, Ed., J. Kempf, E. Nordmark || pekka.nikander@nomadiclab.com, kempf@docomolabs-usa.com, erik.nordmark@sun.com +# RFC3757 || O. Kolkman, J. Schlyter, E. Lewis || olaf@ripe.net, jakob@nic.se, edlewis@arin.net +# RFC3758 || R. Stewart, M. Ramalho, Q. Xie, M. Tuexen, P. Conrad || randall@lakerest.net, mramalho@cisco.com, qxie1@email.mot.com, tuexen@fh-muenster.de, conrad@acm.org +# RFC3759 || L-E. Jonsson || lars-erik.jonsson@ericsson.com +# RFC3760 || D. Gustafson, M. Just, M. Nystrom || degustafson@comcast.net, Just.Mike@tbs-sct.gc.ca, magnus@rsasecurity.com +# RFC3761 || P. Faltstrom, M. Mealling || paf@cisco.com +# RFC3762 || O. Levin || oritl@microsoft.com +# RFC3763 || S. Shalunov, B. Teitelbaum || shalunov@internet2.edu, ben@internet2.edu +# RFC3764 || J. Peterson || jon.peterson@neustar.biz +# RFC3765 || G. Huston || gih@telstra.net +# RFC3766 || H. Orman, P. Hoffman || hilarie@purplestreak.com, paul.hoffman@vpnc.org +# RFC3767 || S. Farrell, Ed. || +# RFC3768 || R. Hinden, Ed. || bob.hinden@gmail.com +# RFC3769 || S. Miyakawa, R. Droms || miyakawa@nttv6.jp, rdroms@cisco.com +# RFC3770 || R. Housley, T. Moore || housley@vigilsec.com, timmoore@microsoft.com +# RFC3771 || R. Harrison, K. Zeilenga || roger_harrison@novell.com, Kurt@OpenLDAP.org +# RFC3772 || J. Carlson, R. Winslow || +# RFC3773 || E. Candell || emily.candell@comverse.com +# RFC3774 || E. Davies, Ed. || +# RFC3775 || D. Johnson, C. Perkins, J. Arkko || dbj@cs.rice.edu, charliep@iprg.nokia.com, jari.arkko@ericsson.com +# RFC3776 || J. Arkko, V. Devarapalli, F. Dupont || jari.arkko@ericsson.com, vijayd@iprg.nokia.com, Francis.Dupont@enst-bretagne.fr +# RFC3777 || J. Galvin, Ed. || galvin+ietf@elistx.com +# RFC3778 || E. Taft, J. Pravetz, S. Zilles, L. Masinter || taft@adobe.com, jpravetz@adobe.com, szilles@adobe.com, LMM@acm.org +# RFC3779 || C. Lynn, S. Kent, K. Seo || CLynn@BBN.Com, Kent@BBN.Com, KSeo@BBN.Com +# RFC3780 || F. Strauss, J. Schoenwaelder || strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de +# RFC3781 || F. Strauss, J. Schoenwaelder || strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de +# RFC3782 || S. Floyd, T. Henderson, A. Gurtov || floyd@acm.org, thomas.r.henderson@boeing.com, andrei.gurtov@teliasonera.com +# RFC3783 || M. Chadalapaka, R. Elliott || cbm@rose.hp.com, elliott@hp.com +# RFC3784 || H. Smit, T. Li || hhwsmit@xs4all.nl, tony.li@tony.li +# RFC3785 || F. Le Faucheur, R. Uppili, A. Vedrenne, P. Merckx, T. Telkamp || flefauch@cisco.com, alain.vedrenne@equant.com, pierre.merckx@equant.com, telkamp@gblx.net +# RFC3786 || A. Hermelin, S. Previdi, M. Shand || amir@montilio.com, sprevidi@cisco.com, mshand@cisco.com +# RFC3787 || J. Parker, Ed. || jparker@axiowave.com +# RFC3788 || J. Loughney, M. Tuexen, Ed., J. Pastor-Balbas || john.loughney@nokia.com, tuexen@fh-muenster.de, j.javier.pastor@ericsson.com +# RFC3789 || P. Nesser, II, A. Bergstrom, Ed. || phil@nesser.com, andreas.bergstrom@hiof.no +# RFC3790 || C. Mickles, Ed., P. Nesser, II || cmickles.ee88@gtalumni.org, phil@nesser.com +# RFC3791 || C. Olvera, P. Nesser, II || cesar.olvera@consulintel.es, phil@nesser.com +# RFC3792 || P. Nesser, II, A. Bergstrom, Ed. || phil@nesser.com, andreas.bergstrom@hiof.no +# RFC3793 || P. Nesser, II, A. Bergstrom, Ed. || phil@nesser.com, andreas.bergstrom@hiof.no +# RFC3794 || P. Nesser, II, A. Bergstrom, Ed. || phil@nesser.com, andreas.bergstrom@hiof.no +# RFC3795 || R. Sofia, P. Nesser, II || rsofia@zmail.pt, phil@nesser.com +# RFC3796 || P. Nesser, II, A. Bergstrom, Ed. || phil@nesser.com, andreas.bergstrom@hiof.no +# RFC3797 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC3798 || T. Hansen, Ed., G. Vaudreuil, Ed. || GregV@ieee.org +# RFC3801 || G. Vaudreuil, G. Parsons || gregv@ieee.org, GParsons@NortelNetworks.com +# RFC3802 || G. Vaudreuil, G. Parsons || gregv@ieee.org, gparsons@nortelnetworks.com +# RFC3803 || G. Vaudreuil, G. Parsons || gregv@ieee.org, gparsons@nortelnetworks.com +# RFC3804 || G. Parsons || gparsons@nortelnetworks.com +# RFC3805 || R. Bergman, H. Lewis, I. McDonald || Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com +# RFC3806 || R. Bergman, H. Lewis, I. McDonald || Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com +# RFC3807 || E. Weilandt, N. Khanchandani, S. Rao || eva.weilandt@temic.com, rsanjay@nortelnetworks.com, neerajk@nortelnetworks.com +# RFC3808 || I. McDonald || imcdonald@sharplabs.com, iana@iana.org +# RFC3809 || A. Nagarajan, Ed. || +# RFC3810 || R. Vida, Ed., L. Costa, Ed. || Rolland.Vida@lip6.fr, Luis.Costa@lip6.fr, Serge.Fdida@lip6.fr, deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com, brian@innovationslab.net +# RFC3811 || T. Nadeau, Ed., J. Cucchiara, Ed. || tnadeau@cisco.com, jcucchiara@mindspring.com +# RFC3812 || C. Srinivasan, A. Viswanathan, T. Nadeau || cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com +# RFC3813 || C. Srinivasan, A. Viswanathan, T. Nadeau || cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com +# RFC3814 || T. Nadeau, C. Srinivasan, A. Viswanathan || tnadeau@cisco.com, cheenu@bloomberg.net, arunv@force10networks.com +# RFC3815 || J. Cucchiara, H. Sjostrand, J. Luciani || james_luciani@mindspring.com, hans@ipunplugged.com, jcucchiara@mindspring.com +# RFC3816 || J. Quittek, M. Stiemerling, H. Hartenstein || quittek@netlab.nec.de, stiemerling@netlab.nec.de, hartenstein@rz.uni-karlsruhe.de +# RFC3817 || W. Townsley, R. da Silva || mark@townsley.net, rdasilva@va.rr.com +# RFC3818 || V. Schryver || vjs@rhyolite.com +# RFC3819 || P. Karn, Ed., C. Bormann, G. Fairhurst, D. Grossman, R. Ludwig, J. Mahdavi, G. Montenegro, J. Touch, L. Wood || karn@qualcomm.com, cabo@tzi.org, gorry@erg.abdn.ac.uk, Dan.Grossman@motorola.com, Reiner.Ludwig@ericsson.com, jmahdavi@earthlink.net, gab@sun.com, touch@isi.edu, lwood@cisco.com +# RFC3820 || S. Tuecke, V. Welch, D. Engert, L. Pearlman, M. Thompson || tuecke@mcs.anl.gov, vwelch@ncsa.uiuc.edu, deengert@anl.gov, laura@isi.edu, mrthompson@lbl.gov +# RFC3821 || M. Rajagopal, E. Rodriguez, R. Weber || +# RFC3822 || D. Peterson || dap@cnt.com +# RFC3823 || B. Kovitz || bkovitz@caltech.edu +# RFC3824 || J. Peterson, H. Liu, J. Yu, B. Campbell || jon.peterson@neustar.biz, hong.liu@neustar.biz, james.yu@neustar.biz, bcampbell@dynamicsoft.com +# RFC3825 || J. Polk, J. Schnizlein, M. Linsner || jmpolk@cisco.com, john.schnizlein@cisco.com, marc.linsner@cisco.com +# RFC3826 || U. Blumenthal, F. Maino, K. McCloghrie || uri@bell-labs.com, fmaino@andiamo.com, kzm@cisco.com +# RFC3827 || K. Sarcar || kanoj.sarcar@sun.com +# RFC3828 || L-A. Larzon, M. Degermark, S. Pink, L-E. Jonsson, Ed., G. Fairhurst, Ed. || lln@csee.ltu.se, micke@cs.arizona.edu, steve@cs.arizona.edu, lars-erik.jonsson@ericsson.com, gorry@erg.abdn.ac.uk +# RFC3829 || R. Weltman, M. Smith, M. Wahl || robw@worldspot.com, mcs@pearlcrescent.com +# RFC3830 || J. Arkko, E. Carrara, F. Lindholm, M. Naslund, K. Norrman || jari.arkko@ericsson.com, elisabetta.carrara@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com +# RFC3831 || C. DeSanti || cds@cisco.com +# RFC3832 || W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome || zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com +# RFC3833 || D. Atkins, R. Austein || derek@ihtfp.com, sra@isc.org +# RFC3834 || K. Moore || moore@cs.utk.edu +# RFC3835 || A. Barbir, R. Penno, R. Chen, M. Hofmann, H. Orman || abbieb@nortelnetworks.com, chen@research.att.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com +# RFC3836 || A. Beck, M. Hofmann, H. Orman, R. Penno, A. Terzis || abeck@bell-labs.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com, terzis@cs.jhu.edu +# RFC3837 || A. Barbir, O. Batuner, B. Srinivas, M. Hofmann, H. Orman || abbieb@nortelnetworks.com, batuner@attbi.com, bindignavile.srinivas@nokia.com, hofmann@bell-labs.com, ho@alum.mit.edu +# RFC3838 || A. Barbir, O. Batuner, A. Beck, T. Chan, H. Orman || abbieb@nortelnetworks.com, batuner@attbi.com, abeck@bell-labs.com, Tat.Chan@nokia.com, ho@alum.mit.edu +# RFC3839 || R. Castagno, D. Singer || +# RFC3840 || J. Rosenberg, H. Schulzrinne, P. Kyzivat || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com +# RFC3841 || J. Rosenberg, H. Schulzrinne, P. Kyzivat || jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com +# RFC3842 || R. Mahy || rohan@cisco.com +# RFC3843 || L-E. Jonsson, G. Pelletier || lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com +# RFC3844 || E. Davies, Ed., J. Hofmann, Ed. || elwynd@nortelnetworks.com, jeanette@wz-berlin.de +# RFC3845 || J. Schlyter, Ed. || jakob@nic.se +# RFC3846 || F. Johansson, T. Johansson || fredrik@ipunplugged.com, tony.johansson@bytemobile.com +# RFC3847 || M. Shand, L. Ginsberg || mshand@cisco.com, ginsberg@cisco.com +# RFC3848 || C. Newman || chris.newman@sun.com +# RFC3849 || G. Huston, A. Lord, P. Smith || gih@apnic.net, anne@apnic.net, pfs@cisco.com +# RFC3850 || B. Ramsdell, Ed. || +# RFC3851 || B. Ramsdell, Ed. || +# RFC3852 || R. Housley || housley@vigilsec.com +# RFC3853 || J. Peterson || jon.peterson@neustar.biz +# RFC3854 || P. Hoffman, C. Bonatti, A. Eggen || +# RFC3855 || P. Hoffman, C. Bonatti || phoffman@imc.org, bonattic@ieca.com +# RFC3856 || J. Rosenberg || jdrosen@dynamicsoft.com +# RFC3857 || J. Rosenberg || jdrosen@dynamicsoft.com +# RFC3858 || J. Rosenberg || jdrosen@dynamicsoft.com +# RFC3859 || J. Peterson || jon.peterson@neustar.biz +# RFC3860 || J. Peterson || jon.peterson@neustar.biz +# RFC3861 || J. Peterson || jon.peterson@neustar.biz +# RFC3862 || G. Klyne, D. Atkins || GK-IETF@ninebynine.org, derek@ihtfp.com +# RFC3863 || H. Sugano, S. Fujimoto, G. Klyne, A. Bateman, W. Carr, J. Peterson || sugano.h@jp.fujitsu.com, shingo_fujimoto@jp.fujitsu.com, GK@ninebynine.org, bateman@acm.org, wayne.carr@intel.com, jon.peterson@neustar.biz +# RFC3864 || G. Klyne, M. Nottingham, J. Mogul || GK-IETF@ninebynine.org, mnot@pobox.com, JeffMogul@acm.org +# RFC3865 || C. Malamud || carl@media.org +# RFC3866 || K. Zeilenga, Ed. || +# RFC3867 || Y. Kawatsura, M. Hiroya, H. Beykirch || ykawatsu@itg.hitachi.co.jp, hiroya@st.rim.or.jp, hbbeykirch@web.de +# RFC3868 || J. Loughney, Ed., G. Sidebottom, L. Coene, G. Verwimp, J. Keller, B. Bidulock || john.Loughney@nokia.com, greg@signatustechnologies.com, lode.coene@siemens.com, gery.verwimp@siemens.com, joe.keller@tekelec.com, bidulock@openss7.org +# RFC3869 || R. Atkinson, Ed., S. Floyd, Ed., Internet Architecture Board || iab@iab.org, iab@iab.org, iab@iab.org +# RFC3870 || A. Swartz || me@aaronsw.com +# RFC3871 || G. Jones, Ed. || gmj3871@pobox.com +# RFC3872 || D. Zinman, D. Walker, J. Jiang || dzinman@rogers.com, david.walker@sedna-wireless.com, jjiang@syndesis.com +# RFC3873 || J. Pastor, M. Belinchon || J.Javier.Pastor@ericsson.com, maria.carmen.belinchon@ericsson.com +# RFC3874 || R. Housley || housley@vigilsec.com +# RFC3875 || D. Robinson, K. Coar || drtr@apache.org, coar@apache.org +# RFC3876 || D. Chadwick, S. Mullan || d.w.chadwick@salford.ac.uk, sean.mullan@sun.com +# RFC3877 || S. Chisholm, D. Romascanu || schishol@nortelnetworks.com, dromasca@gmail.com +# RFC3878 || H. Lam, A. Huynh, D. Perkins || hklam@lucent.com, a_n_huynh@yahoo.com, dperkins@snmpinfo.com +# RFC3879 || C. Huitema, B. Carpenter || huitema@microsoft.com, brc@zurich.ibm.com +# RFC3880 || J. Lennox, X. Wu, H. Schulzrinne || lennox@cs.columbia.edu, xiaotaow@cs.columbia.edu, schulzrinne@cs.columbia.edu +# RFC3881 || G. Marshall || glen.f.marshall@siemens.com +# RFC3882 || D. Turk || doughan.turk@bell.ca +# RFC3883 || S. Rao, A. Zinin, A. Roy || siraprao@hotmail.com, zinin@psg.com, akr@cisco.com +# RFC3884 || J. Touch, L. Eggert, Y. Wang || touch@isi.edu, lars.eggert@netlab.nec.de, yushunwa@isi.edu +# RFC3885 || E. Allman, T. Hansen || eric@Sendmail.COM, tony+msgtrk@maillennium.att.com +# RFC3886 || E. Allman || eric@Sendmail.COM +# RFC3887 || T. Hansen || tony+msgtrk@maillennium.att.com +# RFC3888 || T. Hansen || tony+msgtrk@maillennium.att.com +# RFC3889 || || +# RFC3890 || M. Westerlund || Magnus.Westerlund@ericsson.com +# RFC3891 || R. Mahy, B. Biggs, R. Dean || rohan@cisco.com, bbiggs@dumbterm.net, rfc@fdd.com +# RFC3892 || R. Sparks || RjS@xten.com +# RFC3893 || J. Peterson || jon.peterson@neustar.biz +# RFC3894 || J. Degener || jutta@sendmail.com +# RFC3895 || O. Nicklass, Ed. || orly_n@rad.com +# RFC3896 || O. Nicklass, Ed. || orly_n@rad.com +# RFC3897 || A. Barbir || abbieb@nortelnetworks.com +# RFC3898 || V. Kalusivalingam || vibhaska@cisco.com +# RFC3901 || A. Durand, J. Ihren || Alain.Durand@sun.com, johani@autonomica.se +# RFC3902 || M. Baker, M. Nottingham || distobj@acm.org, mnot@pobox.com +# RFC3903 || A. Niemi, Ed. || aki.niemi@nokia.com +# RFC3904 || C. Huitema, R. Austein, S. Satapati, R. van der Pol || huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl +# RFC3905 || V. See, Ed. || vsee@microsoft.com +# RFC3906 || N. Shen, H. Smit || naiming@redback.com, hhwsmit@xs4all.nl +# RFC3909 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC3910 || V. Gurbani, Ed., A. Brusilovsky, I. Faynberg, J. Gato, H. Lu, M. Unmehopa || vkg@lucent.com, abrusilovsky@lucent.com, faynberg@lucent.com, jorge.gato@vodafone.com, huilanlu@lucent.com, unmehopa@lucent.com +# RFC3911 || R. Mahy, D. Petrie || rohan@airespace.com, dpetrie@pingtel.com +# RFC3912 || L. Daigle || leslie@verisignlabs.com +# RFC3913 || D. Thaler || dthaler@microsoft.com +# RFC3914 || A. Barbir, A. Rousskov || abbieb@nortelnetworks.com, rousskov@measurement-factory.com +# RFC3915 || S. Hollenbeck || shollenbeck@verisign.com +# RFC3916 || X. Xiao, Ed., D. McPherson, Ed., P. Pate, Ed. || xxiao@riverstonenet.com, danny@arbor.net, prayson.pate@overturenetworks.com +# RFC3917 || J. Quittek, T. Zseby, B. Claise, S. Zander || quittek@netlab.nec.de, zseby@fokus.fhg.de, bclaise@cisco.com, szander@swin.edu.au +# RFC3918 || D. Stopp, B. Hickman || debby@ixiacom.com, brooks.hickman@spirentcom.com +# RFC3919 || E. Stephan, J. Palet || emile.stephan@francetelecom.com, jordi.palet@consulintel.es +# RFC3920 || P. Saint-Andre, Ed. || ietf@stpeter.im +# RFC3921 || P. Saint-Andre, Ed. || ietf@stpeter.im +# RFC3922 || P. Saint-Andre || ietf@stpeter.im +# RFC3923 || P. Saint-Andre || ietf@stpeter.im +# RFC3924 || F. Baker, B. Foster, C. Sharp || fred@cisco.com, bfoster@cisco.com, chsharp@cisco.com +# RFC3925 || J. Littlefield || joshl@cisco.com +# RFC3926 || T. Paila, M. Luby, R. Lehtonen, V. Roca, R. Walsh || toni.paila@nokia.com, luby@digitalfountain.com, rami.lehtonen@teliasonera.com, vincent.roca@inrialpes.fr, rod.walsh@nokia.com +# RFC3927 || S. Cheshire, B. Aboba, E. Guttman || rfc@stuartcheshire.org, bernarda@microsoft.com, erik@spybeam.org +# RFC3928 || R. Megginson, Ed., M. Smith, O. Natkovich, J. Parham || rmegginson0224@aol.com, olgan@yahoo-inc.com, mcs@pearlcrescent.com, jeffparh@microsoft.com +# RFC3929 || T. Hardie || hardie@qualcomm.com +# RFC3930 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC3931 || J. Lau, Ed., M. Townsley, Ed., I. Goyret, Ed. || jedlau@cisco.com, mark@townsley.net, igoyret@lucent.com +# RFC3932 || H. Alvestrand || harald@alvestrand.no +# RFC3933 || J. Klensin, S. Dawkins || john-ietf@jck.com, spencer@mcsr-labs.org +# RFC3934 || M. Wasserman || margaret@thingmagic.com +# RFC3935 || H. Alvestrand || harald@alvestrand.no +# RFC3936 || K. Kompella, J. Lang || kireeti@juniper.net, jplang@ieee.org +# RFC3937 || M. Steidl || mdirector@iptc.org +# RFC3938 || T. Hansen || tony+msgctxt@maillennium.att.com +# RFC3939 || G. Parsons, J. Maruszak || gparsons@nortelnetworks.com, jjmaruszak@sympatico.ca +# RFC3940 || B. Adamson, C. Bormann, M. Handley, J. Macker || adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil +# RFC3941 || B. Adamson, C. Bormann, M. Handley, J. Macker || adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil +# RFC3942 || B. Volz || volz@cisco.com +# RFC3943 || R. Friend || rfriend@hifn.com +# RFC3944 || T. Johnson, S. Okubo, S. Campos || Tyler_Johnson@unc.edu, sokubo@waseda.jp, simao.campos@itu.int +# RFC3945 || E. Mannie, Ed. || eric_mannie@hotmail.com +# RFC3946 || E. Mannie, D. Papadimitriou || eric_mannie@hotmail.com, dimitri.papadimitriou@alcatel.be +# RFC3947 || T. Kivinen, B. Swander, A. Huttunen, V. Volpe || kivinen@safenet-inc.com, Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com +# RFC3948 || A. Huttunen, B. Swander, V. Volpe, L. DiBurro, M. Stenberg || Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com, ldiburro@nortelnetworks.com, markus.stenberg@iki.fi +# RFC3949 || R. Buckley, D. Venable, L. McIntyre, G. Parsons, J. Rafferty || rbuckley@crt.xerox.com, dvenable@crt.xerox.com, lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com +# RFC3950 || L. McIntyre, G. Parsons, J. Rafferty || lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com +# RFC3951 || S. Andersen, A. Duric, H. Astrom, R. Hagen, W. Kleijn, J. Linden || sva@kom.auc.dk, alan.duric@telio.no, henrik.astrom@globalipsound.com, roar.hagen@globalipsound.com, bastiaan.kleijn@globalipsound.com, jan.linden@globalipsound.com +# RFC3952 || A. Duric, S. Andersen || alan.duric@telio.no, sva@kom.auc.dk +# RFC3953 || J. Peterson || jon.peterson@neustar.biz +# RFC3954 || B. Claise, Ed. || bclaise@cisco.com +# RFC3955 || S. Leinen || simon@switch.ch +# RFC3956 || P. Savola, B. Haberman || psavola@funet.fi, brian@innovationslab.net +# RFC3957 || C. Perkins, P. Calhoun || charles.perkins@nokia.com, pcalhoun@airespace.com +# RFC3958 || L. Daigle, A. Newton || leslie@thinkingcat.com, anewton@verisignlabs.com +# RFC3959 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC3960 || G. Camarillo, H. Schulzrinne || Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu +# RFC3961 || K. Raeburn || raeburn@mit.edu +# RFC3962 || K. Raeburn || raeburn@mit.edu +# RFC3963 || V. Devarapalli, R. Wakikawa, A. Petrescu, P. Thubert || vijay.devarapalli@nokia.com, ryuji@sfc.wide.ad.jp, Alexandru.Petrescu@motorola.com, pthubert@cisco.com +# RFC3964 || P. Savola, C. Patel || psavola@funet.fi, chirayu@chirayu.org +# RFC3965 || K. Toyoda, H. Ohno, J. Murai, D. Wing || toyoda.kiyoshi@jp.panasonic.com, hohno@ohnolab.org, jun@wide.ad.jp, dwing-ietf@fuggles.com +# RFC3966 || H. Schulzrinne || hgs@cs.columbia.edu +# RFC3967 || R. Bush, T. Narten || randy@psg.com, narten@us.ibm.com +# RFC3968 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC3969 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC3970 || K. Kompella || kireeti@juniper.net +# RFC3971 || J. Arkko, Ed., J. Kempf, B. Zill, P. Nikander || jari.arkko@ericsson.com, kempf@docomolabs-usa.com, bzill@microsoft.com, Pekka.Nikander@nomadiclab.com +# RFC3972 || T. Aura || tuomaura@microsoft.com +# RFC3973 || A. Adams, J. Nicholas, W. Siadak || ala@nexthop.com, jonathan.nicholas@itt.com, wfs@nexthop.com +# RFC3974 || M. Nakamura, J. Hagino || motonori@media.kyoto-u.ac.jp, itojun@iijlab.net +# RFC3975 || G. Huston, Ed., I. Leuca, Ed. || execd@iab.org, ileana.leuca@Cingular.com +# RFC3976 || V. K. Gurbani, F. Haerens, V. Rastogi || vkg@lucent.com, frans.haerens@alcatel.be, vidhi.rastogi@wipro.com +# RFC3977 || C. Feather || clive@davros.org +# RFC3978 || S. Bradner, Ed. || sob@harvard.edu +# RFC3979 || S. Bradner, Ed. || sob@harvard.edu +# RFC3980 || M. Krueger, M. Chadalapaka, R. Elliott || marjorie_krueger@hp.com, cbm@rose.hp.com, elliott@hp.com +# RFC3981 || A. Newton, M. Sanz || anewton@verisignlabs.com, sanz@denic.de +# RFC3982 || A. Newton, M. Sanz || anewton@verisignlabs.com, sanz@denic.de +# RFC3983 || A. Newton, M. Sanz || anewton@verisignlabs.com, sanz@denic.de +# RFC3984 || S. Wenger, M.M. Hannuksela, T. Stockhammer, M. Westerlund, D. Singer || stewe@stewe.org, miska.hannuksela@nokia.com, stockhammer@nomor.de, magnus.westerlund@ericsson.com, singer@apple.com +# RFC3985 || S. Bryant, Ed., P. Pate, Ed. || stbryant@cisco.com, prayson.pate@overturenetworks.com +# RFC3986 || T. Berners-Lee, R. Fielding, L. Masinter || timbl@w3.org, fielding@gbiv.com, LMM@acm.org +# RFC3987 || M. Duerst, M. Suignard || duerst@w3.org, michelsu@microsoft.com +# RFC3988 || B. Black, K. Kompella || ben@layer8.net, kireeti@juniper.net +# RFC3989 || M. Stiemerling, J. Quittek, T. Taylor || stiemerling@netlab.nec.de, quittek@netlab.nec.de, tom.taylor.stds@gmail.com +# RFC3990 || B. O'Hara, P. Calhoun, J. Kempf || bob@airespace.com, pcalhoun@airespace.com, kempf@docomolabs-usa.com +# RFC3991 || B. Foster, F. Andreasen || bfoster@cisco.com, fandreas@cisco.com +# RFC3992 || B. Foster, F. Andreasen || bfoster@cisco.com, fandreas@cisco.com +# RFC3993 || R. Johnson, T. Palaniappan, M. Stapp || raj@cisco.com, athenmoz@cisco.com, mjs@cisco.com +# RFC3994 || H. Schulzrinne || hgs@cs.columbia.edu +# RFC3995 || R. Herriot, T. Hastings || bob@herriot.com, tom.hastings@alum.mit.edu +# RFC3996 || R. Herriot, T. Hastings, H. Lewis || bob@herriot.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com +# RFC3997 || T. Hastings, Ed., R. K. deBry, H. Lewis || tom.hastings@alum.mit.edu, debryro@uvsc.edu, harryl@us.ibm.com +# RFC3998 || C. Kugler, H. Lewis, T. Hastings, Ed. || kugler@us.ibm.com, harryl@us.ibm.com, tom.hastings@alum.mit.edu +# RFC4001 || M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder || michael.daniele@syamsoftware.com, brian@innovationslab.net, shawn.routhier@windriver.com, j.schoenwaelder@iu-bremen.de +# RFC4002 || R. Brandner, L. Conroy, R. Stastny || rudolf.brandner@siemens.com, lwc@roke.co.uk, richard.stastny@oefeg.at +# RFC4003 || L. Berger || lberger@movaz.com +# RFC4004 || P. Calhoun, T. Johansson, C. Perkins, T. Hiller, Ed., P. McCann || pcalhoun@cisco.com, tony.johansson@bytemobile.com, Charles.Perkins@nokia.com, tomhiller@lucent.com, mccap@lucent.com +# RFC4005 || P. Calhoun, G. Zorn, D. Spence, D. Mitton || pcalhoun@cisco.com, gwz@cisco.com, dspence@computer.org, dmitton@circularnetworks.com +# RFC4006 || H. Hakala, L. Mattila, J-P. Koskinen, M. Stura, J. Loughney || Harri.Hakala@ericsson.com, Leena.Mattila@ericsson.com, juha-pekka.koskinen@nokia.com, marco.stura@nokia.com, John.Loughney@nokia.com +# RFC4007 || S. Deering, B. Haberman, T. Jinmei, E. Nordmark, B. Zill || none, brian@innovationslab.net, jinmei@isl.rdc.toshiba.co.jp, Erik.Nordmark@sun.com, bzill@microsoft.com +# RFC4008 || R. Rohit, P. Srisuresh, R. Raghunarayan, N. Pai, C. Wang || rrohit74@hotmail.com, srisuresh@yahoo.com, raraghun@cisco.com, npai@cisco.com, cliffwang2000@yahoo.com +# RFC4009 || J. Park, S. Lee, J. Kim, J. Lee || khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr +# RFC4010 || J. Park, S. Lee, J. Kim, J. Lee || khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr +# RFC4011 || S. Waldbusser, J. Saperia, T. Hongal || waldbusser@nextbeacon.com, saperia@jdscons.com, hongal@riverstonenet.com +# RFC4012 || L. Blunk, J. Damas, F. Parent, A. Robachevsky || ljb@merit.edu, Joao_Damas@isc.org, Florent.Parent@hexago.com, andrei@ripe.net +# RFC4013 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4014 || R. Droms, J. Schnizlein || rdroms@cisco.com, jschnizl@cisco.com +# RFC4015 || R. Ludwig, A. Gurtov || Reiner.Ludwig@ericsson.com, andrei.gurtov@cs.helsinki.fi +# RFC4016 || M. Parthasarathy || mohanp@sbcglobal.net +# RFC4017 || D. Stanley, J. Walker, B. Aboba || dstanley@agere.com, jesse.walker@intel.com, bernarda@microsoft.com +# RFC4018 || M. Bakke, J. Hufferd, K. Voruganti, M. Krueger, T. Sperry || mbakke@cisco.com, jlhufferd@comcast.net, kaladhar@us.ibm.com, marjorie_krueger@hp.com, todd_sperry@adaptec.com +# RFC4019 || G. Pelletier || ghyslain.pelletier@ericsson.com +# RFC4020 || K. Kompella, A. Zinin || kireeti@juniper.net, zinin@psg.com +# RFC4021 || G. Klyne, J. Palme || GK-IETF@ninebynine.org, jpalme@dsv.su.se +# RFC4022 || R. Raghunarayan, Ed. || raraghun@cisco.com +# RFC4023 || T. Worster, Y. Rekhter, E. Rosen, Ed. || tom.worster@motorola.com, yakov@juniper.net, erosen@cisco.com +# RFC4024 || G. Parsons, J. Maruszak || gparsons@nortel.com, jjmaruszak@sympatico.ca +# RFC4025 || M. Richardson || mcr@sandelman.ottawa.on.ca +# RFC4026 || L. Andersson, T. Madsen || loa@pi.se, tove.madsen@acreo.se +# RFC4027 || S. Josefsson || simon@josefsson.org +# RFC4028 || S. Donovan, J. Rosenberg || srd@cisco.com, jdrosen@cisco.com +# RFC4029 || M. Lind, V. Ksinant, S. Park, A. Baudot, P. Savola || mikael.lind@teliasonera.com, vladimir.ksinant@fr.thalesgroup.com, soohong.park@samsung.com, alain.baudot@francetelecom.com, psavola@funet.fi +# RFC4030 || M. Stapp, T. Lemon || mjs@cisco.com, Ted.Lemon@nominum.com +# RFC4031 || M. Carugi, Ed., D. McDysan, Ed. || marco.carugi@nortel.com, dave.mcdysan@mci.com +# RFC4032 || G. Camarillo, P. Kyzivat || Gonzalo.Camarillo@ericsson.com, pkyzivat@cisco.com +# RFC4033 || R. Arends, R. Austein, M. Larson, D. Massey, S. Rose || roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov +# RFC4034 || R. Arends, R. Austein, M. Larson, D. Massey, S. Rose || roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov +# RFC4035 || R. Arends, R. Austein, M. Larson, D. Massey, S. Rose || roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov +# RFC4036 || W. Sawyer || wsawyer@ieee.org +# RFC4037 || A. Rousskov || rousskov@measurement-factory.com +# RFC4038 || M-K. Shin, Ed., Y-G. Hong, J. Hagino, P. Savola, E. M. Castro || mshin@nist.gov, yghong@pec.etri.re.kr, itojun@iijlab.net, psavola@funet.fi, eva@gsyc.escet.urjc.es +# RFC4039 || S. Park, P. Kim, B. Volz || soohong.park@samsung.com, kimps@samsung.com, volz@cisco.com +# RFC4040 || R. Kreuter || ruediger.kreuter@siemens.com +# RFC4041 || A. Farrel || adrian@olddog.co.uk +# RFC4042 || M. Crispin || UTF9@Lingling.Panda.COM +# RFC4043 || D. Pinkas, T. Gindin || Denis.Pinkas@bull.net, tgindin@us.ibm.com +# RFC4044 || K. McCloghrie || kzm@cisco.com +# RFC4045 || G. Bourdon || gilles.bourdon@francetelecom.com +# RFC4046 || M. Baugher, R. Canetti, L. Dondeti, F. Lindholm || mbaugher@cisco.com, canetti@watson.ibm.com, ldondeti@qualcomm.com, fredrik.lindholm@ericsson.com +# RFC4047 || S. Allen, D. Wells || sla@ucolick.org, dwells@nrao.edu +# RFC4048 || B. Carpenter || brc@zurich.ibm.com +# RFC4049 || R. Housley || housley@vigilsec.com +# RFC4050 || S. Blake-Wilson, G. Karlinger, T. Kobayashi, Y. Wang || sblakewilson@bcisse.com, gregor.karlinger@cio.gv.at, kotetsu@isl.ntt.co.jp, yonwang@uncc.edu +# RFC4051 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC4052 || L. Daigle, Ed., Internet Architecture Board || iab@iab.org, iab@iab.org +# RFC4053 || S. Trowbridge, S. Bradner, F. Baker || sjtrowbridge@lucent.com, sob@harvard.edu, fred@cisco.com +# RFC4054 || J. Strand, Ed., A. Chiu, Ed. || jls@research.att.com, chiu@research.att.com +# RFC4055 || J. Schaad, B. Kaliski, R. Housley || jimsch@exmsft.com, bkaliski@rsasecurity.com, housley@vigilsec.com +# RFC4056 || J. Schaad || jimsch@exmsft.com +# RFC4057 || J. Bound, Ed. || jim.bound@hp.com +# RFC4058 || A. Yegin, Ed., Y. Ohba, R. Penno, G. Tsirtsis, C. Wang || alper.yegin@samsung.com, yohba@tari.toshiba.com, rpenno@juniper.net, G.Tsirtsis@Flarion.com, cliffwangmail@yahoo.com +# RFC4059 || D. Linsenbardt, S. Pontius, A. Sturgeon || dlinsenbardt@spyrus.com, spontius@spyrus.com, asturgeon@spyrus.com +# RFC4060 || Q. Xie, D. Pearce || qxie1@email.mot.com, bdp003@motorola.com +# RFC4061 || V. Manral, R. White, A. Shaikh || vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com +# RFC4062 || V. Manral, R. White, A. Shaikh || vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com +# RFC4063 || V. Manral, R. White, A. Shaikh || vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com +# RFC4064 || A. Patel, K. Leung || alpesh@cisco.com, kleung@cisco.com +# RFC4065 || J. Kempf || kempf@docomolabs-usa.com +# RFC4066 || M. Liebsch, Ed., A. Singh, Ed., H. Chaskar, D. Funato, E. Shim || marco.liebsch@netlab.nec.de, asingh1@email.mot.com, hemant.chaskar@airtightnetworks.net, funato@mlab.yrp.nttdocomo.co.jp, eunsoo@research.panasonic.com +# RFC4067 || J. Loughney, Ed., M. Nakhjiri, C. Perkins, R. Koodli || john.loughney@nokia.com, madjid.nakhjiri@motorola.com, charles.perkins@.nokia.com, rajeev.koodli@nokia.com +# RFC4068 || R. Koodli, Ed. || Rajeev.Koodli@nokia.com +# RFC4069 || M. Dodge, B. Ray || mbdodge@ieee.org, rray@pesa.com +# RFC4070 || M. Dodge, B. Ray || mbdodge@ieee.org, rray@pesa.com +# RFC4071 || R. Austein, Ed., B. Wijnen, Ed. || sra@isc.org, bwijnen@lucent.com +# RFC4072 || P. Eronen, Ed., T. Hiller, G. Zorn || pe@iki.fi, tomhiller@lucent.com, gwz@cisco.com +# RFC4073 || R. Housley || housley@vigilsec.com +# RFC4074 || Y. Morishita, T. Jinmei || yasuhiro@jprs.co.jp, jinmei@isl.rdc.toshiba.co.jp +# RFC4075 || V. Kalusivalingam || vibhaska@cisco.com +# RFC4076 || T. Chown, S. Venaas, A. Vijayabhaskar || tjc@ecs.soton.ac.uk, venaas@uninett.no, vibhaska@cisco.com +# RFC4077 || A.B. Roach || adam@estacado.net +# RFC4078 || N. Earnshaw, S. Aoki, A. Ashley, W. Kameyama || nigel.earnshaw@rd.bbc.co.uk, shig@center.jfn.co.jp, aashley@ndsuk.com, wataru@waseda.jp +# RFC4079 || J. Peterson || jon.peterson@neustar.biz +# RFC4080 || R. Hancock, G. Karagiannis, J. Loughney, S. Van den Bosch || robert.hancock@roke.co.uk, g.karagiannis@ewi.utwente.nl, john.loughney@nokia.com, sven.van_den_bosch@alcatel.be +# RFC4081 || H. Tschofenig, D. Kroeselberg || Hannes.Tschofenig@siemens.com, Dirk.Kroeselberg@siemens.com +# RFC4082 || A. Perrig, D. Song, R. Canetti, J. D. Tygar, B. Briscoe || perrig@cmu.edu, dawnsong@cmu.edu, canetti@watson.ibm.com, doug.tygar@gmail.com, bob.briscoe@bt.com +# RFC4083 || M. Garcia-Martin || miguel.an.garcia@nokia.com +# RFC4084 || J. Klensin || john-ietf@jck.com +# RFC4085 || D. Plonka || plonka@doit.wisc.edu +# RFC4086 || D. Eastlake 3rd, J. Schiller, S. Crocker || Donald.Eastlake@motorola.com, jis@mit.edu, steve@stevecrocker.com +# RFC4087 || D. Thaler || dthaler@microsoft.com +# RFC4088 || D. Black, K. McCloghrie, J. Schoenwaelder || black_david@emc.com, kzm@cisco.com, j.schoenwaelder@iu-bremen.de +# RFC4089 || S. Hollenbeck, Ed., IAB and IESG || sah@428cobrajet.net, none, none +# RFC4090 || P. Pan, Ed., G. Swallow, Ed., A. Atlas, Ed. || ppan@hammerheadsystems.com, swallow@cisco.com, aatlas@avici.com +# RFC4091 || G. Camarillo, J. Rosenberg || Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com +# RFC4092 || G. Camarillo, J. Rosenberg || Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com +# RFC4093 || F. Adrangi, Ed., H. Levkowetz, Ed. || farid.adrangi@intel.com, henrik@levkowetz.com +# RFC4094 || J. Manner, X. Fu || jmanner@cs.helsinki.fi, fu@cs.uni-goettingen.de +# RFC4095 || C. Malamud || carl@media.org +# RFC4096 || C. Malamud || carl@media.org +# RFC4097 || M. Barnes, Ed. || mary.barnes@nortel.com +# RFC4098 || H. Berkowitz, E. Davies, Ed., S. Hares, P. Krishnaswamy, M. Lepp || hcb@gettcomm.com, elwynd@dial.pipex.com, skh@nexthop.com, padma.krishnaswamy@saic.com, mlepp@lepp.com +# RFC4101 || E. Rescorla, IAB || ekr@rtfm.com, iab@iab.org +# RFC4102 || P. Jones || paulej@packetizer.com +# RFC4103 || G. Hellstrom, P. Jones || gunnar.hellstrom@omnitor.se, paulej@packetizer.com +# RFC4104 || M. Pana, Ed., A. Reyes, A. Barba, D. Moron, M. Brunner || mpana@metasolv.com, mreyes@ac.upc.edu, telabm@mat.upc.es, dmor4477@hotmail.com, brunner@netlab.nec.de +# RFC4105 || J.-L. Le Roux, Ed., J.-P. Vasseur, Ed., J. Boyle, Ed. || jeanlouis.leroux@francetelecom.com, jpv@cisco.com, jboyle@pdnets.com +# RFC4106 || J. Viega, D. McGrew || viega@securesoftware.com, mcgrew@cisco.com +# RFC4107 || S. Bellovin, R. Housley || bellovin@acm.org, housley@vigilsec.com +# RFC4108 || R. Housley || housley@vigilsec.com +# RFC4109 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4110 || R. Callon, M. Suzuki || rcallon@juniper.net, suzuki.muneyoshi@lab.ntt.co.jp +# RFC4111 || L. Fang, Ed. || luyuanfang@att.com +# RFC4112 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC4113 || B. Fenner, J. Flick || fenner@research.att.com, john.flick@hp.com +# RFC4114 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4115 || O. Aboul-Magd, S. Rabie || osama@nortel.com, rabie@nortel.com +# RFC4116 || J. Abley, K. Lindqvist, E. Davies, B. Black, V. Gill || jabley@isc.org, kurtis@kurtis.pp.se, elwynd@dial.pipex.com, ben@layer8.net, vgill@vijaygill.com +# RFC4117 || G. Camarillo, E. Burger, H. Schulzrinne, A. van Wijk || Gonzalo.Camarillo@ericsson.com, eburger@brooktrout.com, schulzrinne@cs.columbia.edu, a.vwijk@viataal.nl +# RFC4118 || L. Yang, P. Zerfos, E. Sadot || lily.l.yang@intel.com, pzerfos@cs.ucla.edu, esadot@avaya.com +# RFC4119 || J. Peterson || jon.peterson@neustar.biz +# RFC4120 || C. Neuman, T. Yu, S. Hartman, K. Raeburn || bcn@isi.edu, tlyu@mit.edu, hartmans-ietf@mit.edu, raeburn@mit.edu +# RFC4121 || L. Zhu, K. Jaganathan, S. Hartman || LZhu@microsoft.com, karthikj@microsoft.com, hartmans-ietf@mit.edu +# RFC4122 || P. Leach, M. Mealling, R. Salz || paulle@microsoft.com, michael@refactored-networks.com, rsalz@datapower.com +# RFC4123 || H. Schulzrinne, C. Agboh || hgs@cs.columbia.edu, charles.agboh@packetizer.com +# RFC4124 || F. Le Faucheur, Ed. || flefauch@cisco.com +# RFC4125 || F. Le Faucheur, W. Lai || flefauch@cisco.com, wlai@att.com +# RFC4126 || J. Ash || gash@att.com +# RFC4127 || F. Le Faucheur, Ed. || flefauch@cisco.com +# RFC4128 || W. Lai || wlai@att.com +# RFC4129 || R. Mukundan, K. Morneault, N. Mangalpally || ranjith.mukundan@wipro.com, kmorneau@cisco.com, narsim@nortelnetworks.com +# RFC4130 || D. Moberg, R. Drummond || dmoberg@cyclonecommerce.com, rvd2@drummondgroup.com +# RFC4131 || S. Green, K. Ozawa, E. Cardona, Ed., A. Katsnelson || rubbersoul3@yahoo.com, Kazuyoshi.Ozawa@toshiba.co.jp, katsnelson6@peoplepc.com, e.cardona@cablelabs.com +# RFC4132 || S. Moriai, A. Kato, M. Kanda || shiho@rd.scei.sony.co.jp, akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp +# RFC4133 || A. Bierman, K. McCloghrie || andy@yumaworks.com, kzm@cisco.com +# RFC4134 || P. Hoffman, Ed. || phoffman@imc.org +# RFC4135 || JH. Choi, G. Daley || jinchoe@samsung.com, greg.daley@eng.monash.edu.au +# RFC4136 || P. Pillay-Esnault || ppe@cisco.com +# RFC4137 || J. Vollbrecht, P. Eronen, N. Petroni, Y. Ohba || jrv@mtghouse.com, pe@iki.fi, npetroni@cs.umd.edu, yohba@tari.toshiba.com +# RFC4138 || P. Sarolahti, M. Kojo || pasi.sarolahti@nokia.com, kojo@cs.helsinki.fi +# RFC4139 || D. Papadimitriou, J. Drake, J. Ash, A. Farrel, L. Ong || dimitri.papadimitriou@alcatel.be, John.E.Drake2@boeing.com, gash@att.com, adrian@olddog.co.uk, lyong@ciena.com +# RFC4140 || H. Soliman, C. Castelluccia, K. El Malki, L. Bellier || h.soliman@flarion.com, claude.castelluccia@inria.fr, karim@elmalki.homeip.net, ludovic.bellier@inria.fr +# RFC4141 || K. Toyoda, D. Crocker || toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net +# RFC4142 || D. Crocker, G. Klyne || dcrocker@bbiw.net, GK-IETF@ninebynine.org +# RFC4143 || K. Toyoda, D. Crocker || toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net +# RFC4144 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC4145 || D. Yon, G. Camarillo || yon-comedia@rfdsoftware.com, Gonzalo.Camarillo@ericsson.com +# RFC4146 || R. Gellens || randy@qualcomm.com +# RFC4147 || G. Huston || gih@apnic.net +# RFC4148 || E. Stephan || emile.stephan@francetelecom.com +# RFC4149 || C. Kalbfleisch, R. Cole, D. Romascanu || ietf@kalbfleisch.us, robert.cole@jhuapl.edu, dromasca@gmail.com +# RFC4150 || R. Dietz, R. Cole || rdietz@hifn.com, robert.cole@jhuapl.edu +# RFC4151 || T. Kindberg, S. Hawke || timothy@hpl.hp.com, sandro@w3.org +# RFC4152 || K. Tesink, R. Fox || kaj@research.telcordia.com, rfox@telcordia.com +# RFC4153 || K. Fujimura, M. Terada, D. Eastlake 3rd || fujimura.ko@lab.ntt.co.jp, te@rex.yrp.nttdocomo.co.jp, Donald.Eastlake@motorola.com +# RFC4154 || M. Terada, K. Fujimura || te@rex.yrp.nttdocomo.co.jp, fujimura.ko@lab.ntt.co.jp +# RFC4155 || E. Hall || ehall@ntrg.com +# RFC4156 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4157 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4158 || M. Cooper, Y. Dzambasow, P. Hesse, S. Joseph, R. Nicholas || mcooper@orionsec.com, yuriy@anassoc.com, pmhesse@geminisecurity.com, susan.joseph@vdtg.com, richard.nicholas@it.baesystems.com +# RFC4159 || G. Huston || gih@apnic.net +# RFC4160 || K. Mimura, K. Yokoyama, T. Satoh, C. Kanaide, C. Allocchio || mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, icemilk77@yahoo.co.jp, Claudio.Allocchio@garr.it +# RFC4161 || K. Mimura, K. Yokoyama, T. Satoh, K. Watanabe, C. Kanaide || mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, knabe@ad.cyberhome.ne.jp, icemilk77@yahoo.co.jp +# RFC4162 || H.J. Lee, J.H. Yoon, J.I. Lee || jiinii@kisa.or.kr, jhyoon@kisa.or.kr, jilee@kisa.or.kr +# RFC4163 || L-E. Jonsson || lars-erik.jonsson@ericsson.com +# RFC4164 || G. Pelletier || ghyslain.pelletier@ericsson.com +# RFC4165 || T. George, B. Bidulock, R. Dantu, H. Schwarzbauer, K. Morneault || tgeorge_tx@verizon.net, bidulock@openss7.org, rdantu@unt.edu, HannsJuergen.Schwarzbauer@Siemens.com, kmorneau@cisco.com +# RFC4166 || L. Coene, J. Pastor-Balbas || lode.coene@siemens.com, J.Javier.Pastor@ericsson.com +# RFC4167 || A. Lindem || acee@cisco.com +# RFC4168 || J. Rosenberg, H. Schulzrinne, G. Camarillo || jdrosen@cisco.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com +# RFC4169 || V. Torvinen, J. Arkko, M. Naslund || vesa.torvinen@turkuamk.fi, jari.arkko@ericsson.com, mats.naslund@ericsson.com +# RFC4170 || B. Thompson, T. Koren, D. Wing || brucet@cisco.com, tmima@cisco.com, dwing-ietf@fuggles.com +# RFC4171 || J. Tseng, K. Gibbons, F. Travostino, C. Du Laney, J. Souza || joshtseng@yahoo.com, kevin.gibbons@mcdata.com, travos@nortel.com, cdl@rincon.com, joes@exmsft.com +# RFC4172 || C. Monia, R. Mullendore, F. Travostino, W. Jeong, M. Edwards || charles_monia@yahoo.com, Rod.Mullendore@MCDATA.com, travos@nortel.com, wayland@TroikaNetworks.com, mark_edwards@adaptec.com +# RFC4173 || P. Sarkar, D. Missimer, C. Sapuntzakis || psarkar@almaden.ibm.com, duncan.missimer@ieee.org, csapuntz@alum.mit.edu +# RFC4174 || C. Monia, J. Tseng, K. Gibbons || charles_monia@yahoo.com, joshtseng@yahoo.com, kevin.gibbons@mcdata.com +# RFC4175 || L. Gharai, C. Perkins || ladan@isi.edu, csp@csperkins.org +# RFC4176 || Y. El Mghazli, Ed., T. Nadeau, M. Boucadair, K. Chan, A. Gonguet || yacine.el_mghazli@alcatel.fr, tnadeau@cisco.com, mohamed.boucadair@francetelecom.com, khchan@nortel.com, arnaud.gonguet@alcatel.fr +# RFC4177 || G. Huston || gih@apnic.net +# RFC4178 || L. Zhu, P. Leach, K. Jaganathan, W. Ingersoll || lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com, wyllys.ingersoll@sun.com +# RFC4179 || S. Kang || sukang@nca.or.kr +# RFC4180 || Y. Shafranovich || ietf@shaftek.org +# RFC4181 || C. Heard, Ed. || heard@pobox.com +# RFC4182 || E. Rosen || erosen@cisco.com +# RFC4183 || E. Warnicke || eaw@cisco.com +# RFC4184 || B. Link, T. Hager, J. Flaks || bdl@dolby.com, thh@dolby.com, jasonfl@microsoft.com +# RFC4185 || J. Klensin || john-ietf@jck.com +# RFC4186 || H. Haverinen, Ed., J. Salowey, Ed. || henry.haverinen@nokia.com, jsalowey@cisco.com +# RFC4187 || J. Arkko, H. Haverinen || jari.Arkko@ericsson.com, henry.haverinen@nokia.com +# RFC4188 || K. Norseth, Ed., E. Bell, Ed. || kenyon.c.norseth@L-3com.com, elbell@ntlworld.com +# RFC4189 || K. Ono, S. Tachimoto || ono.kumiko@lab.ntt.co.jp, kumiko@cs.columbia.edu, tachimoto.shinya@lab.ntt.co.jp +# RFC4190 || K. Carlberg, I. Brown, C. Beard || k.carlberg@cs.ucl.ac.uk, I.Brown@cs.ucl.ac.uk, BeardC@umkc.edu +# RFC4191 || R. Draves, D. Thaler || richdr@microsoft.com, dthaler@microsoft.com +# RFC4192 || F. Baker, E. Lear, R. Droms || fred@cisco.com, lear@cisco.com, rdroms@cisco.com +# RFC4193 || R. Hinden, B. Haberman || bob.hinden@gmail.com, brian@innovationslab.net +# RFC4194 || J. Strombergson, L. Walleij, P. Faltstrom || Joachim.Strombergson@InformAsic.com, triad@df.lth.se, paf@cisco.com +# RFC4195 || W. Kameyama || wataru@waseda.jp +# RFC4196 || H.J. Lee, J.H. Yoon, S.L. Lee, J.I. Lee || jiinii@kisa.or.kr, jhyoon@kisa.or.kr, sllee@kisa.or.kr, jilee@kisa.or.kr +# RFC4197 || M. Riegel, Ed. || maximilian.riegel@siemens.com +# RFC4198 || D. Tessman || dtessman@zelestra.com +# RFC4201 || K. Kompella, Y. Rekhter, L. Berger || kireeti@juniper.net, yakov@juniper.net, lberger@movaz.com +# RFC4202 || K. Kompella, Ed., Y. Rekhter, Ed. || kireeti@juniper.net, yakov@juniper.net +# RFC4203 || K. Kompella, Ed., Y. Rekhter, Ed. || kireeti@juniper.net, yakov@juniper.net +# RFC4204 || J. Lang, Ed. || jplang@ieee.org +# RFC4205 || K. Kompella, Ed., Y. Rekhter, Ed. || kireeti@juniper.net, yakov@juniper.net +# RFC4206 || K. Kompella, Y. Rekhter || kireeti@juniper.net, yakov@juniper.net +# RFC4207 || J. Lang, D. Papadimitriou || jplang@ieee.org, dimitri.papadimitriou@alcatel.be +# RFC4208 || G. Swallow, J. Drake, H. Ishimatsu, Y. Rekhter || swallow@cisco.com, John.E.Drake2@boeing.com, hirokazu.ishimatsu@g1m.jp, yakov@juniper.net +# RFC4209 || A. Fredette, Ed., J. Lang, Ed. || Afredette@HatterasNetworks.com, jplang@ieee.org +# RFC4210 || C. Adams, S. Farrell, T. Kause, T. Mononen || cadams@site.uottawa.ca, stephen.farrell@cs.tcd.ie, toka@ssh.com, tmononen@safenet-inc.com +# RFC4211 || J. Schaad || jimsch@exmsft.com +# RFC4212 || M. Blinov, C. Adams || mikblinov@online.ie, cadams@site.uottawa.ca +# RFC4213 || E. Nordmark, R. Gilligan || erik.nordmark@sun.com, bob.gilligan@acm.org +# RFC4214 || F. Templin, T. Gleeson, M. Talwar, D. Thaler || fltemplin@acm.org, tgleeson@cisco.com, mohitt@microsoft.com, dthaler@microsoft.com +# RFC4215 || J. Wiljakka, Ed. || juha.wiljakka@nokia.com +# RFC4216 || R. Zhang, Ed., J.-P. Vasseur, Ed. || raymond_zhang@infonet.com, jpv@cisco.com +# RFC4217 || P. Ford-Hutchinson || rfc4217@ford-hutchinson.com +# RFC4218 || E. Nordmark, T. Li || erik.nordmark@sun.com, Tony.Li@tony.li +# RFC4219 || E. Lear || lear@cisco.com +# RFC4220 || M. Dubuc, T. Nadeau, J. Lang || mdubuc@ncf.ca, tnadeau@cisco.com, jplang@ieee.org +# RFC4221 || T. Nadeau, C. Srinivasan, A. Farrel || tnadeau@cisco.com, cheenu@bloomberg.net, adrian@olddog.co.uk +# RFC4222 || G. Choudhury, Ed. || gchoudhury@att.com +# RFC4223 || P. Savola || psavola@funet.fi +# RFC4224 || G. Pelletier, L-E. Jonsson, K. Sandlund || ghyslain.pelletier@ericsson.com, lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com +# RFC4225 || P. Nikander, J. Arkko, T. Aura, G. Montenegro, E. Nordmark || pekka.nikander@nomadiclab.com, jari.arkko@ericsson.com, Tuomaura@microsoft.com, gabriel_montenegro_2000@yahoo.com, erik.nordmark@sun.com +# RFC4226 || D. M'Raihi, M. Bellare, F. Hoornaert, D. Naccache, O. Ranen || davidietf@gmail.com, mihir@cs.ucsd.edu, frh@vasco.com, david.naccache@gemplus.com, Ohad.Ranen@ealaddin.com +# RFC4227 || E. O'Tuathail, M. Rose || eamon.otuathail@clipcode.com, mrose17@gmail.com +# RFC4228 || A. Rousskov || rousskov@measurement-factory.com +# RFC4229 || M. Nottingham, J. Mogul || mnot@pobox.com, JeffMogul@acm.org +# RFC4230 || H. Tschofenig, R. Graveman || Hannes.Tschofenig@siemens.com, rfg@acm.org +# RFC4231 || M. Nystrom || magnus@rsasecurity.com +# RFC4233 || K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom || kmorneau@cisco.com, mkalla@telcordia.com, selvam@trideaworks.com, greg@signatustechnologies.com +# RFC4234 || D. Crocker, Ed., P. Overell || dcrocker@bbiw.net, paul@bayleaf.org.uk +# RFC4235 || J. Rosenberg, H. Schulzrinne, R. Mahy, Ed. || jdrosen@cisco.com, schulzrinne@cs.columbia.edu, rohan@ekabal.com +# RFC4236 || A. Rousskov, M. Stecher || rousskov@measurement-factory.com, martin.stecher@webwasher.com +# RFC4237 || G. Vaudreuil || GregV@ieee.org +# RFC4238 || G. Vaudreuil || GregV@ieee.org +# RFC4239 || S. McRae, G. Parsons || stuart.mcrae@uk.ibm.com, gparsons@nortel.com +# RFC4240 || E. Burger, Ed., J. Van Dyke, A. Spitzer || eburger@brooktrout.com, jvandyke@brooktrout.com, woof@brooktrout.com +# RFC4241 || Y. Shirasaki, S. Miyakawa, T. Yamasaki, A. Takenouchi || yasuhiro@nttv6.jp, miyakawa@nttv6.jp, t.yamasaki@ntt.com, takenouchi.ayako@lab.ntt.co.jp +# RFC4242 || S. Venaas, T. Chown, B. Volz || venaas@uninett.no, tjc@ecs.soton.ac.uk, volz@cisco.com +# RFC4243 || M. Stapp, R. Johnson, T. Palaniappan || mjs@cisco.com, raj@cisco.com, athenmoz@cisco.com +# RFC4244 || M. Barnes, Ed. || mary.barnes@nortel.com +# RFC4245 || O. Levin, R. Even || oritl@microsoft.com, roni.even@polycom.co.il +# RFC4246 || M. Dolan || md.1@newtbt.com +# RFC4247 || J. Ash, B. Goode, J. Hand, R. Zhang || gash@att.com, bgoode@att.com, jameshand@att.com, raymond.zhang@bt.infonet.com +# RFC4248 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4249 || B. Lilly || blilly@erols.com +# RFC4250 || S. Lehtinen, C. Lonvick, Ed. || sjl@ssh.com, clonvick@cisco.com +# RFC4251 || T. Ylonen, C. Lonvick, Ed. || ylo@ssh.com, clonvick@cisco.com +# RFC4252 || T. Ylonen, C. Lonvick, Ed. || ylo@ssh.com, clonvick@cisco.com +# RFC4253 || T. Ylonen, C. Lonvick, Ed. || ylo@ssh.com, clonvick@cisco.com +# RFC4254 || T. Ylonen, C. Lonvick, Ed. || ylo@ssh.com, clonvick@cisco.com +# RFC4255 || J. Schlyter, W. Griffin || jakob@openssh.com, wgriffin@sparta.com +# RFC4256 || F. Cusack, M. Forssen || frank@savecore.net, maf@appgate.com +# RFC4257 || G. Bernstein, E. Mannie, V. Sharma, E. Gray || gregb@grotto-networking.com, eric.mannie@perceval.net, v.sharma@ieee.org, Eric.Gray@Marconi.com +# RFC4258 || D. Brungard, Ed. || dbrungard@att.com +# RFC4259 || M.-J. Montpetit, G. Fairhurst, H. Clausen, B. Collini-Nocker, H. Linder || mmontpetit@motorola.com, gorry@erg.abdn.ac.uk, h.d.clausen@ieee.org, bnocker@cosy.sbg.ac.at, hlinder@cosy.sbg.ac.at +# RFC4260 || P. McCann || mccap@lucent.com +# RFC4261 || J. Walker, A. Kulkarni, Ed. || jesse.walker@intel.com, amol.kulkarni@intel.com +# RFC4262 || S. Santesson || stefans@microsoft.com +# RFC4263 || B. Lilly || blilly@erols.com +# RFC4264 || T. Griffin, G. Huston || Timothy.Griffin@cl.cam.ac.uk, gih@apnic.net +# RFC4265 || B. Schliesser, T. Nadeau || bensons@savvis.net, tnadeau@cisco.com +# RFC4266 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4267 || M. Froumentin || mf@w3.org +# RFC4268 || S. Chisholm, D. Perkins || schishol@nortel.com, dperkins@snmpinfo.com +# RFC4269 || H.J. Lee, S.J. Lee, J.H. Yoon, D.H. Cheon, J.I. Lee || jiinii@kisa.or.kr, sjlee@kisa.or.kr, jhyoon@kisa.or.kr, dhcheon@mmaa.or.kr, jilee@kisa.or.kr +# RFC4270 || P. Hoffman, B. Schneier || paul.hoffman@vpnc.org, schneier@counterpane.com +# RFC4271 || Y. Rekhter, Ed., T. Li, Ed., S. Hares, Ed. || yakov@juniper.net, tony.li@tony.li, skh@nexthop.com +# RFC4272 || S. Murphy || Sandy@tislabs.com +# RFC4273 || J. Haas, Ed., S. Hares, Ed. || jhaas@nexthop.com, skh@nexthop.com +# RFC4274 || D. Meyer, K. Patel || dmm@1-4-5.net, keyupate@cisco.com +# RFC4275 || S. Hares, D. Hares || skh@nexthop.com, dhares@hickoryhill-consulting.com +# RFC4276 || S. Hares, A. Retana || skh@nexthop.com, aretana@cisco.com +# RFC4277 || D. McPherson, K. Patel || danny@arbor.net, keyupate@cisco.com +# RFC4278 || S. Bellovin, A. Zinin || bellovin@acm.org, zinin@psg.com +# RFC4279 || P. Eronen, Ed., H. Tschofenig, Ed. || pe@iki.fi, Hannes.Tschofenig@siemens.com +# RFC4280 || K. Chowdhury, P. Yegani, L. Madour || kchowdhury@starentnetworks.com, pyegani@cisco.com, Lila.Madour@ericsson.com +# RFC4281 || R. Gellens, D. Singer, P. Frojdh || randy@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com +# RFC4282 || B. Aboba, M. Beadles, J. Arkko, P. Eronen || bernarda@microsoft.com, mbeadles@endforce.com, jari.arkko@ericsson.com, pe@iki.fi +# RFC4283 || A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury || alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com +# RFC4284 || F. Adrangi, V. Lortz, F. Bari, P. Eronen || farid.adrangi@intel.com, victor.lortz@intel.com, farooq.bari@cingular.com, pe@iki.fi +# RFC4285 || A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury || alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com +# RFC4286 || B. Haberman, J. Martin || brian@innovationslab.net, jim@netzwert.ag +# RFC4287 || M. Nottingham, Ed., R. Sayre, Ed. || mnot@pobox.com, rfsayre@boswijck.com +# RFC4288 || N. Freed, J. Klensin || ned.freed@mrochek.com, klensin+ietf@jck.com +# RFC4289 || N. Freed, J. Klensin || ned.freed@mrochek.com, klensin+ietf@jck.com +# RFC4290 || J. Klensin || john-ietf@jck.com +# RFC4291 || R. Hinden, S. Deering || bob.hinden@gmail.com +# RFC4292 || B. Haberman || brian@innovationslab.net +# RFC4293 || S. Routhier, Ed. || sar@iwl.com +# RFC4294 || J. Loughney, Ed. || john.loughney@nokia.com +# RFC4295 || G. Keeni, K. Koide, K. Nagami, S. Gundavelli || glenn@cysols.com, koide@shiratori.riec.tohoku.ac.jp, nagami@inetcore.com, sgundave@cisco.com +# RFC4296 || S. Bailey, T. Talpey || steph@sandburst.com, thomas.talpey@netapp.com +# RFC4297 || A. Romanow, J. Mogul, T. Talpey, S. Bailey || allyn@cisco.com, JeffMogul@acm.org, thomas.talpey@netapp.com, steph@sandburst.com +# RFC4298 || J.-H. Chen, W. Lee, J. Thyssen || rchen@broadcom.com, wlee@broadcom.com, jthyssen@broadcom.com +# RFC4301 || S. Kent, K. Seo || kent@bbn.com, kseo@bbn.com +# RFC4302 || S. Kent || kent@bbn.com +# RFC4303 || S. Kent || kent@bbn.com +# RFC4304 || S. Kent || kent@bbn.com +# RFC4305 || D. Eastlake 3rd || Donald.Eastlake@Motorola.com +# RFC4306 || C. Kaufman, Ed. || charliek@microsoft.com +# RFC4307 || J. Schiller || jis@mit.edu +# RFC4308 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4309 || R. Housley || housley@vigilsec.com +# RFC4310 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4311 || R. Hinden, D. Thaler || bob.hinden@gmail.com, dthaler@microsoft.com +# RFC4312 || A. Kato, S. Moriai, M. Kanda || akato@po.ntts.co.jp, shiho@rd.scei.sony.co.jp, kanda@isl.ntt.co.jp +# RFC4313 || D. Oran || oran@cisco.com +# RFC4314 || A. Melnikov || alexey.melnikov@isode.com +# RFC4315 || M. Crispin || MRC@CAC.Washington.EDU +# RFC4316 || J. Reschke || julian.reschke@greenbytes.de +# RFC4317 || A. Johnston, R. Sparks || ajohnston@tello.com, rjsparks@estacado.net +# RFC4318 || D. Levi, D. Harrington || dlevi@nortel.com, ietfdbh@comcast.net +# RFC4319 || C. Sikes, B. Ray, R. Abbi || csikes@zhone.com, rray@pesa.com, Rajesh.Abbi@alcatel.com +# RFC4320 || R. Sparks || rjsparks@estacado.net +# RFC4321 || R. Sparks || rjsparks@estacado.net +# RFC4322 || M. Richardson, D.H. Redelmeier || mcr@sandelman.ottawa.on.ca, hugh@mimosa.com +# RFC4323 || M. Patrick, W. Murwin || michael.patrick@motorola.com, w.murwin@motorola.com +# RFC4324 || D. Royer, G. Babics, S. Mansour || Doug@IntelliCal.com, george.babics@oracle.com, smansour@ebay.com +# RFC4325 || S. Santesson, R. Housley || stefans@microsoft.com, housley@vigilsec.com +# RFC4326 || G. Fairhurst, B. Collini-Nocker || gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at +# RFC4327 || M. Dubuc, T. Nadeau, J. Lang, E. McGinnis || dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com +# RFC4328 || D. Papadimitriou, Ed. || dimitri.papadimitriou@alcatel.be +# RFC4329 || B. Hoehrmann || bjoern@hoehrmann.de +# RFC4330 || D. Mills || mills@udel.edu +# RFC4331 || B. Korver, L. Dusseault || briank@networkresonance.com, lisa.dusseault@gmail.com +# RFC4332 || K. Leung, A. Patel, G. Tsirtsis, E. Klovning || kleung@cisco.com, alpesh@cisco.com, g.tsirtsis@flarion.com, espen@birdstep.com +# RFC4333 || G. Huston, Ed., B. Wijnen, Ed. || gih@apnic.net, bwijnen@lucent.com +# RFC4334 || R. Housley, T. Moore || housley@vigilsec.com, timmoore@microsoft.com +# RFC4335 || J. Galbraith, P. Remaker || galb-list@vandyke.com, remaker@cisco.com +# RFC4336 || S. Floyd, M. Handley, E. Kohler || floyd@icir.org, M.Handley@cs.ucl.ac.uk, kohler@cs.ucla.edu +# RFC4337 || Y Lim, D. Singer || young@netntv.co.kr, singer@apple.com +# RFC4338 || C. DeSanti, C. Carlson, R. Nixon || cds@cisco.com, craig.carlson@qlogic.com, bob.nixon@emulex.com +# RFC4339 || J. Jeong, Ed. || jjeong@cs.umn.edu +# RFC4340 || E. Kohler, M. Handley, S. Floyd || kohler@cs.ucla.edu, M.Handley@cs.ucl.ac.uk, floyd@icir.org +# RFC4341 || S. Floyd, E. Kohler || floyd@icir.org, kohler@cs.ucla.edu +# RFC4342 || S. Floyd, E. Kohler, J. Padhye || floyd@icir.org, kohler@cs.ucla.edu, padhye@microsoft.com +# RFC4343 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC4344 || M. Bellare, T. Kohno, C. Namprempre || mihir@cs.ucsd.edu, tkohno@cs.ucsd.edu, meaw@alum.mit.edu +# RFC4345 || B. Harris || bjh21@bjh21.me.uk +# RFC4346 || T. Dierks, E. Rescorla || tim@dierks.org, ekr@rtfm.com +# RFC4347 || E. Rescorla, N. Modadugu || ekr@rtfm.com, nagendra@cs.stanford.edu +# RFC4348 || S. Ahmadi || sassan.ahmadi@ieee.org +# RFC4349 || C. Pignataro, M. Townsley || cpignata@cisco.com, mark@townsley.net +# RFC4350 || F. Hendrikx, C. Wallis || ferry.hendrikx@ssc.govt.nz, colin.wallis@ssc.govt.nz +# RFC4351 || G. Hellstrom, P. Jones || gunnar.hellstrom@omnitor.se, paulej@packetizer.com +# RFC4352 || J. Sjoberg, M. Westerlund, A. Lakaniemi, S. Wenger || Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Stephan.Wenger@nokia.com +# RFC4353 || J. Rosenberg || jdrosen@cisco.com +# RFC4354 || M. Garcia-Martin || miguel.an.garcia@nokia.com +# RFC4355 || R. Brandner, L. Conroy, R. Stastny || rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at +# RFC4356 || R. Gellens || randy@qualcomm.com +# RFC4357 || V. Popov, I. Kurepkin, S. Leontiev || vpopov@cryptopro.ru, kure@cryptopro.ru, lse@cryptopro.ru +# RFC4358 || D. Smith || dwight.smith@motorola.com +# RFC4359 || B. Weis || bew@cisco.com +# RFC4360 || S. Sangli, D. Tappan, Y. Rekhter || rsrihari@cisco.com, tappan@cisco.com, yakov@juniper.net +# RFC4361 || T. Lemon, B. Sommerfeld || mellon@nominum.com, sommerfeld@sun.com +# RFC4362 || L-E. Jonsson, G. Pelletier, K. Sandlund || lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com +# RFC4363 || D. Levi, D. Harrington || dlevi@nortel.com, ietfdbh@comcast.net +# RFC4364 || E. Rosen, Y. Rekhter || erosen@cisco.com, yakov@juniper.net +# RFC4365 || E. Rosen || erosen@cisco.com +# RFC4366 || S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright || sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@blueyonder.co.uk, janm@transactionware.com, timothy.wright@vodafone.com +# RFC4367 || J. Rosenberg, Ed., IAB || jdrosen@cisco.com +# RFC4368 || T. Nadeau, S. Hegde || tnadeau@cisco.com, subrah@cisco.com +# RFC4369 || K. Gibbons, C. Monia, J. Tseng, F. Travostino || kevin.gibbons@mcdata.com, charles_monia@yahoo.com, joshtseng@yahoo.com, travos@nortel.com +# RFC4370 || R. Weltman || robw@worldspot.com +# RFC4371 || B. Carpenter, Ed., L. Lynch, Ed. || brc@zurich.ibm.com, llynch@darkwing.uoregon.edu +# RFC4372 || F. Adrangi, A. Lior, J. Korhonen, J. Loughney || farid.adrangi@intel.com, avi@bridgewatersystems.com, jouni.korhonen@teliasonera.com, john.loughney@nokia.com +# RFC4373 || R. Harrison, J. Sermersheim, Y. Dong || rharrison@novell.com, jimse@novell.com, yulindong@gmail.com +# RFC4374 || G. McCobb || mccobb@us.ibm.com +# RFC4375 || K. Carlberg || carlberg@g11.org.uk +# RFC4376 || P. Koskelainen, J. Ott, H. Schulzrinne, X. Wu || petri.koskelainen@nokia.com, jo@netlab.hut.fi, hgs@cs.columbia.edu, xiaotaow@cs.columbia.edu +# RFC4377 || T. Nadeau, M. Morrow, G. Swallow, D. Allan, S. Matsushima || tnadeau@cisco.com, mmorrow@cisco.com, swallow@cisco.com, dallan@nortel.com, satoru@ft.solteria.net +# RFC4378 || D. Allan, Ed., T. Nadeau, Ed. || dallan@nortel.com, tnadeau@cisco.com +# RFC4379 || K. Kompella, G. Swallow || kireeti@juniper.net, swallow@cisco.com +# RFC4380 || C. Huitema || huitema@microsoft.com +# RFC4381 || M. Behringer || mbehring@cisco.com +# RFC4382 || T. Nadeau, Ed., H. van der Linde, Ed. || tnadeau@cisco.com, havander@cisco.com +# RFC4383 || M. Baugher, E. Carrara || mbaugher@cisco.com, carrara@kth.se +# RFC4384 || D. Meyer || dmm@1-4-5.net +# RFC4385 || S. Bryant, G. Swallow, L. Martini, D. McPherson || stbryant@cisco.com, swallow@cisco.com, lmartini@cisco.com, danny@arbor.net +# RFC4386 || S. Boeyen, P. Hallam-Baker || sharon.boeyen@entrust.com, pbaker@VeriSign.com +# RFC4387 || P. Gutmann, Ed. || pgut001@cs.auckland.ac.nz +# RFC4388 || R. Woundy, K. Kinnear || richard_woundy@cable.comcast.com, kkinnear@cisco.com +# RFC4389 || D. Thaler, M. Talwar, C. Patel || dthaler@microsoft.com, mohitt@microsoft.com, chirayu@chirayu.org +# RFC4390 || V. Kashyap || vivk@us.ibm.com +# RFC4391 || J. Chu, V. Kashyap || jerry.chu@sun.com, vivk@us.ibm.com +# RFC4392 || V. Kashyap || vivk@us.ibm.com +# RFC4393 || H. Garudadri || hgarudadri@qualcomm.com +# RFC4394 || D. Fedyk, O. Aboul-Magd, D. Brungard, J. Lang, D. Papadimitriou || dwfedyk@nortel.com, osama@nortel.com, dbrungard@att.com, jplang@ieee.org, dimitri.papadimitriou@alcatel.be +# RFC4395 || T. Hansen, T. Hardie, L. Masinter || tony+urireg@maillennium.att.com, hardie@qualcomm.com, LMM@acm.org +# RFC4396 || J. Rey, Y. Matsui || jose.rey@eu.panasonic.com, matsui.yoshinori@jp.panasonic.com +# RFC4397 || I. Bryskin, A. Farrel || i_bryskin@yahoo.com, adrian@olddog.co.uk +# RFC4398 || S. Josefsson || simon@josefsson.org +# RFC4401 || N. Williams || Nicolas.Williams@sun.com +# RFC4402 || N. Williams || Nicolas.Williams@sun.com +# RFC4403 || B. Bergeson, K. Boogert, V. Nanjundaswamy || bruce.bergeson@novell.com, kent.boogert@novell.com, vijay.nanjundaswamy@oracle.com +# RFC4404 || R. Natarajan, A. Rijhsinghani || anil@charter.net, r.natarajan@f5.com +# RFC4405 || E. Allman, H. Katz || eric@sendmail.com, hkatz@microsoft.com +# RFC4406 || J. Lyon, M. Wong || jimlyon@microsoft.com, mengwong@dumbo.pobox.com +# RFC4407 || J. Lyon || jimlyon@microsoft.com +# RFC4408 || M. Wong, W. Schlitt || mengwong+spf@pobox.com, wayne@schlitt.net +# RFC4409 || R. Gellens, J. Klensin || g+ietf@qualcomm.com, john+ietf@jck.com +# RFC4410 || M. Pullen, F. Zhao, D. Cohen || mpullen@gmu.edu, fzhao@netlab.gmu.edu, danny.cohen@sun.com +# RFC4411 || J. Polk || jmpolk@cisco.com +# RFC4412 || H. Schulzrinne, J. Polk || hgs@cs.columbia.edu, jmpolk@cisco.com +# RFC4413 || M. West, S. McCann || mark.a.west@roke.co.uk, stephen.mccann@roke.co.uk +# RFC4414 || A. Newton || andy@hxr.us +# RFC4415 || R. Brandner, L. Conroy, R. Stastny || rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at +# RFC4416 || J. Wong, Ed. || j.k.wong@sympatico.ca +# RFC4417 || P. Resnick, Ed., P. Saint-Andre, Ed. || presnick@qti.qualcomm.com, ietf@stpeter.im +# RFC4418 || T. Krovetz, Ed. || tdk@acm.org +# RFC4419 || M. Friedl, N. Provos, W. Simpson || markus@openbsd.org, provos@citi.umich.edu, wsimpson@greendragon.com +# RFC4420 || A. Farrel, Ed., D. Papadimitriou, J.-P. Vasseur, A. Ayyangar || adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net +# RFC4421 || C. Perkins || csp@csperkins.org +# RFC4422 || A. Melnikov, Ed., K. Zeilenga, Ed. || Alexey.Melnikov@isode.com, Kurt@OpenLDAP.org +# RFC4423 || R. Moskowitz, P. Nikander || rgm@icsalabs.com, pekka.nikander@nomadiclab.com +# RFC4424 || S. Ahmadi || sassan.ahmadi@ieee.org +# RFC4425 || A. Klemets || Anders.Klemets@microsoft.com +# RFC4426 || J. Lang, Ed., B. Rajagopalan, Ed., D. Papadimitriou, Ed. || jplang@ieee.org, balar@microsoft.com, dimitri.papadimitriou@alcatel.be +# RFC4427 || E. Mannie, Ed., D. Papadimitriou, Ed. || eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be +# RFC4428 || D. Papadimitriou, Ed., E. Mannie, Ed. || dimitri.papadimitriou@alcatel.be, eric.mannie@perceval.net +# RFC4429 || N. Moore || sharkey@zoic.org +# RFC4430 || S. Sakane, K. Kamada, M. Thomas, J. Vilhuber || Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, mat@cisco.com, vilhuber@cisco.com +# RFC4431 || M. Andrews, S. Weiler || Mark_Andrews@isc.org, weiler@tislabs.com +# RFC4432 || B. Harris || bjh21@bjh21.me.uk +# RFC4433 || M. Kulkarni, A. Patel, K. Leung || mkulkarn@cisco.com, alpesh@cisco.com, kleung@cisco.com +# RFC4434 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4435 || Y. Nomura, R. Walsh, J-P. Luoma, H. Asaeda, H. Schulzrinne || nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, asaeda@wide.ad.jp, schulzrinne@cs.columbia.edu +# RFC4436 || B. Aboba, J. Carlson, S. Cheshire || bernarda@microsoft.com, james.d.carlson@sun.com, rfc@stuartcheshire.org +# RFC4437 || J. Whitehead, G. Clemm, J. Reschke, Ed. || ejw@cse.ucsc.edu, julian.reschke@greenbytes.degeoffrey.clemm@us.ibm.com, +# RFC4438 || C. DeSanti, V. Gaonkar, H.K. Vivek, K. McCloghrie, S. Gai || cds@cisco.com, vgaonkar@cisco.com, hvivek@cisco.com, kzm@cisco.com, none +# RFC4439 || C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai || cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none +# RFC4440 || S. Floyd, Ed., V. Paxson, Ed., A. Falk, Ed., IAB || floyd@acm.org, vern@icir.org, falk@isi.edu +# RFC4441 || B. Aboba, Ed. || bernarda@microsoft.com +# RFC4442 || S. Fries, H. Tschofenig || steffen.fries@siemens.com, Hannes.Tschofenig@siemens.com +# RFC4443 || A. Conta, S. Deering, M. Gupta, Ed. || aconta@txc.com, none, mukesh.gupta@tropos.com +# RFC4444 || J. Parker, Ed. || jeffp@middlebury.edu +# RFC4445 || J. Welch, J. Clark || Jim.Welch@ineoquest.com, jiclark@cisco.com +# RFC4446 || L. Martini || lmartini@cisco.com +# RFC4447 || L. Martini, Ed., E. Rosen, N. El-Aawar, T. Smith, G. Heron || lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com, tob@netapp.com +# RFC4448 || L. Martini, Ed., E. Rosen, N. El-Aawar, G. Heron || lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com +# RFC4449 || C. Perkins || charles.perkins@nokia.com +# RFC4450 || E. Lear, H. Alvestrand || lear@cisco.com, harald@alvestrand.no +# RFC4451 || D. McPherson, V. Gill || danny@arbor.net, VijayGill9@aol.com +# RFC4452 || H. Van de Sompel, T. Hammond, E. Neylon, S. Weibel || herbertv@lanl.gov, t.hammond@nature.com, eneylon@manifestsolutions.com, weibel@oclc.org +# RFC4453 || J. Rosenberg, G. Camarillo, Ed., D. Willis || jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com +# RFC4454 || S. Singh, M. Townsley, C. Pignataro || sanjeevs@cisco.com, mark@townsley.net, cpignata@cisco.com +# RFC4455 || M. Hallak-Stamler, M. Bakke, Y. Lederman, M. Krueger, K. McCloghrie || michele@sanrad.com, mbakke@cisco.com, yaronled@bezeqint.net, marjorie_krueger@hp.com, kzm@cisco.com +# RFC4456 || T. Bates, E. Chen, R. Chandra || tbates@cisco.com, enkechen@cisco.com, rchandra@sonoasystems.com +# RFC4457 || G. Camarillo, G. Blanco || Gonzalo.Camarillo@ericsson.com, german.blanco@ericsson.com +# RFC4458 || C. Jennings, F. Audet, J. Elwell || fluffy@cisco.com, audet@nortel.com, john.elwell@siemens.com +# RFC4459 || P. Savola || psavola@funet.fi +# RFC4460 || R. Stewart, I. Arias-Rodriguez, K. Poon, A. Caro, M. Tuexen || randall@lakerest.net, ivan.arias-rodriguez@nokia.com, kacheong.poon@sun.com, acaro@bbn.com, tuexen@fh-muenster.de +# RFC4461 || S. Yasukawa, Ed. || yasukawa.seisho@lab.ntt.co.jp +# RFC4462 || J. Hutzelman, J. Salowey, J. Galbraith, V. Welch || jhutz+@cmu.edu, jsalowey@cisco.com, galb@vandyke.com, welch@mcs.anl.gov +# RFC4463 || S. Shanmugham, P. Monaco, B. Eberman || sarvi@cisco.com, peter.monaco@nuasis.com, brian.eberman@speechworks.com +# RFC4464 || A. Surtees, M. West || abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk +# RFC4465 || A. Surtees, M. West || abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk +# RFC4466 || A. Melnikov, C. Daboo || Alexey.Melnikov@isode.com, cyrus@daboo.name +# RFC4467 || M. Crispin || MRC@CAC.Washington.EDU +# RFC4468 || C. Newman || chris.newman@sun.com +# RFC4469 || P. Resnick || presnick@qti.qualcomm.com +# RFC4470 || S. Weiler, J. Ihren || weiler@tislabs.com, johani@autonomica.se +# RFC4471 || G. Sisson, B. Laurie || geoff@nominet.org.uk, ben@algroup.co.uk +# RFC4472 || A. Durand, J. Ihren, P. Savola || Alain_Durand@cable.comcast.com, johani@autonomica.se, psavola@funet.fi +# RFC4473 || Y. Nomura, R. Walsh, J-P. Luoma, J. Ott, H. Schulzrinne || nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, jo@netlab.tkk.fi, schulzrinne@cs.columbia.edu +# RFC4474 || J. Peterson, C. Jennings || jon.peterson@neustar.biz, fluffy@cisco.com +# RFC4475 || R. Sparks, Ed., A. Hawrylyshen, A. Johnston, J. Rosenberg, H. Schulzrinne || RjS@estacado.net, ahawrylyshen@ditechnetworks.com, alan@sipstation.com, jdrosen@cisco.com, hgs@cs.columbia.edu +# RFC4476 || C. Francis, D. Pinkas || Chris_S_Francis@Raytheon.com, Denis.Pinkas@bull.net +# RFC4477 || T. Chown, S. Venaas, C. Strauf || tjc@ecs.soton.ac.uk, venaas@uninett.no, strauf@rz.tu-clausthal.de +# RFC4478 || Y. Nir || ynir@checkpoint.com +# RFC4479 || J. Rosenberg || jdrosen@cisco.com +# RFC4480 || H. Schulzrinne, V. Gurbani, P. Kyzivat, J. Rosenberg || hgs+simple@cs.columbia.edu, vkg@lucent.com, pkyzivat@cisco.com, jdrosen@cisco.com +# RFC4481 || H. Schulzrinne || hgs+simple@cs.columbia.edu +# RFC4482 || H. Schulzrinne || hgs+simple@cs.columbia.edu +# RFC4483 || E. Burger, Ed. || eburger@cantata.com +# RFC4484 || J. Peterson, J. Polk, D. Sicker, H. Tschofenig || jon.peterson@neustar.biz, jmpolk@cisco.com, douglas.sicker@colorado.edu, Hannes.Tschofenig@siemens.com +# RFC4485 || J. Rosenberg, H. Schulzrinne || jdrosen@cisco.com, schulzrinne@cs.columbia.edu +# RFC4486 || E. Chen, V. Gillet || enkechen@cisco.com, vgi@opentransit.net +# RFC4487 || F. Le, S. Faccin, B. Patil, H. Tschofenig || franckle@cmu.edu, sfaccinstd@gmail.com, Basavaraj.Patil@nokia.com, Hannes.Tschofenig@siemens.com +# RFC4488 || O. Levin || oritl@microsoft.com +# RFC4489 || J-S. Park, M-K. Shin, H-J. Kim || pjs@etri.re.kr, myungki.shin@gmail.com, khj@etri.re.kr +# RFC4490 || S. Leontiev, Ed., G. Chudov, Ed. || lse@cryptopro.ru, chudov@cryptopro.ru +# RFC4491 || S. Leontiev, Ed., D. Shefanovski, Ed. || lse@cryptopro.ru, dbs@mts.ru +# RFC4492 || S. Blake-Wilson, N. Bolyard, V. Gupta, C. Hawk, B. Moeller || sblakewilson@safenet-inc.com, nelson@bolyard.com, vipul.gupta@sun.com, chris@corriente.net, bodo@openssl.org +# RFC4493 || JH. Song, R. Poovendran, J. Lee, T. Iwata || songlee@ee.washington.edu, radha@ee.washington.edu, icheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp +# RFC4494 || JH. Song, R. Poovendran, J. Lee || songlee@ee.washington.edu, radha@ee.washington.edu, jicheol.lee@samsung.com +# RFC4495 || J. Polk, S. Dhesikan || jmpolk@cisco.com, sdhesika@cisco.com +# RFC4496 || M. Stecher, A. Barbir || martin.stecher@webwasher.com, abbieb@nortel.com +# RFC4497 || J. Elwell, F. Derks, P. Mourot, O. Rousseau || john.elwell@siemens.com, frank.derks@nec-philips.com, Patrick.Mourot@alcatel.fr, Olivier.Rousseau@alcatel.fr +# RFC4498 || G. Keeni || glenn@cysols.com +# RFC4501 || S. Josefsson || simon@josefsson.org +# RFC4502 || S. Waldbusser || waldbusser@nextbeacon.com +# RFC4503 || M. Boesgaard, M. Vesterager, E. Zenner || mab@cryptico.com, mvp@cryptico.com, ez@cryptico.com +# RFC4504 || H. Sinnreich, Ed., S. Lass, C. Stredicke || henry@pulver.com, steven.lass@verizonbusiness.com, cs@snom.de +# RFC4505 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4506 || M. Eisler, Ed. || email2mre-rfc4506@yahoo.com +# RFC4507 || J. Salowey, H. Zhou, P. Eronen, H. Tschofenig || jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@siemens.com +# RFC4508 || O. Levin, A. Johnston || oritl@microsoft.com, ajohnston@ipstation.com +# RFC4509 || W. Hardaker || hardaker@tislabs.com +# RFC4510 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC4511 || J. Sermersheim, Ed. || jimse@novell.com +# RFC4512 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC4513 || R. Harrison, Ed. || roger_harrison@novell.com +# RFC4514 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC4515 || M. Smith, Ed., T. Howes || mcs@pearlcrescent.com, howes@opsware.com +# RFC4516 || M. Smith, Ed., T. Howes || mcs@pearlcrescent.com, howes@opsware.com +# RFC4517 || S. Legg, Ed. || steven.legg@eb2bcom.com +# RFC4518 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4519 || A. Sciberras, Ed. || andrew.sciberras@eb2bcom.com +# RFC4520 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4521 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4522 || S. Legg || steven.legg@eb2bcom.com +# RFC4523 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4524 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC4525 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4526 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4527 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4528 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4529 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4530 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4531 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4532 || K. Zeilenga || Kurt@OpenLDAP.org +# RFC4533 || K. Zeilenga, J.H. Choi || Kurt@OpenLDAP.org, jongchoi@us.ibm.com +# RFC4534 || A Colegrove, H Harney || acc@sparta.com, hh@sparta.com +# RFC4535 || H. Harney, U. Meth, A. Colegrove, G. Gross || hh@sparta.com, umeth@sparta.com, acc@sparta.com, gmgross@identaware.com +# RFC4536 || P. Hoschka || ph@w3.org +# RFC4537 || L. Zhu, P. Leach, K. Jaganathan || lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com +# RFC4538 || J. Rosenberg || jdrosen@cisco.com +# RFC4539 || T. Edwards || tedwards@pbs.org +# RFC4540 || M. Stiemerling, J. Quittek, C. Cadar || stiemerling@netlab.nec.de, quittek@netlab.nec.de, ccadar2@yahoo.com +# RFC4541 || M. Christensen, K. Kimball, F. Solensky || mjc@tt.dk, karen.kimball@hp.com, frank.solensky@calix.com +# RFC4542 || F. Baker, J. Polk || fred@cisco.com, jmpolk@cisco.com +# RFC4543 || D. McGrew, J. Viega || mcgrew@cisco.com, viega@list.org +# RFC4544 || M. Bakke, M. Krueger, T. McSweeney, J. Muchow || mbakke@cisco.com, marjorie_krueger@hp.com, tommcs@us.ibm.com, james.muchow@qlogic.com +# RFC4545 || M. Bakke, J. Muchow || mbakke@cisco.com, james.muchow@qlogic.com +# RFC4546 || D. Raftus, E. Cardona || david.raftus@ati.com, e.cardona@cablelabs.com +# RFC4547 || A. Ahmad, G. Nakanishi || azlina@cisco.com, gnakanishi@motorola.com +# RFC4548 || E. Gray, J. Rutemiller, G. Swallow || Eric.Gray@Marconi.com, John.Rutemiller@Marconi.com, swallow@cisco.com +# RFC4549 || A. Melnikov, Ed. || alexey.melnikov@isode.com +# RFC4550 || S. Maes, A. Melnikov || stephane.maes@oracle.com, Alexey.melnikov@isode.com +# RFC4551 || A. Melnikov, S. Hole || Alexey.Melnikov@isode.com, Steve.Hole@messagingdirect.com +# RFC4552 || M. Gupta, N. Melam || mukesh.gupta@tropos.com, nmelam@juniper.net +# RFC4553 || A. Vainshtein, Ed., YJ. Stein, Ed. || sasha@axerra.com, yaakov_s@rad.com +# RFC4554 || T. Chown || tjc@ecs.soton.ac.uk +# RFC4555 || P. Eronen || pe@iki.fi +# RFC4556 || L. Zhu, B. Tung || lzhu@microsoft.com, brian@aero.org +# RFC4557 || L. Zhu, K. Jaganathan, N. Williams || lzhu@microsoft.com, karthikj@microsoft.com, Nicolas.Williams@sun.com +# RFC4558 || Z. Ali, R. Rahman, D. Prairie, D. Papadimitriou || zali@cisco.com, rrahman@cisco.com, dprairie@cisco.com, dimitri.papadimitriou@alcatel.be +# RFC4559 || K. Jaganathan, L. Zhu, J. Brezak || karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com +# RFC4560 || J. Quittek, Ed., K. White, Ed. || quittek@netlab.nec.de, wkenneth@us.ibm.com +# RFC4561 || J.-P. Vasseur, Ed., Z. Ali, S. Sivabalan || jpv@cisco.com, zali@cisco.com, msiva@cisco.com +# RFC4562 || T. Melsen, S. Blake || Torben.Melsen@ericsson.com, steven.blake@ericsson.com +# RFC4563 || E. Carrara, V. Lehtovirta, K. Norrman || carrara@kth.se, vesa.lehtovirta@ericsson.com, karl.norrman@ericsson.com +# RFC4564 || S. Govindan, Ed., H. Cheng, ZH. Yao, WH. Zhou, L. Yang || saravanan.govindan@sg.panasonic.com, hong.cheng@sg.panasonic.com, yaoth@huawei.com, zhouwenhui@chinamobile.com, lily.l.yang@intel.com +# RFC4565 || D. Loher, D. Nelson, O. Volinsky, B. Sarikaya || dplore@gmail.com, dnelson@enterasys.com, ovolinsky@colubris.com, sarikaya@ieee.org +# RFC4566 || M. Handley, V. Jacobson, C. Perkins || M.Handley@cs.ucl.ac.uk, van@packetdesign.com, csp@csperkins.org +# RFC4567 || J. Arkko, F. Lindholm, M. Naslund, K. Norrman, E. Carrara || jari.arkko@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com, carrara@kth.se +# RFC4568 || F. Andreasen, M. Baugher, D. Wing || fandreas@cisco.com, mbaugher@cisco.com, dwing-ietf@fuggles.com +# RFC4569 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC4570 || B. Quinn, R. Finlayson || rcq@boxnarrow.com, finlayson@live555.com +# RFC4571 || J. Lazzaro || lazzaro@cs.berkeley.edu +# RFC4572 || J. Lennox || lennox@cs.columbia.edu +# RFC4573 || R. Even, A. Lochbaum || roni.even@polycom.co.il, alochbaum@polycom.com +# RFC4574 || O. Levin, G. Camarillo || oritl@microsoft.com, Gonzalo.Camarillo@ericsson.com +# RFC4575 || J. Rosenberg, H. Schulzrinne, O. Levin, Ed. || jdrosen@cisco.com, schulzrinne@cs.columbia.edu, oritl@microsoft.com +# RFC4576 || E. Rosen, P. Psenak, P. Pillay-Esnault || erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com +# RFC4577 || E. Rosen, P. Psenak, P. Pillay-Esnault || erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com +# RFC4578 || M. Johnston, S. Venaas, Ed. || michael.johnston@intel.com, venaas@uninett.no +# RFC4579 || A. Johnston, O. Levin || alan@sipstation.com, oritl@microsoft.com +# RFC4580 || B. Volz || volz@cisco.com +# RFC4581 || M. Bagnulo, J. Arkko || marcelo@it.uc3m.es, jari.arkko@ericsson.com +# RFC4582 || G. Camarillo, J. Ott, K. Drage || Gonzalo.Camarillo@ericsson.com, jo@netlab.hut.fi, drage@lucent.com +# RFC4583 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC4584 || S. Chakrabarti, E. Nordmark || samitac2@gmail.com, erik.nordmark@sun.com +# RFC4585 || J. Ott, S. Wenger, N. Sato, C. Burmeister, J. Rey || jo@acm.org, stewe@stewe.org, sato652@oki.com, carsten.burmeister@eu.panasonic.com, jose.rey@eu.panasonic.com +# RFC4586 || C. Burmeister, R. Hakenberg, A. Miyazaki, J. Ott, N. Sato, S. Fukunaga || carsten.burmeister@eu.panasonic.com, rolf.hakenberg@eu.panasonic.com, miyazaki.akihiro@jp.panasonic.com, jo@acm.org, sato652@oki.com, fukunaga444@oki.com +# RFC4587 || R. Even || roni.even@polycom.co.il +# RFC4588 || J. Rey, D. Leon, A. Miyazaki, V. Varsa, R. Hakenberg || jose.rey@eu.panasonic.com, davidleon123@yahoo.com, miyazaki.akihiro@jp.panasonic.com, viktor.varsa@nokia.com, rolf.hakenberg@eu.panasonic.com +# RFC4589 || H. Schulzrinne, H. Tschofenig || schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com +# RFC4590 || B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck || baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com +# RFC4591 || M. Townsley, G. Wilkie, S. Booth, S. Bryant, J. Lau || mark@townsley.net, gwilkie@cisco.com, jebooth@cisco.com, stbryant@cisco.com, jedlau@gmail.com +# RFC4592 || E. Lewis || ed.lewis@neustar.biz +# RFC4593 || A. Barbir, S. Murphy, Y. Yang || abbieb@nortel.com, sandy@sparta.com, yiya@cisco.com +# RFC4594 || J. Babiarz, K. Chan, F. Baker || babiarz@nortel.com, khchan@nortel.com, fred@cisco.com +# RFC4595 || F. Maino, D. Black || fmaino@cisco.com, black_david@emc.com +# RFC4596 || J. Rosenberg, P. Kyzivat || jdrosen@cisco.com, pkyzivat@cisco.com +# RFC4597 || R. Even, N. Ismail || roni.even@polycom.co.il, nismail@cisco.com +# RFC4598 || B. Link || bdl@dolby.com +# RFC4601 || B. Fenner, M. Handley, H. Holbrook, I. Kouvelas || fenner@research.att.com, M.Handley@cs.ucl.ac.uk, holbrook@arastra.com, kouvelas@cisco.com +# RFC4602 || T. Pusateri || pusateri@juniper.net +# RFC4603 || G. Zorn, G. Weber, R. Foltak || gwz@cisco.com, gdweber@cisco.com, rfoltak@cisco.com +# RFC4604 || H. Holbrook, B. Cain, B. Haberman || holbrook@cisco.com, bcain99@gmail.com, brian@innovationslab.net +# RFC4605 || B. Fenner, H. He, B. Haberman, H. Sandick || fenner@research.att.com, haixiang@nortelnetworks.com, brian@innovationslab.net, sandick@nc.rr.com +# RFC4606 || E. Mannie, D. Papadimitriou || eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be +# RFC4607 || H. Holbrook, B. Cain || holbrook@arastra.com, bcain99@gmail.com +# RFC4608 || D. Meyer, R. Rockell, G. Shepherd || dmm@1-4-5.net, rrockell@sprint.net, gjshep@gmail.com +# RFC4609 || P. Savola, R. Lehtonen, D. Meyer || psavola@funet.fi, rami.lehtonen@teliasonera.com, dmm@1-4-5.net +# RFC4610 || D. Farinacci, Y. Cai || dino@cisco.com, ycai@cisco.com +# RFC4611 || M. McBride, J. Meylor, D. Meyer || mcbride@cisco.com, jmeylor@cisco.com, dmm@1-4-5.net +# RFC4612 || P. Jones, H. Tamura || paulej@packetizer.com, tamura@cs.ricoh.co.jp +# RFC4613 || P. Frojdh, U. Lindgren, M. Westerlund || per.frojdh@ericsson.com, ulf.a.lindgren@ericsson.com, magnus.westerlund@ericsson.com +# RFC4614 || M. Duke, R. Braden, W. Eddy, E. Blanton || martin.duke@boeing.com, braden@isi.edu, weddy@grc.nasa.gov, eblanton@cs.purdue.edu +# RFC4615 || J. Song, R. Poovendran, J. Lee, T. Iwata || junhyuk.song@gmail.com, radha@ee.washington.edu, jicheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp +# RFC4616 || K. Zeilenga, Ed. || Kurt@OpenLDAP.org +# RFC4617 || J. Kornijenko || j.kornienko@abcsoftware.lv +# RFC4618 || L. Martini, E. Rosen, G. Heron, A. Malis || lmartini@cisco.com, erosen@cisco.com, giles.heron@tellabs.com, Andy.Malis@tellabs.com +# RFC4619 || L. Martini, Ed., C. Kawa, Ed., A. Malis, Ed. || lmartini@cisco.com, claude.kawa@oz.com, Andy.Malis@tellabs.com +# RFC4620 || M. Crawford, B. Haberman, Ed. || crawdad@fnal.gov, brian@innovationslab.net +# RFC4621 || T. Kivinen, H. Tschofenig || kivinen@safenet-inc.com, Hannes.Tschofenig@siemens.com +# RFC4622 || P. Saint-Andre || ietf@stpeter.im +# RFC4623 || A. Malis, M. Townsley || Andy.Malis@tellabs.com, mark@townsley.net +# RFC4624 || B. Fenner, D. Thaler || fenner@research.att.com, dthaler@microsoft.com +# RFC4625 || C. DeSanti, K. McCloghrie, S. Kode, S. Gai || cds@cisco.com, srinikode@yahoo.com, kzm@cisco.com, none +# RFC4626 || C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai || cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none +# RFC4627 || D. Crockford || douglas@crockford.com +# RFC4628 || R. Even || roni.even@polycom.co.il +# RFC4629 || J. Ott, C. Bormann, G. Sullivan, S. Wenger, R. Even, Ed. || jo@netlab.tkk.fi, cabo@tzi.org, garysull@microsoft.com, stewe@stewe.org, roni.even@polycom.co.il +# RFC4630 || R. Housley, S. Santesson || housley@vigilsec.com, stefans@microsoft.com +# RFC4631 || M. Dubuc, T. Nadeau, J. Lang, E. McGinnis, A. Farrel || dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com, adrian@olddog.co.uk +# RFC4632 || V. Fuller, T. Li || vaf@cisco.com, tli@tropos.com +# RFC4633 || S. Hartman || hartmans-ietf@mit.edu +# RFC4634 || D. Eastlake 3rd, T. Hansen || donald.eastlake@motorola.com, tony+shs@maillennium.att.com +# RFC4635 || D. Eastlake 3rd || Donald.Eastlake@motorola.com +# RFC4636 || C. Perkins || charles.perkins@nokia.com +# RFC4637 || || +# RFC4638 || P. Arberg, D. Kourkouzelis, M. Duckett, T. Anschutz, J. Moisand || parberg@redback.com, diamondk@redback.com, mike.duckett@bellsouth.com, tom.anschutz@bellsouth.com, jmoisand@juniper.net +# RFC4639 || R. Woundy, K. Marez || richard_woundy@cable.comcast.com, kevin.marez@motorola.com +# RFC4640 || A. Patel, Ed., G. Giaretta, Ed. || alpesh@cisco.com, gerardo.giaretta@telecomitalia.it +# RFC4641 || O. Kolkman, R. Gieben || olaf@nlnetlabs.nl, miek@miek.nl +# RFC4642 || K. Murchison, J. Vinocur, C. Newman || murch@andrew.cmu.edu, vinocur@cs.cornell.edu, Chris.Newman@sun.com +# RFC4643 || J. Vinocur, K. Murchison || vinocur@cs.cornell.edu, murch@andrew.cmu.edu +# RFC4644 || J. Vinocur, K. Murchison || vinocur@cs.cornell.edu, murch@andrew.cmu.edu +# RFC4645 || D. Ewell || dewell@adelphia.net +# RFC4646 || A. Phillips, M. Davis || addison@inter-locale.com, mark.davis@macchiato.com +# RFC4647 || A. Phillips, M. Davis || addison@inter-locale.com, mark.davis@macchiato.com +# RFC4648 || S. Josefsson || simon@josefsson.org +# RFC4649 || B. Volz || volz@cisco.com +# RFC4650 || M. Euchner || martin_euchner@hotmail.com +# RFC4651 || C. Vogt, J. Arkko || chvogt@tm.uka.de, jari.arkko@ericsson.com +# RFC4652 || D. Papadimitriou, Ed., L.Ong, J. Sadler, S. Shew, D. Ward || dimitri.papadimitriou@alcatel.be, lyong@ciena.com, jonathan.sadler@tellabs.com, sdshew@nortel.com, dward@cisco.com +# RFC4653 || S. Bhandarkar, A. L. N. Reddy, M. Allman, E. Blanton || sumitha@tamu.edu, reddy@ee.tamu.edu, mallman@icir.org, eblanton@cs.purdue.edu +# RFC4654 || J. Widmer, M. Handley || widmer@acm.org, m.handley@cs.ucl.ac.uk +# RFC4655 || A. Farrel, J.-P. Vasseur, J. Ash || adrian@olddog.co.uk, jpv@cisco.com, gash@att.com +# RFC4656 || S. Shalunov, B. Teitelbaum, A. Karp, J. Boote, M. Zekauskas || shalunov@internet2.edu, ben@internet2.edu, akarp@cs.wisc.edu, boote@internet2.edu, matt@internet2.edu +# RFC4657 || J. Ash, Ed., J.L. Le Roux, Ed. || gash@att.com, jeanlouis.leroux@orange-ft.com +# RFC4659 || J. De Clercq, D. Ooms, M. Carugi, F. Le Faucheur || jeremy.de_clercq@alcatel.be, dirk@onesparrow.com, marco.carugi@nortel.com, flefauch@cisco.com +# RFC4660 || H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena || hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com +# RFC4661 || H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena || hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com +# RFC4662 || A. B. Roach, B. Campbell, J. Rosenberg || adam@estacado.net, ben@estacado.net, jdrosen@cisco.com +# RFC4663 || D. Harrington || dbharrington@comcast.net +# RFC4664 || L. Andersson, Ed., E. Rosen, Ed. || loa@pi.se, erosen@cisco.com +# RFC4665 || W. Augustyn, Ed., Y. Serbest, Ed. || waldemar@wdmsys.com, yetik_serbest@labs.att.com +# RFC4666 || K. Morneault, Ed., J. Pastor-Balbas, Ed. || kmorneau@cisco.com, j.javier.pastor@ericsson.com +# RFC4667 || W. Luo || luo@cisco.com +# RFC4668 || D. Nelson || dnelson@enterasys.com +# RFC4669 || D. Nelson || dnelson@enterasys.com +# RFC4670 || D. Nelson || dnelson@enterasys.com +# RFC4671 || D. Nelson || dnelson@enterasys.com +# RFC4672 || S. De Cnodder, N. Jonnala, M. Chiba || stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com +# RFC4673 || S. De Cnodder, N. Jonnala, M. Chiba || stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com +# RFC4674 || J.L. Le Roux, Ed. || jeanlouis.leroux@francetelecom.com +# RFC4675 || P. Congdon, M. Sanchez, B. Aboba || paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com +# RFC4676 || H. Schulzrinne || hgs+geopriv@cs.columbia.edu +# RFC4677 || P. Hoffman, S. Harris || paul.hoffman@vpnc.org, srh@umich.edu +# RFC4678 || A. Bivens || jbivens@us.ibm.com +# RFC4679 || V. Mammoliti, G. Zorn, P. Arberg, R. Rennison || vince@cisco.com, gwz@cisco.com, parberg@redback.com, robert.rennison@ecitele.com +# RFC4680 || S. Santesson || stefans@microsoft.com +# RFC4681 || S. Santesson, A. Medvinsky, J. Ball || stefans@microsoft.com, arimed@microsoft.com, joshball@microsoft.com +# RFC4682 || E. Nechamkin, J-F. Mule || enechamkin@broadcom.com, jf.mule@cablelabs.com +# RFC4683 || J. Park, J. Lee, H.. Lee, S. Park, T. Polk || khopri@kisa.or.kr, jilee@kisa.or.kr, hslee@kisa.or.kr, sjpark@bcqre.com, tim.polk@nist.gov +# RFC4684 || P. Marques, R. Bonica, L. Fang, L. Martini, R. Raszuk, K. Patel, J. Guichard || roque@juniper.net, rbonica@juniper.net, luyuanfang@att.com, lmartini@cisco.com, rraszuk@cisco.com, keyupate@cisco.com, jguichar@cisco.com +# RFC4685 || J. Snell || jasnell@gmail.com +# RFC4686 || J. Fenton || fenton@bluepopcorn.net +# RFC4687 || S. Yasukawa, A. Farrel, D. King, T. Nadeau || s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, daniel.king@aria-networks.com, tnadeau@cisco.com +# RFC4688 || S. Rushing || srushing@inmedius.com +# RFC4689 || S. Poretsky, J. Perser, S. Erramilli, S. Khurana || sporetsky@reefpoint.com, jerry@perser.org, shobha@research.telcordia.com, skhurana@motorola.com +# RFC4690 || J. Klensin, P. Faltstrom, C. Karp, IAB || john-ietf@jck.com, paf@cisco.com, ck@nic.museum, iab@iab.org +# RFC4691 || L. Andersson, Ed. || loa@pi.se +# RFC4692 || G. Huston || gih@apnic.net +# RFC4693 || H. Alvestrand || harald@alvestrand.no +# RFC4694 || J. Yu || james.yu@neustar.biz +# RFC4695 || J. Lazzaro, J. Wawrzynek || lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu +# RFC4696 || J. Lazzaro, J. Wawrzynek || lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu +# RFC4697 || M. Larson, P. Barber || mlarson@verisign.com, pbarber@verisign.com +# RFC4698 || E. Gunduz, A. Newton, S. Kerr || e.gunduz@computer.org, andy@hxr.us, shane@time-travellers.org +# RFC4701 || M. Stapp, T. Lemon, A. Gustafsson || mjs@cisco.com, mellon@nominum.com, gson@araneus.fi +# RFC4702 || M. Stapp, B. Volz, Y. Rekhter || mjs@cisco.com, volz@cisco.com, yakov@juniper.net +# RFC4703 || M. Stapp, B. Volz || mjs@cisco.com, volz@cisco.com +# RFC4704 || B. Volz || volz@cisco.com +# RFC4705 || R. Housley, A. Corry || housley@vigilsec.com, publications@gigabeam.com +# RFC4706 || M. Morgenstern, M. Dodge, S. Baillie, U. Bonollo || moti.Morgenstern@ecitele.com, mbdodge@ieee.org, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au +# RFC4707 || P. Grau, V. Heinau, H. Schlichting, R. Schuettler || nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de +# RFC4708 || A. Miller || ak.miller@auckland.ac.nz +# RFC4709 || J. Reschke || julian.reschke@greenbytes.de +# RFC4710 || A. Siddiqui, D. Romascanu, E. Golovinsky || anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net +# RFC4711 || A. Siddiqui, D. Romascanu, E. Golovinsky || anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net +# RFC4712 || A. Siddiqui, D. Romascanu, E. Golovinsky, M. Rahman,Y. Kim || anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net, none, ybkim@broadcom.com +# RFC4713 || X. Lee, W. Mao, E. Chen, N. Hsu, J. Klensin || lee@cnnic.cn, mao@cnnic.cn, erin@twnic.net.tw, snw@twnic.net.tw, john+ietf@jck.com +# RFC4714 || A. Mankin, S. Hayes || mankin@psg.com, stephen.hayes@ericsson.com +# RFC4715 || M. Munakata, S. Schubert, T. Ohba || munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp +# RFC4716 || J. Galbraith, R. Thayer || galb@vandyke.com, rodney@canola-jones.com +# RFC4717 || L. Martini, J. Jayakumar, M. Bocci, N. El-Aawar, J. Brayley, G. Koleyni || lmartini@cisco.com, jjayakum@cisco.com, matthew.bocci@alcatel.co.uk, nna@level3.net, jeremy.brayley@ecitele.com, ghassem@nortelnetworks.com +# RFC4718 || P. Eronen, P. Hoffman || pe@iki.fi, paul.hoffman@vpnc.org +# RFC4719 || R. Aggarwal, Ed., M. Townsley, Ed., M. Dos Santos, Ed. || rahul@juniper.net, mark@townsley.net, mariados@cisco.com +# RFC4720 || A. Malis, D. Allan, N. Del Regno || Andy.Malis@tellabs.com, dallan@nortelnetworks.com, nick.delregno@mci.com +# RFC4721 || C. Perkins, P. Calhoun, J. Bharatia || charles.perkins@nokia.com, pcalhoun@cisco.com, jayshree@nortel.com +# RFC4722 || J. Van Dyke, E. Burger, Ed., A. Spitzer || jvandyke@cantata.com, eburger@cantata.com, woof@pingtel.com +# RFC4723 || T. Kosonen, T. White || timo.kosonen@nokia.com, twhite@midi.org +# RFC4724 || S. Sangli, E. Chen, R. Fernando, J. Scudder, Y. Rekhter || rsrihari@cisco.com, enkechen@cisco.com, rex@juniper.net, jgs@juniper.net, yakov@juniper.net +# RFC4725 || A. Mayrhofer, B. Hoeneisen || alexander.mayrhofer@enum.at, b.hoeneisen@ieee.org +# RFC4726 || A. Farrel, J.-P. Vasseur, A. Ayyangar || adrian@olddog.co.uk, jpv@cisco.com, arthi@nuovasystems.com +# RFC4727 || B. Fenner || fenner@research.att.com +# RFC4728 || D. Johnson, Y. Hu, D. Maltz || dbj@cs.rice.edu, yihchun@uiuc.edu, dmaltz@cs.cmu.edu +# RFC4729 || M. Abel || TPM@nfc-forum.org +# RFC4730 || E. Burger, M. Dolly || eburger@cantata.com, mdolly@att.com +# RFC4731 || A. Melnikov, D. Cridland || Alexey.Melnikov@isode.com, dave.cridland@inventuresystems.co.uk +# RFC4732 || M. Handley, Ed., E. Rescorla, Ed., IAB || M.Handley@cs.ucl.ac.uk, ekr@networkresonance.com, iab@ietf.org +# RFC4733 || H. Schulzrinne, T. Taylor || schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com +# RFC4734 || H. Schulzrinne, T. Taylor || schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com +# RFC4735 || T. Taylor || tom.taylor.stds@gmail.com +# RFC4736 || JP. Vasseur, Ed., Y. Ikejiri, R. Zhang || jpv@cisco.com, y.ikejiri@ntt.com, raymond_zhang@bt.infonet.com +# RFC4737 || A. Morton, L. Ciavattone, G. Ramachandran, S. Shalunov, J. Perser || acmorton@att.com, lencia@att.com, gomathi@att.com, shalunov@internet2.edu, jperser@veriwave.com +# RFC4738 || D. Ignjatic, L. Dondeti, F. Audet, P. Lin || dignjatic@polycom.com, dondeti@qualcomm.com, audet@nortel.com, linping@nortel.com +# RFC4739 || P. Eronen, J. Korhonen || pe@iki.fi, jouni.korhonen@teliasonera.com +# RFC4740 || M. Garcia-Martin, Ed., M. Belinchon, M. Pallares-Lopez, C. Canales-Valenzuela, K. Tammi || miguel.an.garcia@nokia.com, maria.carmen.belinchon@ericsson.com, miguel-angel.pallares@ericsson.com, carolina.canales@ericsson.com, kalle.tammi@nokia.com +# RFC4741 || R. Enns, Ed. || rpe@juniper.net +# RFC4742 || M. Wasserman, T. Goddard || margaret@thingmagic.com, ted.goddard@icesoft.com +# RFC4743 || T. Goddard || ted.goddard@icesoft.com +# RFC4744 || E. Lear, K. Crozier || lear@cisco.com, ken.crozier@gmail.com +# RFC4745 || H. Schulzrinne, H. Tschofenig, J. Morris, J. Cuellar, J. Polk, J. Rosenberg || schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com, jmorris@cdt.org, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, jdrosen@cisco.com +# RFC4746 || T. Clancy, W. Arbaugh || clancy@ltsnet.net, waa@cs.umd.edu +# RFC4747 || S. Kipp, G. Ramkumar, K. McCloghrie || scott.kipp@mcdata.com, gramkumar@stanfordalumni.org, kzm@cisco.com +# RFC4748 || S. Bradner, Ed. || sob@harvard.edu +# RFC4749 || A. Sollaud || aurelien.sollaud@orange-ft.com +# RFC4750 || D. Joyal, Ed., P. Galecki, Ed., S. Giacalone, Ed., R. Coltun, F. Baker || djoyal@nortel.com, pgalecki@airvana.com, spencer.giacalone@gmail.com, fred@cisco.com +# RFC4752 || A. Melnikov, Ed. || Alexey.Melnikov@isode.com +# RFC4753 || D. Fu, J. Solinas || defu@orion.ncsc.mil, jasolin@orion.ncsc.mil +# RFC4754 || D. Fu, J. Solinas || defu@orion.ncsc.mil, jasolin@orion.ncsc.mil +# RFC4755 || V. Kashyap || vivk@us.ibm.com +# RFC4756 || A. Li || adamli@hyervision.com +# RFC4757 || K. Jaganathan, L. Zhu, J. Brezak || karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com +# RFC4758 || M. Nystroem || magnus@rsasecurity.com +# RFC4759 || R. Stastny, R. Shockey, L. Conroy || Richard.stastny@oefeg.at, richard.shockey@neustar.biz, lconroy@insensate.co.uk +# RFC4760 || T. Bates, R. Chandra, D. Katz, Y. Rekhter || tbates@cisco.com, rchandra@sonoasystems.com, dkatz@juniper.com, yakov@juniper.com +# RFC4761 || K. Kompella, Ed., Y. Rekhter, Ed. || kireeti@juniper.net, yakov@juniper.net +# RFC4762 || M. Lasserre, Ed., V. Kompella, Ed. || mlasserre@alcatel-lucent.com, vach.kompella@alcatel-lucent.com +# RFC4763 || M. Vanderveen, H. Soliman || mvandervn@yahoo.com, solimanhs@gmail.com +# RFC4764 || F. Bersani, H. Tschofenig || bersani_florent@yahoo.fr, Hannes.Tschofenig@siemens.com +# RFC4765 || H. Debar, D. Curry, B. Feinstein || herve.debar@orange-ftgroup.com, david_a_curry@glic.com, feinstein@acm.org +# RFC4766 || M. Wood, M. Erlinger || mark1@iss.net, mike@cs.hmc.edu +# RFC4767 || B. Feinstein, G. Matthews || bfeinstein@acm.org, gmatthew@nas.nasa.gov +# RFC4768 || S. Hartman || hartmans-ietf@mit.edu +# RFC4769 || J. Livingood, R. Shockey || jason_livingood@cable.comcast.com, richard.shockey@neustar.biz +# RFC4770 || C. Jennings, J. Reschke, Ed. || fluffy@cisco.com, julian.reschke@greenbytes.de +# RFC4771 || V. Lehtovirta, M. Naslund, K. Norrman || vesa.lehtovirta@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com +# RFC4772 || S. Kelly || scott@hyperthought.com +# RFC4773 || G. Huston || gih@apnic.net +# RFC4774 || S. Floyd || floyd@icir.org +# RFC4775 || S. Bradner, B. Carpenter, Ed., T. Narten || sob@harvard.edu, brc@zurich.ibm.com, narten@us.ibm.com +# RFC4776 || H. Schulzrinne || hgs+geopriv@cs.columbia.edu +# RFC4777 || T. Murphy Jr., P. Rieth, J. Stevens || murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com +# RFC4778 || M. Kaeo || merike@doubleshotsecurity.com +# RFC4779 || S. Asadullah, A. Ahmed, C. Popoviciu, P. Savola, J. Palet || sasad@cisco.com, adahmed@cisco.com, cpopovic@cisco.com, psavola@funet.fi, jordi.palet@consulintel.es +# RFC4780 || K. Lingle, J-F. Mule, J. Maeng, D. Walker || klingle@cisco.com, jf.mule@cablelabs.com, jmaeng@austin.rr.com, drwalker@rogers.com +# RFC4781 || Y. Rekhter, R. Aggarwal || yakov@juniper.net, rahul@juniper.net +# RFC4782 || S. Floyd, M. Allman, A. Jain, P. Sarolahti || floyd@icir.org, mallman@icir.org, a.jain@f5.com, pasi.sarolahti@iki.fi +# RFC4783 || L. Berger, Ed. || lberger@labn.net +# RFC4784 || C. Carroll, F. Quick || Christopher.Carroll@ropesgray.com, fquick@qualcomm.com +# RFC4785 || U. Blumenthal, P. Goel || urimobile@optonline.net, Purushottam.Goel@intel.com +# RFC4786 || J. Abley, K. Lindqvist || jabley@ca.afilias.info, kurtis@kurtis.pp.se +# RFC4787 || F. Audet, Ed., C. Jennings || audet@nortel.com, fluffy@cisco.com +# RFC4788 || Q. Xie, R. Kapoor || Qiaobing.Xie@Motorola.com, rkapoor@qualcomm.com +# RFC4789 || J. Schoenwaelder, T. Jeffree || j.schoenwaelder@iu-bremen.de, tony@jeffree.co.uk +# RFC4790 || C. Newman, M. Duerst, A. Gulbrandsen || chris.newman@sun.com, duerst@it.aoyama.ac.jp, arnt@oryx.com +# RFC4791 || C. Daboo, B. Desruisseaux, L. Dusseault || cyrus@daboo.name, bernard.desruisseaux@oracle.com, lisa.dusseault@gmail.com +# RFC4792 || S. Legg || steven.legg@eb2bcom.com +# RFC4793 || M. Nystroem || magnus@rsasecurity.com +# RFC4794 || B. Fenner || fenner@research.att.com +# RFC4795 || B. Aboba, D. Thaler, L. Esibov || bernarda@microsoft.com, dthaler@microsoft.com, levone@microsoft.com +# RFC4796 || J. Hautakorpi, G. Camarillo || Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com +# RFC4797 || Y. Rekhter, R. Bonica, E. Rosen || yakov@juniper.net, rbonica@juniper.net, erosen@cisco.com +# RFC4798 || J. De Clercq, D. Ooms, S. Prevost, F. Le Faucheur || jeremy.de_clercq@alcatel-lucent.be, dirk@onesparrow.com, stuart.prevost@bt.com, flefauch@cisco.com +# RFC4801 || T. Nadeau, Ed., A. Farrel, Ed. || tnadeau@cisco.com, adrian@olddog.co.uk +# RFC4802 || T. Nadeau, Ed., A. Farrel, Ed. || tnadeau@cisco.com, adrian@olddog.co.uk +# RFC4803 || T. Nadeau, Ed., A. Farrel, Ed. || tnadeau@cisco.com, adrian@olddog.co.uk +# RFC4804 || F. Le Faucheur, Ed. || flefauch@cisco.com +# RFC4805 || O. Nicklass, Ed. || orly_n@rad.com +# RFC4806 || M. Myers, H. Tschofenig || mmyers@fastq.com, Hannes.Tschofenig@siemens.com +# RFC4807 || M. Baer, R. Charlet, W. Hardaker, R. Story, C. Wang || baerm@tislabs.com, rcharlet@alumni.calpoly.edu, hardaker@tislabs.com, rstory@ipsp.revelstone.com, cliffwangmail@yahoo.com +# RFC4808 || S. Bellovin || bellovin@acm.org +# RFC4809 || C. Bonatti, Ed., S. Turner, Ed., G. Lebovitz, Ed. || Bonattic@ieca.com, Turners@ieca.com, gregory.ietf@gmail.com +# RFC4810 || C. Wallace, U. Pordesch, R. Brandner || cwallace@cygnacom.com, ulrich.pordesch@zv.fraunhofer.de, ralf.brandner@intercomponentware.com +# RFC4811 || L. Nguyen, A. Roy, A. Zinin || lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com +# RFC4812 || L. Nguyen, A. Roy, A. Zinin || lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com +# RFC4813 || B. Friedman, L. Nguyen, A. Roy, D. Yeung, A. Zinin || friedman@cisco.com, lhnguyen@cisco.com, akr@cisco.com, myeung@cisco.com, alex.zinin@alcatel-lucent.com +# RFC4814 || D. Newman, T. Player || dnewman@networktest.com, timmons.player@spirent.com +# RFC4815 || L-E. Jonsson, K. Sandlund, G. Pelletier, P. Kremer || lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, peter.kremer@ericsson.com +# RFC4816 || A. Malis, L. Martini, J. Brayley, T. Walsh || andrew.g.malis@verizon.com, lmartini@cisco.com, jeremy.brayley@ecitele.com, twalsh@juniper.net +# RFC4817 || M. Townsley, C. Pignataro, S. Wainner, T. Seely, J. Young || mark@townsley.net, cpignata@cisco.com, swainner@cisco.com, tseely@sprint.net, young@jsyoung.net +# RFC4818 || J. Salowey, R. Droms || jsalowey@cisco.com, rdroms@cisco.com +# RFC4819 || J. Galbraith, J. Van Dyke, J. Bright || galb@vandyke.com, jpv@vandyke.com, jon@siliconcircus.com +# RFC4820 || M. Tuexen, R. Stewart, P. Lei || tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com +# RFC4821 || M. Mathis, J. Heffner || mathis@psc.edu, jheffner@psc.edu +# RFC4822 || R. Atkinson, M. Fanto || rja@extremenetworks.com, mattjf@umd.edu +# RFC4823 || T. Harding, R. Scott || tharding@us.axway.com, rscott@us.axway.com +# RFC4824 || J. Hofmueller, Ed., A. Bachmann, Ed., IO. zmoelnig, Ed. || ip-sfs@mur.at, ip-sfs@mur.at, ip-sfs@mur.at +# RFC4825 || J. Rosenberg || jdrosen@cisco.com +# RFC4826 || J. Rosenberg || jdrosen@cisco.com +# RFC4827 || M. Isomaki, E. Leppanen || markus.isomaki@nokia.com, eva-maria.leppanen@nokia.com +# RFC4828 || S. Floyd, E. Kohler || floyd@icir.org, kohler@cs.ucla.edu +# RFC4829 || J. de Oliveira, Ed., JP. Vasseur, Ed., L. Chen, C. Scoglio || jau@ece.drexel.edu, jpv@cisco.com, leonardo.c.chen@verizon.com, caterina@eece.ksu.edu +# RFC4830 || J. Kempf, Ed. || kempf@docomolabs-usa.com +# RFC4831 || J. Kempf, Ed. || kempf@docomolabs-usa.com +# RFC4832 || C. Vogt, J. Kempf || chvogt@tm.uka.de, kempf@docomolabs-usa.com +# RFC4833 || E. Lear, P. Eggert || lear@cisco.com, eggert@cs.ucla.edu +# RFC4834 || T. Morin, Ed. || thomas.morin@orange-ftgroup.com +# RFC4835 || V. Manral || vishwas@ipinfusion.com +# RFC4836 || E. Beili || edward.beili@actelis.com +# RFC4837 || L. Khermosh || lior_khermosh@pmc-sierra.com +# RFC4838 || V. Cerf, S. Burleigh, A. Hooke, L. Torgerson, R. Durst, K. Scott, K. Fall, H. Weiss || vint@google.com, Scott.Burleigh@jpl.nasa.gov, Adrian.Hooke@jpl.nasa.gov, ltorgerson@jpl.nasa.gov, durst@mitre.org, kscott@mitre.org, kfall@intel.com, howard.weiss@sparta.com +# RFC4839 || G. Conboy, J. Rivlin, J. Ferraiolo || gc@ebooktechnologies.com, john@ebooktechnologies.com, jferrai@us.ibm.com +# RFC4840 || B. Aboba, Ed., E. Davies, D. Thaler || bernarda@microsoft.com, elwynd@dial.pipex.com, dthaler@microsoft.com +# RFC4841 || C. Heard, Ed. || heard@pobox.com +# RFC4842 || A. Malis, P. Pate, R. Cohen, Ed., D. Zelig || andrew.g.malis@verizon.com, prayson.pate@overturenetworks.com, ronc@resolutenetworks.com, davidz@corrigent.com +# RFC4843 || P. Nikander, J. Laganier, F. Dupont || pekka.nikander@nomadiclab.com, julien.ietf@laposte.net, Francis.Dupont@fdupont.fr +# RFC4844 || L. Daigle, Ed., Internet Architecture Board || leslie@thinkingcat.com, iab@iab.org +# RFC4845 || L. Daigle, Ed., Internet Architecture Board || leslie@thinkingcat.com, iab@iab.org +# RFC4846 || J. Klensin, Ed., D. Thaler, Ed. || john-ietf@jck.com, dthaler@microsoft.com +# RFC4847 || T. Takeda, Ed. || takeda.tomonori@lab.ntt.co.jp +# RFC4848 || L. Daigle || leslie@thinkingcat.com +# RFC4849 || P. Congdon, M. Sanchez, B. Aboba || paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com +# RFC4850 || D. Wysochanski || wysochanski@pobox.com +# RFC4851 || N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou || ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com +# RFC4852 || J. Bound, Y. Pouffary, S. Klynsma, T. Chown, D. Green || jim.bound@hp.com, Yanick.pouffary@hp.com, tjc@ecs.soton.ac.uk, green@commandinformation.com, sklynsma@mitre.org +# RFC4853 || R. Housley || housley@vigilsec.com +# RFC4854 || P. Saint-Andre || ietf@stpeter.im +# RFC4855 || S. Casner || casner@acm.org +# RFC4856 || S. Casner || casner@acm.org +# RFC4857 || E. Fogelstroem, A. Jonsson, C. Perkins || eva.fogelstrom@ericsson.com, annika.jonsson@ericsson.com, charles.perkins@nsn.com +# RFC4858 || H. Levkowetz, D. Meyer, L. Eggert, A. Mankin || henrik@levkowetz.com, dmm@1-4-5.net, lars.eggert@nokia.com, mankin@psg.com +# RFC4859 || A. Farrel || adrian@olddog.co.uk +# RFC4860 || F. Le Faucheur, B. Davie, P. Bose, C. Christou, M. Davenport || flefauch@cisco.com, bds@cisco.com, pratik.bose@lmco.com, christou_chris@bah.com, davenport_michael@bah.com +# RFC4861 || T. Narten, E. Nordmark, W. Simpson, H. Soliman || narten@us.ibm.com, erik.nordmark@sun.com, william.allen.simpson@gmail.com, hesham@elevatemobile.com +# RFC4862 || S. Thomson, T. Narten, T. Jinmei || sethomso@cisco.com, narten@us.ibm.com, jinmei@isl.rdc.toshiba.co.jp +# RFC4863 || L. Martini, G. Swallow || lmartini@cisco.com, swallow@cisco.com +# RFC4864 || G. Van de Velde, T. Hain, R. Droms, B. Carpenter, E. Klein || gunter@cisco.com, alh-ietf@tndh.net, rdroms@cisco.com, brc@zurich.ibm.com, ericlklein.ipv6@gmail.com +# RFC4865 || G. White, G. Vaudreuil || g.a.white@comcast.net, GregV@ieee.org +# RFC4866 || J. Arkko, C. Vogt, W. Haddad || jari.arkko@ericsson.com, chvogt@tm.uka.de, wassim.haddad@ericsson.com +# RFC4867 || J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie || Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Qiaobing.Xie@motorola.com +# RFC4868 || S. Kelly, S. Frankel || scott@hyperthought.com, sheila.frankel@nist.gov +# RFC4869 || L. Law, J. Solinas || lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil +# RFC4870 || M. Delany || markd+domainkeys@yahoo-inc.com +# RFC4871 || E. Allman, J. Callas, M. Delany, M. Libbey, J. Fenton, M. Thomas || eric+dkim@sendmail.org, jon@pgp.com, markd+dkim@yahoo-inc.com, mlibbeymail-mailsig@yahoo.com, fenton@bluepopcorn.net, mat@cisco.com +# RFC4872 || J.P. Lang, Ed., Y. Rekhter, Ed., D. Papadimitriou, Ed. || jplang@ieee.org, yakov@juniper.net, dimitri.papadimitriou@alcatel-lucent.be +# RFC4873 || L. Berger, I. Bryskin, D. Papadimitriou, A. Farrel || lberger@labn.net, IBryskin@advaoptical.com, dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk +# RFC4874 || CY. Lee, A. Farrel, S. De Cnodder || c.yin.lee@gmail.com, adrian@olddog.co.uk, stefaan.de_cnodder@alcatel-lucent.be +# RFC4875 || R. Aggarwal, Ed., D. Papadimitriou, Ed., S. Yasukawa, Ed. || rahul@juniper.net, yasukawa.seisho@lab.ntt.co.jp, Dimitri.Papadimitriou@alcatel-lucent.be +# RFC4876 || B. Neal-Joslin, Ed., L. Howard, M. Ansari || bob_joslin@hp.com, lukeh@padl.com, morteza@infoblox.com +# RFC4877 || V. Devarapalli, F. Dupont || vijay.devarapalli@azairenet.com, Francis.Dupont@fdupont.fr +# RFC4878 || M. Squire || msquire@hatterasnetworks.com +# RFC4879 || T. Narten || narten@us.ibm.com +# RFC4880 || J. Callas, L. Donnerhacke, H. Finney, D. Shaw, R. Thayer || jon@callas.org, lutz@iks-jena.de, hal@finney.org, dshaw@jabberwocky.com, rodney@canola-jones.com +# RFC4881 || K. El Malki, Ed. || karim@athonet.com +# RFC4882 || R. Koodli || rajeev.koodli@nokia.com +# RFC4883 || G. Feher, K. Nemeth, A. Korn, I. Cselenyi || Gabor.Feher@tmit.bme.hu, Krisztian.Nemeth@tmit.bme.hu, Andras.Korn@tmit.bme.hu, Istvan.Cselenyi@teliasonera.com +# RFC4884 || R. Bonica, D. Gan, D. Tappan, C. Pignataro || rbonica@juniper.net, derhwagan@yahoo.com, Dan.Tappan@gmail.com, cpignata@cisco.com +# RFC4885 || T. Ernst, H-Y. Lach || thierry.ernst@inria.fr, hong-yon.lach@motorola.com +# RFC4886 || T. Ernst || thierry.ernst@inria.fr +# RFC4887 || P. Thubert, R. Wakikawa, V. Devarapalli || pthubert@cisco.com, ryuji@sfc.wide.ad.jp, vijay.devarapalli@azairenet.com +# RFC4888 || C. Ng, P. Thubert, M. Watari, F. Zhao || chanwah.ng@sg.panasonic.com, pthubert@cisco.com, watari@kddilabs.jp, fanzhao@ucdavis.edu +# RFC4889 || C. Ng, F. Zhao, M. Watari, P. Thubert || chanwah.ng@sg.panasonic.com, fanzhao@ucdavis.edu, watari@kddilabs.jp, pthubert@cisco.com +# RFC4890 || E. Davies, J. Mohacsi || elwynd@dial.pipex.com, mohacsi@niif.hu +# RFC4891 || R. Graveman, M. Parthasarathy, P. Savola, H. Tschofenig || rfg@acm.org, mohanp@sbcglobal.net, psavola@funet.fi, Hannes.Tschofenig@nsn.com +# RFC4892 || S. Woolf, D. Conrad || woolf@isc.org, david.conrad@icann.org +# RFC4893 || Q. Vohra, E. Chen || quaizar.vohra@gmail.com, enkechen@cisco.com +# RFC4894 || P. Hoffman || paul.hoffman@vpnc.org +# RFC4895 || M. Tuexen, R. Stewart, P. Lei, E. Rescorla || tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com, ekr@rtfm.com +# RFC4896 || A. Surtees, M. West, A.B. Roach || abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk, adam@estacado.net +# RFC4897 || J. Klensin, S. Hartman || john-ietf@jck.com, hartmans-ietf@mit.edu +# RFC4898 || M. Mathis, J. Heffner, R. Raghunarayan || mathis@psc.edu, jheffner@psc.edu, raraghun@cisco.com +# RFC4901 || J. Ash, Ed., J. Hand, Ed., A. Malis, Ed. || gash5107@yahoo.com, jameshand@att.com, andrew.g.malis@verizon.com +# RFC4902 || M. Stecher || martin.stecher@webwasher.com +# RFC4903 || D. Thaler || dthaler@microsoft.com +# RFC4904 || V. Gurbani, C. Jennings || vkg@alcatel-lucent.com, fluffy@cisco.com +# RFC4905 || L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed. || lmartini@cisco.com, erosen@cisco.com, nna@level3.net +# RFC4906 || L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed. || lmartini@cisco.com, erosen@cisco.com, nna@level3.net +# RFC4907 || B. Aboba, Ed. || bernarda@microsoft.com +# RFC4908 || K. Nagami, S. Uda, N. Ogashiwa, H. Esaki, R. Wakikawa, H. Ohnishi || nagami@inetcore.com, zin@jaist.ac.jp, ogashiwa@wide.ad.jp, hiroshi@wide.ad.jp, ryuji@sfc.wide.ad.jp, ohnishi.hiroyuki@lab.ntt.co.jp +# RFC4909 || L. Dondeti, Ed., D. Castleford, F. Hartung || ldondeti@qualcomm.com, david.castleford@orange-ftgroup.com, frank.hartung@ericsson.com +# RFC4910 || S. Legg, D. Prager || steven.legg@eb2bcom.com, dap@austhink.com +# RFC4911 || S. Legg || steven.legg@eb2bcom.com +# RFC4912 || S. Legg || steven.legg@eb2bcom.com +# RFC4913 || S. Legg || steven.legg@eb2bcom.com +# RFC4914 || S. Legg || steven.legg@eb2bcom.com +# RFC4915 || P. Psenak, S. Mirtorabi, A. Roy, L. Nguyen, P. Pillay-Esnault || ppsenak@cisco.com, sina@force10networks.com, akr@cisco.com, lhnguyen@cisco.com, ppe@cisco.com +# RFC4916 || J. Elwell || john.elwell@siemens.com +# RFC4917 || V. Sastry, K. Leung, A. Patel || venkat.s@samsung.com, kleung@cisco.com, alpesh@cisco.com +# RFC4918 || L. Dusseault, Ed. || lisa.dusseault@gmail.com +# RFC4919 || N. Kushalnagar, G. Montenegro, C. Schumacher || nandakishore.kushalnagar@intel.com, gabriel.montenegro@microsoft.com, schumacher@danfoss.com +# RFC4920 || A. Farrel, Ed., A. Satyanarayana, A. Iwata, N. Fujita, G. Ash || adrian@olddog.co.uk, asatyana@cisco.com, a-iwata@ah.jp.nec.com, n-fujita@bk.jp.nec.com, gash5107@yahoo.com +# RFC4923 || F. Baker, P. Bose || fred@cisco.com, pratik.bose@lmco.com +# RFC4924 || B. Aboba, Ed., E. Davies || bernarda@microsoft.com, elwynd@dial.pipex.com +# RFC4925 || X. Li, Ed., S. Dawkins, Ed., D. Ward, Ed., A. Durand, Ed. || xing@cernet.edu.cn, spencer@mcsr-labs.org, dward@cisco.com, alain_durand@cable.comcast.com +# RFC4926 || T.Kalin, M.Molina || tomaz.kalin@dante.org.uk, maurizio.molina@dante.org.uk +# RFC4927 || J.-L. Le Roux, Ed. || jeanlouis.leroux@orange-ftgroup.com +# RFC4928 || G. Swallow, S. Bryant, L. Andersson || stbryant@cisco.com, swallow@cisco.com, loa@pi.se +# RFC4929 || L. Andersson, Ed., A. Farrel, Ed. || loa@pi.se, adrian@olddog.co.uk +# RFC4930 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4931 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4932 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4933 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4934 || S. Hollenbeck || shollenbeck@verisign.com +# RFC4935 || C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai || cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com +# RFC4936 || C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai || cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com +# RFC4937 || P. Arberg, V. Mammoliti || parberg@redback.com, vince@cisco.com +# RFC4938 || B. Berry, H. Holgate || bberry@cisco.com, hholgate@cisco.com +# RFC4939 || K. Gibbons, G. Ramkumar, S. Kipp || kgibbons@yahoo.com, gramkumar@stanfordalumni.org, skipp@brocade.com +# RFC4940 || K. Kompella, B. Fenner || kireeti@juniper.net, fenner@research.att.com +# RFC4941 || T. Narten, R. Draves, S. Krishnan || narten@us.ibm.com, richdr@microsoft.com, suresh.krishnan@ericsson.com +# RFC4942 || E. Davies, S. Krishnan, P. Savola || elwynd@dial.pipex.com, suresh.krishnan@ericsson.com, psavola@funet.fi +# RFC4943 || S. Roy, A. Durand, J. Paugh || sebastien.roy@sun.com, alain_durand@cable.comcast.com, jim.paugh@nominum.com +# RFC4944 || G. Montenegro, N. Kushalnagar, J. Hui, D. Culler || gabriel.montenegro@microsoft.com, nandakishore.kushalnagar@intel.com, jhui@archrock.com, dculler@archrock.com +# RFC4945 || B. Korver || briank@networkresonance.com +# RFC4946 || J. Snell || jasnell@gmail.com +# RFC4947 || G. Fairhurst, M. Montpetit || gorry@erg.abdn.ac.uk, mmontpetit@motorola.com +# RFC4948 || L. Andersson, E. Davies, L. Zhang || loa@pi.se, elwynd@dial.pipex.com, lixia@cs.ucla.edu +# RFC4949 || R. Shirey || rwshirey4949@verizon.net +# RFC4950 || R. Bonica, D. Gan, D. Tappan, C. Pignataro || rbonica@juniper.net, derhwagan@yahoo.com, dan.tappan@gmail.com, cpignata@cisco.com +# RFC4951 || V. Jain, Ed. || vipinietf@yahoo.com +# RFC4952 || J. Klensin, Y. Ko || john-ietf@jck.com, yw@mrko.pe.kr +# RFC4953 || J. Touch || touch@isi.edu +# RFC4954 || R. Siemborski, Ed., A. Melnikov, Ed. || robsiemb@google.com, Alexey.Melnikov@isode.com +# RFC4955 || D. Blacka || davidb@verisign.com +# RFC4956 || R. Arends, M. Kosters, D. Blacka || roy@nominet.org.uk, markk@verisign.com, davidb@verisign.com +# RFC4957 || S. Krishnan, Ed., N. Montavont, E. Njedjou, S. Veerepalli, A. Yegin, Ed. || suresh.krishnan@ericsson.com, nicolas.montavont@enst-bretagne.fr, eric.njedjou@orange-ftgroup.com, sivav@qualcomm.com, a.yegin@partner.samsung.com +# RFC4958 || K. Carlberg || carlberg@g11.org.uk +# RFC4959 || R. Siemborski, A. Gulbrandsen || robsiemb@google.com, arnt@oryx.com +# RFC4960 || R. Stewart, Ed. || randall@lakerest.net +# RFC4961 || D. Wing || dwing-ietf@fuggles.com +# RFC4962 || R. Housley, B. Aboba || housley@vigilsec.com, bernarda@microsoft.com +# RFC4963 || J. Heffner, M. Mathis, B. Chandler || jheffner@psc.edu, mathis@psc.edu, bchandle@gmail.com +# RFC4964 || A. Allen, Ed., J. Holm, T. Hallin || aallen@rim.com, Jan.Holm@ericsson.com, thallin@motorola.com +# RFC4965 || J-F. Mule, W. Townsley || jf.mule@cablelabs.com, mark@townsley.net +# RFC4966 || C. Aoun, E. Davies || ietf@energizeurnet.com, elwynd@dial.pipex.com +# RFC4967 || B. Rosen || br@brianrosen.net +# RFC4968 || S. Madanapalli, Ed. || smadanapalli@gmail.com +# RFC4969 || A. Mayrhofer || alexander.mayrhofer@enum.at +# RFC4970 || A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer || acee@redback.com, naiming@cisco.com, jpv@cisco.com, rahul@juniper.net, sshaffer@bridgeport-networks.com +# RFC4971 || JP. Vasseur, Ed., N. Shen, Ed., R. Aggarwal, Ed. || jpv@cisco.com, naiming@cisco.com, rahul@juniper.net +# RFC4972 || JP. Vasseur, Ed., JL. Leroux, Ed., S. Yasukawa, S. Previdi, P. Psenak, P. Mabbey || jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, s.yasukawa@hco.ntt.co.jp, sprevidi@cisco.com, ppsenak@cisco.com, Paul_Mabey@cable.comcast.com +# RFC4973 || P. Srisuresh, P. Joseph || srisuresh@yahoo.com, paul_95014@yahoo.com +# RFC4974 || D. Papadimitriou, A. Farrel || dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk +# RFC4975 || B. Campbell, Ed., R. Mahy, Ed., C. Jennings, Ed. || ben@estacado.net, rohan@ekabal.com, fluffy@cisco.com +# RFC4976 || C. Jennings, R. Mahy, A. B. Roach || fluffy@cisco.com, rohan@ekabal.com, adam@estacado.net +# RFC4977 || G. Tsirtsis, H. Soliman || tsirtsis@qualcomm.com, hesham@elevatemobile.com +# RFC4978 || A. Gulbrandsen || arnt@oryx.com +# RFC4979 || A. Mayrhofer || alexander.mayrhofer@enum.at +# RFC4980 || C. Ng, T. Ernst, E. Paik, M. Bagnulo || chanwah.ng@sg.panasonic.com, thierry.ernst@inria.fr, euna@kt.co.kr, marcelo@it.uc3m.es +# RFC4981 || J. Risson, T. Moors || jr@tuffit.com, t.moors@unsw.edu.au +# RFC4982 || M. Bagnulo, J. Arkko || marcelo@it.uc3m.es, jari.arkko@ericsson.com +# RFC4983 || C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai || cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com +# RFC4984 || D. Meyer, Ed., L. Zhang, Ed., K. Fall, Ed. || dmm@1-4-5.net, lixia@cs.ucla.edu, kfall@intel.com +# RFC4985 || S. Santesson || stefans@microsoft.com +# RFC4986 || H. Eland, R. Mundy, S. Crocker, S. Krishnaswamy || heland@afilias.info, mundy@sparta.com, steve@shinkuro.com, suresh@sparta.com +# RFC4987 || W. Eddy || weddy@grc.nasa.gov +# RFC4988 || R. Koodli, C. Perkins || rajeev.koodli@nokia.com, charles.perkins@nokia.com +# RFC4990 || K. Shiomoto, R. Papneja, R. Rabbat || shiomoto.kohei@lab.ntt.co.jp, rabbat@alum.mit.edu, rpapneja@isocore.com +# RFC4991 || A. Newton || andy@hxr.us +# RFC4992 || A. Newton || andy@hxr.us +# RFC4993 || A. Newton || andy@hxr.us +# RFC4994 || S. Zeng, B. Volz, K. Kinnear, J. Brzozowski || szeng@cisco.com, volz@cisco.com, kkinnear@cisco.com, john_brzozowski@cable.comcast.com +# RFC4995 || L-E. Jonsson, G. Pelletier, K. Sandlund || lars-erik@lejonsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com +# RFC4996 || G. Pelletier, K. Sandlund, L-E. Jonsson, M. West || ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk +# RFC4997 || R. Finking, G. Pelletier || robert.finking@roke.co.uk, ghyslain.pelletier@ericsson.com +# RFC4998 || T. Gondrom, R. Brandner, U. Pordesch || tobias.gondrom@opentext.com, ralf.brandner@intercomponentware.com, ulrich.pordesch@zv.fraunhofer.de +# RFC5000 || RFC Editor || rfc-editor@rfc-editor.org +# RFC5001 || R. Austein || sra@isc.org +# RFC5002 || G. Camarillo, G. Blanco || Gonzalo.Camarillo@ericsson.com, German.Blanco@ericsson.com +# RFC5003 || C. Metz, L. Martini, F. Balus, J. Sugimoto || chmetz@cisco.com, lmartini@cisco.com, florin.balus@alcatel-lucent.com, sugimoto@nortel.com +# RFC5004 || E. Chen, S. Sangli || enkechen@cisco.com, rsrihari@cisco.com +# RFC5005 || M. Nottingham || mnot@pobox.com +# RFC5006 || J. Jeong, Ed., S. Park, L. Beloeil, S. Madanapalli || jjeong@cs.umn.edu, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com +# RFC5007 || J. Brzozowski, K. Kinnear, B. Volz, S. Zeng || john_brzozowski@cable.comcast.com, kkinnear@cisco.com, volz@cisco.com, szeng@cisco.com +# RFC5008 || R. Housley, J. Solinas || housley@vigilsec.com, jasolin@orion.ncsc.mil +# RFC5009 || R. Ejza || ejzak@alcatel-lucent.com +# RFC5010 || K. Kinnear, M. Normoyle, M. Stapp || kkinnear@cisco.com, mnormoyle@cisco.com, mjs@cisco.com +# RFC5011 || M. StJohns || mstjohns@comcast.net +# RFC5012 || H. Schulzrinne, R. Marshall, Ed. || hgs+ecrit@cs.columbia.edu, rmarshall@telecomsys.com +# RFC5013 || J. Kunze, T. Baker || jak@ucop.edu, tbaker@tbaker.de +# RFC5014 || E. Nordmark, S. Chakrabarti, J. Laganier || Erik.Nordmark@Sun.com, samitac2@gmail.com, julien.IETF@laposte.net +# RFC5015 || M. Handley, I. Kouvelas, T. Speakman, L. Vicisano || M.Handley@cs.ucl.ac.uk, kouvelas@cisco.com, speakman@cisco.com, lorenzo@digitalfountain.com +# RFC5016 || M. Thomas || mat@cisco.com +# RFC5017 || D. McWalter, Ed. || dmcw@dataconnection.com +# RFC5018 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5019 || A. Deacon, R. Hurst || alex@verisign.com, rmh@microsoft.com +# RFC5020 || K. Zeilenga || Kurt.Zeilenga@Isode.COM +# RFC5021 || S. Josefsson || simon@josefsson.org +# RFC5022 || J. Van Dyke, E. Burger, Ed., A. Spitzer || jvandyke@cantata.com, eburger@standardstrack.com, woof@pingtel.com +# RFC5023 || J. Gregorio, Ed., B. de hOra, Ed. || joe@bitworking.org, bill@dehora.net +# RFC5024 || I. Friend || ieuan.friend@dip.co.uk +# RFC5025 || J. Rosenberg || jdrosen@cisco.com +# RFC5026 || G. Giaretta, Ed., J. Kempf, V. Devarapalli, Ed. || gerardog@qualcomm.com, kempf@docomolabs-usa.com, vijay.devarapalli@azairenet.com +# RFC5027 || F. Andreasen, D. Wing || fandreas@cisco.com, dwing-ietf@fuggles.com +# RFC5028 || R. Mahy || rohan@ekabal.com +# RFC5029 || JP. Vasseur, S. Previdi || jpv@cisco.com, sprevidi@cisco.com +# RFC5030 || M. Nakhjiri, Ed., K. Chowdhury, A. Lior, K. Leung || madjid.nakhjiri@motorola.com, kchowdhury@starentnetworks.com, avi@bridgewatersystems.com, kleung@cisco.com +# RFC5031 || H. Schulzrinne || hgs+ecrit@cs.columbia.edu +# RFC5032 || E. Burger, Ed. || eric.burger@bea.com +# RFC5033 || S. Floyd, M. Allman || floyd@icir.org, mallman@icir.org +# RFC5034 || R. Siemborski, A. Menon-Sen || robsiemb@google.com, ams@oryx.com +# RFC5035 || J. Schaad || jimsch@exmsft.com +# RFC5036 || L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed. || loa@pi.se, ina@juniper.net, rhthomas@cisco.com +# RFC5037 || L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed. || loa@pi.se, ina@juniper.net, rhthomas@cisco.com +# RFC5038 || B. Thomas, L. Andersson || loa@pi.se, rhthomas@cisco.com +# RFC5039 || J. Rosenberg, C. Jennings || jdrosen@cisco.com, fluffy@cisco.com +# RFC5040 || R. Recio, B. Metzler, P. Culley, J. Hilland, D. Garcia || recio@us.ibm.com, bmt@zurich.ibm.com, paul.culley@hp.com, jeff.hilland@hp.com, Dave.Garcia@StanfordAlumni.org +# RFC5041 || H. Shah, J. Pinkerton, R. Recio, P. Culley || hemal@broadcom.com, jpink@microsoft.com, recio@us.ibm.com, paul.culley@hp.com +# RFC5042 || J. Pinkerton, E. Deleganes || jpink@windows.microsoft.com, deleganes@yahoo.com +# RFC5043 || C. Bestler, Ed., R. Stewart, Ed. || caitlin.bestler@neterion.com, randall@lakerest.net +# RFC5044 || P. Culley, U. Elzur, R. Recio, S. Bailey, J. Carrier || paul.culley@hp.com, uri@broadcom.com, recio@us.ibm.com, steph@sandburst.com, carrier@cray.com +# RFC5045 || C. Bestler, Ed., L. Coene || caitlin.bestler@neterion.com, lode.coene@nsn.com +# RFC5046 || M. Ko, M. Chadalapaka, J. Hufferd, U. Elzur, H. Shah, P. Thaler || mako@us.ibm.com, cbm@rose.hp.com, jhufferd@brocade.com, Uri@Broadcom.com, hemal@broadcom.com, pthaler@broadcom.com +# RFC5047 || M. Chadalapaka, J. Hufferd, J. Satran, H. Shah || cbm@rose.hp.com, jhufferd@brocade.com, Julian_Satran@il.ibm.com, hemal@broadcom.com +# RFC5048 || M. Chadalapaka, Ed. || cbm@rose.hp.com +# RFC5049 || C. Bormann, Z. Liu, R. Price, G. Camarillo, Ed. || cabo@tzi.org, zhigang.c.liu@nokia.com, richard.price@eads.com, Gonzalo.Camarillo@ericsson.com +# RFC5050 || K. Scott, S. Burleigh || kscott@mitre.org, Scott.Burleigh@jpl.nasa.gov +# RFC5051 || M. Crispin || MRC@CAC.Washington.EDU +# RFC5052 || M. Watson, M. Luby, L. Vicisano || mark@digitalfountain.com, luby@digitalfountain.com, lorenzo@digitalfountain.com +# RFC5053 || M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer || luby@digitalfountain.com, amin.shokrollahi@epfl.ch, mark@digitalfountain.com, stockhammer@nomor.de +# RFC5054 || D. Taylor, T. Wu, N. Mavrogiannopoulos, T. Perrin || dtaylor@gnutls.org, thomwu@cisco.com, nmav@gnutls.org, trevp@trevp.net +# RFC5055 || T. Freeman, R. Housley, A. Malpani, D. Cooper, W. Polk || trevorf@microsoft.com, housley@vigilsec.com, ambarish@yahoo.com, david.cooper@nist.gov, wpolk@nist.gov +# RFC5056 || N. Williams || Nicolas.Williams@sun.com +# RFC5057 || R. Sparks || RjS@estacado.net +# RFC5058 || R. Boivie, N. Feldman, Y. Imai, W. Livens, D. Ooms || rhboivie@us.ibm.com, nkfeldman@yahoo.com, ug@xcast.jp, wim@livens.net, dirk@onesparrow.com +# RFC5059 || N. Bhaskar, A. Gall, J. Lingard, S. Venaas || nidhi@arastra.com, alexander.gall@switch.ch, jchl@arastra.com, venaas@uninett.no +# RFC5060 || R. Sivaramu, J. Lingard, D. McWalter, B. Joshi, A. Kessler || raghava@cisco.com, jchl@arastra.com, dmcw@dataconnection.com, bharat_joshi@infosys.com, kessler@cisco.com +# RFC5061 || R. Stewart, Q. Xie, M. Tuexen, S. Maruyama, M. Kozuka || randall@lakerest.net, Qiaobing.Xie@motorola.com, tuexen@fh-muenster.de, mail@marushin.gr.jp, ma-kun@kozuka.jp +# RFC5062 || R. Stewart, M. Tuexen, G. Camarillo || randall@lakerest.net, tuexen@fh-muenster.de, Gonzalo.Camarillo@ericsson.com +# RFC5063 || A. Satyanarayana, Ed., R. Rahman, Ed. || asatyana@cisco.com, rrahman@cisco.com +# RFC5064 || M. Duerst || duerst@it.aoyama.ac.jp +# RFC5065 || P. Traina, D. McPherson, J. Scudder || bgp-confederations@st04.pst.org, danny@arbor.net, jgs@juniper.net +# RFC5066 || E. Beili || edward.beili@actelis.com +# RFC5067 || S. Lind, P. Pfautz || sdlind@att.com, ppfautz@att.com +# RFC5068 || C. Hutzler, D. Crocker, P. Resnick, E. Allman, T. Finch || cdhutzler@aol.com, dcrocker@bbiw.net, presnick@qti.qualcomm.com, eric+ietf-smtp@sendmail.org, dot@dotat.at +# RFC5069 || T. Taylor, Ed., H. Tschofenig, H. Schulzrinne, M. Shanmugam || tom.taylor.stds@gmail.com, Hannes.Tschofenig@nsn.com, hgs+ecrit@cs.columbia.edu, murugaraj.shanmugam@detecon.com +# RFC5070 || R. Danyliw, J. Meijer, Y. Demchenko || rdd@cert.org, jan@flyingcloggies.nl, demch@chello.nl +# RFC5071 || D. Hankins || David_Hankins@isc.org +# RFC5072 || S. Varada, Ed., D. Haskins, E. Allen || varada@txc.com +# RFC5073 || J.P. Vasseur, Ed., J.L. Le Roux, Ed. || jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com +# RFC5074 || S. Weiler || weiler@tislabs.com +# RFC5075 || B. Haberman, Ed., R. Hinden || brian@innovationslab.net, bob.hinden@gmail.com +# RFC5076 || B. Hoeneisen || hoeneisen@switch.ch +# RFC5077 || J. Salowey, H. Zhou, P. Eronen, H. Tschofenig || jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@nsn.com +# RFC5078 || S. Dawkins || spencer@mcsr-labs.org +# RFC5079 || J. Rosenberg || jdrosen@cisco.com +# RFC5080 || D. Nelson, A. DeKok || dnelson@elbrysnetworks.com, aland@freeradius.org +# RFC5081 || N. Mavrogiannopoulos || nmav@gnutls.org +# RFC5082 || V. Gill, J. Heasley, D. Meyer, P. Savola, Ed., C. Pignataro || vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net, psavola@funet.fi, cpignata@cisco.com +# RFC5083 || R. Housley || housley@vigilsec.com +# RFC5084 || R. Housley || housley@vigilsec.com +# RFC5085 || T. Nadeau, Ed., C. Pignataro, Ed. || tnadeau@lucidvision.com, cpignata@cisco.com +# RFC5086 || A. Vainshtein, Ed., I. Sasson, E. Metz, T. Frost, P. Pate || sasha@axerra.com, israel@axerra.com, e.t.metz@telecom.tno.nl, tfrost@symmetricom.com, prayson.pate@overturenetworks.com +# RFC5087 || Y(J). Stein, R. Shashoua, R. Insler, M. Anavi || yaakov_s@rad.com, ronen_s@rad.com, ron_i@rad.com, motty@radusa.com +# RFC5088 || JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang || jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com +# RFC5089 || JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang || jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com +# RFC5090 || B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck || baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com +# RFC5091 || X. Boyen, L. Martin || xavier@voltage.com, martin@voltage.com +# RFC5092 || A. Melnikov, Ed., C. Newman || Alexey.Melnikov@isode.com, chris.newman@sun.com +# RFC5093 || G. Hunt || geoff.hunt@bt.com +# RFC5094 || V. Devarapalli, A. Patel, K. Leung || vijay.devarapalli@azairenet.com, alpesh@cisco.com, kleung@cisco.com +# RFC5095 || J. Abley, P. Savola, G. Neville-Neil || jabley@ca.afilias.info, psavola@funet.fi, gnn@neville-neil.com +# RFC5096 || V. Devarapalli || vijay.devarapalli@azairenet.com +# RFC5097 || G. Renker, G. Fairhurst || gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk +# RFC5098 || G. Beacham, S. Kumar, S. Channabasappa || gordon.beacham@motorola.com, satish.kumar@ti.com, Sumanth@cablelabs.com +# RFC5101 || B. Claise, Ed. || bclaise@cisco.com +# RFC5102 || J. Quittek, S. Bryant, B. Claise, P. Aitken, J. Meyer || quittek@netlab.nec.de, stbryant@cisco.com, bclaise@cisco.com, paitken@cisco.com, jemeyer@paypal.com +# RFC5103 || B. Trammell, E. Boschi || bht@cert.org, elisa.boschi@hitachi-eu.com +# RFC5104 || S. Wenger, U. Chandra, M. Westerlund, B. Burman || stewe@stewe.org, Umesh.1.Chandra@nokia.com, magnus.westerlund@ericsson.com, bo.burman@ericsson.com +# RFC5105 || O. Lendl || otmar.lendl@enum.at +# RFC5106 || H. Tschofenig, D. Kroeselberg, A. Pashalidis, Y. Ohba, F. Bersani || Hannes.Tschofenig@nsn.com, Dirk.Kroeselberg@nsn.com, pashalidis@nw.neclab.eu, yohba@tari.toshiba.com, florent.ftrd@gmail.com +# RFC5107 || R. Johnson, J. Kumarasamy, K. Kinnear, M. Stapp || raj@cisco.com, jayk@cisco.com, kkinnear@cisco.com, mjs@cisco.com +# RFC5109 || A. Li, Ed. || adamli@hyervision.com +# RFC5110 || P. Savola || psavola@funet.fi +# RFC5111 || B. Aboba, L. Dondeti || bernarda@microsoft.com, ldondeti@qualcomm.com +# RFC5112 || M. Garcia-Martin || miguel.garcia@nsn.com +# RFC5113 || J. Arkko, B. Aboba, J. Korhonen, Ed., F. Bari || jari.arkko@ericsson.com, bernarda@microsoft.com, jouni.korhonen@teliasonera.com, farooq.bari@att.com +# RFC5114 || M. Lepinski, S. Kent || mlepinski@bbn.com, kent@bbn.com +# RFC5115 || K. Carlberg, P. O'Hanlon || carlberg@g11.org.uk, p.ohanlon@cs.ucl.ac.uk +# RFC5116 || D. McGrew || mcgrew@cisco.com +# RFC5117 || M. Westerlund, S. Wenger || magnus.westerlund@ericsson.com, stewe@stewe.org +# RFC5118 || V. Gurbani, C. Boulton, R. Sparks || vkg@alcatel-lucent.com, cboulton@ubiquitysoftware.com, RjS@estacado.net +# RFC5119 || T. Edwards || thomas.edwards@fox.com +# RFC5120 || T. Przygienda, N. Shen, N. Sheth || prz@net4u.ch, naiming@cisco.com, nsheth@juniper.net +# RFC5121 || B. Patil, F. Xia, B. Sarikaya, JH. Choi, S. Madanapalli || basavaraj.patil@nsn.com, xiayangsong@huawei.com, sarikaya@ieee.org, jinchoe@samsung.com, smadanapalli@gmail.com +# RFC5122 || P. Saint-Andre || ietf@stpeter.im +# RFC5123 || R. White, B. Akyol || riw@cisco.com, bora@cisco.com +# RFC5124 || J. Ott, E. Carrara || jo@comnet.tkk.fi, carrara@kth.se +# RFC5125 || T. Taylor || tom.taylor.stds@gmail.com +# RFC5126 || D. Pinkas, N. Pope, J. Ross || Denis.Pinkas@bull.net, nick.pope@thales-esecurity.com, ross@secstan.com +# RFC5127 || K. Chan, J. Babiarz, F. Baker || khchan@nortel.com, babiarz@nortel.com, fred@cisco.com +# RFC5128 || P. Srisuresh, B. Ford, D. Kegel || srisuresh@yahoo.com, baford@mit.edu, dank06@kegel.com +# RFC5129 || B. Davie, B. Briscoe, J. Tay || bsd@cisco.com, bob.briscoe@bt.com, june.tay@bt.com +# RFC5130 || S. Previdi, M. Shand, Ed., C. Martin || sprevidi@cisco.com, mshand@cisco.com, chris@ipath.net +# RFC5131 || D. McWalter, Ed. || dmcw@dataconnection.com +# RFC5132 || D. McWalter, D. Thaler, A. Kessler || dmcw@dataconnection.com, dthaler@windows.microsoft.com, kessler@cisco.com +# RFC5133 || M. Tuexen, K. Morneault || tuexen@fh-muenster.de, kmorneau@cisco.com +# RFC5134 || M. Mealling || michael@refactored-networks.com +# RFC5135 || D. Wing, T. Eckert || dwing-ietf@fuggles.com, eckert@cisco.com +# RFC5136 || P. Chimento, J. Ishac || Philip.Chimento@jhuapl.edu, jishac@nasa.gov +# RFC5137 || J. Klensin || john-ietf@jck.com +# RFC5138 || S. Cox || Simon.Cox@csiro.au +# RFC5139 || M. Thomson, J. Winterbottom || martin.thomson@andrew.com, james.winterbottom@andrew.com +# RFC5140 || M. Bangalore, R. Kumar, J. Rosenberg, H. Salama, D.N. Shah || manjax@cisco.com, rajneesh@cisco.com, jdrosen@cisco.com, hsalama@citexsoftware.com, dhaval@moowee.tv +# RFC5141 || J. Goodwin, H. Apel || goodwin@iso.org, apel@iso.org +# RFC5142 || B. Haley, V. Devarapalli, H. Deng, J. Kempf || brian.haley@hp.com, vijay.devarapalli@azairenet.com, kempf@docomolabs-usa.com, denghui@chinamobile.com +# RFC5143 || A. Malis, J. Brayley, J. Shirron, L. Martini, S. Vogelsang || andrew.g.malis@verizon.com, jeremy.brayley@ecitele.com, john.shirron@ecitele.com, lmartini@cisco.com, steve.vogelsang@alcatel-lucent.com +# RFC5144 || A. Newton, M. Sanz || andy@arin.net, sanz@denic.de +# RFC5145 || K. Shiomoto, Ed. || shiomoto.kohei@lab.ntt.co.jp +# RFC5146 || K. Kumaki, Ed. || ke-kumaki@kddi.com +# RFC5147 || E. Wilde, M. Duerst || dret@berkeley.edu, duerst@it.aoyama.ac.jp +# RFC5148 || T. Clausen, C. Dearlove, B. Adamson || T.Clausen@computer.org, chris.dearlove@baesystems.com, adamson@itd.nrl.navy.mil +# RFC5149 || J. Korhonen, U. Nilsson, V. Devarapalli || jouni.korhonen@teliasonera.com, ulf.s.nilsson@teliasonera.com, vijay.devarapalli@azairenet.com +# RFC5150 || A. Ayyangar, K. Kompella, JP. Vasseur, A. Farrel || arthi@juniper.net, kireeti@juniper.net, jpv@cisco.com, adrian@olddog.co.uk +# RFC5151 || A. Farrel, Ed., A. Ayyangar, JP. Vasseur || adrian@olddog.co.uk, arthi@juniper.net, jpv@cisco.com +# RFC5152 || JP. Vasseur, Ed., A. Ayyangar, Ed., R. Zhang || jpv@cisco.com, arthi@juniper.net, raymond.zhang@bt.com +# RFC5153 || E. Boschi, L. Mark, J. Quittek, M. Stiemerling, P. Aitken || elisa.boschi@hitachi-eu.com, lutz.mark@fokus.fraunhofer.de, quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, paitken@cisco.com +# RFC5154 || J. Jee, Ed., S. Madanapalli, J. Mandin || jhjee@etri.re.kr, smadanapalli@gmail.com, j_mandin@yahoo.com +# RFC5155 || B. Laurie, G. Sisson, R. Arends, D. Blacka || ben@links.org, geoff-s@panix.com, roy@nominet.org.uk, davidb@verisign.com +# RFC5156 || M. Blanchet || Marc.Blanchet@viagenie.ca +# RFC5157 || T. Chown || tjc@ecs.soton.ac.uk +# RFC5158 || G. Huston || gih@apnic.net +# RFC5159 || L. Dondeti, Ed., A. Jerichow || ldondeti@qualcomm.com, anja.jerichow@nsn.com +# RFC5160 || P. Levis, M. Boucadair || pierre.levis@orange-ftgroup.com, mohamed.boucadair@orange-ftgroup.com +# RFC5161 || A. Gulbrandsen, Ed., A. Melnikov, Ed. || arnt@oryx.com, Alexey.Melnikov@isode.com +# RFC5162 || A. Melnikov, D. Cridland, C. Wilson || Alexey.Melnikov@isode.com, dave.cridland@isode.com, corby@computer.org +# RFC5163 || G. Fairhurst, B. Collini-Nocker || gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at +# RFC5164 || T. Melia, Ed. || tmelia@cisco.com +# RFC5165 || C. Reed || creed@opengeospatial.org +# RFC5166 || S. Floyd, Ed. || floyd@icir.org +# RFC5167 || M. Dolly, R. Even || mdolly@att.com, roni.even@polycom.co.il +# RFC5168 || O. Levin, R. Even, P. Hagendorf || oritl@microsoft.com, roni.even@polycom.co.il, pierre@radvision.com +# RFC5169 || T. Clancy, M. Nakhjiri, V. Narayanan, L. Dondeti || clancy@LTSnet.net, madjid.nakhjiri@motorola.com, vidyan@qualcomm.com, ldondeti@qualcomm.com +# RFC5170 || V. Roca, C. Neumann, D. Furodet || vincent.roca@inria.fr, christoph.neumann@thomson.net, david.furodet@st.com +# RFC5171 || M. Foschiano || foschia@cisco.com +# RFC5172 || S. Varada, Ed. || varada@ieee.org +# RFC5173 || J. Degener, P. Guenther || jutta@pobox.com, guenther@sendmail.com +# RFC5174 || J-P. Evain || evain@ebu.ch +# RFC5175 || B. Haberman, Ed., R. Hinden || brian@innovationslab.net, bob.hinden@gmail.com +# RFC5176 || M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba || mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com +# RFC5177 || K. Leung, G. Dommety, V. Narayanan, A. Petrescu || kleung@cisco.com, gdommety@cisco.com, vidyan@qualcomm.com, alexandru.petrescu@motorola.com +# RFC5178 || N. Williams, A. Melnikov || Nicolas.Williams@sun.com, Alexey.Melnikov@isode.com +# RFC5179 || N. Williams || Nicolas.Williams@sun.com +# RFC5180 || C. Popoviciu, A. Hamza, G. Van de Velde, D. Dugatkin || cpopovic@cisco.com, ahamza@cisco.com, gunter@cisco.com, diego@fastsoft.com +# RFC5181 || M-K. Shin, Ed., Y-H. Han, S-E. Kim, D. Premec || myungki.shin@gmail.com, yhhan@kut.ac.kr, sekim@kt.co.kr, domagoj.premec@siemens.com +# RFC5182 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC5183 || N. Freed || ned.freed@mrochek.com +# RFC5184 || F. Teraoka, K. Gogo, K. Mitsuya, R. Shibui, K. Mitani || tera@ics.keio.ac.jp, gogo@tera.ics.keio.ac.jp, mitsuya@sfc.wide.ad.jp, shibrie@tera.ics.keio.ac.jp, koki@tera.ics.keio.ac.jp, rajeev_koodli@yahoo.com +# RFC5185 || S. Mirtorabi, P. Psenak, A. Lindem, Ed., A. Oswal || sina@nuovasystems.com, ppsenak@cisco.com, acee@redback.com, aoswal@redback.com +# RFC5186 || B. Haberman, J. Martin || brian@innovationslab.net, jim@wovensystems.com +# RFC5187 || P. Pillay-Esnault, A. Lindem || ppe@cisco.com, acee@redback.com +# RFC5188 || H. Desineni, Q. Xie || hd@qualcomm.com, Qiaobing.Xie@Gmail.com +# RFC5189 || M. Stiemerling, J. Quittek, T. Taylor || stiemerling@nw.neclab.eu, quittek@nw.neclab.eu, tom.taylor.stds@gmail.com +# RFC5190 || J. Quittek, M. Stiemerling, P. Srisuresh || quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, srisuresh@yahoo.com +# RFC5191 || D. Forsberg, Y. Ohba, Ed., B. Patil, H. Tschofenig, A. Yegin || dan.forsberg@nokia.com, yohba@tari.toshiba.com, basavaraj.patil@nsn.com, hannes.tschofenig@nsn.com, a.yegin@partner.samsung.com +# RFC5192 || L. Morand, A. Yegin, S. Kumar, S. Madanapalli || lionel.morand@orange-ftgroup.com, a.yegin@partner.samsung.com, surajk@techmahindra.com, syam@samsung.com +# RFC5193 || P. Jayaraman, R. Lopez, Y. Ohba, Ed., M. Parthasarathy, A. Yegin || prakash_jayaraman@net.com, rafa@um.es, yohba@tari.toshiba.com, mohanp@sbcglobal.net, a.yegin@partner.samsung.com +# RFC5194 || A. van Wijk, Ed., G. Gybels, Ed. || guido.gybels@rnid.org.uk, arnoud@realtimetext.org +# RFC5195 || H. Ould-Brahim, D. Fedyk, Y. Rekhter || hbrahim@nortel.com, yakov@juniper.net, dwfedyk@nortel.com +# RFC5196 || M. Lonnfors, K. Kiss || mikko.lonnfors@nokia.com, krisztian.kiss@nokia.com +# RFC5197 || S. Fries, D. Ignjatic || steffen.fries@siemens.com, dignjatic@polycom.com +# RFC5198 || J. Klensin, M. Padlipsky || john-ietf@jck.com, the.map@alum.mit.edu +# RFC5201 || R. Moskowitz, P. Nikander, P. Jokela, Ed., T. Henderson || rgm@icsalabs.com, pekka.nikander@nomadiclab.com, petri.jokela@nomadiclab.com, thomas.r.henderson@boeing.com +# RFC5202 || P. Jokela, R. Moskowitz, P. Nikander || petri.jokela@nomadiclab.com, rgm@icsalabs.com, pekka.nikander@nomadiclab.com +# RFC5203 || J. Laganier, T. Koponen, L. Eggert || julien.ietf@laposte.net, teemu.koponen@iki.fi, lars.eggert@nokia.com +# RFC5204 || J. Laganier, L. Eggert || julien.ietf@laposte.net, lars.eggert@nokia.com +# RFC5205 || P. Nikander, J. Laganier || pekka.nikander@nomadiclab.com, julien.ietf@laposte.net +# RFC5206 || P. Nikander, T. Henderson, Ed., C. Vogt, J. Arkko || pekka.nikander@nomadiclab.com, thomas.r.henderson@boeing.com, christian.vogt@ericsson.com, jari.arkko@ericsson.com +# RFC5207 || M. Stiemerling, J. Quittek, L. Eggert || stiemerling@netlab.nec.de, quittek@nw.neclab.eu, lars.eggert@nokia.com +# RFC5208 || B. Kaliski || kaliski_burt@emc.com +# RFC5209 || P. Sangster, H. Khosravi, M. Mani, K. Narayan, J. Tardo || Paul_Sangster@symantec.com, hormuzd.m.khosravi@intel.com, mmani@avaya.com, kaushik@cisco.com, joseph.tardo@nevisnetworks.com +# RFC5210 || J. Wu, J. Bi, X. Li, G. Ren, K. Xu, M. Williams || jianping@cernet.edu.cn, junbi@cernet.edu.cn, xing@cernet.edu.cn, rg03@mails.tsinghua.edu.cn, xuke@csnet1.cs.tsinghua.edu.cn, miw@juniper.net +# RFC5211 || J. Curran || jcurran@istaff.org +# RFC5212 || K. Shiomoto, D. Papadimitriou, JL. Le Roux, M. Vigoureux, D. Brungard || shiomoto.kohei@lab.ntt.co.jp, dimitri.papadimitriou@alcatel-lucent.be, jeanlouis.leroux@orange-ftgroup.com, martin.vigoureux@alcatel-lucent.fr, dbrungard@att.com +# RFC5213 || S. Gundavelli, Ed., K. Leung, V. Devarapalli, K. Chowdhury, B. Patil || sgundave@cisco.com, kleung@cisco.com, vijay@wichorus.com, kchowdhury@starentnetworks.com, basavaraj.patil@nokia.com +# RFC5214 || F. Templin, T. Gleeson, D. Thaler || fred.l.templin@boeing.com, tgleeson@cisco.com, dthaler@microsoft.com +# RFC5215 || L. Barbato || lu_zero@gentoo.org +# RFC5216 || D. Simon, B. Aboba, R. Hurst || dansimon@microsoft.com, bernarda@microsoft.com, rmh@microsoft.com +# RFC5217 || M. Shimaoka, Ed., N. Hastings, R. Nielsen || m-shimaoka@secom.co.jp, nelson.hastings@nist.gov, nielsen_rebecca@bah.com +# RFC5218 || D. Thaler, B. Aboba || dthaler@microsoft.com, bernarda@microsoft.com +# RFC5219 || R. Finlayson || finlayson@live555.com +# RFC5220 || A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama || arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp +# RFC5221 || A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama || arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp +# RFC5222 || T. Hardie, A. Newton, H. Schulzrinne, H. Tschofenig || hardie@qualcomm.com, andy@hxr.us, hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@nsn.com +# RFC5223 || H. Schulzrinne, J. Polk, H. Tschofenig || hgs+ecrit@cs.columbia.edu, jmpolk@cisco.com, Hannes.Tschofenig@nsn.com +# RFC5224 || M. Brenner || mrbrenner@alcatel-lucent.com +# RFC5225 || G. Pelletier, K. Sandlund || ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com +# RFC5226 || T. Narten, H. Alvestrand || narten@us.ibm.com, Harald@Alvestrand.no +# RFC5227 || S. Cheshire || rfc@stuartcheshire.org +# RFC5228 || P. Guenther, Ed., T. Showalter, Ed. || guenther@sendmail.com, tjs@psaux.com +# RFC5229 || K. Homme || kjetilho@ifi.uio.no +# RFC5230 || T. Showalter, N. Freed, Ed. || tjs@psaux.com, ned.freed@mrochek.com +# RFC5231 || W. Segmuller, B. Leiba || werewolf@us.ibm.com, leiba@watson.ibm.com +# RFC5232 || A. Melnikov || alexey.melnikov@isode.com +# RFC5233 || K. Murchison || murch@andrew.cmu.edu +# RFC5234 || D. Crocker, Ed., P. Overell || dcrocker@bbiw.net, paul@bayleaf.org.uk +# RFC5235 || C. Daboo || cyrus@daboo.name +# RFC5236 || A. Jayasumana, N. Piratla, T. Banka, A. Bare, R. Whitner || Anura.Jayasumana@colostate.edu, Nischal.Piratla@telekom.de, Tarun.Banka@colostate.edu, abhijit_bare@agilent.com, rick_whitner@agilent.com +# RFC5237 || J. Arkko, S. Bradner || jari.arkko@piuha.net, sob@harvard.edu +# RFC5238 || T. Phelan || tphelan@sonusnet.com +# RFC5239 || M. Barnes, C. Boulton, O. Levin || mary.barnes@nortel.com, cboulton@avaya.com, oritl@microsoft.com +# RFC5240 || B. Joshi, R. Bijlani || bharat_joshi@infosys.com, rainab@gmail.com +# RFC5241 || A. Falk, S. Bradner || falk@bbn.com, sob@harvard.edu +# RFC5242 || J. Klensin, H. Alvestrand || john+ietf@jck.com, harald@alvestrand.no +# RFC5243 || R. Ogier || rich.ogier@earthlink.net +# RFC5244 || H. Schulzrinne, T. Taylor || schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com +# RFC5245 || J. Rosenberg || jdrosen@jdrosen.net +# RFC5246 || T. Dierks, E. Rescorla || tim@dierks.org, ekr@rtfm.com +# RFC5247 || B. Aboba, D. Simon, P. Eronen || bernarda@microsoft.com, dansimon@microsoft.com, pe@iki.fi +# RFC5248 || T. Hansen, J. Klensin || tony+mailesc@maillennium.att.com, john+ietf@jck.com +# RFC5249 || D. Harrington, Ed. || dharrington@huawei.com +# RFC5250 || L. Berger, I. Bryskin, A. Zinin, R. Coltun || lberger@labn.net, ibryskin@advaoptical.com, alex.zinin@alcatel-lucent.com, none +# RFC5251 || D. Fedyk, Ed., Y. Rekhter, Ed., D. Papadimitriou, R. Rabbat, L. Berger || dwfedyk@nortel.com, yakov@juniper.net, Dimitri.Papadimitriou@alcatel-lucent.be, rabbat@alum.mit.edu, lberger@labn.net +# RFC5252 || I. Bryskin, L. Berger || ibryskin@advaoptical.com, lberger@labn.net +# RFC5253 || T. Takeda, Ed. || takeda.tomonori@lab.ntt.co.jp +# RFC5254 || N. Bitar, Ed., M. Bocci, Ed., L. Martini, Ed. || nabil.bitar@verizon.com, matthew.bocci@alcatel-lucent.co.uk, lmartini@cisco.com +# RFC5255 || C. Newman, A. Gulbrandsen, A. Melnikov || chris.newman@sun.com, arnt@oryx.com, Alexey.Melnikov@isode.com +# RFC5256 || M. Crispin, K. Murchison || IMAP+SORT+THREAD@Lingling.Panda.COM, murch@andrew.cmu.edu +# RFC5257 || C. Daboo, R. Gellens || cyrus@daboo.name, randy@qualcomm.com +# RFC5258 || B. Leiba, A. Melnikov || leiba@watson.ibm.com, Alexey.Melnikov@isode.com +# RFC5259 || A. Melnikov, Ed., P. Coates, Ed. || Alexey.Melnikov@isode.com, peter.coates@Sun.COM +# RFC5260 || N. Freed || ned.freed@mrochek.com +# RFC5261 || J. Urpalainen || jari.urpalainen@nokia.com +# RFC5262 || M. Lonnfors, E. Leppanen, H. Khartabil, J. Urpalainen || mikko.lonnfors@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com, jari.urpalainen@nokia.com +# RFC5263 || M. Lonnfors, J. Costa-Requena, E. Leppanen, H. Khartabil || mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com +# RFC5264 || A. Niemi, M. Lonnfors, E. Leppanen || aki.niemi@nokia.com, mikko.lonnfors@nokia.com, eva.leppanen@saunalaht.fi +# RFC5265 || S. Vaarala, E. Klovning || sami.vaarala@iki.fi, espen@birdstep.com +# RFC5266 || V. Devarapalli, P. Eronen || vijay@wichorus.com, pe@iki.fi +# RFC5267 || D. Cridland, C. King || dave.cridland@isode.com, cking@mumbo.ca +# RFC5268 || R. Koodli, Ed. || rkoodli@starentnetworks.com[ +# RFC5269 || J. Kempf, R. Koodli || kempf@docomolabs-usa.com, rkoodli@starentnetworks.com +# RFC5270 || H. Jang, J. Jee, Y. Han, S. Park, J. Cha || heejin.jang@gmail.com, jhjee@etri.re.kr, yhhan@kut.ac.kr, soohong.park@samsung.com, jscha@etri.re.kr +# RFC5271 || H. Yokota, G. Dommety || yokota@kddilabs.jp, gdommety@cisco.com +# RFC5272 || J. Schaad, M. Myers || jimsch@nwlink.com, mmyers@fastq.com +# RFC5273 || J. Schaad, M. Myers || jimsch@nwlink.com, mmyers@fastq.com +# RFC5274 || J. Schaad, M. Myers || jimsch@nwlink.com, mmyers@fastq.com +# RFC5275 || S. Turner || turners@ieca.com +# RFC5276 || C. Wallace || cwallace@cygnacom.com +# RFC5277 || S. Chisholm, H. Trevino || schishol@nortel.com, htrevino@cisco.com +# RFC5278 || J. Livingood, D. Troshynski || jason_livingood@cable.comcast.com, dtroshynski@acmepacket.com +# RFC5279 || A. Monrad, S. Loreto || atle.monrad@ericsson.com, Salvatore.Loreto@ericsson.com +# RFC5280 || D. Cooper, S. Santesson, S. Farrell, S. Boeyen, R. Housley, W. Polk || david.cooper@nist.gov, stefans@microsoft.com, stephen.farrell@cs.tcd.ie, sharon.boeyen@entrust.com, housley@vigilsec.com, wpolk@nist.gov +# RFC5281 || P. Funk, S. Blake-Wilson || PaulFunk@alum.mit.edu, sblakewilson@nl.safenet-inc.com +# RFC5282 || D. Black, D. McGrew || black_david@emc.com, mcgrew@cisco.com +# RFC5283 || B. Decraene, JL. Le Roux, I. Minei || bruno.decraene@orange-ftgroup.com, jeanlouis.leroux@orange-ftgroup.com, ina@juniper.net +# RFC5284 || G. Swallow, A. Farrel || swallow@cisco.com, adrian@olddog.co.uk +# RFC5285 || D. Singer, H. Desineni || singer@apple.com, hd@qualcomm.com +# RFC5286 || A. Atlas, Ed., A. Zinin, Ed. || alia.atlas@bt.com, alex.zinin@alcatel-lucent.com +# RFC5287 || A. Vainshtein, Y(J). Stein || Alexander.Vainshtein@ecitele.com, yaakov_s@rad.com +# RFC5288 || J. Salowey, A. Choudhury, D. McGrew || jsalowey@cisco.com, abhijitc@cisco.com, mcgrew@cisco.com +# RFC5289 || E. Rescorla || ekr@rtfm.com +# RFC5290 || S. Floyd, M. Allman || floyd@icir.org, mallman@icir.org +# RFC5291 || E. Chen, Y. Rekhter || enkechen@cisco.com, yakov@juniper.net +# RFC5292 || E. Chen, S. Sangli || enkechen@cisco.com, rsrihari@cisco.com +# RFC5293 || J. Degener, P. Guenther || jutta@pobox.com, guenther@sendmail.com +# RFC5294 || P. Savola, J. Lingard || psavola@funet.fi, jchl@arastra.com +# RFC5295 || J. Salowey, L. Dondeti, V. Narayanan, M. Nakhjiri || jsalowey@cisco.com, ldondeti@qualcomm.com, vidyan@qualcomm.com, madjid.nakhjiri@motorola.com +# RFC5296 || V. Narayanan, L. Dondeti || vidyan@qualcomm.com, ldondeti@qualcomm.com +# RFC5297 || D. Harkins || dharkins@arubanetworks.com +# RFC5298 || T. Takeda, Ed., A. Farrel, Ed., Y. Ikejiri, JP. Vasseur || takeda.tomonori@lab.ntt.co.jp, y.ikejiri@ntt.com, adrian@olddog.co.uk, jpv@cisco.com +# RFC5301 || D. McPherson, N. Shen || danny@arbor.net, naiming@cisco.com +# RFC5302 || T. Li, H. Smit, T. Przygienda || tony.li@tony.li, hhw.smit@xs4all.nl, prz@net4u.ch +# RFC5303 || D. Katz, R. Saluja, D. Eastlake 3rd || dkatz@juniper.net, rajesh.saluja@tenetindia.com, d3e3e3@gmail.com +# RFC5304 || T. Li, R. Atkinson || tony.li@tony.li, rja@extremenetworks.com +# RFC5305 || T. Li, H. Smit || tony.li@tony.li, hhwsmit@xs4all.nl +# RFC5306 || M. Shand, L. Ginsberg || mshand@cisco.com, ginsberg@cisco.com +# RFC5307 || K. Kompella, Ed., Y. Rekhter, Ed. || kireeti@juniper.net, yakov@juniper.net +# RFC5308 || C. Hopps || chopps@cisco.com +# RFC5309 || N. Shen, Ed., A. Zinin, Ed. || naiming@cisco.com, alex.zinin@alcatel-lucent.com +# RFC5310 || M. Bhatia, V. Manral, T. Li, R. Atkinson, R. White, M. Fanto || manav@alcatel-lucent.com, vishwas@ipinfusion.com, tony.li@tony.li, rja@extremenetworks.com, riw@cisco.com, mfanto@aegisdatasecurity.com +# RFC5311 || D. McPherson, Ed., L. Ginsberg, S. Previdi, M. Shand || danny@arbor.net, ginsberg@cisco.com, sprevidi@cisco.com, mshand@cisco.com +# RFC5316 || M. Chen, R. Zhang, X. Duan || mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com +# RFC5317 || S. Bryant, Ed., L. Andersson, Ed. || stbryant@cisco.com, loa@pi.nu +# RFC5318 || J. Hautakorpi, G. Camarillo || Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com +# RFC5320 || F. Templin, Ed. || fltemplin@acm.org +# RFC5321 || J. Klensin || john+smtp@jck.com +# RFC5322 || P. Resnick, Ed. || presnick@qti.qualcomm.com +# RFC5323 || J. Reschke, Ed., S. Reddy, J. Davis, A. Babich || julian.reschke@greenbytes.de, Surendra.Reddy@mitrix.com, jrd3@alum.mit.edu, ababich@us.ibm.com +# RFC5324 || C. DeSanti, F. Maino, K. McCloghrie || cds@cisco.com, fmaino@cisco.com, kzm@cisco.com +# RFC5325 || S. Burleigh, M. Ramadas, S. Farrell || Scott.Burleigh@jpl.nasa.gov, mramadas@gmail.com, stephen.farrell@cs.tcd.ie +# RFC5326 || M. Ramadas, S. Burleigh, S. Farrell || mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov, stephen.farrell@cs.tcd.ie +# RFC5327 || S. Farrell, M. Ramadas, S. Burleigh || stephen.farrell@cs.tcd.ie, mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov +# RFC5328 || A. Adolf, P. MacAvock || alexander.adolf@micronas.com, macavock@dvb.org +# RFC5329 || K. Ishiguro, V. Manral, A. Davey, A. Lindem, Ed. || kunihiro@ipinfusion.com, vishwas@ipinfusion.com, Alan.Davey@dataconnection.com, acee@redback.com +# RFC5330 || JP. Vasseur, Ed., M. Meyer, K. Kumaki, A. Bonda || jpv@cisco.com, matthew.meyer@bt.com, ke-kumaki@kddi.com, alberto.tempiabonda@telecomitalia.it +# RFC5331 || R. Aggarwal, Y. Rekhter, E. Rosen || rahul@juniper.net, yakov@juniper.net, erosen@cisco.com +# RFC5332 || T. Eckert, E. Rosen, Ed., R. Aggarwal, Y. Rekhter || eckert@cisco.com, erosen@cisco.com, rahul@juniper.net, yakov@juniper.net +# RFC5333 || R. Mahy, B. Hoeneisen || rohan@ekabal.com, bernie@ietf.hoeneisen.ch +# RFC5334 || I. Goncalves, S. Pfeiffer, C. Montgomery || justivo@gmail.com, silvia@annodex.net, monty@xiph.org +# RFC5335 || A. Yang, Ed. || abelyang@twnic.net.tw +# RFC5336 || J. Yao, Ed., W. Mao, Ed. || yaojk@cnnic.cn, maowei_ietf@cnnic.cn +# RFC5337 || C. Newman, A. Melnikov, Ed. || chris.newman@sun.com, Alexey.Melnikov@isode.com +# RFC5338 || T. Henderson, P. Nikander, M. Komu || thomas.r.henderson@boeing.com, pekka.nikander@nomadiclab.com, miika@iki.fi +# RFC5339 || JL. Le Roux, Ed., D. Papadimitriou, Ed. || jeanlouis.leroux@orange-ftgroup.com, dimitri.papadimitriou@alcatel-lucent.be +# RFC5340 || R. Coltun, D. Ferguson, J. Moy, A. Lindem || none, dennis@juniper.net, jmoy@sycamorenet.com, acee@redback.com +# RFC5341 || C. Jennings, V. Gurbani || fluffy@cisco.com, vkg@alcatel-lucent.com +# RFC5342 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC5343 || J. Schoenwaelder || j.schoenwaelder@jacobs-university.de +# RFC5344 || A. Houri, E. Aoki, S. Parameswar || avshalom@il.ibm.com, aoki@aol.net, Sriram.Parameswar@microsoft.com +# RFC5345 || J. Schoenwaelder || j.schoenwaelder@jacobs-university.de +# RFC5346 || J. Lim, W. Kim, C. Park, L. Conroy || jhlim@nida.or.kr, wkim@nida.or.kr, ckp@nida.or.kr, lconroy@insensate.co.uk +# RFC5347 || F. Andreasen, D. Hancock || fandreas@cisco.com, d.hancock@cablelabs.com +# RFC5348 || S. Floyd, M. Handley, J. Padhye, J. Widmer || floyd@icir.org, M.Handley@cs.ucl.ac.uk, padhye@microsoft.com, widmer@acm.org +# RFC5349 || L. Zhu, K. Jaganathan, K. Lauter || lzhu@microsoft.com, karthikj@microsoft.com, klauter@microsoft.com +# RFC5350 || J. Manner, A. McDonald || jukka.manner@tkk.fi, andrew.mcdonald@roke.co.uk +# RFC5351 || P. Lei, L. Ong, M. Tuexen, T. Dreibholz || peterlei@cisco.com, Lyong@Ciena.com, tuexen@fh-muenster.de, dreibh@iem.uni-due.de +# RFC5352 || R. Stewart, Q. Xie, M. Stillman, M. Tuexen || randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de +# RFC5353 || Q. Xie, R. Stewart, M. Stillman, M. Tuexen, A. Silverton || Qiaobing.Xie@gmail.org, randall@lakerest.net, maureen.stillman@nokia.com, tuexen@fh-muenster.de, ajs.ietf@gmail.com +# RFC5354 || R. Stewart, Q. Xie, M. Stillman, M. Tuexen || randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de +# RFC5355 || M. Stillman, Ed., R. Gopal, E. Guttman, S. Sengodan, M. Holdrege || maureen.stillman@nokia.com, ram.gopal@nsn.com, Erik.Guttman@sun.com, Senthil.sengodan@nsn.com, Holdrege@gmail.com +# RFC5356 || T. Dreibholz, M. Tuexen || dreibh@iem.uni-due.de, tuexen@fh-muenster.de +# RFC5357 || K. Hedayat, R. Krzanowski, A. Morton, K. Yum, J. Babiarz || khedayat@brixnet.com, roman.krzanowski@verizon.com, acmorton@att.com, kyum@juniper.net, babiarz@nortel.com +# RFC5358 || J. Damas, F. Neves || Joao_Damas@isc.org, fneves@registro.br +# RFC5359 || A. Johnston, Ed., R. Sparks, C. Cunningham, S. Donovan, K. Summers || alan@sipstation.com, RjS@nostrum.com, chrcunni@cisco.com, srd@cisco.com, ksummers@sonusnet.com +# RFC5360 || J. Rosenberg, G. Camarillo, Ed., D. Willis || jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com +# RFC5361 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5362 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5363 || G. Camarillo, A.B. Roach || Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com +# RFC5364 || M. Garcia-Martin, G. Camarillo || miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com +# RFC5365 || M. Garcia-Martin, G. Camarillo || miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com +# RFC5366 || G. Camarillo, A. Johnston || Gonzalo.Camarillo@ericsson.com, alan@sipstation.com +# RFC5367 || G. Camarillo, A.B. Roach, O. Levin || Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com, oritl@microsoft.com +# RFC5368 || G. Camarillo, A. Niemi, M. Isomaki, M. Garcia-Martin, H. Khartabil || Gonzalo.Camarillo@ericsson.com, Aki.Niemi@nokia.com, markus.isomaki@nokia.com, miguel.a.garcia@ericsson.com, hisham.khartabil@gmail.com +# RFC5369 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5370 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5371 || S. Futemma, E. Itakura, A. Leung || satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp, andrew@ualberta.net +# RFC5372 || A. Leung, S. Futemma, E. Itakura || andrew@ualberta.net, satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp +# RFC5373 || D. Willis, Ed., A. Allen || dean.willis@softarmor.com, aallen@rim.com +# RFC5374 || B. Weis, G. Gross, D. Ignjatic || bew@cisco.com, gmgross@securemulticast.net, dignjatic@polycom.com +# RFC5375 || G. Van de Velde, C. Popoviciu, T. Chown, O. Bonness, C. Hahn || gunter@cisco.com, cpopovic@cisco.com, tjc@ecs.soton.ac.uk, Olaf.Bonness@t-systems.com, HahnC@t-systems.com +# RFC5376 || N. Bitar, R. Zhang, K. Kumaki || nabil.n.bitar@verizon.com, ke-kumaki@kddi.com, Raymond.zhang@bt.com +# RFC5377 || J. Halpern, Ed. || jmh@joelhalpern.com +# RFC5378 || S. Bradner, Ed., J. Contreras, Ed. || sob@harvard.edu, jorge.contreras@wilmerhale.com +# RFC5379 || M. Munakata, S. Schubert, T. Ohba || munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp +# RFC5380 || H. Soliman, C. Castelluccia, K. ElMalki, L. Bellier || hesham@elevatemobile.com, claude.castelluccia@inria.fr, karim@athonet.com, ludovic.bellier@inria.fr +# RFC5381 || T. Iijima, Y. Atarashi, H. Kimura, M. Kitani, H. Okita || tomoyuki.iijima@alaxala.com, atarashi@alaxala.net, h-kimura@alaxala.net, makoto.kitani@alaxala.com, hideki.okita.pf@hitachi.com +# RFC5382 || S. Guha, Ed., K. Biswas, B. Ford, S. Sivakumar, P. Srisuresh || saikat@cs.cornell.edu, kbiswas@cisco.com, baford@mpi-sws.org, ssenthil@cisco.com, srisuresh@yahoo.com +# RFC5383 || R. Gellens || randy@qualcomm.com +# RFC5384 || A. Boers, I. Wijnands, E. Rosen || aboers@cisco.com, ice@cisco.com, erosen@cisco.com +# RFC5385 || J. Touch || touch@isi.edu +# RFC5386 || N. Williams, M. Richardson || Nicolas.Williams@sun.com, mcr@sandelman.ottawa.on.ca +# RFC5387 || J. Touch, D. Black, Y. Wang || touch@isi.edu, black_david@emc.com, yu-shun.wang@microsoft.com +# RFC5388 || S. Niccolini, S. Tartarelli, J. Quittek, T. Dietz, M. Swany || saverio.niccolini@nw.neclab.eu, sandra.tartarelli@nw.neclab.eu, quittek@nw.neclab.eu, thomas.dietz@nw.neclab.eu, swany@UDel.Edu +# RFC5389 || J. Rosenberg, R. Mahy, P. Matthews, D. Wing || jdrosen@cisco.com, rohan@ekabal.com, philip_matthews@magma.ca, dwing-ietf@fuggles.com +# RFC5390 || J. Rosenberg || jdrosen@cisco.com +# RFC5391 || A. Sollaud || aurelien.sollaud@orange-ftgroup.com +# RFC5392 || M. Chen, R. Zhang, X. Duan || mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com +# RFC5393 || R. Sparks, Ed., S. Lawrence, A. Hawrylyshen, B. Campen || RjS@nostrum.com, scott.lawrence@nortel.com, alan.ietf@polyphase.ca, bcampen@estacado.net +# RFC5394 || I. Bryskin, D. Papadimitriou, L. Berger, J. Ash || ibryskin@advaoptical.com, dimitri.papadimitriou@alcatel.be, lberger@labn.net, gash5107@yahoo.com +# RFC5395 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC5396 || G. Huston, G. Michaelson || gih@apnic.net, ggm@apnic.net +# RFC5397 || W. Sanchez, C. Daboo || wsanchez@wsanchez.net, cyrus@daboo.name +# RFC5398 || G. Huston || gih@apnic.net +# RFC5401 || B. Adamson, C. Bormann, M. Handley, J. Macker || adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil +# RFC5402 || T. Harding, Ed. || tharding@us.axway.com +# RFC5403 || M. Eisler || mike@eisler.com +# RFC5404 || M. Westerlund, I. Johansson || magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com +# RFC5405 || L. Eggert, G. Fairhurst || lars.eggert@nokia.com, gorry@erg.abdn.ac.uk +# RFC5406 || S. Bellovin || bellovin@acm.org +# RFC5407 || M. Hasebe, J. Koshiko, Y. Suzuki, T. Yoshikawa, P. Kyzivat || hasebe.miki@east.ntt.co.jp, j.koshiko@east.ntt.co.jp, suzuki.yasushi@lab.ntt.co.jp, tomoyuki.yoshikawa@east.ntt.co.jp, pkyzivat@cisco.com +# RFC5408 || G. Appenzeller, L. Martin, M. Schertler || appenz@cs.stanford.edu, martin@voltage.com, mschertler@us.axway.com +# RFC5409 || L. Martin, M. Schertler || martin@voltage.com, mschertler@us.axway.com +# RFC5410 || A. Jerichow, Ed., L. Piron || anja.jerichow@nsn.com, laurent.piron@nagravision.com +# RFC5411 || J. Rosenberg || jdrosen@cisco.com +# RFC5412 || P. Calhoun, R. Suri, N. Cam-Winget, M. Williams, S. Hares, B. O'Hara, S. Kelly || pcalhoun@cisco.com, rsuri@cisco.com, ncamwing@cisco.com, gwhiz@gwhiz.com, shares@ndzh.com, bob.ohara@computer.org, scott@hyperthought.com +# RFC5413 || P. Narasimhan, D. Harkins, S. Ponnuswamy || partha@arubanetworks.com, dharkins@arubanetworks.com, subbu@arubanetworks.com +# RFC5414 || S. Iino, S. Govindan, M. Sugiura, H. Cheng || iino.satoshi@jp.panasonic.com, saravanan.govindan@sg.panasonic.com, sugiura.mikihito@jp.panasonic.com, hong.cheng@sg.panasonic.com +# RFC5415 || P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed. || pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com +# RFC5416 || P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed. || pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com +# RFC5417 || P. Calhoun || pcalhoun@cisco.com +# RFC5418 || S. Kelly, T. Clancy || scott@hyperthought.com, clancy@LTSnet.net +# RFC5419 || B. Patil, G. Dommety || basavaraj.patil@nokia.com, gdommety@cisco.com +# RFC5420 || A. Farrel, Ed., D. Papadimitriou, JP. Vasseur, A. Ayyangarps || adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net +# RFC5421 || N. Cam-Winget, H. Zhou || ncamwing@cisco.com, hzhou@cisco.com +# RFC5422 || N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou || ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com +# RFC5423 || R. Gellens, C. Newman || rg+ietf@qualcomm.com, chris.newman@sun.com +# RFC5424 || R. Gerhards || rgerhards@adiscon.com +# RFC5425 || F. Miao, Ed., Y. Ma, Ed., J. Salowey, Ed. || miaofy@huawei.com, myz@huawei.com, jsalowey@cisco.com +# RFC5426 || A. Okmianski || aokmians@cisco.com +# RFC5427 || G. Keeni || glenn@cysols.com +# RFC5428 || S. Channabasappa, W. De Ketelaere, E. Nechamkin || Sumanth@cablelabs.com, deketelaere@tComLabs.com, enechamkin@broadcom.com +# RFC5429 || A. Stone, Ed. || aaron@serendipity.palo-alto.ca.us +# RFC5430 || M. Salter, E. Rescorla, R. Housley || msalter@restarea.ncsc.mil, ekr@rtfm.com, housley@vigilsec.com +# RFC5431 || D. Sun || dongsun@alcatel-lucent.com +# RFC5432 || J. Polk, S. Dhesikan, G. Camarillo || jmpolk@cisco.com, sdhesika@cisco.com, Gonzalo.Camarillo@ericsson.com +# RFC5433 || T. Clancy, H. Tschofenig || clancy@ltsnet.net, Hannes.Tschofenig@gmx.net +# RFC5434 || T. Narten || narten@us.ibm.com +# RFC5435 || A. Melnikov, Ed., B. Leiba, Ed., W. Segmuller, T. Martin || Alexey.Melnikov@isode.com, leiba@watson.ibm.com, werewolf@us.ibm.com, timmartin@alumni.cmu.edu +# RFC5436 || B. Leiba, M. Haardt || leiba@watson.ibm.com, michael.haardt@freenet.ag +# RFC5437 || P. Saint-Andre, A. Melnikov || ietf@stpeter.im, Alexey.Melnikov@isode.com +# RFC5438 || E. Burger, H. Khartabil || eburger@standardstrack.com, hisham.khartabil@gmail.com +# RFC5439 || S. Yasukawa, A. Farrel, O. Komolafe || s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, femi@cisco.com +# RFC5440 || JP. Vasseur, Ed., JL. Le Roux, Ed. || jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com +# RFC5441 || JP. Vasseur, Ed., R. Zhang, N. Bitar, JL. Le Roux || jpv@cisco.com, raymond.zhang@bt.com, nabil.n.bitar@verizon.com, jeanlouis.leroux@orange-ftgroup.com +# RFC5442 || E. Burger, G. Parsons || eburger@standardstrack.com, gparsons@nortel.com +# RFC5443 || M. Jork, A. Atlas, L. Fang || Markus.Jork@genband.com, alia.atlas@bt.com, lufang@cisco.com +# RFC5444 || T. Clausen, C. Dearlove, J. Dean, C. Adjih || T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil, Cedric.Adjih@inria.fr +# RFC5445 || M. Watson || mark@digitalfountain.com +# RFC5446 || J. Korhonen, U. Nilsson || jouni.nospam@gmail.com, ulf.s.nilsson@teliasonera.com +# RFC5447 || J. Korhonen, Ed., J. Bournelle, H. Tschofenig, C. Perkins, K. Chowdhury || jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, Hannes.Tschofenig@nsn.com, charliep@wichorus.com, kchowdhury@starentnetworks.com +# RFC5448 || J. Arkko, V. Lehtovirta, P. Eronen || jari.arkko@piuha.net, vesa.lehtovirta@ericsson.com, pe@iki.fi +# RFC5449 || E. Baccelli, P. Jacquet, D. Nguyen, T. Clausen || Emmanuel.Baccelli@inria.fr, Philippe.Jacquet@inria.fr, dang.nguyen@crc.ca, T.Clausen@computer.org +# RFC5450 || D. Singer, H. Desineni || singer@apple.com, hd@qualcomm.com +# RFC5451 || M. Kucherawy || msk+ietf@sendmail.com +# RFC5452 || A. Hubert, R. van Mook || bert.hubert@netherlabs.nl, remco@eu.equinix.com +# RFC5453 || S. Krishnan || suresh.krishnan@ericsson.com +# RFC5454 || G. Tsirtsis, V. Park, H. Soliman || tsirtsis@googlemail.com, vpark@qualcomm.com, hesham@elevatemobile.com +# RFC5455 || S. Sivabalan, Ed., J. Parker, S. Boutros, K. Kumaki || msiva@cisco.com, jdparker@cisco.com, sboutros@cisco.com, ke-kumaki@kddi.com +# RFC5456 || M. Spencer, B. Capouch, E. Guy, Ed., F. Miller, K. Shumard || markster@digium.com, brianc@saintjoe.edu, edguy@emcsw.com, mail@frankwmiller.net, kshumard@gmail.com +# RFC5457 || E. Guy, Ed. || edguy@emcsw.com +# RFC5458 || H. Cruickshank, P. Pillai, M. Noisternig, S. Iyengar || h.cruickshank@surrey.ac.uk, p.pillai@bradford.ac.uk, mnoist@cosy.sbg.ac.at, sunil.iyengar@logica.com +# RFC5459 || A. Sollaud || aurelien.sollaud@orange-ftgroup.com +# RFC5460 || M. Stapp || mjs@cisco.com +# RFC5461 || F. Gont || fernando@gont.com.ar +# RFC5462 || L. Andersson, R. Asati || loa@pi.nu, rajiva@cisco.com +# RFC5463 || N. Freed || ned.freed@mrochek.com +# RFC5464 || C. Daboo || cyrus@daboo.name +# RFC5465 || A. Gulbrandsen, C. King, A. Melnikov || arnt@oryx.com, Curtis.King@isode.com, Alexey.Melnikov@isode.com +# RFC5466 || A. Melnikov, C. King || Alexey.Melnikov@isode.com, Curtis.King@isode.com +# RFC5467 || L. Berger, A. Takacs, D. Caviglia, D. Fedyk, J. Meuric || lberger@labn.net, attila.takacs@ericsson.com, diego.caviglia@ericsson.com, dwfedyk@nortel.com, julien.meuric@orange-ftgroup.com +# RFC5468 || S. Dasgupta, J. de Oliveira, JP. Vasseur || sukrit@ece.drexel.edu, jau@ece.drexel.edu, jpv@cisco.com +# RFC5469 || P. Eronen, Ed. || pe@iki.fi +# RFC5470 || G. Sadasivan, N. Brownlee, B. Claise, J. Quittek || gsadasiv@rohati.com, n.brownlee@auckland.ac.nz, bclaise@cisco.com, quittek@nw.neclab.eu +# RFC5471 || C. Schmoll, P. Aitken, B. Claise || carsten.schmoll@fokus.fraunhofer.de, paitken@cisco.com, bclaise@cisco.com +# RFC5472 || T. Zseby, E. Boschi, N. Brownlee, B. Claise || tanja.zseby@fokus.fraunhofer.de, elisa.boschi@hitachi-eu.com, nevil@caida.org, bclaise@cisco.com +# RFC5473 || E. Boschi, L. Mark, B. Claise || elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, bclaise@cisco.com +# RFC5474 || N. Duffield, Ed., D. Chiou, B. Claise, A. Greenberg, M. Grossglauser, J. Rexford || duffield@research.att.com, Derek@ece.utexas.edu, bclaise@cisco.com, albert@microsoft.com, matthias.grossglauser@epfl.ch, jrex@cs.princeton.edu +# RFC5475 || T. Zseby, M. Molina, N. Duffield, S. Niccolini, F. Raspall || tanja.zseby@fokus.fraunhofer.de, maurizio.molina@dante.org.uk, duffield@research.att.com, saverio.niccolini@netlab.nec.de, fredi@entel.upc.es +# RFC5476 || B. Claise, Ed., A. Johnson, J. Quittek || bclaise@cisco.com, andrjohn@cisco.com, quittek@nw.neclab.eu +# RFC5477 || T. Dietz, B. Claise, P. Aitken, F. Dressler, G. Carle || Thomas.Dietz@nw.neclab.eu, bclaise@cisco.com, paitken@cisco.com, dressler@informatik.uni-erlangen.de, carle@informatik.uni-tuebingen.de +# RFC5478 || J. Polk || jmpolk@cisco.com +# RFC5479 || D. Wing, Ed., S. Fries, H. Tschofenig, F. Audet || dwing-ietf@fuggles.com, steffen.fries@siemens.com, Hannes.Tschofenig@nsn.com, audet@nortel.com +# RFC5480 || S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk || turners@ieca.com, kelviny@microsoft.com, dbrown@certicom.com, housley@vigilsec.com, wpolk@nist.gov +# RFC5481 || A. Morton, B. Claise || acmorton@att.com, bclaise@cisco.com +# RFC5482 || L. Eggert, F. Gont || lars.eggert@nokia.com, fernando@gont.com.ar +# RFC5483 || L. Conroy, K. Fujiwara || lconroy@insensate.co.uk, fujiwara@jprs.co.jp +# RFC5484 || D. Singer || singer@apple.com +# RFC5485 || R. Housley || housley@vigilsec.com +# RFC5486 || D. Malas, Ed., D. Meyer, Ed. || d.malas@cablelabs.com, dmm@1-4-5.net +# RFC5487 || M. Badra || badra@isima.fr +# RFC5488 || S. Gundavelli, G. Keeni, K. Koide, K. Nagami || sgundave@cisco.com, glenn@cysols.com, ka-koide@kddi.com, nagami@inetcore.com +# RFC5489 || M. Badra, I. Hajjeh || badra@isima.fr, ibrahim.hajjeh@ineovation.fr +# RFC5490 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC5491 || J. Winterbottom, M. Thomson, H. Tschofenig || james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net +# RFC5492 || J. Scudder, R. Chandra || jgs@juniper.net, rchandra@sonoasystems.com +# RFC5493 || D. Caviglia, D. Bramanti, D. Li, D. McDysan || diego.caviglia@ericsson.com, dino.bramanti@ericsson.com, danli@huawei.com, dave.mcdysan@verizon.com +# RFC5494 || J. Arkko, C. Pignataro || jari.arkko@piuha.net, cpignata@cisco.com +# RFC5495 || D. Li, J. Gao, A. Satyanarayana, S. Bardalai || danli@huawei.com, gjhhit@huawei.com, asatyana@cisco.com, snigdho.bardalai@us.fujitsu.com +# RFC5496 || IJ. Wijnands, A. Boers, E. Rosen || ice@cisco.com, aboers@cisco.com, erosen@cisco.com +# RFC5497 || T. Clausen, C. Dearlove || T.Clausen@computer.org, chris.dearlove@baesystems.com +# RFC5498 || I. Chakeres || ian.chakeres@gmail.com +# RFC5501 || Y. Kamite, Ed., Y. Wada, Y. Serbest, T. Morin, L. Fang || y.kamite@ntt.com, wada.yuichiro@lab.ntt.co.jp, yetik_serbest@labs.att.com, thomas.morin@francetelecom.com, lufang@cisco.com +# RFC5502 || J. van Elburg || HansErik.van.Elburg@ericsson.com +# RFC5503 || F. Andreasen, B. McKibben, B. Marshall || fandreas@cisco.com, B.McKibben@cablelabs.com, wtm@research.att.com +# RFC5504 || K. Fujiwara, Ed., Y. Yoneya, Ed. || fujiwara@jprs.co.jp, yone@jprs.co.jp +# RFC5505 || B. Aboba, D. Thaler, L. Andersson, S. Cheshire || bernarda@microsoft.com, dthaler@microsoft.com, loa.andersson@ericsson.com, cheshire@apple.com +# RFC5506 || I. Johansson, M. Westerlund || ingemar.s.johansson@ericsson.com, magnus.westerlund@ericsson.com +# RFC5507 || IAB, P. Faltstrom, Ed., R. Austein, Ed., P. Koch, Ed. || iab@iab.org, paf@cisco.com, sra@isc.org, pk@denic.de +# RFC5508 || P. Srisuresh, B. Ford, S. Sivakumar, S. Guha || srisuresh@yahoo.com, baford@mpi-sws.org, ssenthil@cisco.com, saikat@cs.cornell.edu +# RFC5509 || S. Loreto || Salvatore.Loreto@ericsson.com +# RFC5510 || J. Lacan, V. Roca, J. Peltotalo, S. Peltotalo || jerome.lacan@isae.fr, vincent.roca@inria.fr, jani.peltotalo@tut.fi, sami.peltotalo@tut.fi +# RFC5511 || A. Farrel || adrian@olddog.co.uk +# RFC5512 || P. Mohapatra, E. Rosen || pmohapat@cisco.com, erosen@cisco.com +# RFC5513 || A. Farrel || adrian@olddog.co.uk +# RFC5514 || E. Vyncke || evyncke@cisco.com +# RFC5515 || V. Mammoliti, C. Pignataro, P. Arberg, J. Gibbons, P. Howard || vince@cisco.com, cpignata@cisco.com, parberg@redback.com, jgibbons@juniper.net, howsoft@mindspring.com +# RFC5516 || M. Jones, L. Morand || mark.jones@bridgewatersystems.com, lionel.morand@orange-ftgroup.com +# RFC5517 || S. HomChaudhuri, M. Foschiano || sanjibhc@gmail.com, foschia@cisco.com +# RFC5518 || P. Hoffman, J. Levine, A. Hathcock || paul.hoffman@domain-assurance.org, john.levine@domain-assurance.org, arvel.hathcock@altn.com +# RFC5519 || J. Chesterfield, B. Haberman, Ed. || julian.chesterfield@cl.cam.ac.uk, brian@innovationslab.net +# RFC5520 || R. Bradford, Ed., JP. Vasseur, A. Farrel || rbradfor@cisco.com, jpv@cisco.com, adrian@olddog.co.uk +# RFC5521 || E. Oki, T. Takeda, A. Farrel || oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC5522 || W. Eddy, W. Ivancic, T. Davis || weddy@grc.nasa.gov, William.D.Ivancic@grc.nasa.gov, Terry.L.Davis@boeing.com +# RFC5523 || L. Berger || lberger@labn.net +# RFC5524 || D. Cridland || dave.cridland@isode.com +# RFC5525 || T. Dreibholz, J. Mulik || dreibh@iem.uni-due.de, jaiwant@mulik.com +# RFC5526 || J. Livingood, P. Pfautz, R. Stastny || jason_livingood@cable.comcast.com, ppfautz@att.com, richard.stastny@gmail.com +# RFC5527 || M. Haberler, O. Lendl, R. Stastny || ietf@mah.priv.at, otmar.lendl@enum.at, richardstastny@gmail.com +# RFC5528 || A. Kato, M. Kanda, S. Kanno || akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp +# RFC5529 || A. Kato, M. Kanda, S. Kanno || akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp +# RFC5530 || A. Gulbrandsen || arnt@oryx.com +# RFC5531 || R. Thurlow || robert.thurlow@sun.com +# RFC5532 || T. Talpey, C. Juszczak || tmtalpey@gmail.com, chetnh@earthlink.net +# RFC5533 || E. Nordmark, M. Bagnulo || erik.nordmark@sun.com, marcelo@it.uc3m.es +# RFC5534 || J. Arkko, I. van Beijnum || jari.arkko@ericsson.com, iljitsch@muada.com +# RFC5535 || M. Bagnulo || marcelo@it.uc3m.es +# RFC5536 || K. Murchison, Ed., C. Lindsey, D. Kohn || murch@andrew.cmu.edu, chl@clerew.man.ac.uk, dan@dankohn.com +# RFC5537 || R. Allbery, Ed., C. Lindsey || rra@stanford.edu, chl@clerew.man.ac.uk +# RFC5538 || F. Ellermann || hmdmhdfmhdjmzdtjmzdtzktdkztdjz@gmail.com +# RFC5539 || M. Badra || badra@isima.fr +# RFC5540 || RFC Editor || rfc-editor@rfc-editor.org +# RFC5541 || JL. Le Roux, JP. Vasseur, Y. Lee || jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, ylee@huawei.com +# RFC5542 || T. Nadeau, Ed., D. Zelig, Ed., O. Nicklass, Ed. || tom.nadeau@bt.com, davidz@oversi.com, orlyn@radvision.com +# RFC5543 || H. Ould-Brahim, D. Fedyk, Y. Rekhter || hbrahim@nortel.com, donald.fedyk@alcatel-lucent.com, yakov@juniper.com +# RFC5544 || A. Santoni || adriano.santoni@actalis.it +# RFC5545 || B. Desruisseaux, Ed. || bernard.desruisseaux@oracle.com +# RFC5546 || C. Daboo, Ed. || cyrus@daboo.name +# RFC5547 || M. Garcia-Martin, M. Isomaki, G. Camarillo, S. Loreto, P. Kyzivat || miguel.a.garcia@ericsson.com, markus.isomaki@nokia.com, Gonzalo.Camarillo@ericsson.com, Salvatore.Loreto@ericsson.com, pkyzivat@cisco.com +# RFC5548 || M. Dohler, Ed., T. Watteyne, Ed., T. Winter, Ed., D. Barthel, Ed. || mischa.dohler@cttc.es, watteyne@eecs.berkeley.edu, wintert@acm.org, Dominique.Barthel@orange-ftgroup.com +# RFC5549 || F. Le Faucheur, E. Rosen || flefauch@cisco.com, erosen@cisco.com +# RFC5550 || D. Cridland, Ed., A. Melnikov, Ed., S. Maes, Ed. || dave.cridland@isode.com, Alexey.Melnikov@isode.com, stephane.maes@oracle.com +# RFC5551 || R. Gellens, Ed. || rg+ietf@qualcomm.com +# RFC5552 || D. Burke, M. Scott || daveburke@google.com, Mark.Scott@genesyslab.com +# RFC5553 || A. Farrel, Ed., R. Bradford, JP. Vasseur || adrian@olddog.co.uk, rbradfor@cisco.com, jpv@cisco.com +# RFC5554 || N. Williams || Nicolas.Williams@sun.com +# RFC5555 || H. Soliman, Ed. || hesham@elevatemobile.com +# RFC5556 || J. Touch, R. Perlman || touch@isi.edu, Radia.Perlman@sun.com +# RFC5557 || Y. Lee, JL. Le Roux, D. King, E. Oki || ylee@huawei.com, jeanlouis.leroux@orange-ftgroup.com, daniel@olddog.co.uk, oki@ice.uec.ac.jp +# RFC5558 || F. Templin, Ed. || fltemplin@acm.org +# RFC5559 || P. Eardley, Ed. || philip.eardley@bt.com +# RFC5560 || H. Uijterwaal || henk@ripe.net +# RFC5561 || B. Thomas, K. Raza, S. Aggarwal, R. Aggarwal, JL. Le Roux || bobthomas@alum.mit.edu, skraza@cisco.com, shivani@juniper.net, rahul@juniper.net, jeanlouis.leroux@orange-ftgroup.com +# RFC5562 || A. Kuzmanovic, A. Mondal, S. Floyd, K. Ramakrishnan || akuzma@northwestern.edu, a-mondal@northwestern.edu, floyd@icir.org, kkrama@research.att.com +# RFC5563 || K. Leung, G. Dommety, P. Yegani, K. Chowdhury || kleung@cisco.com, gdommety@cisco.com, pyegani@cisco.com, kchowdhury@starentnetworks.com +# RFC5564 || A. El-Sherbiny, M. Farah, I. Oueichek, A. Al-Zoman || El-sherbiny@un.org, farah14@un.org, oueichek@scs-net.org, azoman@citc.gov.sa +# RFC5565 || J. Wu, Y. Cui, C. Metz, E. Rosen || jianping@cernet.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com, erosen@cisco.com +# RFC5566 || L. Berger, R. White, E. Rosen || lberger@labn.net, riw@cisco.com, erosen@cisco.com +# RFC5567 || T. Melanchuk, Ed. || tim.melanchuk@gmail.com +# RFC5568 || R. Koodli, Ed. || rkoodli@starentnetworks.com +# RFC5569 || R. Despres || remi.despres@free.fr +# RFC5570 || M. StJohns, R. Atkinson, G. Thomas || mstjohns@comcast.net, rja@extremenetworks.com, none +# RFC5571 || B. Storer, C. Pignataro, Ed., M. Dos Santos, B. Stevant, Ed., L. Toutain, J. Tremblay || bstorer@cisco.com, cpignata@cisco.com, mariados@cisco.com, bruno.stevant@telecom-bretagne.eu, laurent.toutain@telecom-bretagne.eu, jf@jftremblay.com +# RFC5572 || M. Blanchet, F. Parent || Marc.Blanchet@viagenie.ca, Florent.Parent@beon.ca +# RFC5573 || M. Thomson || martin.thomson@andrew.com +# RFC5574 || G. Herlein, J. Valin, A. Heggestad, A. Moizard || gherlein@herlein.com, jean-marc.valin@usherbrooke.ca, aeh@db.org, jack@atosc.org +# RFC5575 || P. Marques, N. Sheth, R. Raszuk, B. Greene, J. Mauch, D. McPherson || roque@cisco.com, nsheth@juniper.net, raszuk@cisco.com, bgreene@juniper.net, jmauch@us.ntt.net, danny@arbor.net +# RFC5576 || J. Lennox, J. Ott, T. Schierl || jonathan@vidyo.com, jo@acm.org, ts@thomas-schierl.de +# RFC5577 || P. Luthi, R. Even || patrick.luthi@tandberg.no, ron.even.tlv@gmail.com +# RFC5578 || B. Berry, Ed., S. Ratliff, E. Paradise, T. Kaiser, M. Adams || bberry@cisco.com, sratliff@cisco.com, pdice@cisco.com, timothy.kaiser@harris.com, Michael.D.Adams@L-3com.com +# RFC5579 || F. Templin, Ed. || fltemplin@acm.org +# RFC5580 || H. Tschofenig, Ed., F. Adrangi, M. Jones, A. Lior, B. Aboba || Hannes.Tschofenig@gmx.net, farid.adrangi@intel.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com, bernarda@microsoft.com +# RFC5581 || D. Shaw || dshaw@jabberwocky.com +# RFC5582 || H. Schulzrinne || hgs+ecrit@cs.columbia.edu +# RFC5583 || T. Schierl, S. Wenger || ts@thomas-schierl.de, stewe@stewe.org +# RFC5584 || M. Hatanaka, J. Matsumoto || actech@jp.sony.com, actech@jp.sony.com +# RFC5585 || T. Hansen, D. Crocker, P. Hallam-Baker || tony+dkimov@maillennium.att.com, dcrocker@bbiw.net, phillip@hallambaker.com +# RFC5586 || M. Bocci, Ed., M. Vigoureux, Ed., S. Bryant, Ed. || matthew.bocci@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.com, stbryant@cisco.com +# RFC5587 || N. Williams || Nicolas.Williams@sun.com +# RFC5588 || N. Williams || Nicolas.Williams@sun.com +# RFC5589 || R. Sparks, A. Johnston, Ed., D. Petrie || RjS@nostrum.com, alan@sipstation.com, dan.ietf@SIPez.com +# RFC5590 || D. Harrington, J. Schoenwaelder || ietfdbh@comcast.net, j.schoenwaelder@jacobs-university.de +# RFC5591 || D. Harrington, W. Hardaker || ietfdbh@comcast.net, ietf@hardakers.net +# RFC5592 || D. Harrington, J. Salowey, W. Hardaker || ietfdbh@comcast.net, jsalowey@cisco.com, ietf@hardakers.net +# RFC5593 || N. Cook || neil.cook@noware.co.uk +# RFC5594 || J. Peterson, A. Cooper || jon.peterson@neustar.biz, acooper@cdt.org +# RFC5595 || G. Fairhurst || gorry@erg.abdn.ac.uk +# RFC5596 || G. Fairhurst || gorry@erg.abdn.ac.uk +# RFC5597 || R. Denis-Courmont || rem@videolan.org +# RFC5598 || D. Crocker || dcrocker@bbiw.net +# RFC5601 || T. Nadeau, Ed., D. Zelig, Ed. || thomas.nadeau@bt.com, davidz@oversi.com +# RFC5602 || D. Zelig, Ed., T. Nadeau, Ed. || davidz@oversi.com, tom.nadeau@bt.com +# RFC5603 || D. Zelig, Ed., T. Nadeau, Ed. || davidz@oversi.com, tom.nadeau@bt.com +# RFC5604 || O. Nicklass || orlyn@radvision.com +# RFC5605 || O. Nicklass, T. Nadeau || orlyn@radvision.com, tom.nadeau@bt.com +# RFC5606 || J. Peterson, T. Hardie, J. Morris || jon.peterson@neustar.biz, hardie@qualcomm.com, jmorris@cdt.org +# RFC5607 || D. Nelson, G. Weber || dnelson@elbrysnetworks.com, gdweber@gmail.com +# RFC5608 || K. Narayan, D. Nelson || kaushik_narayan@yahoo.com, dnelson@elbrysnetworks.com +# RFC5609 || V. Fajardo, Ed., Y. Ohba, R. Marin-Lopez || vfajardo@research.telcordia.com, yoshihiro.ohba@toshiba.co.jp, rafa@um.es +# RFC5610 || E. Boschi, B. Trammell, L. Mark, T. Zseby || elisa.boschi@hitachi-eu.com, brian.trammell@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de +# RFC5611 || A. Vainshtein, S. Galtzur || Alexander.Vainshtein@ecitele.com, sharon.galtzur@rebellion.co.uk +# RFC5612 || P. Eronen, D. Harrington || pe@iki.fi, dharrington@huawei.com +# RFC5613 || A. Zinin, A. Roy, L. Nguyen, B. Friedman, D. Yeung || alex.zinin@alcatel-lucent.com, akr@cisco.com, lhnguyen@cisco.com, barryf@google.com, myeung@cisco.com +# RFC5614 || R. Ogier, P. Spagnolo || rich.ogier@earthlink.net, phillipspagnolo@gmail.com +# RFC5615 || C. Groves, Y. Lin || Christian.Groves@nteczone.com, linyangbo@huawei.com +# RFC5616 || N. Cook || neil.cook@noware.co.uk +# RFC5617 || E. Allman, J. Fenton, M. Delany, J. Levine || eric+dkim@sendmail.org, fenton@bluepopcorn.net, markd+dkim@yahoo-inc.com, standards@taugh.com +# RFC5618 || A. Morton, K. Hedayat || acmorton@att.com, kaynam.hedayat@exfo.com +# RFC5619 || S. Yamamoto, C. Williams, H. Yokota, F. Parent || shu@nict.go.jp, carlw@mcsr-labs.org, yokota@kddilabs.jp, Florent.Parent@beon.ca +# RFC5620 || O. Kolkman, Ed., IAB || olaf@nlnetlabs.nl, iab@iab.org +# RFC5621 || G. Camarillo || Gonzalo.Camarillo@ericsson.com +# RFC5622 || S. Floyd, E. Kohler || floyd@icir.org, kohler@cs.ucla.edu +# RFC5623 || E. Oki, T. Takeda, JL. Le Roux, A. Farrel || oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, jeanlouis.leroux@orange-ftgroup.com, adrian@olddog.co.uk +# RFC5624 || J. Korhonen, Ed., H. Tschofenig, E. Davies || jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, elwynd@dial.pipex.com +# RFC5625 || R. Bellis || ray.bellis@nominet.org.uk +# RFC5626 || C. Jennings, Ed., R. Mahy, Ed., F. Audet, Ed. || fluffy@cisco.com, rohan@ekabal.com, francois.audet@skypelabs.com +# RFC5627 || J. Rosenberg || jdrosen@cisco.com +# RFC5628 || P. Kyzivat || pkyzivat@cisco.com +# RFC5629 || J. Rosenberg || jdrosen@cisco.com +# RFC5630 || F. Audet || francois.audet@skypelabs.com +# RFC5631 || R. Shacham, H. Schulzrinne, S. Thakolsri, W. Kellerer || shacham@cs.columbia.edu, hgs@cs.columbia.edu, thakolsri@docomolab-euro.com, kellerer@docomolab-euro.com +# RFC5632 || C. Griffiths, J. Livingood, L. Popkin, R. Woundy, Y. Yang || chris_griffiths@cable.comcast.com, jason_livingood@cable.comcast.com, laird@pando.com, richard_woundy@cable.comcast.com, yry@cs.yale.edu +# RFC5633 || S. Dawkins, Ed. || spencer@wonderhamster.org +# RFC5634 || G. Fairhurst, A. Sathiaseelan || gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk +# RFC5635 || W. Kumari, D. McPherson || warren@kumari.net, danny@arbor.net +# RFC5636 || S. Park, H. Park, Y. Won, J. Lee, S. Kent || shpark@kisa.or.kr, hrpark@kisa.or.kr, yjwon@kisa.or.kr, jilee@kisa.or.kr, kent@bbn.com +# RFC5637 || G. Giaretta, I. Guardini, E. Demaria, J. Bournelle, R. Lopez || gerardo@qualcomm.com, ivano.guardini@telecomitalia.it, elena.demaria@telecomitalia.it, julien.bournelle@gmail.com, rafa@dif.um.es +# RFC5638 || H. Sinnreich, Ed., A. Johnston, E. Shim, K. Singh || henrys@adobe.com, alan@sipstation.com, eunsooshim@gmail.com, kns10@cs.columbia.edu +# RFC5639 || M. Lochter, J. Merkle || manfred.lochter@bsi.bund.de, johannes.merkle@secunet.com +# RFC5640 || C. Filsfils, P. Mohapatra, C. Pignataro || cfilsfil@cisco.com, pmohapat@cisco.com, cpignata@cisco.com +# RFC5641 || N. McGill, C. Pignataro || nmcgill@cisco.com, cpignata@cisco.com +# RFC5642 || S. Venkata, S. Harwani, C. Pignataro, D. McPherson || svenkata@google.com, sharwani@cisco.com, cpignata@cisco.com, danny@arbor.net +# RFC5643 || D. Joyal, Ed., V. Manral, Ed. || djoyal@nortel.com, vishwas@ipinfusion.com +# RFC5644 || E. Stephan, L. Liang, A. Morton || emile.stephan@orange-ftgroup.com, L.Liang@surrey.ac.uk, acmorton@att.com +# RFC5645 || D. Ewell, Ed. || doug@ewellic.org +# RFC5646 || A. Phillips, Ed., M. Davis, Ed. || addison@inter-locale.com, markdavis@google.com +# RFC5647 || K. Igoe, J. Solinas || kmigoe@nsa.gov, jasolin@orion.ncsc.mil +# RFC5648 || R. Wakikawa, Ed., V. Devarapalli, G. Tsirtsis, T. Ernst, K. Nagami || ryuji.wakikawa@gmail.com, vijay@wichorus.com, Tsirtsis@gmail.com, thierry.ernst@inria.fr, nagami@inetcore.com +# RFC5649 || R. Housley, M. Dworkin || housley@vigilsec.com, dworkin@nist.gov +# RFC5650 || M. Morgenstern, S. Baillie, U. Bonollo || moti.Morgenstern@ecitele.com, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au +# RFC5651 || M. Luby, M. Watson, L. Vicisano || luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com +# RFC5652 || R. Housley || housley@vigilsec.com +# RFC5653 || M. Upadhyay, S. Malkani || m.d.upadhyay+ietf@gmail.com, Seema.Malkani@gmail.com +# RFC5654 || B. Niven-Jenkins, Ed., D. Brungard, Ed., M. Betts, Ed., N. Sprecher, S. Ueno || benjamin.niven-jenkins@bt.com, dbrungard@att.com, malcolm.betts@huawei.com, nurit.sprecher@nsn.com, satoshi.ueno@ntt.com +# RFC5655 || B. Trammell, E. Boschi, L. Mark, T. Zseby, A. Wagner || brian.trammell@hitachi-eu.com, elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de, arno@wagner.name +# RFC5656 || D. Stebila, J. Green || douglas@stebila.ca, jonathan.green@queensu.ca +# RFC5657 || L. Dusseault, R. Sparks || lisa.dusseault@gmail.com, RjS@nostrum.com +# RFC5658 || T. Froment, C. Lebel, B. Bonnaerens || thomas.froment@tech-invite.com, Christophe.Lebel@alcatel-lucent.fr, ben.bonnaerens@alcatel-lucent.be +# RFC5659 || M. Bocci, S. Bryant || matthew.bocci@alcatel-lucent.com, stbryant@cisco.com +# RFC5660 || N. Williams || Nicolas.Williams@sun.com +# RFC5661 || S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed. || shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com +# RFC5662 || S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed. || shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com +# RFC5663 || D. Black, S. Fridella, J. Glasgow || black_david@emc.com, stevef@nasuni.com, jglasgow@aya.yale.edu +# RFC5664 || B. Halevy, B. Welch, J. Zelenka || bhalevy@panasas.com, welch@panasas.com, jimz@panasas.com +# RFC5665 || M. Eisler || mike@eisler.com +# RFC5666 || T. Talpey, B. Callaghan || tmtalpey@gmail.com, brentc@apple.com +# RFC5667 || T. Talpey, B. Callaghan || tmtalpey@gmail.com, brentc@apple.com +# RFC5668 || Y. Rekhter, S. Sangli, D. Tappan || yakov@juniper.net, rsrihari@cisco.com, Dan.Tappan@Gmail.com +# RFC5669 || S. Yoon, J. Kim, H. Park, H. Jeong, Y. Won || seokung@kisa.or.kr, seopo@kisa.or.kr, hrpark@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr +# RFC5670 || P. Eardley, Ed. || philip.eardley@bt.com +# RFC5671 || S. Yasukawa, A. Farrel, Ed. || yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC5672 || D. Crocker, Ed. || dcrocker@bbiw.net +# RFC5673 || K. Pister, Ed., P. Thubert, Ed., S. Dwars, T. Phinney || kpister@dustnetworks.com, pthubert@cisco.com, sicco.dwars@shell.com, tom.phinney@cox.net +# RFC5674 || S. Chisholm, R. Gerhards || schishol@nortel.com, rgerhards@adiscon.com +# RFC5675 || V. Marinov, J. Schoenwaelder || v.marinov@jacobs-university.de, j.schoenwaelder@jacobs-university.de +# RFC5676 || J. Schoenwaelder, A. Clemm, A. Karmakar || j.schoenwaelder@jacobs-university.de, alex@cisco.com, akarmaka@cisco.com +# RFC5677 || T. Melia, Ed., G. Bajko, S. Das, N. Golmie, JC. Zuniga || telemaco.melia@alcatel-lucent.com, Gabor.Bajko@nokia.com, subir@research.telcordia.com, nada.golmie@nist.gov, j.c.zuniga@ieee.org +# RFC5678 || G. Bajko, S. Das || gabor.bajko@nokia.com, subir@research.telcordia.com +# RFC5679 || G. Bajko || gabor.bajko@nokia.com +# RFC5680 || S. Dawkins, Ed. || spencer@wonderhamster.org +# RFC5681 || M. Allman, V. Paxson, E. Blanton || mallman@icir.org, vern@icir.org, eblanton@cs.purdue.edu +# RFC5682 || P. Sarolahti, M. Kojo, K. Yamamoto, M. Hata || pasi.sarolahti@iki.fi, kojo@cs.helsinki.fi, yamamotokaz@nttdocomo.co.jp, hatama@s1.nttdocomo.co.jp +# RFC5683 || A. Brusilovsky, I. Faynberg, Z. Zeltsan, S. Patel || Alec.Brusilovsky@alcatel-lucent.com, igor.faynberg@alcatel-lucent.com, zeltsan@alcatel-lucent.com, sarvar@google.com +# RFC5684 || P. Srisuresh, B. Ford || srisuresh@yahoo.com, bryan.ford@yale.edu +# RFC5685 || V. Devarapalli, K. Weniger || vijay@wichorus.com, kilian.weniger@googlemail.com +# RFC5686 || Y. Hiwasaki, H. Ohmuro || hiwasaki.yusuke@lab.ntt.co.jp, ohmuro.hitoshi@lab.ntt.co.jp +# RFC5687 || H. Tschofenig, H. Schulzrinne || Hannes.Tschofenig@gmx.net, hgs+ecrit@cs.columbia.edu +# RFC5688 || J. Rosenberg || jdrosen@jdrosen.net +# RFC5689 || C. Daboo || cyrus@daboo.name +# RFC5690 || S. Floyd, A. Arcia, D. Ros, J. Iyengar || floyd@icir.org, ae.arcia@telecom-bretagne.eu, David.Ros@telecom-bretagne.eu, jiyengar@fandm.edu +# RFC5691 || F. de Bont, S. Doehla, M. Schmidt, R. Sperschneider || frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, malte.schmidt@dolby.com, ralph.sperschneider@iis.fraunhofer.de +# RFC5692 || H. Jeon, S. Jeong, M. Riegel || hongseok.jeon@gmail.com, sjjeong@etri.re.kr, maximilian.riegel@nsn.com +# RFC5693 || J. Seedorf, E. Burger || jan.seedorf@nw.neclab.eu, eburger@standardstrack.com +# RFC5694 || G. Camarillo, Ed., IAB || Gonzalo.Camarillo@ericsson.com, iab@iab.org +# RFC5695 || A. Akhter, R. Asati, C. Pignataro || aakhter@cisco.com, rajiva@cisco.com, cpignata@cisco.com +# RFC5696 || T. Moncaster, B. Briscoe, M. Menth || toby.moncaster@bt.com, bob.briscoe@bt.com, menth@informatik.uni-wuerzburg.de +# RFC5697 || S. Farrell || stephen.farrell@cs.tcd.ie +# RFC5698 || T. Kunz, S. Okunick, U. Pordesch || thomas.kunz@sit.fraunhofer.de, susanne.okunick@pawisda.de, ulrich.pordesch@zv.fraunhofer.de +# RFC5701 || Y. Rekhter || yakov@juniper.net +# RFC5702 || J. Jansen || jelte@NLnetLabs.nl +# RFC5703 || T. Hansen, C. Daboo || tony+sieveloop@maillennium.att.com, cyrus@daboo.name +# RFC5704 || S. Bryant, Ed., M. Morrow, Ed., IAB || stbryant@cisco.com, mmorrow@cisco.com, iab@iab.org +# RFC5705 || E. Rescorla || ekr@rtfm.com +# RFC5706 || D. Harrington || ietfdbh@comcast.net +# RFC5707 || A. Saleem, Y. Xin, G. Sharratt || adnan.saleem@RadiSys.com, yong.xin@RadiSys.com, garland.sharratt@gmail.com +# RFC5708 || A. Keromytis || angelos@cs.columbia.edu +# RFC5709 || M. Bhatia, V. Manral, M. Fanto, R. White, M. Barnes, T. Li, R. Atkinson || manav@alcatel-lucent.com, vishwas@ipinfusion.com, mfanto@aegisdatasecurity.com, riw@cisco.com, mjbarnes@cisco.com, tony.li@tony.li, rja@extremenetworks.com +# RFC5710 || L. Berger, D. Papadimitriou, JP. Vasseur || lberger@labn.net, Dimitri.Papadimitriou@alcatel-lucent.be, jpv@cisco.com +# RFC5711 || JP. Vasseur, Ed., G. Swallow, I. Minei || jpv@cisco.com, swallow@cisco.com, ina@juniper.net +# RFC5712 || M. Meyer, Ed., JP. Vasseur, Ed. || matthew.meyer@bt.com, jpv@cisco.com +# RFC5713 || H. Moustafa, H. Tschofenig, S. De Cnodder || hassnaa.moustafa@orange-ftgroup.com, Hannes.Tschofenig@gmx.net, stefaan.de_cnodder@alcatel-lucent.com +# RFC5714 || M. Shand, S. Bryant || mshand@cisco.com, stbryant@cisco.com +# RFC5715 || M. Shand, S. Bryant || mshand@cisco.com, stbryant@cisco.com +# RFC5716 || J. Lentini, C. Everhart, D. Ellard, R. Tewari, M. Naik || jlentini@netapp.com, everhart@netapp.com, dellard@bbn.com, tewarir@us.ibm.com, manoj@almaden.ibm.com +# RFC5717 || B. Lengyel, M. Bjorklund || balazs.lengyel@ericsson.com, mbj@tail-f.com +# RFC5718 || D. Beller, A. Farrel || dieter.beller@alcatel-lucent.com, adrian@olddog.co.uk +# RFC5719 || D. Romascanu, H. Tschofenig || dromasca@gmail.com , Hannes.Tschofenig@gmx.net +# RFC5720 || F. Templin || fltemplin@acm.org +# RFC5721 || R. Gellens, C. Newman || rg+ietf@qualcomm.com, chris.newman@sun.com +# RFC5722 || S. Krishnan || suresh.krishnan@ericsson.com +# RFC5723 || Y. Sheffer, H. Tschofenig || yaronf@checkpoint.com, Hannes.Tschofenig@gmx.net +# RFC5724 || E. Wilde, A. Vaha-Sipila || dret@berkeley.edu, antti.vaha-sipila@nokia.com +# RFC5725 || A. Begen, D. Hsu, M. Lague || abegen@cisco.com, dohsu@cisco.com, mlague@cisco.com +# RFC5726 || Y. Qiu, F. Zhao, Ed., R. Koodli || qiuying@i2r.a-star.edu.sg, fanzhao@google.com, rkoodli@cisco.com +# RFC5727 || J. Peterson, C. Jennings, R. Sparks || jon.peterson@neustar.biz, fluffy@cisco.com, rjsparks@nostrum.com +# RFC5728 || S. Combes, P. Amundsen, M. Lambert, H-P. Lexow || stephane.combes@esa.int, pca@verisat.no, micheline.lambert@advantechamt.com, hlexow@stmi.com +# RFC5729 || J. Korhonen, Ed., M. Jones, L. Morand, T. Tsou || jouni.nospam@gmail.com, Mark.Jones@bridgewatersystems.com, Lionel.morand@orange-ftgroup.com, tena@huawei.com +# RFC5730 || S. Hollenbeck || shollenbeck@verisign.com +# RFC5731 || S. Hollenbeck || shollenbeck@verisign.com +# RFC5732 || S. Hollenbeck || shollenbeck@verisign.com +# RFC5733 || S. Hollenbeck || shollenbeck@verisign.com +# RFC5734 || S. Hollenbeck || shollenbeck@verisign.com +# RFC5735 || M. Cotton, L. Vegoda || michelle.cotton@icann.org, leo.vegoda@icann.org +# RFC5736 || G. Huston, M. Cotton, L. Vegoda || gih@apnic.net, michelle.cotton@icann.org, leo.vegoda@icann.org +# RFC5737 || J. Arkko, M. Cotton, L. Vegoda || jari.arkko@piuha.net, michelle.cotton@icann.org, leo.vegoda@icann.org +# RFC5738 || P. Resnick, C. Newman || presnick@qti.qualcomm.com, chris.newman@sun.com +# RFC5739 || P. Eronen, J. Laganier, C. Madson || pe@iki.fi, julienl@qualcomm.com, cmadson@cisco.com +# RFC5740 || B. Adamson, C. Bormann, M. Handley, J. Macker || adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil +# RFC5741 || L. Daigle, Ed., O. Kolkman, Ed., IAB || leslie@thinkingcat.com, olaf@nlnetlabs.nl, iab@iab.org +# RFC5742 || H. Alvestrand, R. Housley || harald@alvestrand.no, housley@vigilsec.com +# RFC5743 || A. Falk || falk@bbn.com +# RFC5744 || R. Braden, J. Halpern || braden@isi.edu, jhalpern@redback.com +# RFC5745 || A. Malis, Ed., IAB || andrew.g.malis@verizon.com, iab@iab.org +# RFC5746 || E. Rescorla, M. Ray, S. Dispensa, N. Oskov || ekr@rtfm.com, marsh@extendedsubset.com, dispensa@phonefactor.com, nasko.oskov@microsoft.com +# RFC5747 || J. Wu, Y. Cui, X. Li, M. Xu, C. Metz || jianping@cernet.edu.cn, cy@csnet1.cs.tsinghua.edu.cn, xing@cernet.edu.cn, xmw@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com +# RFC5748 || S. Yoon, J. Jeong, H. Kim, H. Jeong, Y. Won || seokung@kisa.or.kr, jijeong@kisa.or.kr, rinyfeel@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr +# RFC5749 || K. Hoeper, Ed., M. Nakhjiri, Y. Ohba, Ed. || khoeper@motorola.com, madjid.nakhjiri@motorola.com, yoshihiro.ohba@toshiba.co.jp +# RFC5750 || B. Ramsdell, S. Turner || blaker@gmail.com, turners@ieca.com +# RFC5751 || B. Ramsdell, S. Turner || blaker@gmail.com, turners@ieca.com +# RFC5752 || S. Turner, J. Schaad || turners@ieca.com, jimsch@exmsft.com +# RFC5753 || S. Turner, D. Brown || turners@ieca.com, dbrown@certicom.com +# RFC5754 || S. Turner || turners@ieca.com +# RFC5755 || S. Farrell, R. Housley, S. Turner || stephen.farrell@cs.tcd.ie, housley@vigilsec.com, turners@ieca.com +# RFC5756 || S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk || turners@ieca.com, dbrown@certicom.com, kelviny@microsoft.com, housley@vigilsec.com, wpolk@nist.gov +# RFC5757 || T. Schmidt, M. Waehlisch, G. Fairhurst || schmidt@informatik.haw-hamburg.de, mw@link-lab.net, gorry@erg.abdn.ac.uk +# RFC5758 || Q. Dang, S. Santesson, K. Moriarty, D. Brown, T. Polk || quynh.dang@nist.gov, sts@aaa-sec.com, Moriarty_Kathleen@emc.com, dbrown@certicom.com, tim.polk@nist.gov +# RFC5759 || J. Solinas, L. Zieglar || jasolin@orion.ncsc.mil, llziegl@tycho.ncsc.mil +# RFC5760 || J. Ott, J. Chesterfield, E. Schooler || jo@acm.org, julianchesterfield@cantab.net, eve_schooler@acm.org +# RFC5761 || C. Perkins, M. Westerlund || csp@csperkins.org, magnus.westerlund@ericsson.com +# RFC5762 || C. Perkins || csp@csperkins.org +# RFC5763 || J. Fischl, H. Tschofenig, E. Rescorla || jason.fischl@skype.net, Hannes.Tschofenig@gmx.net, ekr@rtfm.com +# RFC5764 || D. McGrew, E. Rescorla || mcgrew@cisco.com, ekr@rtfm.com +# RFC5765 || H. Schulzrinne, E. Marocco, E. Ivov || hgs@cs.columbia.edu, enrico.marocco@telecomitalia.it, emcho@sip-communicator.org +# RFC5766 || R. Mahy, P. Matthews, J. Rosenberg || rohan@ekabal.com, philip_matthews@magma.ca, jdrosen@jdrosen.net +# RFC5767 || M. Munakata, S. Schubert, T. Ohba || munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp +# RFC5768 || J. Rosenberg || jdrosen@jdrosen.net +# RFC5769 || R. Denis-Courmont || remi.denis-courmont@nokia.com +# RFC5770 || M. Komu, T. Henderson, H. Tschofenig, J. Melen, A. Keranen, Ed. || miika@iki.fi, thomas.r.henderson@boeing.com, Hannes.Tschofenig@gmx.net, jan.melen@ericsson.com, ari.keranen@ericsson.com +# RFC5771 || M. Cotton, L. Vegoda, D. Meyer || michelle.cotton@icann.org, leo.vegoda@icann.org, dmm@1-4-5.net +# RFC5772 || A. Doria, E. Davies, F. Kastenholz || avri@ltu.se, elwynd@dial.pipex.com, frank@bbn.com +# RFC5773 || E. Davies, A. Doria || elwynd@dial.pipex.com, avri@acm.org +# RFC5774 || K. Wolf, A. Mayrhofer || karlheinz.wolf@nic.at, alexander.mayrhofer@nic.at +# RFC5775 || M. Luby, M. Watson, L. Vicisano || luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com +# RFC5776 || V. Roca, A. Francillon, S. Faurite || vincent.roca@inria.fr, aurelien.francillon@inria.fr, faurite@lcpc.fr +# RFC5777 || J. Korhonen, H. Tschofenig, M. Arumaithurai, M. Jones, Ed., A. Lior || jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, mayutan.arumaithurai@gmail.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com +# RFC5778 || J. Korhonen, Ed., H. Tschofenig, J. Bournelle, G. Giaretta, M. Nakhjiri || jouni.nospam@gmail.com, Hannes.Tschofenig@gmx.net, julien.bournelle@orange-ftgroup.com, gerardo.giaretta@gmail.com, madjid.nakhjiri@motorola.com +# RFC5779 || J. Korhonen, Ed., J. Bournelle, K. Chowdhury, A. Muhanna, U. Meyer || jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, kchowdhury@cisco.com, Ahmad.muhanna@ericsson.com, meyer@umic.rwth-aachen.de +# RFC5780 || D. MacDonald, B. Lowekamp || derek.macdonald@gmail.com, bbl@lowekamp.net +# RFC5781 || S. Weiler, D. Ward, R. Housley || weiler@tislabs.com, dward@juniper.net, housley@vigilsec.com +# RFC5782 || J. Levine || standards@taugh.com +# RFC5783 || M. Welzl, W. Eddy || michawe@ifi.uio.no, wes@mti-systems.com +# RFC5784 || N. Freed, S. Vedam || ned.freed@mrochek.com, Srinivas.Sv@Sun.COM +# RFC5785 || M. Nottingham, E. Hammer-Lahav || mnot@mnot.net, eran@hueniverse.com +# RFC5786 || R. Aggarwal, K. Kompella || rahul@juniper.net, kireeti@juniper.net +# RFC5787 || D. Papadimitriou || dimitri.papadimitriou@alcatel-lucent.be +# RFC5788 || A. Melnikov, D. Cridland || Alexey.Melnikov@isode.com, dave.cridland@isode.com +# RFC5789 || L. Dusseault, J. Snell || lisa.dusseault@gmail.com, jasnell@gmail.com +# RFC5790 || H. Liu, W. Cao, H. Asaeda || Liuhui47967@huawei.com, caowayne@huawei.com, asaeda@wide.ad.jp +# RFC5791 || J. Reschke, J. Kunze || julian.reschke@greenbytes.de, jak@ucop.edu +# RFC5792 || P. Sangster, K. Narayan || Paul_Sangster@symantec.com, kaushik@cisco.com +# RFC5793 || R. Sahita, S. Hanna, R. Hurst, K. Narayan || Ravi.Sahita@intel.com, shanna@juniper.net, Ryan.Hurst@microsoft.com, kaushik@cisco.com +# RFC5794 || J. Lee, J. Lee, J. Kim, D. Kwon, C. Kim || jklee@ensec.re.kr, jlee05@ensec.re.kr, jaeheon@ensec.re.kr, ds_kwon@ensec.re.kr, jbr@ensec.re.kr +# RFC5795 || K. Sandlund, G. Pelletier, L-E. Jonsson || kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, lars-erik@lejonsson.com +# RFC5796 || W. Atwood, S. Islam, M. Siami || bill@cse.concordia.ca, Salekul.Islam@emt.inrs.ca, mzrsm@yahoo.ca +# RFC5797 || J. Klensin, A. Hoenes || john+ietf@jck.com, ah@TR-Sys.de +# RFC5798 || S. Nadas, Ed. || stephen.nadas@ericsson.com +# RFC5801 || S. Josefsson, N. Williams || simon@josefsson.org, Nicolas.Williams@oracle.com +# RFC5802 || C. Newman, A. Menon-Sen, A. Melnikov, N. Williams || chris.newman@oracle.com, ams@toroid.org, Alexey.Melnikov@isode.com, Nicolas.Williams@oracle.com +# RFC5803 || A. Melnikov || alexey.melnikov@isode.com +# RFC5804 || A. Melnikov, Ed., T. Martin || Alexey.Melnikov@isode.com, timmartin@alumni.cmu.edu +# RFC5805 || K. Zeilenga || Kurt.Zeilenga@Isode.COM +# RFC5806 || S. Levy, M. Mohali, Ed. || stlevy@cisco.com, marianne.mohali@orange-ftgroup.com +# RFC5807 || Y. Ohba, A. Yegin || yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org +# RFC5808 || R. Marshall, Ed. || rmarshall@telecomsys.com +# RFC5810 || A. Doria, Ed., J. Hadi Salim, Ed., R. Haas, Ed., H. Khosravi, Ed., W. Wang, Ed., L. Dong, R. Gopal, J. Halpern || avri@ltu.se, hadi@mojatatu.com, rha@zurich.ibm.com, hormuzd.m.khosravi@intel.com, wmwang@mail.zjgsu.edu.cn, donglg@zjgsu.edu.cn, ram.gopal@nsn.com, jmh@joelhalpern.com +# RFC5811 || J. Hadi Salim, K. Ogawa || hadi@mojatatu.com, ogawa.kentaro@lab.ntt.co.jp +# RFC5812 || J. Halpern, J. Hadi Salim || jmh@joelhalpern.com, hadi@mojatatu.com +# RFC5813 || R. Haas || rha@zurich.ibm.com +# RFC5814 || W. Sun, Ed., G. Zhang, Ed. || sunwq@mit.edu, zhangguoying@mail.ritt.com.cn +# RFC5815 || T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz || Thomas.Dietz@nw.neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de +# RFC5816 || S. Santesson, N. Pope || sts@aaa-sec.com, nick.pope@thales-esecurity.com +# RFC5817 || Z. Ali, JP. Vasseur, A. Zamfir, J. Newton || zali@cisco.com, jpv@cisco.com, ancaz@cisco.com, jonathan.newton@cw.com +# RFC5818 || D. Li, H. Xu, S. Bardalai, J. Meuric, D. Caviglia || danli@huawei.com, xuhuiying@huawei.com, snigdho.bardalai@us.fujitsu.com, julien.meuric@orange-ftgroup.com, diego.caviglia@ericsson.com +# RFC5819 || A. Melnikov, T. Sirainen || Alexey.Melnikov@isode.com, tss@iki.fi +# RFC5820 || A. Roy, Ed., M. Chandra, Ed. || akr@cisco.com, mw.chandra@gmail.com +# RFC5824 || K. Kumaki, Ed., R. Zhang, Y. Kamite || ke-kumaki@kddi.com, raymond.zhang@bt.com, y.kamite@ntt.com +# RFC5825 || K. Fujiwara, B. Leiba || fujiwara@jprs.co.jp, barryleiba@computer.org +# RFC5826 || A. Brandt, J. Buron, G. Porcu || abr@sdesigns.dk, jbu@sdesigns.dk, gporcu@gmail.com +# RFC5827 || M. Allman, K. Avrachenkov, U. Ayesta, J. Blanton, P. Hurtig || mallman@icir.org, k.avrachenkov@sophia.inria.fr, urtzi@laas.fr, jblanton@irg.cs.ohiou.edu, per.hurtig@kau.se +# RFC5828 || D. Fedyk, L. Berger, L. Andersson || donald.fedyk@alcatel-lucent.com, lberger@labn.net, loa.andersson@ericsson.com +# RFC5829 || A. Brown, G. Clemm, J. Reschke, Ed. || albertcbrown@us.ibm.com, geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de +# RFC5830 || V. Dolmatov, Ed. || dol@cryptocom.ru +# RFC5831 || V. Dolmatov, Ed. || dol@cryptocom.ru +# RFC5832 || V. Dolmatov, Ed. || dol@cryptocom.ru +# RFC5833 || Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed. || rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com +# RFC5834 || Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed. || rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com +# RFC5835 || A. Morton, Ed., S. Van den Berghe, Ed. || acmorton@att.com, steven.van_den_berghe@alcatel-lucent.com +# RFC5836 || Y. Ohba, Ed., Q. Wu, Ed., G. Zorn, Ed. || oshihiro.ohba@toshiba.co.jp, sunseawq@huawei.com, gwz@net-zen.net +# RFC5837 || A. Atlas, Ed., R. Bonica, Ed., C. Pignataro, Ed., N. Shen, JR. Rivers || alia.atlas@bt.com, rbonica@juniper.net, cpignata@cisco.com, naiming@cisco.com, jrrivers@yahoo.com +# RFC5838 || A. Lindem, Ed., S. Mirtorabi, A. Roy, M. Barnes, R. Aggarwal || acee.lindem@ericsson.com, smirtora@cisco.com, akr@cisco.com, mjbarnes@cisco.com, rahul@juniper.net +# RFC5839 || A. Niemi, D. Willis, Ed. || aki.niemi@nokia.com, dean.willis@softarmor.com +# RFC5840 || K. Grewal, G. Montenegro, M. Bhatia || ken.grewal@intel.com, gabriel.montenegro@microsoft.com, manav.bhatia@alcatel-lucent.com +# RFC5841 || R. Hay, W. Turkal || rhay@google.com, turkal@google.com +# RFC5842 || G. Clemm, J. Crawford, J. Reschke, Ed., J. Whitehead || geoffrey.clemm@us.ibm.com, ccjason@us.ibm.com, julian.reschke@greenbytes.de, ejw@cse.ucsc.edu +# RFC5843 || A. Bryan || anthonybryan@gmail.com +# RFC5844 || R. Wakikawa, S. Gundavelli || ryuji@us.toyota-itc.com, sgundave@cisco.com +# RFC5845 || A. Muhanna, M. Khalil, S. Gundavelli, K. Leung || ahmad.muhanna@ericsson.com, Mohamed.khalil@ericsson.com, sgundave@cisco.com, kleung@cisco.com +# RFC5846 || A. Muhanna, M. Khalil, S. Gundavelli, K. Chowdhury, P. Yegani || ahmad.muhanna@ericsson.com, mohamed.khalil@ericsson.com, sgundave@cisco.com, kchowdhu@cisco.com, pyegani@juniper.net +# RFC5847 || V. Devarapalli, Ed., R. Koodli, Ed., H. Lim, N. Kant, S. Krishnan, J. Laganier || vijay@wichorus.com, rkoodli@cisco.com, hlim@stoke.com, nishi@stoke.com, suresh.krishnan@ericsson.com, julienl@qualcomm.com +# RFC5848 || J. Kelsey, J. Callas, A. Clemm || john.kelsey@nist.gov, jon@callas.org, alex@cisco.com +# RFC5849 || E. Hammer-Lahav, Ed. || eran@hueniverse.com +# RFC5850 || R. Mahy, R. Sparks, J. Rosenberg, D. Petrie, A. Johnston, Ed. || rohan@ekabal.com, rjsparks@nostrum.com, jdrosen@jdrosen.net, dpetrie@sipez.com, alan@sipstation.com +# RFC5851 || S. Ooghe, N. Voigt, M. Platnic, T. Haag, S. Wadhwa || sven.ooghe@alcatel-lucent.com, norbert.voigt@nsn.com, mplatnic@gmail.com, haagt@telekom.de, swadhwa@juniper.net +# RFC5852 || D. Caviglia, D. Ceccarelli, D. Bramanti, D. Li, S. Bardalai || diego.caviglia@ericsson.com, daniele.ceccarelli@ericsson.com, none, danli@huawei.com, sbardalai@gmail.com +# RFC5853 || J. Hautakorpi, Ed., G. Camarillo, R. Penfield, A. Hawrylyshen, M. Bhatia || Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com, bpenfield@acmepacket.com, alan.ietf@polyphase.ca, mbhatia@3clogic.com +# RFC5854 || A. Bryan, T. Tsujikawa, N. McNab, P. Poeml || anthonybryan@gmail.com, tatsuhiro.t@gmail.com, neil@nabber.org, peter@poeml.de +# RFC5855 || J. Abley, T. Manderson || joe.abley@icann.org, terry.manderson@icann.org +# RFC5856 || E. Ertekin, R. Jasani, C. Christou, C. Bormann || ertekin_emre@bah.com, ro@breakcheck.com, christou_chris@bah.com, cabo@tzi.org +# RFC5857 || E. Ertekin, C. Christou, R. Jasani, T. Kivinen, C. Bormann || ertekin_emre@bah.com, christou_chris@bah.com, ro@breakcheck.com, kivinen@iki.fi, cabo@tzi.org +# RFC5858 || E. Ertekin, C. Christou, C. Bormann || ertekin_emre@bah.com, christou_chris@bah.com, cabo@tzi.org +# RFC5859 || R. Johnson || raj@cisco.com +# RFC5860 || M. Vigoureux, Ed., D. Ward, Ed., M. Betts, Ed. || martin.vigoureux@alcatel-lucent.com, dward@juniper.net, malcolm.betts@rogers.com +# RFC5861 || M. Nottingham || mnot@yahoo-inc.com +# RFC5862 || S. Yasukawa, A. Farrel || yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC5863 || T. Hansen, E. Siegel, P. Hallam-Baker, D. Crocker || tony+dkimov@maillennium.att.com, dkim@esiegel.net, phillip@hallambaker.com, dcrocker@bbiw.net +# RFC5864 || R. Allbery || rra@stanford.edu +# RFC5865 || F. Baker, J. Polk, M. Dolly || fred@cisco.com, jmpolk@cisco.com, mdolly@att.com +# RFC5866 || D. Sun, Ed., P. McCann, H. Tschofenig, T. Tsou, A. Doria, G. Zorn, Ed. || d.sun@alcatel-lucent.com, pete.mccann@motorola.com, Hannes.Tschofenig@gmx.net, tena@huawei.com, avri@ltu.se, gwz@net-zen.net +# RFC5867 || J. Martocci, Ed., P. De Mil, N. Riou, W. Vermeylen || jerald.p.martocci@jci.com, pieter.demil@intec.ugent.be, nicolas.riou@fr.schneider-electric.com, wouter@vooruit.be +# RFC5868 || S. Sakane, K. Kamada, S. Zrelli, M. Ishiyama || Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, Saber.Zrelli@jp.yokogawa.com, masahiro@isl.rdc.toshiba.co.jp +# RFC5869 || H. Krawczyk, P. Eronen || hugokraw@us.ibm.com, pe@iki.fi +# RFC5870 || A. Mayrhofer, C. Spanring || alexander.mayrhofer@ipcom.at, christian@spanring.eu +# RFC5871 || J. Arkko, S. Bradner || jari.arkko@piuha.net, sob@harvard.edu +# RFC5872 || J. Arkko, A. Yegin || jari.arkko@piuha.net, alper.yegin@yegin.org +# RFC5873 || Y. Ohba, A. Yegin || yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org +# RFC5874 || J. Rosenberg, J. Urpalainen || jdrosen.net, jari.urpalainen@nokia.com +# RFC5875 || J. Urpalainen, D. Willis, Ed. || jari.urpalainen@nokia.com, dean.willis@softarmor.com +# RFC5876 || J. Elwell || john.elwell@siemens-enterprise.com +# RFC5877 || R. Housley || housley@vigilsec.com +# RFC5878 || M. Brown, R. Housley || mark@redphonesecurity.com, housley@vigilsec.com +# RFC5879 || T. Kivinen, D. McDonald || kivinen@iki.fi, danmcd@opensolaris.org +# RFC5880 || D. Katz, D. Ward || dkatz@juniper.net, dward@juniper.net +# RFC5881 || D. Katz, D. Ward || dkatz@juniper.net, dward@juniper.net +# RFC5882 || D. Katz, D. Ward || dkatz@juniper.net, dward@juniper.net +# RFC5883 || D. Katz, D. Ward || dkatz@juniper.net, dward@juniper.net +# RFC5884 || R. Aggarwal, K. Kompella, T. Nadeau, G. Swallow || rahul@juniper.net, kireeti@juniper.net, tom.nadeau@bt.com, swallow@cisco.com +# RFC5885 || T. Nadeau, Ed., C. Pignataro, Ed. || tom.nadeau@bt.com, cpignata@cisco.com +# RFC5886 || JP. Vasseur, Ed., JL. Le Roux, Y. Ikejiri || jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, y.ikejiri@ntt.com +# RFC5887 || B. Carpenter, R. Atkinson, H. Flinck || brian.e.carpenter@gmail.com, rja@extremenetworks.com, hannu.flinck@nsn.com +# RFC5888 || G. Camarillo, H. Schulzrinne || Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu +# RFC5889 || E. Baccelli, Ed., M. Townsley, Ed. || Emmanuel.Baccelli@inria.fr, mark@townsley.net +# RFC5890 || J. Klensin || john+ietf@jck.com +# RFC5891 || J. Klensin || john+ietf@jck.com +# RFC5892 || P. Faltstrom, Ed. || paf@cisco.com +# RFC5893 || H. Alvestrand, Ed., C. Karp || harald@alvestrand.no, ck@nic.museum +# RFC5894 || J. Klensin || john+ietf@jck.com +# RFC5895 || P. Resnick, P. Hoffman || presnick@qti.qualcomm.com, paul.hoffman@vpnc.org +# RFC5896 || L. Hornquist Astrand, S. Hartman || lha@apple.com, hartmans-ietf@mit.edu +# RFC5897 || J. Rosenberg || jdrosen@jdrosen.net +# RFC5898 || F. Andreasen, G. Camarillo, D. Oran, D. Wing || fandreas@cisco.com, Gonzalo.Camarillo@ericsson.com, oran@cisco.com, dwing-ietf@fuggles.com +# RFC5901 || P. Cain, D. Jevans || pcain@coopercain.com, dave.jevans@antiphishing.org +# RFC5902 || D. Thaler, L. Zhang, G. Lebovitz || dthaler@microsoft.com, lixia@cs.ucla.edu, gregory.ietf@gmail.com, iab@iab.org +# RFC5903 || D. Fu, J. Solinas || defu@orion.ncsc.mil, jasolin@orion.ncsc.mil +# RFC5904 || G. Zorn || gwz@net-zen.net +# RFC5905 || D. Mills, J. Martin, Ed., J. Burbank, W. Kasch || mills@udel.edu, jrmii@isc.org, jack.burbank@jhuapl.edu, william.kasch@jhuapl.edu +# RFC5906 || B. Haberman, Ed., D. Mills || brian@innovationslab.net, mills@udel.edu +# RFC5907 || H. Gerstung, C. Elliott, B. Haberman, Ed. || heiko.gerstung@meinberg.de, chelliot@pobox.com, brian@innovationslab.net +# RFC5908 || R. Gayraud, B. Lourdelet || richard.gayraud@free.fr, blourdel@cisco.com +# RFC5909 || J-M. Combes, S. Krishnan, G. Daley || jeanmichel.combes@orange-ftgroup.com, Suresh.Krishnan@ericsson.com, hoskuld@hotmail.com +# RFC5910 || J. Gould, S. Hollenbeck || jgould@verisign.com, shollenbeck@verisign.com +# RFC5911 || P. Hoffman, J. Schaad || paul.hoffman@vpnc.org, jimsch@exmsft.com +# RFC5912 || P. Hoffman, J. Schaad || paul.hoffman@vpnc.org, jimsch@exmsft.com +# RFC5913 || S. Turner, S. Chokhani || turners@ieca.com, SChokhani@cygnacom.com +# RFC5914 || R. Housley, S. Ashmore, C. Wallace || housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com +# RFC5915 || S. Turner, D. Brown || turners@ieca.com, dbrown@certicom.com +# RFC5916 || S. Turner || turners@ieca.com +# RFC5917 || S. Turner || turners@ieca.com +# RFC5918 || R. Asati, I. Minei, B. Thomas || rajiva@cisco.com, ina@juniper.net, bobthomas@alum.mit.edu +# RFC5919 || R. Asati, P. Mohapatra, E. Chen, B. Thomas || rajiva@cisco.com, pmohapat@cisco.com, chenying220@huawei.com, bobthomas@alum.mit.edu +# RFC5920 || L. Fang, Ed. || lufang@cisco.com +# RFC5921 || M. Bocci, Ed., S. Bryant, Ed., D. Frost, Ed., L. Levrau, L. Berger || matthew.bocci@alcatel-lucent.com, stbryant@cisco.com, danfrost@cisco.com, lieven.levrau@alcatel-lucent.com, lberger@labn.net +# RFC5922 || V. Gurbani, S. Lawrence, A. Jeffrey || vkg@alcatel-lucent.com, scott-ietf@skrb.org, ajeffrey@alcatel-lucent.com +# RFC5923 || V. Gurbani, Ed., R. Mahy, B. Tate || vkg@alcatel-lucent.com, rohan@ekabal.com, brett@broadsoft.com +# RFC5924 || S. Lawrence, V. Gurbani || scott-ietf@skrb.org, vkg@bell-labs.com +# RFC5925 || J. Touch, A. Mankin, R. Bonica || touch@isi.edu, mankin@psg.com, rbonica@juniper.net +# RFC5926 || G. Lebovitz, E. Rescorla || gregory.ietf@gmail.com, ekr@rtfm.com +# RFC5927 || F. Gont || fernando@gont.com.ar +# RFC5928 || M. Petit-Huguenin || petithug@acm.org +# RFC5929 || J. Altman, N. Williams, L. Zhu || jaltman@secure-endpoints.com, Nicolas.Williams@oracle.com, larry.zhu@microsoft.com +# RFC5930 || S. Shen, Y. Mao, NSS. Murthy || shenshuo@cnnic.cn, yumao9@gmail.com, ssmurthy.nittala@freescale.com +# RFC5931 || D. Harkins, G. Zorn || dharkins@arubanetworks.com, gwz@net-zen.net +# RFC5932 || A. Kato, M. Kanda, S. Kanno || kato.akihiro@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno.satoru@po.ntts.co.jp +# RFC5933 || V. Dolmatov, Ed., A. Chuprina, I. Ustinov || dol@cryptocom.ru, ran@cryptocom.ru, igus@cryptocom.ru +# RFC5934 || R. Housley, S. Ashmore, C. Wallace || housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com +# RFC5935 || M. Ellison, B. Natale || ietf@ellisonsoftware.com, rnatale@mitre.org +# RFC5936 || E. Lewis, A. Hoenes, Ed. || ed.lewis@neustar.biz, ah@TR-Sys.de +# RFC5937 || S. Ashmore, C. Wallace || srashmo@radium.ncsc.mil, cwallace@cygnacom.com +# RFC5938 || A. Morton, M. Chiba || acmorton@att.com, mchiba@cisco.com +# RFC5939 || F. Andreasen || fandreas@cisco.com +# RFC5940 || S. Turner, R. Housley || turners@ieca.com, housley@vigilsec.com +# RFC5941 || D. M'Raihi, S. Boeyen, M. Grandcolas, S. Bajaj || davidietf@gmail.com, sharon.boeyen@entrust.com, michael.grandcolas@hotmail.com, sbajaj@verisign.com +# RFC5942 || H. Singh, W. Beebee, E. Nordmark || shemant@cisco.com, wbeebee@cisco.com, erik.nordmark@oracle.com +# RFC5943 || B. Haberman, Ed. || brian@innovationslab.net +# RFC5944 || C. Perkins, Ed. || charliep@computer.org +# RFC5945 || F. Le Faucheur, J. Manner, D. Wing, A. Guillou || flefauch@cisco.com, jukka.manner@tkk.fi, dwing-ietf@fuggles.com, allan.guillou@sfr.com +# RFC5946 || F. Le Faucheur, J. Manner, A. Narayanan, A. Guillou, H. Malik || flefauch@cisco.com, jukka.manner@tkk.fi, ashokn@cisco.com, allan.guillou@sfr.com, Hemant.Malik@airtel.in +# RFC5947 || J. Elwell, H. Kaplan || john.elwell@siemens-enterprise.com, hkaplan@acmepacket.com +# RFC5948 || S. Madanapalli, S. Park, S. Chakrabarti, G. Montenegro || smadanapalli@gmail.com, soohong.park@samsung.com, samitac@ipinfusion.com, gabriel.montenegro@microsoft.com +# RFC5949 || H. Yokota, K. Chowdhury, R. Koodli, B. Patil, F. Xia || yokota@kddilabs.jp, kchowdhu@cisco.com, rkoodli@cisco.com, basavaraj.patil@nokia.com, xiayangsong@huawei.com +# RFC5950 || S. Mansfield, Ed., E. Gray, Ed., K. Lam, Ed. || scott.mansfield@ericsson.com, eric.gray@ericsson.com, Kam.Lam@alcatel-lucent.com +# RFC5951 || K. Lam, S. Mansfield, E. Gray || Kam.Lam@Alcatel-Lucent.com, Scott.Mansfield@Ericsson.com, Kam.Lam@Alcatel-Lucent.com +# RFC5952 || S. Kawamura, M. Kawashima || kawamucho@mesh.ad.jp, kawashimam@vx.jp.nec.com +# RFC5953 || W. Hardaker || ietf@hardakers.net +# RFC5954 || V. Gurbani, Ed., B. Carpenter, Ed., B. Tate, Ed. || vkg@bell-labs.com, brian.e.carpenter@gmail.com, brett@broadsoft.com +# RFC5955 || A. Santoni || adriano.santoni@actalis.it +# RFC5956 || A. Begen || abegen@cisco.com +# RFC5957 || D. Karp || dkarp@zimbra.com +# RFC5958 || S. Turner || turners@ieca.com +# RFC5959 || S. Turner || turners@ieca.com +# RFC5960 || D. Frost, Ed., S. Bryant, Ed., M. Bocci, Ed. || danfrost@cisco.com, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com +# RFC5961 || A. Ramaiah, R. Stewart, M. Dalal || ananth@cisco.com, randall@lakerest.net, mdalal@cisco.com +# RFC5962 || H. Schulzrinne, V. Singh, H. Tschofenig, M. Thomson || hgs@cs.columbia.edu, vs2140@cs.columbia.edu, Hannes.Tschofenig@gmx.net, martin.thomson@andrew.com +# RFC5963 || R. Gagliano || rogaglia@cisco.com +# RFC5964 || J. Winterbottom, M. Thomson || james.winterbottom@andrew.com, martin.thomson@andrew.com +# RFC5965 || Y. Shafranovich, J. Levine, M. Kucherawy || ietf@shaftek.org, standards@taugh.com, msk@cloudmark.com +# RFC5966 || R. Bellis || ray.bellis@nominet.org.uk +# RFC5967 || S. Turner || turners@ieca.com +# RFC5968 || J. Ott, C. Perkins || jo@netlab.tkk.fi, csp@csperkins.org +# RFC5969 || W. Townsley, O. Troan || mark@townsley.net, ot@cisco.com +# RFC5970 || T. Huth, J. Freimann, V. Zimmer, D. Thaler || thuth@de.ibm.com, jfrei@de.ibm.com, vincent.zimmer@intel.com, dthaler@microsoft.com +# RFC5971 || H. Schulzrinne, R. Hancock || hgs+nsis@cs.columbia.edu, robert.hancock@roke.co.uk +# RFC5972 || T. Tsenov, H. Tschofenig, X. Fu, Ed., C. Aoun, E. Davies || tseno.tsenov@mytum.de, Hannes.Tschofenig@nsn.com, fu@cs.uni-goettingen.de, cedaoun@yahoo.fr, elwynd@dial.pipex.com +# RFC5973 || M. Stiemerling, H. Tschofenig, C. Aoun, E. Davies || Martin.Stiemerling@neclab.eu, Hannes.Tschofenig@nsn.com, cedaoun@yahoo.fr, elwynd@dial.pipex.com +# RFC5974 || J. Manner, G. Karagiannis, A. McDonald || jukka.manner@tkk.fi, karagian@cs.utwente.nl, andrew.mcdonald@roke.co.uk +# RFC5975 || G. Ash, Ed., A. Bader, Ed., C. Kappler, Ed., D. Oran, Ed. || gash5107@yahoo.com, Attila.Bader@ericsson.com, cornelia.kappler@cktecc.de, oran@cisco.com +# RFC5976 || G. Ash, A. Morton, M. Dolly, P. Tarapore, C. Dvorak, Y. El Mghazli || gash5107@yahoo.com, acmorton@att.com, mdolly@att.com, tarapore@att.com, cdvorak@att.com, yacine.el_mghazli@alcatel.fr +# RFC5977 || A. Bader, L. Westberg, G. Karagiannis, C. Kappler, T. Phelan || Attila.Bader@ericsson.com, Lars.Westberg@ericsson.com, g.karagiannis@ewi.utwente.nl, cornelia.kappler@cktecc.de, tphelan@sonusnet.com +# RFC5978 || J. Manner, R. Bless, J. Loughney, E. Davies, Ed. || jukka.manner@tkk.fi, bless@kit.edu, john.loughney@nokia.com, elwynd@folly.org.uk +# RFC5979 || C. Shen, H. Schulzrinne, S. Lee, J. Bang || charles@cs.columbia.edu, hgs@cs.columbia.edu, sung1.lee@samsung.com, jh0278.bang@samsung.com +# RFC5980 || T. Sanda, Ed., X. Fu, S. Jeong, J. Manner, H. Tschofenig || sanda.takako@jp.panasonic.com, fu@cs.uni-goettingen.de, shjeong@hufs.ac.kr, jukka.manner@tkk.fi, Hannes.Tschofenig@nsn.com +# RFC5981 || J. Manner, M. Stiemerling, H. Tschofenig, R. Bless, Ed. || jukka.manner@tkk.fi, martin.stiemerling@neclab.eu, Hannes.Tschofenig@gmx.net, roland.bless@kit.edu +# RFC5982 || A. Kobayashi, Ed., B. Claise, Ed. || akoba@nttv6.net, bclaise@cisco.com +# RFC5983 || R. Gellens || rg+ietf@qualcomm.com +# RFC5984 || K-M. Moller || kalle@tankesaft.se +# RFC5985 || M. Barnes, Ed. || mary.ietf.barnes@gmail.com +# RFC5986 || M. Thomson, J. Winterbottom || martin.thomson@andrew.com, james.winterbottom@andrew.com +# RFC5987 || J. Reschke || julian.reschke@greenbytes.de +# RFC5988 || M. Nottingham || mnot@mnot.net +# RFC5989 || A.B. Roach || adam@nostrum.com +# RFC5990 || J. Randall, B. Kaliski, J. Brainard, S. Turner || jdrandall@comcast.net, kaliski_burt@emc.com, jbrainard@rsa.com, turners@ieca.com +# RFC5991 || D. Thaler, S. Krishnan, J. Hoagland || dthaler@microsoft.com, suresh.krishnan@ericsson.com, Jim_Hoagland@symantec.com +# RFC5992 || S. Sharikov, D. Miloshevic, J. Klensin || s.shar@regtime.net, dmiloshevic@afilias.info, john-ietf@jck.com +# RFC5993 || X. Duan, S. Wang, M. Westerlund, K. Hellwig, I. Johansson || duanxiaodong@chinamobile.com, wangshuaiyu@chinamobile.com, magnus.westerlund@ericsson.com, karl.hellwig@ericsson.com, ingemar.s.johansson@ericsson.com +# RFC5994 || S. Bryant, Ed., M. Morrow, G. Swallow, R. Cherukuri, T. Nadeau, N. Harrison, B. Niven-Jenkins || stbryant@cisco.com, mmorrow@cisco.com, swallow@cisco.com, cherukuri@juniper.net, thomas.nadeau@huawei.com, neil.2.harrison@bt.com, ben@niven-jenkins.co.uk +# RFC5995 || J. Reschke || julian.reschke@greenbytes.de +# RFC5996 || C. Kaufman, P. Hoffman, Y. Nir, P. Eronen || charliek@microsoft.com, paul.hoffman@vpnc.org, ynir@checkpoint.com, pe@iki.fi +# RFC5997 || A. DeKok || aland@freeradius.org +# RFC5998 || P. Eronen, H. Tschofenig, Y. Sheffer || pe@iki.fi, Hannes.Tschofenig@gmx.net, yaronf.ietf@gmail.com +# RFC6001 || D. Papadimitriou, M. Vigoureux, K. Shiomoto, D. Brungard, JL. Le Roux || dimitri.papadimitriou@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.fr, shiomoto.kohei@lab.ntt.co.jp, dbrungard@att.com, jean-louis.leroux@rd.francetelecom.com +# RFC6002 || L. Berger, D. Fedyk || lberger@labn.net, donald.fedyk@alcatel-lucent.com +# RFC6003 || D. Papadimitriou || dimitri.papadimitriou@alcatel-lucent.be +# RFC6004 || L. Berger, D. Fedyk || lberger@labn.net, donald.fedyk@alcatel-lucent.com +# RFC6005 || L. Berger, D. Fedyk || lberger@labn.net, donald.fedyk@alcatel-lucent.com +# RFC6006 || Q. Zhao, Ed., D. King, Ed., F. Verhaeghe, T. Takeda, Z. Ali, J. Meuric || qzhao@huawei.com, daniel@olddog.co.uk, fabien.verhaeghe@gmail.com, takeda.tomonori@lab.ntt.co.jp, zali@cisco.com, julien.meuric@orange-ftgroup.com +# RFC6007 || I. Nishioka, D. King || i-nishioka@cb.jp.nec.com, daniel@olddog.co.uk +# RFC6008 || M. Kucherawy || msk@cloudmark.com +# RFC6009 || N. Freed || ned.freed@mrochek.com +# RFC6010 || R. Housley, S. Ashmore, C. Wallace || housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com +# RFC6011 || S. Lawrence, Ed., J. Elwell || scott-ietf@skrb.org, john.elwell@siemens-enterprise.com +# RFC6012 || J. Salowey, T. Petch, R. Gerhards, H. Feng || jsalowey@cisco.com, tomSecurity@network-engineer.co.uk, rgerhards@adiscon.com, fhyfeng@gmail.com +# RFC6013 || W. Simpson || William.Allen.Simpson@Gmail.com +# RFC6014 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6015 || A. Begen || abegen@cisco.com +# RFC6016 || B. Davie, F. Le Faucheur, A. Narayanan || bsd@cisco.com, flefauch@cisco.com, ashokn@cisco.com +# RFC6017 || K. Meadors, Ed. || kyle@drummondgroup.com +# RFC6018 || F. Baker, W. Harrop, G. Armitage || fred@cisco.com, wazz@bud.cc.swin.edu.au, garmitage@swin.edu.au +# RFC6019 || R. Housley || housley@vigilsec.com +# RFC6020 || M. Bjorklund, Ed. || mbj@tail-f.com +# RFC6021 || J. Schoenwaelder, Ed. || j.schoenwaelder@jacobs-university.de +# RFC6022 || M. Scott, M. Bjorklund || mark.scott@ericsson.com, mbj@tail-f.com +# RFC6023 || Y. Nir, H. Tschofenig, H. Deng, R. Singh || ynir@checkpoint.com, Hannes.Tschofenig@gmx.net, denghui02@gmail.com, rsj@cisco.com +# RFC6024 || R. Reddy, C. Wallace || r.reddy@radium.ncsc.mil, cwallace@cygnacom.com +# RFC6025 || C. Wallace, C. Gardiner || cwallace@cygnacom.com, gardiner@bbn.com +# RFC6026 || R. Sparks, T. Zourzouvillys || RjS@nostrum.com, theo@crazygreek.co.uk +# RFC6027 || Y. Nir || ynir@checkpoint.com +# RFC6028 || G. Camarillo, A. Keranen || Gonzalo.Camarillo@ericsson.com, Ari.Keranen@ericsson.com +# RFC6029 || I. Rimac, V. Hilt, M. Tomsu, V. Gurbani, E. Marocco || rimac@bell-labs.com, volkerh@bell-labs.com, marco.tomsu@alcatel-lucent.com, vkg@bell-labs.com, enrico.marocco@telecomitalia.it +# RFC6030 || P. Hoyer, M. Pei, S. Machani || phoyer@actividentity.com, mpei@verisign.com, smachani@diversinet.com +# RFC6031 || S. Turner, R. Housley || turners@ieca.com, housley@vigilsec.com +# RFC6032 || S. Turner, R. Housley || turners@ieca.com, housley@vigilsec.com +# RFC6033 || S. Turner || turners@ieca.com +# RFC6034 || D. Thaler || dthaler@microsoft.com +# RFC6035 || A. Pendleton, A. Clark, A. Johnston, H. Sinnreich || aspen@telchemy.com, alan.d.clark@telchemy.com, alan.b.johnston@gmail.com, henry.sinnreich@gmail.com +# RFC6036 || B. Carpenter, S. Jiang || brian.e.carpenter@gmail.com, shengjiang@huawei.com +# RFC6037 || E. Rosen, Ed., Y. Cai, Ed., IJ. Wijnands || erosen@cisco.com, ycai@cisco.com, ice@cisco.com +# RFC6038 || A. Morton, L. Ciavattone || acmorton@att.com, lencia@att.com +# RFC6039 || V. Manral, M. Bhatia, J. Jaeggli, R. White || vishwas@ipinfusion.com, manav.bhatia@alcatel-lucent.com, joel.jaeggli@nokia.com, riw@cisco.com +# RFC6040 || B. Briscoe || bob.briscoe@bt.com +# RFC6041 || A. Crouch, H. Khosravi, A. Doria, Ed., X. Wang, K. Ogawa || alan.crouch@intel.com, hormuzd.m.khosravi@intel.com, avri@acm.org, carly.wang@huawei.com, ogawa.kentaro@lab.ntt.co.jp +# RFC6042 || A. Keromytis || angelos@cs.columbia.edu +# RFC6043 || J. Mattsson, T. Tian || john.mattsson@ericsson.com, tian.tian1@zte.com.cn +# RFC6044 || M. Mohali || marianne.mohali@orange-ftgroup.com +# RFC6045 || K. Moriarty || Moriarty_Kathleen@EMC.com +# RFC6046 || K. Moriarty, B. Trammell || Moriarty_Kathleen@EMC.com, trammell@tik.ee.ethz.ch +# RFC6047 || A. Melnikov, Ed. || Alexey.Melnikov@isode.com +# RFC6048 || J. Elie || julien@trigofacile.com +# RFC6049 || A. Morton, E. Stephan || acmorton@att.com, emile.stephan@orange-ftgroup.com +# RFC6050 || K. Drage || drage@alcatel-lucent.com +# RFC6051 || C. Perkins, T. Schierl || csp@csperkins.org, ts@thomas-schierl.de +# RFC6052 || C. Bao, C. Huitema, M. Bagnulo, M. Boucadair, X. Li || congxiao@cernet.edu.cn, huitema@microsoft.com, marcelo@it.uc3m.es, mohamed.boucadair@orange-ftgroup.com, xing@cernet.edu.cn +# RFC6053 || E. Haleplidis, K. Ogawa, W. Wang, J. Hadi Salim || ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, wmwang@mail.zjgsu.edu.cn, hadi@mojatatu.com +# RFC6054 || D. McGrew, B. Weis || mcgrew@cisco.com, bew@cisco.com +# RFC6055 || D. Thaler, J. Klensin, S. Cheshire || dthaler@microsoft.com, john+ietf@jck.com, cheshire@apple.com +# RFC6056 || M. Larsen, F. Gont || michael.larsen@tieto.com, fernando@gont.com.ar +# RFC6057 || C. Bastian, T. Klieber, J. Livingood, J. Mills, R. Woundy || chris_bastian@cable.comcast.com, tom_klieber@cable.comcast.com, jason_livingood@cable.comcast.com, jim_mills@cable.comcast.com, richard_woundy@cable.comcast.com +# RFC6058 || M. Liebsch, Ed., A. Muhanna, O. Blume || marco.liebsch@neclab.eu, ahmad.muhanna@ericsson.com, oliver.blume@alcatel-lucent.de +# RFC6059 || S. Krishnan, G. Daley || suresh.krishnan@ericsson.com, hoskuld@hotmail.com +# RFC6060 || D. Fedyk, H. Shah, N. Bitar, A. Takacs || donald.fedyk@alcatel-lucent.com, hshah@ciena.com, nabil.n.bitar@verizon.com, attila.takacs@ericsson.com +# RFC6061 || B. Rosen || br@brianrosen.net +# RFC6062 || S. Perreault, Ed., J. Rosenberg || simon.perreault@viagenie.ca, jdrosen@jdrosen.net +# RFC6063 || A. Doherty, M. Pei, S. Machani, M. Nystrom || andrea.doherty@rsa.com, mpei@verisign.com, smachani@diversinet.com, mnystrom@microsoft.com +# RFC6064 || M. Westerlund, P. Frojdh || magnus.westerlund@ericsson.com, per.frojdh@ericsson.com +# RFC6065 || K. Narayan, D. Nelson, R. Presuhn, Ed. || kaushik_narayan@yahoo.com, d.b.nelson@comcast.net, randy_presuhn@mindspring.com +# RFC6066 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6067 || M. Davis, A. Phillips, Y. Umaoka || mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com +# RFC6068 || M. Duerst, L. Masinter, J. Zawinski || duerst@it.aoyama.ac.jp, LMM@acm.org, jwz@jwz.org +# RFC6069 || A. Zimmermann, A. Hannemann || zimmermann@cs.rwth-aachen.de, hannemann@nets.rwth-aachen.de +# RFC6070 || S. Josefsson || simon@josefsson.org +# RFC6071 || S. Frankel, S. Krishnan || sheila.frankel@nist.gov, suresh.krishnan@ericsson.com +# RFC6072 || C. Jennings, J. Fischl, Ed. || fluffy@cisco.com, jason.fischl@skype.net +# RFC6073 || L. Martini, C. Metz, T. Nadeau, M. Bocci, M. Aissaoui || lmartini@cisco.com, chmetz@cisco.com, tnadeau@lucidvision.com, matthew.bocci@alcatel-lucent.co.uk, mustapha.aissaoui@alcatel-lucent.com +# RFC6074 || E. Rosen, B. Davie, V. Radoaca, W. Luo || erosen@cisco.com, bsd@cisco.com, vasile.radoaca@alcatel-lucent.com, luo@weiluo.net +# RFC6075 || D. Cridland || dave.cridland@isode.com +# RFC6076 || D. Malas, A. Morton || d.malas@cablelabs.com, acmorton@att.com +# RFC6077 || D. Papadimitriou, Ed., M. Welzl, M. Scharf, B. Briscoe || dimitri.papadimitriou@alcatel-lucent.be, michawe@ifi.uio.no, michael.scharf@googlemail.com, bob.briscoe@bt.com +# RFC6078 || G. Camarillo, J. Melen || Gonzalo.Camarillo@ericsson.com, Jan.Melen@ericsson.com +# RFC6079 || G. Camarillo, P. Nikander, J. Hautakorpi, A. Keranen, A. Johnston || Gonzalo.Camarillo@ericsson.com, Pekka.Nikander@ericsson.com, Jani.Hautakorpi@ericsson.com, Ari.Keranen@ericsson.com, alan.b.johnston@gmail.com +# RFC6080 || D. Petrie, S. Channabasappa, Ed. || dan.ietf@SIPez.com, sumanth@cablelabs.com +# RFC6081 || D. Thaler || dthaler@microsoft.com +# RFC6082 || K. Whistler, G. Adams, M. Duerst, R. Presuhn, Ed., J. Klensin || kenw@sybase.com, glenn@skynav.com, duerst@it.aoyama.ac.jp, randy_presuhn@mindspring.com, john+ietf@jck.com +# RFC6083 || M. Tuexen, R. Seggelmann, E. Rescorla || tuexen@fh-muenster.de, seggelmann@fh-muenster.de, ekr@networkresonance.com +# RFC6084 || X. Fu, C. Dickmann, J. Crowcroft || fu@cs.uni-goettingen.de, mail@christian-dickmann.de, jon.crowcroft@cl.cam.ac.uk +# RFC6085 || S. Gundavelli, M. Townsley, O. Troan, W. Dec || sgundave@cisco.com, townsley@cisco.com, ot@cisco.com, wdec@cisco.com +# RFC6086 || C. Holmberg, E. Burger, H. Kaplan || christer.holmberg@ericsson.com, eburger@standardstrack.com, hkaplan@acmepacket.com +# RFC6087 || A. Bierman || andy@yumaworks.com +# RFC6088 || G. Tsirtsis, G. Giarreta, H. Soliman, N. Montavont || tsirtsis@qualcomm.com, gerardog@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu +# RFC6089 || G. Tsirtsis, H. Soliman, N. Montavont, G. Giaretta, K. Kuladinithi || tsirtsis@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu, gerardog@qualcomm.com, koo@comnets.uni-bremen.de +# RFC6090 || D. McGrew, K. Igoe, M. Salter || mcgrew@cisco.com, kmigoe@nsa.gov, msalter@restarea.ncsc.mil +# RFC6091 || N. Mavrogiannopoulos, D. Gillmor || nikos.mavrogiannopoulos@esat.kuleuven.be, dkg@fifthhorseman.net +# RFC6092 || J. Woodyatt, Ed. || jhw@apple.com +# RFC6093 || F. Gont, A. Yourtchenko || fernando@gont.com.ar, ayourtch@cisco.com +# RFC6094 || M. Bhatia, V. Manral || manav.bhatia@alcatel-lucent.com, vishwas@ipinfusion.com +# RFC6095 || B. Linowski, M. Ersue, S. Kuryla || bernd.linowski.ext@nsn.com, mehmet.ersue@nsn.com, s.kuryla@gmail.com +# RFC6096 || M. Tuexen, R. Stewart || tuexen@fh-muenster.de, randall@lakerest.net +# RFC6097 || J. Korhonen, V. Devarapalli || jouni.nospam@gmail.com, dvijay@gmail.com +# RFC6098 || H. Deng, H. Levkowetz, V. Devarapalli, S. Gundavelli, B. Haley || denghui02@gmail.com, henrik@levkowetz.com, dvijay@gmail.com, sgundave@cisco.com, brian.haley@hp.com +# RFC6101 || A. Freier, P. Karlton, P. Kocher || nikos.mavrogiannopoulos@esat.kuleuven.be +# RFC6104 || T. Chown, S. Venaas || tjc@ecs.soton.ac.uk, stig@cisco.com +# RFC6105 || E. Levy-Abegnoli, G. Van de Velde, C. Popoviciu, J. Mohacsi || elevyabe@cisco.com, gunter@cisco.com, chip@technodyne.com, mohacsi@niif.hu +# RFC6106 || J. Jeong, S. Park, L. Beloeil, S. Madanapalli || pjeong@brocade.com, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com +# RFC6107 || K. Shiomoto, Ed., A. Farrel, Ed. || shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC6108 || C. Chung, A. Kasyanov, J. Livingood, N. Mody, B. Van Lieu || chae_chung@cable.comcast.com, alexander_kasyanov@cable.comcast.com, jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, brian@vanlieu.net +# RFC6109 || C. Petrucci, F. Gennai, A. Shahin, A. Vinciarelli || petrucci@digitpa.gov.it, francesco.gennai@isti.cnr.it, alba.shahin@isti.cnr.it, alessandro.vinciarelli@gmail.com +# RFC6110 || L. Lhotka, Ed. || ladislav@lhotka.name +# RFC6111 || L. Zhu || lzhu@microsoft.com +# RFC6112 || L. Zhu, P. Leach, S. Hartman || larry.zhu@microsoft.com, paulle@microsoft.com, hartmans-ietf@mit.edu +# RFC6113 || S. Hartman, L. Zhu || hartmans-ietf@mit.edu, larry.zhu@microsoft.com +# RFC6114 || M. Katagi, S. Moriai || Masanobu.Katagi@jp.sony.com, clefia-q@jp.sony.com +# RFC6115 || T. Li, Ed. || tony.li@tony.li +# RFC6116 || S. Bradner, L. Conroy, K. Fujiwara || sob@harvard.edu, lconroy@insensate.co.uk, fujiwara@jprs.co.jp +# RFC6117 || B. Hoeneisen, A. Mayrhofer, J. Livingood || bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at, jason_livingood@cable.comcast.com +# RFC6118 || B. Hoeneisen, A. Mayrhofer || bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at +# RFC6119 || J. Harrison, J. Berger, M. Bartlett || jon.harrison@metaswitch.com, jon.berger@metaswitch.com, mike.bartlett@metaswitch.com +# RFC6120 || P. Saint-Andre || ietf@stpeter.im +# RFC6121 || P. Saint-Andre || ietf@stpeter.im +# RFC6122 || P. Saint-Andre || ietf@stpeter.im +# RFC6123 || A. Farrel || adrian@olddog.co.uk +# RFC6124 || Y. Sheffer, G. Zorn, H. Tschofenig, S. Fluhrer || yaronf.ietf@gmail.com, gwz@net-zen.net, Hannes.Tschofenig@gmx.net, sfluhrer@cisco.com +# RFC6125 || P. Saint-Andre, J. Hodges || ietf@stpeter.im, Jeff.Hodges@PayPal.com +# RFC6126 || J. Chroboczek || jch@pps.jussieu.fr +# RFC6127 || J. Arkko, M. Townsley || jari.arkko@piuha.net, townsley@cisco.com +# RFC6128 || A. Begen || abegen@cisco.com +# RFC6129 || L. Romary, S. Lundberg || laurent.romary@inria.fr, slu@kb.dk +# RFC6130 || T. Clausen, C. Dearlove, J. Dean || T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil +# RFC6131 || R. George, B. Leiba || robinsgv@gmail.com, barryleiba@computer.org +# RFC6132 || R. George, B. Leiba || robinsgv@gmail.com, barryleiba@computer.org +# RFC6133 || R. George, B. Leiba, A. Melnikov || robinsgv@gmail.com, barryleiba@computer.org, Alexey.Melnikov@isode.com +# RFC6134 || A. Melnikov, B. Leiba || Alexey.Melnikov@isode.com, barryleiba@computer.org +# RFC6135 || C. Holmberg, S. Blau || christer.holmberg@ericsson.com, staffan.blau@ericsson.com +# RFC6136 || A. Sajassi, Ed., D. Mohan, Ed. || sajassi@cisco.com, mohand@nortel.com +# RFC6137 || D. Zisiadis, Ed., S. Kopsidas, Ed., M. Tsavli, Ed., G. Cessieux, Ed. || dzisiadis@iti.gr, spyros@uth.gr, sttsavli@uth.gr, Guillaume.Cessieux@cc.in2p3.fr +# RFC6138 || S. Kini, Ed., W. Lu, Ed. || sriganesh.kini@ericsson.com, wenhu.lu@ericsson.com +# RFC6139 || S. Russert, Ed., E. Fleischman, Ed., F. Templin, Ed. || russerts@hotmail.com, eric.fleischman@boeing.com, fltemplin@acm.org +# RFC6140 || A.B. Roach || adam@nostrum.com +# RFC6141 || G. Camarillo, Ed., C. Holmberg, Y. Gao || Gonzalo.Camarillo@ericsson.com, Christer.Holmberg@ericsson.com, gao.yang2@zte.com.cn +# RFC6142 || A. Moise, J. Brodkin || avy@fdos.ca, jonathan.brodkin@fdos.ca +# RFC6143 || T. Richardson, J. Levine || standards@realvnc.com, standards@taugh.com +# RFC6144 || F. Baker, X. Li, C. Bao, K. Yin || fred@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, kyin@cisco.com +# RFC6145 || X. Li, C. Bao, F. Baker || xing@cernet.edu.cn, congxiao@cernet.edu.cn, fred@cisco.com +# RFC6146 || M. Bagnulo, P. Matthews, I. van Beijnum || marcelo@it.uc3m.es, philip_matthews@magma.ca, iljitsch@muada.com +# RFC6147 || M. Bagnulo, A. Sullivan, P. Matthews, I. van Beijnum || marcelo@it.uc3m.es, ajs@shinkuro.com, philip_matthews@magma.ca, iljitsch@muada.com +# RFC6148 || P. Kurapati, R. Desetti, B. Joshi || kurapati@juniper.net, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com +# RFC6149 || S. Turner, L. Chen || turners@ieca.com, lily.chen@nist.gov +# RFC6150 || S. Turner, L. Chen || turners@ieca.com, lily.chen@nist.gov +# RFC6151 || S. Turner, L. Chen || turners@ieca.com, lily.chen@nist.gov +# RFC6152 || J. Klensin, N. Freed, M. Rose, D. Crocker, Ed. || john+ietf@jck.com, ned.freed@mrochek.com, mrose17@gmail.com, dcrocker@bbiw.net +# RFC6153 || S. Das, G. Bajko || subir@research.Telcordia.com, gabor.bajko@nokia.com +# RFC6154 || B. Leiba, J. Nicolson || barryleiba@computer.org, nicolson@google.com +# RFC6155 || J. Winterbottom, M. Thomson, H. Tschofenig, R. Barnes || james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net, rbarnes@bbn.com +# RFC6156 || G. Camarillo, O. Novo, S. Perreault, Ed. || Gonzalo.Camarillo@ericsson.com, Oscar.Novo@ericsson.com, simon.perreault@viagenie.ca +# RFC6157 || G. Camarillo, K. El Malki, V. Gurbani || Gonzalo.Camarillo@ericsson.com, karim@athonet.com, vkg@bell-labs.com +# RFC6158 || A. DeKok, Ed., G. Weber || aland@freeradius.org, gdweber@gmail.com +# RFC6159 || T. Tsou, G. Zorn, T. Taylor, Ed. || tena@huawei.com, gwz@net-zen.net, tom.taylor.stds@gmail.com +# RFC6160 || S. Turner || turners@ieca.com +# RFC6161 || S. Turner || turners@ieca.com +# RFC6162 || S. Turner || turners@ieca.com +# RFC6163 || Y. Lee, Ed., G. Bernstein, Ed., W. Imajuku || ylee@huawei.com, gregb@grotto-networking.com, imajuku.wataru@lab.ntt.co.jp +# RFC6164 || M. Kohno, B. Nitzan, R. Bush, Y. Matsuzaki, L. Colitti, T. Narten || mkohno@juniper.net, nitzan@juniper.net, randy@psg.com, maz@iij.ad.jp, lorenzo@google.com, narten@us.ibm.com +# RFC6165 || A. Banerjee, D. Ward || ayabaner@cisco.com, dward@juniper.net +# RFC6166 || S. Venaas || stig@cisco.com +# RFC6167 || M. Phillips, P. Adams, D. Rokicki, E. Johnson || m8philli@uk.ibm.com, phil_adams@us.ibm.com, derek.rokicki@softwareag.com, eric@tibco.com +# RFC6168 || W. Hardaker || ietf@hardakers.net +# RFC6169 || S. Krishnan, D. Thaler, J. Hoagland || suresh.krishnan@ericsson.com, dthaler@microsoft.com, Jim_Hoagland@symantec.com +# RFC6170 || S. Santesson, R. Housley, S. Bajaj, L. Rosenthol || sts@aaa-sec.com, housley@vigilsec.com, siddharthietf@gmail.com, leonardr@adobe.com +# RFC6171 || K. Zeilenga || Kurt.Zeilenga@Isode.COM +# RFC6172 || D. Black, D. Peterson || david.black@emc.com, david.peterson@brocade.com +# RFC6173 || P. Venkatesen, Ed. || prakashvn@hcl.com +# RFC6174 || E. Juskevicius || edj.etc@gmail.com +# RFC6175 || E. Juskevicius || edj.etc@gmail.com +# RFC6176 || S. Turner, T. Polk || turners@ieca.com, tim.polk@nist.gov +# RFC6177 || T. Narten, G. Huston, L. Roberts || narten@us.ibm.com, gih@apnic.net, lea.roberts@stanford.edu +# RFC6178 || D. Smith, J. Mullooly, W. Jaeger, T. Scholl || djsmith@cisco.com, jmullool@cisco.com, wjaeger@att.com, tscholl@nlayer.net +# RFC6179 || F. Templin, Ed. || fltemplin@acm.org +# RFC6180 || J. Arkko, F. Baker || jari.arkko@piuha.net, fred@cisco.com +# RFC6181 || M. Bagnulo || marcelo@it.uc3m.es +# RFC6182 || A. Ford, C. Raiciu, M. Handley, S. Barre, J. Iyengar || alan.ford@roke.co.uk, c.raiciu@cs.ucl.ac.uk, m.handley@cs.ucl.ac.uk, sebastien.barre@uclouvain.be, jiyengar@fandm.edu +# RFC6183 || A. Kobayashi, B. Claise, G. Muenz, K. Ishibashi || akoba@orange.plala.or.jp, bclaise@cisco.com, muenz@net.in.tum.de, ishibashi.keisuke@lab.ntt.co.jp +# RFC6184 || Y.-K. Wang, R. Even, T. Kristensen, R. Jesup || yekuiwang@huawei.com, even.roni@huawei.com, tom.kristensen@tandberg.com, rjesup@wgate.com +# RFC6185 || T. Kristensen, P. Luthi || tom.kristensen@tandberg.com, patrick.luthi@tandberg.com +# RFC6186 || C. Daboo || cyrus@daboo.name +# RFC6187 || K. Igoe, D. Stebila || kmigoe@nsa.gov, douglas@stebila.ca +# RFC6188 || D. McGrew || mcgrew@cisco.com +# RFC6189 || P. Zimmermann, A. Johnston, Ed., J. Callas || prz@mit.edu, alan.b.johnston@gmail.com, jon@callas.org +# RFC6190 || S. Wenger, Y.-K. Wang, T. Schierl, A. Eleftheriadis || stewe@stewe.org, yekui.wang@huawei.com, ts@thomas-schierl.de, alex@vidyo.com +# RFC6191 || F. Gont || fernando@gont.com.ar +# RFC6192 || D. Dugal, C. Pignataro, R. Dunn || dave@juniper.net, cpignata@cisco.com, rodunn@cisco.com +# RFC6193 || M. Saito, D. Wing, M. Toyama || ma.saito@nttv6.jp, dwing-ietf@fuggles.com, toyama.masashi@lab.ntt.co.jp +# RFC6194 || T. Polk, L. Chen, S. Turner, P. Hoffman || tim.polk@nist.gov, lily.chen@nist.gov, turners@ieca.com, paul.hoffman@vpnc.org +# RFC6195 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6196 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC6197 || K. Wolf || karlheinz.wolf@nic.at +# RFC6198 || B. Decraene, P. Francois, C. Pelsser, Z. Ahmad, A.J. Elizondo Armengol, T. Takeda || bruno.decraene@orange-ftgroup.com, francois@info.ucl.ac.be, cristel@iij.ad.jp, zubair.ahmad@orange-ftgroup.com, ajea@tid.es, takeda.tomonori@lab.ntt.co.jp +# RFC6201 || R. Asati, C. Pignataro, F. Calabria, C. Olvera || rajiva@cisco.com, cpignata@cisco.com, fcalabri@cisco.com, cesar.olvera@consulintel.es +# RFC6202 || S. Loreto, P. Saint-Andre, S. Salsano, G. Wilkins || salvatore.loreto@ericsson.com, ietf@stpeter.im, stefano.salsano@uniroma2.it, gregw@webtide.com +# RFC6203 || T. Sirainen || tss@iki.fi +# RFC6204 || H. Singh, W. Beebee, C. Donley, B. Stark, O. Troan, Ed. || shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com, ot@cisco.com +# RFC6205 || T. Otani, Ed., D. Li, Ed. || tm-otani@kddi.com, danli@huawei.com +# RFC6206 || P. Levis, T. Clausen, J. Hui, O. Gnawali, J. Ko || pal@cs.stanford.edu, T.Clausen@computer.org, jhui@archrock.com, gnawali@cs.stanford.edu, jgko@cs.jhu.edu +# RFC6207 || R. Denenberg, Ed. || rden@loc.gov +# RFC6208 || K. Sankar, Ed., A. Jones || ksankar@cisco.com, arnold.jones@snia.org +# RFC6209 || W. Kim, J. Lee, J. Park, D. Kwon || whkim5@ensec.re.kr, jklee@ensec.re.kr, jhpark@ensec.re.kr, ds_kwon@ensec.re.kr +# RFC6210 || J. Schaad || ietf@augustcellars.com +# RFC6211 || J. Schaad || ietf@augustcellars.com +# RFC6212 || M. Kucherawy || msk@cloudmark.com +# RFC6213 || C. Hopps, L. Ginsberg || chopps@cisco.com, ginsberg@cisco.com +# RFC6214 || B. Carpenter, R. Hinden || brian.e.carpenter@gmail.com, bob.hinden@gmail.com +# RFC6215 || M. Bocci, L. Levrau, D. Frost || matthew.bocci@alcatel-lucent.com, lieven.levrau@alcatel-lucent.com, danfrost@cisco.com +# RFC6216 || C. Jennings, K. Ono, R. Sparks, B. Hibbard, Ed. || fluffy@cisco.com, kumiko@cs.columbia.edu, Robert.Sparks@tekelec.com, Brian.Hibbard@tekelec.com +# RFC6217 || T. Ritter || tom@ritter.vg +# RFC6218 || G. Zorn, T. Zhang, J. Walker, J. Salowey || gwz@net-zen.net, tzhang@advistatech.com, jesse.walker@intel.com, jsalowey@cisco.com +# RFC6219 || X. Li, C. Bao, M. Chen, H. Zhang, J. Wu || xing@cernet.edu.cn, congxiao@cernet.edu.cn, fibrib@gmail.com, neilzh@gmail.com, jianping@cernet.edu.cn +# RFC6220 || D. McPherson, Ed., O. Kolkman, Ed., J. Klensin, Ed., G. Huston, Ed., Internet Architecture Board || dmcpherson@verisign.com, olaf@NLnetLabs.nl, john+ietf@jck.com, gih@apnic.net +# RFC6221 || D. Miles, Ed., S. Ooghe, W. Dec, S. Krishnan, A. Kavanagh || david.miles@alcatel-lucent.com, sven.ooghe@alcatel-lucent.com, wdec@cisco.com, suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com +# RFC6222 || A. Begen, C. Perkins, D. Wing || abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com +# RFC6223 || C. Holmberg || christer.holmberg@ericsson.com +# RFC6224 || T. Schmidt, M. Waehlisch, S. Krishnan || schmidt@informatik.haw-hamburg.de, mw@link-lab.net, suresh.krishnan@ericsson.com +# RFC6225 || J. Polk, M. Linsner, M. Thomson, B. Aboba, Ed. || jmpolk@cisco.com, marc.linsner@cisco.com, martin.thomson@andrew.com, bernard_aboba@hotmail.com +# RFC6226 || B. Joshi, A. Kessler, D. McWalter || bharat_joshi@infosys.com, kessler@cisco.com, david@mcwalter.eu +# RFC6227 || T. Li, Ed. || tli@cisco.com +# RFC6228 || C. Holmberg || christer.holmberg@ericsson.com +# RFC6229 || J. Strombergson, S. Josefsson || joachim@secworks.se, simon@josefsson.org +# RFC6230 || C. Boulton, T. Melanchuk, S. McGlashan || chris@ns-technologies.com, timm@rainwillow.com, smcg.stds01@mcglashan.org +# RFC6231 || S. McGlashan, T. Melanchuk, C. Boulton || smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com +# RFC6232 || F. Wei, Y. Qin, Z. Li, T. Li, J. Dong || weifang@chinamobile.com, qinyue@chinamobile.com, lizhenqiang@chinamobile.com, tony.li@tony.li, dongjie_dj@huawei.com +# RFC6233 || T. Li, L. Ginsberg || tony.li@tony.li, ginsberg@cisco.com +# RFC6234 || D. Eastlake 3rd, T. Hansen || d3e3e3@gmail.com, tony+shs@maillennium.att.com +# RFC6235 || E. Boschi, B. Trammell || boschie@tik.ee.ethz.ch, trammell@tik.ee.ethz.ch +# RFC6236 || I. Johansson, K. Jung || ingemar.s.johansson@ericsson.com, kyunghun.jung@samsung.com +# RFC6237 || B. Leiba, A. Melnikov || barryleiba@computer.org, Alexey.Melnikov@isode.com +# RFC6238 || D. M'Raihi, S. Machani, M. Pei, J. Rydell || davidietf@gmail.com, smachani@diversinet.com, Mingliang_Pei@symantec.com, johanietf@gmail.com +# RFC6239 || K. Igoe || kmigoe@nsa.gov +# RFC6240 || D. Zelig, Ed., R. Cohen, Ed., T. Nadeau, Ed. || david_zelig@pmc-sierra.com, ronc@resolutenetworks.com, Thomas.Nadeau@ca.com +# RFC6241 || R. Enns, Ed., M. Bjorklund, Ed., J. Schoenwaelder, Ed., A. Bierman, Ed. || rob.enns@gmail.com, mbj@tail-f.com, j.schoenwaelder@jacobs-university.de, andy@yumaworks.com +# RFC6242 || M. Wasserman || mrw@painless-security.com +# RFC6243 || A. Bierman, B. Lengyel || andy@yumaworks.com, balazs.lengyel@ericsson.com +# RFC6244 || P. Shafer || phil@juniper.net +# RFC6245 || P. Yegani, K. Leung, A. Lior, K. Chowdhury, J. Navali || pyegani@juniper.net, kleung@cisco.com, avi@bridgewatersystems.com, kchowdhu@cisco.com, jnavali@cisco.com +# RFC6246 || A. Sajassi, Ed., F. Brockners, D. Mohan, Ed., Y. Serbest || sajassi@cisco.com, fbrockne@cisco.com, dinmohan@hotmail.com, yetik_serbest@labs.att.com +# RFC6247 || L. Eggert || lars.eggert@nokia.com +# RFC6248 || A. Morton || acmorton@att.com +# RFC6249 || A. Bryan, N. McNab, T. Tsujikawa, P. Poeml, H. Nordstrom || anthonybryan@gmail.com, neil@nabber.org, tatsuhiro.t@gmail.com, peter@poeml.de, henrik@henriknordstrom.net +# RFC6250 || D. Thaler || dthaler@microsoft.com +# RFC6251 || S. Josefsson || simon@josefsson.org +# RFC6252 || A. Dutta, Ed., V. Fajardo, Y. Ohba, K. Taniuchi, H. Schulzrinne || ashutosh.dutta@ieee.org, vf0213@gmail.com, yoshihiro.ohba@toshiba.co.jp, kenichi.taniuchi@toshiba.co.jp, hgs@cs.columbia.edu +# RFC6253 || T. Heer, S. Varjonen || heer@cs.rwth-aachen.de, samu.varjonen@hiit.fi +# RFC6254 || M. McFadden || mark.mcfadden@icann.org +# RFC6255 || M. Blanchet || Marc.Blanchet@viagenie.ca +# RFC6256 || W. Eddy, E. Davies || wes@mti-systems.com, elwynd@folly.org.uk +# RFC6257 || S. Symington, S. Farrell, H. Weiss, P. Lovell || susan@mitre.org, stephen.farrell@cs.tcd.ie, howard.weiss@sparta.com, dtnbsp@gmail.com +# RFC6258 || S. Symington || susan@mitre.org +# RFC6259 || S. Symington || susan@mitre.org +# RFC6260 || S. Burleigh || Scott.C.Burleigh@jpl.nasa.gov +# RFC6261 || A. Keranen || ari.keranen@ericsson.com +# RFC6262 || S. Ikonin || ikonin@spiritdsp.com +# RFC6263 || X. Marjou, A. Sollaud || xavier.marjou@orange-ftgroup.com, aurelien.sollaud@orange-ftgroup.com +# RFC6264 || S. Jiang, D. Guo, B. Carpenter || jiangsheng@huawei.com, guoseu@huawei.com, brian.e.carpenter@gmail.com +# RFC6265 || A. Barth || abarth@eecs.berkeley.edu +# RFC6266 || J. Reschke || julian.reschke@greenbytes.de +# RFC6267 || V. Cakulev, G. Sundaram || violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com +# RFC6268 || J. Schaad, S. Turner || ietf@augustcellars.com, turners@ieca.com +# RFC6269 || M. Ford, Ed., M. Boucadair, A. Durand, P. Levis, P. Roberts || ford@isoc.org, mohamed.boucadair@orange-ftgroup.com, adurand@juniper.net, pierre.levis@orange-ftgroup.com, roberts@isoc.org +# RFC6270 || M. Yevstifeyev || evnikita2@gmail.com +# RFC6271 || J-F. Mule || jf.mule@cablelabs.com +# RFC6272 || F. Baker, D. Meyer || fred@cisco.com, dmm@cisco.com +# RFC6273 || A. Kukec, S. Krishnan, S. Jiang || ana.kukec@fer.hr, suresh.krishnan@ericsson.com, jiangsheng@huawei.com +# RFC6274 || F. Gont || fernando@gont.com.ar +# RFC6275 || C. Perkins, Ed., D. Johnson, J. Arkko || charliep@computer.org, dbj@cs.rice.edu, jari.arkko@ericsson.com +# RFC6276 || R. Droms, P. Thubert, F. Dupont, W. Haddad, C. Bernardos || rdroms@cisco.com, pthubert@cisco.com, fdupont@isc.org, Wassim.Haddad@ericsson.com, cjbc@it.uc3m.es +# RFC6277 || S. Santesson, P. Hallam-Baker || sts@aaa-sec.com, hallam@gmail.com +# RFC6278 || J. Herzog, R. Khazan || jherzog@ll.mit.edu, rkh@ll.mit.edu +# RFC6279 || M. Liebsch, Ed., S. Jeong, Q. Wu || liebsch@neclab.eu, sjjeong@etri.re.kr, sunseawq@huawei.com +# RFC6280 || R. Barnes, M. Lepinski, A. Cooper, J. Morris, H. Tschofenig, H. Schulzrinne || rbarnes@bbn.com, mlepinski@bbn.com, acooper@cdt.org, jmorris@cdt.org, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu +# RFC6281 || S. Cheshire, Z. Zhu, R. Wakikawa, L. Zhang || cheshire@apple.com, zhenkai@ucla.edu, ryuji@jp.toyota-itc.com, lixia@cs.ucla.edu +# RFC6282 || J. Hui, Ed., P. Thubert || jhui@archrock.com, pthubert@cisco.com +# RFC6283 || A. Jerman Blazic, S. Saljic, T. Gondrom || aljosa@setcce.si, svetlana.saljic@setcce.si, tobias.gondrom@gondrom.org +# RFC6284 || A. Begen, D. Wing, T. Van Caenegem || abegen@cisco.com, dwing-ietf@fuggles.com, Tom.Van_Caenegem@alcatel-lucent.com +# RFC6285 || B. Ver Steeg, A. Begen, T. Van Caenegem, Z. Vax || billvs@cisco.com, abegen@cisco.com, Tom.Van_Caenegem@alcatel-lucent.be, zeevvax@microsoft.com +# RFC6286 || E. Chen, J. Yuan || enkechen@cisco.com, jenny@cisco.com +# RFC6287 || D. M'Raihi, J. Rydell, S. Bajaj, S. Machani, D. Naccache || davidietf@gmail.com, johanietf@gmail.com, siddharthietf@gmail.com, smachani@diversinet.com, david.naccache@ens.fr +# RFC6288 || C. Reed || creed@opengeospatial.org +# RFC6289 || E. Cardona, S. Channabasappa, J-F. Mule || e.cardona@cablelabs.com, sumanth@cablelabs.com, jf.mule@cablelabs.com +# RFC6290 || Y. Nir, Ed., D. Wierbowski, F. Detienne, P. Sethi || ynir@checkpoint.com, wierbows@us.ibm.com, fd@cisco.com, psethi@cisco.com +# RFC6291 || L. Andersson, H. van Helvoort, R. Bonica, D. Romascanu, S. Mansfield || loa.andersson@ericsson.com, huub.van.helvoort@huawei.com, rbonica@juniper.net, dromasca@gmail.com , scott.mansfield@ericsson.com +# RFC6292 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6293 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6294 || Q. Hu, B. Carpenter || qhu009@aucklanduni.ac.nz, brian.e.carpenter@gmail.com +# RFC6295 || J. Lazzaro, J. Wawrzynek || lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu +# RFC6296 || M. Wasserman, F. Baker || mrw@painless-security.com, fred@cisco.com +# RFC6297 || M. Welzl, D. Ros || michawe@ifi.uio.no, david.ros@telecom-bretagne.eu +# RFC6298 || V. Paxson, M. Allman, J. Chu, M. Sargent || vern@icir.org, mallman@icir.org, hkchu@google.com, mts71@case.edu +# RFC6301 || Z. Zhu, R. Wakikawa, L. Zhang || zhenkai@cs.ucla.edu, ryuji.wakikawa@gmail.com, lixia@cs.ucla.edu +# RFC6302 || A. Durand, I. Gashinsky, D. Lee, S. Sheppard || adurand@juniper.net, igor@yahoo-inc.com, donn@fb.com, Scott.Sheppard@att.com +# RFC6303 || M. Andrews || marka@isc.org +# RFC6304 || J. Abley, W. Maton || joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca +# RFC6305 || J. Abley, W. Maton || joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca +# RFC6306 || P. Frejborg || pfrejborg@gmail.com +# RFC6307 || D. Black, Ed., L. Dunbar, Ed., M. Roth, R. Solomon || david.black@emc.com, ldunbar@huawei.com, MRoth@infinera.com, ronens@corrigent.com +# RFC6308 || P. Savola || psavola@funet.fi +# RFC6309 || J. Arkko, A. Keranen, J. Mattsson || jari.arkko@piuha.net, ari.keranen@ericsson.com, john.mattsson@ericsson.com +# RFC6310 || M. Aissaoui, P. Busschbach, L. Martini, M. Morrow, T. Nadeau, Y(J). Stein || mustapha.aissaoui@alcatel-lucent.com, busschbach@alcatel-lucent.com, lmartini@cisco.com, mmorrow@cisco.com, Thomas.Nadeau@ca.com, yaakov_s@rad.com +# RFC6311 || R. Singh, Ed., G. Kalyani, Y. Nir, Y. Sheffer, D. Zhang || rsj@cisco.com, kagarigi@cisco.com, ynir@checkpoint.com, yaronf.ietf@gmail.com, zhangdacheng@huawei.com +# RFC6312 || R. Koodli || rkoodli@cisco.com +# RFC6313 || B. Claise, G. Dhandapani, P. Aitken, S. Yates || bclaise@cisco.com, gowri@cisco.com, paitken@cisco.com, syates@cisco.com +# RFC6314 || C. Boulton, J. Rosenberg, G. Camarillo, F. Audet || chris@ns-technologies.com, jdrosen@jdrosen.net, Gonzalo.Camarillo@ericsson.com, francois.audet@skype.net +# RFC6315 || E. Guy, K. Darilion || edguy@CleverSpoke.com, klaus.darilion@nic.at +# RFC6316 || M. Komu, M. Bagnulo, K. Slavov, S. Sugimoto, Ed. || miika@iki.fi, marcelo@it.uc3m.es, kristian.slavov@ericsson.com, shinta@sfc.wide.ad.jp +# RFC6317 || M. Komu, T. Henderson || miika@iki.fi, thomas.r.henderson@boeing.com +# RFC6318 || R. Housley, J. Solinas || housley@vigilsec.com, jasolin@orion.ncsc.mil +# RFC6319 || M. Azinger, L. Vegoda || marla.azinger@ftr.com, leo.vegoda@icann.org +# RFC6320 || S. Wadhwa, J. Moisand, T. Haag, N. Voigt, T. Taylor, Ed. || sanjay.wadhwa@alcatel-lucent.com, jmoisand@juniper.net, haagt@telekom.de, norbert.voigt@nsn.com, tom.taylor.stds@gmail.com +# RFC6321 || C. Daboo, M. Douglass, S. Lees || cyrus@daboo.name, douglm@rpi.edu, steven.lees@microsoft.com +# RFC6322 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6323 || G. Renker, G. Fairhurst || gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk +# RFC6324 || G. Nakibly, F. Templin || gnakibly@yahoo.com, fltemplin@acm.org +# RFC6325 || R. Perlman, D. Eastlake 3rd, D. Dutt, S. Gai, A. Ghanwani || Radia@alum.mit.edu, d3e3e3@gmail.com, ddutt@cisco.com, silvano@ip6.com, anoop@alumni.duke.edu +# RFC6326 || D. Eastlake, A. Banerjee, D. Dutt, R. Perlman, A. Ghanwani || d3e3e3@gmail.com, ayabaner@cisco.com, ddutt@cisco.com, Radia@alum.mit.edu, anoop@alumni.duke.edu +# RFC6327 || D. Eastlake 3rd, R. Perlman, A. Ghanwani, D. Dutt, V. Manral || d3e3e3@gmail.com, Radia@alum.mit.edu, anoop@alumni.duke.edu, ddutt@cisco.com, vishwas.manral@hp.com +# RFC6328 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6329 || D. Fedyk, Ed., P. Ashwood-Smith, Ed., D. Allan, A. Bragg, P. Unbehagen || Donald.Fedyk@alcatel-lucent.com, Peter.AshwoodSmith@huawei.com, david.i.allan@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com +# RFC6330 || M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer, L. Minder || luby@qti.qualcomm.com, amin.shokrollahi@epfl.ch, watsonm@netflix.com, stockhammer@nomor.de, lminder@qualcomm.com +# RFC6331 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC6332 || A. Begen, E. Friedrich || abegen@cisco.com, efriedri@cisco.com +# RFC6333 || A. Durand, R. Droms, J. Woodyatt, Y. Lee || adurand@juniper.net, rdroms@cisco.com, jhw@apple.com, yiu_lee@cable.comcast.com +# RFC6334 || D. Hankins, T. Mrugalski || dhankins@google.com, tomasz.mrugalski@eti.pg.gda.pl +# RFC6335 || M. Cotton, L. Eggert, J. Touch, M. Westerlund, S. Cheshire || michelle.cotton@icann.org, lars.eggert@nokia.com, touch@isi.edu, magnus.westerlund@ericsson.com, cheshire@apple.com +# RFC6336 || M. Westerlund, C. Perkins || magnus.westerlund@ericsson.com, csp@csperkins.org +# RFC6337 || S. Okumura, T. Sawada, P. Kyzivat || shinji.okumura@softfront.jp, tu-sawada@kddi.com, pkyzivat@alum.mit.edu +# RFC6338 || V. Giralt, R. McDuff || victoriano@uma.es, r.mcduff@uq.edu.au +# RFC6339 || S. Josefsson, L. Hornquist Astrand || simon@josefsson.org, lha@apple.com +# RFC6340 || R. Presuhn || randy_presuhn@mindspring.com +# RFC6341 || K. Rehor, Ed., L. Portman, Ed., A. Hutton, R. Jain || krehor@cisco.com, leon.portman@nice.com, andrew.hutton@siemens-enterprise.com, rajnish.jain@ipc.com +# RFC6342 || R. Koodli || rkoodli@cisco.com +# RFC6343 || B. Carpenter || brian.e.carpenter@gmail.com +# RFC6344 || G. Bernstein, Ed., D. Caviglia, R. Rabbat, H. van Helvoort || gregb@grotto-networking.com, diego.caviglia@ericsson.com, rabbat@alum.mit.edu, hhelvoort@huawei.com +# RFC6345 || P. Duffy, S. Chakrabarti, R. Cragie, Y. Ohba, Ed., A. Yegin || paduffy@cisco.com, samita.chakrabarti@ericsson.com, robert.cragie@gridmerge.com, yoshihiro.ohba@toshiba.co.jp, a.yegin@partner.samsung.com +# RFC6346 || R. Bush, Ed. || randy@psg.com +# RFC6347 || E. Rescorla, N. Modadugu || ekr@rtfm.com, nagendra@cs.stanford.edu +# RFC6348 || JL. Le Roux, Ed., T. Morin, Ed. || jeanlouis.leroux@orange-ftgroup.com, thomas.morin@orange-ftgroup.com +# RFC6349 || B. Constantine, G. Forget, R. Geib, R. Schrage || barry.constantine@jdsu.com, gilles.forget@sympatico.ca, Ruediger.Geib@telekom.de, reinhard@schrageconsult.com +# RFC6350 || S. Perreault || simon.perreault@viagenie.ca +# RFC6351 || S. Perreault || simon.perreault@viagenie.ca +# RFC6352 || C. Daboo || cyrus@daboo.name +# RFC6353 || W. Hardaker || ietf@hardakers.net +# RFC6354 || Q. Xie || Qiaobing.Xie@gmail.com +# RFC6355 || T. Narten, J. Johnson || narten@us.ibm.com, jarrod.b.johnson@gmail.com +# RFC6356 || C. Raiciu, M. Handley, D. Wischik || costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, d.wischik@cs.ucl.ac.uk +# RFC6357 || V. Hilt, E. Noel, C. Shen, A. Abdelal || volker.hilt@alcatel-lucent.com, eric.noel@att.com, charles@cs.columbia.edu, aabdelal@sonusnet.com +# RFC6358 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6359 || S. Ginoza, M. Cotton, A. Morris || sginoza@amsl.com, michelle.cotton@icann.org, amorris@amsl.com +# RFC6360 || R. Housley || housley@vigilsec.com +# RFC6361 || J. Carlson, D. Eastlake 3rd || carlsonj@workingcode.com, d3e3e3@gmail.com +# RFC6362 || K. Meadors, Ed. || kyle@drummondgroup.com +# RFC6363 || M. Watson, A. Begen, V. Roca || watsonm@netflix.com, abegen@cisco.com, vincent.roca@inria.fr +# RFC6364 || A. Begen || abegen@cisco.com +# RFC6365 || P. Hoffman, J. Klensin || paul.hoffman@vpnc.org, john+ietf@jck.com +# RFC6366 || J. Valin, K. Vos || jmvalin@jmvalin.ca, koen.vos@skype.net +# RFC6367 || S. Kanno, M. Kanda || kanno.satoru@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp +# RFC6368 || P. Marques, R. Raszuk, K. Patel, K. Kumaki, T. Yamagata || pedro.r.marques@gmail.com, robert@raszuk.net, keyupate@cisco.com, ke-kumaki@kddi.com, to-yamagata@kddi.com +# RFC6369 || E. Haleplidis, O. Koufopavlou, S. Denazis || ehalep@ece.upatras.gr, odysseas@ece.upatras.gr, sdena@upatras.gr +# RFC6370 || M. Bocci, G. Swallow, E. Gray || matthew.bocci@alcatel-lucent.com, swallow@cisco.com, eric.gray@ericsson.com +# RFC6371 || I. Busi, Ed., D. Allan, Ed. || Italo.Busi@alcatel-lucent.com, david.i.allan@ericsson.com +# RFC6372 || N. Sprecher, Ed., A. Farrel, Ed. || nurit.sprecher@nsn.com, adrian@olddog.co.uk +# RFC6373 || L. Andersson, Ed., L. Berger, Ed., L. Fang, Ed., N. Bitar, Ed., E. Gray, Ed. || loa.andersson@ericsson.com, lberger@labn.net, lufang@cisco.com, nabil.n.bitar@verizon.com, Eric.Gray@Ericsson.com +# RFC6374 || D. Frost, S. Bryant || danfrost@cisco.com, stbryant@cisco.com +# RFC6375 || D. Frost, Ed., S. Bryant, Ed. || danfrost@cisco.com, stbryant@cisco.com +# RFC6376 || D. Crocker, Ed., T. Hansen, Ed., M. Kucherawy, Ed. || dcrocker@bbiw.net, tony+dkimov@maillennium.att.com, msk@cloudmark.com +# RFC6377 || M. Kucherawy || msk@cloudmark.com +# RFC6378 || Y. Weingarten, Ed., S. Bryant, E. Osborne, N. Sprecher, A. Fulignoli, Ed. || yaacov.weingarten@nsn.com, stbryant@cisco.com, eosborne@cisco.com, nurit.sprecher@nsn.com, annamaria.fulignoli@ericsson.com +# RFC6379 || L. Law, J. Solinas || lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil +# RFC6380 || K. Burgin, M. Peck || kwburgi@tycho.ncsc.mil, mpeck@mitre.org +# RFC6381 || R. Gellens, D. Singer, P. Frojdh || rg+ietf@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com +# RFC6382 || D. McPherson, R. Donnelly, F. Scalzo || dmcpherson@verisign.com, rdonnelly@verisign.com, fscalzo@verisign.com +# RFC6383 || K. Shiomoto, A. Farrel || shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC6384 || I. van Beijnum || iljitsch@muada.com +# RFC6385 || M. Barnes, A. Doria, H. Alvestrand, B. Carpenter || mary.ietf.barnes@gmail.com, avri@acm.org, harald@alvestrand.no, brian.e.carpenter@gmail.com +# RFC6386 || J. Bankoski, J. Koleszar, L. Quillio, J. Salonen, P. Wilkins, Y. Xu || jimbankoski@google.com, jkoleszar@google.com, louquillio@google.com, jsalonen@google.com, paulwilkins@google.com, yaowu@google.com +# RFC6387 || A. Takacs, L. Berger, D. Caviglia, D. Fedyk, J. Meuric || attila.takacs@ericsson.com, lberger@labn.net, diego.caviglia@ericsson.com, donald.fedyk@alcatel-lucent.com, julien.meuric@orange.com +# RFC6388 || IJ. Wijnands, Ed., I. Minei, Ed., K. Kompella, B. Thomas || ice@cisco.com, ina@juniper.net, kireeti@juniper.net, bobthomas@alum.mit.edu +# RFC6389 || R. Aggarwal, JL. Le Roux || raggarwa_1@yahoo.com, jeanlouis.leroux@orange-ftgroup.com +# RFC6390 || A. Clark, B. Claise || alan.d.clark@telchemy.com, bclaise@cisco.com +# RFC6391 || S. Bryant, Ed., C. Filsfils, U. Drafz, V. Kompella, J. Regan, S. Amante || stbryant@cisco.com, cfilsfil@cisco.com, Ulrich.Drafz@telekom.de, vach.kompella@alcatel-lucent.com, joe.regan@alcatel-lucent.com, shane@level3.net +# RFC6392 || R. Alimi, Ed., A. Rahman, Ed., Y. Yang, Ed. || ralimi@google.com, Akbar.Rahman@InterDigital.com, yry@cs.yale.edu +# RFC6393 || M. Yevstifeyev || evnikita2@gmail.com +# RFC6394 || R. Barnes || rbarnes@bbn.com +# RFC6395 || S. Gulrajani, S. Venaas || sameerg@cisco.com, stig@cisco.com +# RFC6396 || L. Blunk, M. Karir, C. Labovitz || ljb@merit.edu, mkarir@merit.edu, labovit@deepfield.net +# RFC6397 || T. Manderson || terry.manderson@icann.org +# RFC6398 || F. Le Faucheur, Ed. || flefauch@cisco.com +# RFC6401 || F. Le Faucheur, J. Polk, K. Carlberg || flefauch@cisco.com, jmpolk@cisco.com, carlberg@g11.org.uk +# RFC6402 || J. Schaad || jimsch@augustcellars.com +# RFC6403 || L. Zieglar, S. Turner, M. Peck || llziegl@tycho.ncsc.mil, turners@ieca.com, mpeck@alumni.virginia.edu +# RFC6404 || J. Seedorf, S. Niccolini, E. Chen, H. Scholz || jan.seedorf@nw.neclab.eu, saverio.niccolini@.neclab.eu, eric.chen@lab.ntt.co.jp, hendrik.scholz@voipfuture.com +# RFC6405 || A. Uzelac, Ed., Y. Lee, Ed. || adam.uzelac@globalcrossing.com, yiu_lee@cable.comcast.com +# RFC6406 || D. Malas, Ed., J. Livingood, Ed. || d.malas@cablelabs.com, Jason_Livingood@cable.comcast.com +# RFC6407 || B. Weis, S. Rowles, T. Hardjono || bew@cisco.com, sheela@cisco.com, hardjono@mit.edu +# RFC6408 || M. Jones, J. Korhonen, L. Morand || mark@azu.ca, jouni.nospam@gmail.com, lionel.morand@orange-ftgroup.com +# RFC6409 || R. Gellens, J. Klensin || rg+ietf@qualcomm.com, john-ietf@jck.com +# RFC6410 || R. Housley, D. Crocker, E. Burger || housley@vigilsec.com, dcrocker@bbiw.net, eburger@standardstrack.com +# RFC6411 || M. Behringer, F. Le Faucheur, B. Weis || mbehring@cisco.com, flefauch@cisco.com, bew@cisco.com +# RFC6412 || S. Poretsky, B. Imhoff, K. Michielsen || sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com +# RFC6413 || S. Poretsky, B. Imhoff, K. Michielsen || sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com +# RFC6414 || S. Poretsky, R. Papneja, J. Karthik, S. Vapiwala || sporetsky@allot.com, rajiv.papneja@huawei.com, jkarthik@cisco.com, svapiwal@cisco.com +# RFC6415 || E. Hammer-Lahav, Ed., B. Cook || eran@hueniverse.com, romeda@gmail.com +# RFC6416 || M. Schmidt, F. de Bont, S. Doehla, J. Kim || malte.schmidt@dolby.com, frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, kjh1905m@naver.com +# RFC6417 || P. Eardley, L. Eggert, M. Bagnulo, R. Winter || philip.eardley@bt.com, lars.eggert@nokia.com, marcelo@it.uc3m.es, rolf.winter@neclab.eu +# RFC6418 || M. Blanchet, P. Seite || Marc.Blanchet@viagenie.ca, pierrick.seite@orange.com +# RFC6419 || M. Wasserman, P. Seite || mrw@painless-security.com, pierrick.seite@orange-ftgroup.com +# RFC6420 || Y. Cai, H. Ou || ycai@cisco.com, hou@cisco.com +# RFC6421 || D. Nelson, Ed. || d.b.nelson@comcast.net +# RFC6422 || T. Lemon, Q. Wu || mellon@nominum.com, sunseawq@huawei.com +# RFC6423 || H. Li, L. Martini, J. He, F. Huang || lihan@chinamobile.com, lmartini@cisco.com, hejia@huawei.com, feng.f.huang@alcatel-sbell.com.cn +# RFC6424 || N. Bahadur, K. Kompella, G. Swallow || nitinb@juniper.net, kireeti@juniper.net, swallow@cisco.com +# RFC6425 || S. Saxena, Ed., G. Swallow, Z. Ali, A. Farrel, S. Yasukawa, T. Nadeau || ssaxena@cisco.com, swallow@cisco.com, zali@cisco.com, adrian@olddog.co.uk, yasukawa.seisho@lab.ntt.co.jp, thomas.nadeau@ca.com +# RFC6426 || E. Gray, N. Bahadur, S. Boutros, R. Aggarwal || eric.gray@ericsson.com, nitinb@juniper.net, sboutros@cisco.com, raggarwa_1@yahoo.com +# RFC6427 || G. Swallow, Ed., A. Fulignoli, Ed., M. Vigoureux, Ed., S. Boutros, D. Ward || swallow@cisco.com, annamaria.fulignoli@ericsson.com, martin.vigoureux@alcatel-lucent.com, sboutros@cisco.com, dward@juniper.net +# RFC6428 || D. Allan, Ed., G. Swallow, Ed., J. Drake, Ed. || david.i.allan@ericsson.com, swallow@cisco.com, jdrake@juniper.net +# RFC6429 || M. Bashyam, M. Jethanandani, A. Ramaiah || mbashyam@ocarinanetworks.com, mjethanandani@gmail.com, ananth@cisco.com +# RFC6430 || K. Li, B. Leiba || likepeng@huawei.com, barryleiba@computer.org +# RFC6431 || M. Boucadair, P. Levis, G. Bajko, T. Savolainen, T. Tsou || mohamed.boucadair@orange.com, pierre.levis@orange.com, gabor.bajko@nokia.com, teemu.savolainen@nokia.com, tina.tsou.zouting@huawei.com +# RFC6432 || R. Jesske, L. Liess || r.jesske@telekom.de, L.Liess@telekom.de +# RFC6433 || P. Hoffman || paul.hoffman@vpnc.org +# RFC6434 || E. Jankiewicz, J. Loughney, T. Narten || edward.jankiewicz@sri.com, john.loughney@nokia.com, narten@us.ibm.com +# RFC6435 || S. Boutros, Ed., S. Sivabalan, Ed., R. Aggarwal, Ed., M. Vigoureux, Ed., X. Dai, Ed. || sboutros@cisco.com, msiva@cisco.com, raggarwa_1@yahoo.com, martin.vigoureux@alcatel-lucent.com, dai.xuehui@zte.com.cn +# RFC6436 || S. Amante, B. Carpenter, S. Jiang || shane@level3.net, brian.e.carpenter@gmail.com, shengjiang@huawei.com +# RFC6437 || S. Amante, B. Carpenter, S. Jiang, J. Rajahalme || shane@level3.net, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, jarno.rajahalme@nsn.com +# RFC6438 || B. Carpenter, S. Amante || brian.e.carpenter@gmail.com, shane@level3.net +# RFC6439 || R. Perlman, D. Eastlake, Y. Li, A. Banerjee, F. Hu || Radia@alum.mit.edu, d3e3e3@gmail.com, liyizhou@huawei.com, ayabaner@cisco.com, hu.fangwei@zte.com.cn +# RFC6440 || G. Zorn, Q. Wu, Y. Wang || gwz@net-zen.net, sunseawq@huawei.com, w52006@huawei.com +# RFC6441 || L. Vegoda || leo.vegoda@icann.org +# RFC6442 || J. Polk, B. Rosen, J. Peterson || jmpolk@cisco.com, br@brianrosen.net, jon.peterson@neustar.biz +# RFC6443 || B. Rosen, H. Schulzrinne, J. Polk, A. Newton || br@brianrosen.net, hgs@cs.columbia.edu, jmpolk@cisco.com, andy@hxr.us +# RFC6444 || H. Schulzrinne, L. Liess, H. Tschofenig, B. Stark, A. Kuett || hgs+ecrit@cs.columbia.edu, L.Liess@telekom.de, Hannes.Tschofenig@gmx.net, barbara.stark@att.com, andres.kytt@skype.net +# RFC6445 || T. Nadeau, Ed., A. Koushik, Ed., R. Cetin, Ed. || thomas.nadeau@ca.com, kkoushik@cisco.com, riza.cetin@alcatel.be +# RFC6446 || A. Niemi, K. Kiss, S. Loreto || aki.niemi@nokia.com, krisztian.kiss@nokia.com, salvatore.loreto@ericsson.com +# RFC6447 || R. Mahy, B. Rosen, H. Tschofenig || rohan@ekabal.com, br@brianrosen.net, Hannes.Tschofenig@gmx.net +# RFC6448 || R. Yount || rjy@cmu.edu +# RFC6449 || J. Falk, Ed. || ietf@cybernothing.org +# RFC6450 || S. Venaas || stig@cisco.com +# RFC6451 || A. Forte, H. Schulzrinne || forte@att.com, hgs@cs.columbia.edu +# RFC6452 || P. Faltstrom, Ed., P. Hoffman, Ed. || paf@cisco.com, paul.hoffman@vpnc.org +# RFC6453 || F. Dijkstra, R. Hughes-Jones || Freek.Dijkstra@sara.nl, Richard.Hughes-Jones@dante.net +# RFC6454 || A. Barth || ietf@adambarth.com +# RFC6455 || I. Fette, A. Melnikov || ifette+ietf@google.com, Alexey.Melnikov@isode.com +# RFC6456 || H. Li, R. Zheng, A. Farrel || hongyu.lihongyu@huawei.com, robin@huawei.com, adrian@olddog.co.uk +# RFC6457 || T. Takeda, Ed., A. Farrel || takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk +# RFC6458 || R. Stewart, M. Tuexen, K. Poon, P. Lei, V. Yasevich || randall@lakerest.net, tuexen@fh-muenster.de, ka-cheong.poon@oracle.com, peterlei@cisco.com, vladislav.yasevich@hp.com +# RFC6459 || J. Korhonen, Ed., J. Soininen, B. Patil, T. Savolainen, G. Bajko, K. Iisakkila || jouni.nospam@gmail.com, jonne.soininen@renesasmobile.com, basavaraj.patil@nokia.com, teemu.savolainen@nokia.com, gabor.bajko@nokia.com, kaisu.iisakkila@renesasmobile.com +# RFC6460 || M. Salter, R. Housley || misalte@nsa.gov, housley@vigilsec.com +# RFC6461 || S. Channabasappa, Ed. || sumanth@cablelabs.com +# RFC6462 || A. Cooper || acooper@cdt.org +# RFC6463 || J. Korhonen, Ed., S. Gundavelli, H. Yokota, X. Cui || jouni.nospam@gmail.com, sri.gundavelli@cisco.com, yokota@kddilabs.jp, Xiangsong.Cui@huawei.com +# RFC6464 || J. Lennox, Ed., E. Ivov, E. Marocco || jonathan@vidyo.com, emcho@jitsi.org, enrico.marocco@telecomitalia.it +# RFC6465 || E. Ivov, Ed., E. Marocco, Ed., J. Lennox || emcho@jitsi.org, enrico.marocco@telecomitalia.it, jonathan@vidyo.com +# RFC6466 || G. Salgueiro || gsalguei@cisco.com +# RFC6467 || T. Kivinen || kivinen@iki.fi +# RFC6468 || A. Melnikov, B. Leiba, K. Li || Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com +# RFC6469 || K. Kobayashi, K. Mishima, S. Casner, C. Bormann || ikob@riken.jp, three@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org +# RFC6470 || A. Bierman || andy@yumaworks.com +# RFC6471 || C. Lewis, M. Sergeant || clewisbcp@cauce.org, matt@sergeant.org +# RFC6472 || W. Kumari, K. Sriram || warren@kumari.net, ksriram@nist.gov +# RFC6473 || P. Saint-Andre || ietf@stpeter.im +# RFC6474 || K. Li, B. Leiba || likepeng@huawei.com, barryleiba@computer.org +# RFC6475 || G. Keeni, K. Koide, S. Gundavelli, R. Wakikawa || glenn@cysols.com, ka-koide@kddi.com, sgundave@cisco.com, ryuji@us.toyota-itc.com +# RFC6476 || P. Gutmann || pgut001@cs.auckland.ac.nz +# RFC6477 || A. Melnikov, G. Lunt || Alexey.Melnikov@isode.com, graeme.lunt@smhs.co.uk +# RFC6478 || L. Martini, G. Swallow, G. Heron, M. Bocci || lmartini@cisco.com, swallow@cisco.com, giheron@cisco.com, matthew.bocci@alcatel-lucent.com +# RFC6479 || X. Zhang, T. Tsou || xiangyang.zhang@huawei.com, tena@huawei.com +# RFC6480 || M. Lepinski, S. Kent || mlepinski@bbn.com, kent@bbn.com +# RFC6481 || G. Huston, R. Loomans, G. Michaelson || gih@apnic.net, robertl@apnic.net, ggm@apnic.net +# RFC6482 || M. Lepinski, S. Kent, D. Kong || mlepinski@bbn.com, skent@bbn.com, dkong@bbn.com +# RFC6483 || G. Huston, G. Michaelson || gih@apnic.net, ggm@apnic.net +# RFC6484 || S. Kent, D. Kong, K. Seo, R. Watro || skent@bbn.com, dkong@bbn.com, kseo@bbn.com, rwatro@bbn.com +# RFC6485 || G. Huston || gih@apnic.net +# RFC6486 || R. Austein, G. Huston, S. Kent, M. Lepinski || sra@isc.org, gih@apnic.net, kent@bbn.com, mlepinski@bbn.com +# RFC6487 || G. Huston, G. Michaelson, R. Loomans || gih@apnic.net, ggm@apnic.net, robertl@apnic.net +# RFC6488 || M. Lepinski, A. Chi, S. Kent || mlepinski@bbn.com, achi@bbn.com, kent@bbn.com +# RFC6489 || G. Huston, G. Michaelson, S. Kent || gih@apnic.net, ggm@apnic.net, kent@bbn.com +# RFC6490 || G. Huston, S. Weiler, G. Michaelson, S. Kent || gih@apnic.net, weiler@sparta.com, ggm@apnic.net, kent@bbn.com +# RFC6491 || T. Manderson, L. Vegoda, S. Kent || terry.manderson@icann.org, leo.vegoda@icann.org, kent@bbn.com +# RFC6492 || G. Huston, R. Loomans, B. Ellacott, R. Austein || gih@apnic.net, robertl@apnic.net, bje@apnic.net, sra@hactrn.net +# RFC6493 || R. Bush || randy@psg.com +# RFC6494 || R. Gagliano, S. Krishnan, A. Kukec || rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com +# RFC6495 || R. Gagliano, S. Krishnan, A. Kukec || rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com +# RFC6496 || S. Krishnan, J. Laganier, M. Bonola, A. Garcia-Martinez || suresh.krishnan@ericsson.com, julien.ietf@gmail.com, marco.bonola@gmail.com, alberto@it.uc3m.es +# RFC6497 || M. Davis, A. Phillips, Y. Umaoka, C. Falk || mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com, court@infiauto.com +# RFC6498 || J. Stone, R. Kumar, F. Andreasen || joestone@cisco.com, rkumar@cisco.com, fandreas@cisco.com +# RFC6501 || O. Novo, G. Camarillo, D. Morgan, J. Urpalainen || Oscar.Novo@ericsson.com, Gonzalo.Camarillo@ericsson.com, Dave.Morgan@fmr.com, jari.urpalainen@nokia.com +# RFC6502 || G. Camarillo, S. Srinivasan, R. Even, J. Urpalainen || Gonzalo.Camarillo@ericsson.com, srivatsa.srinivasan@gmail.com, ron.even.tlv@gmail.com, jari.urpalainen@nokia.com +# RFC6503 || M. Barnes, C. Boulton, S. Romano, H. Schulzrinne || mary.ietf.barnes@gmail.com, chris@ns-technologies.com, spromano@unina.it, hgs+xcon@cs.columbia.edu +# RFC6504 || M. Barnes, L. Miniero, R. Presta, S P. Romano || mary.ietf.barnes@gmail.com, lorenzo@meetecho.com, roberta.presta@unina.it, spromano@unina.it +# RFC6505 || S. McGlashan, T. Melanchuk, C. Boulton || smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com +# RFC6506 || M. Bhatia, V. Manral, A. Lindem || manav.bhatia@alcatel-lucent.com, vishwas.manral@hp.com, acee.lindem@ericsson.com +# RFC6507 || M. Groves || Michael.Groves@cesg.gsi.gov.uk +# RFC6508 || M. Groves || Michael.Groves@cesg.gsi.gov.uk +# RFC6509 || M. Groves || Michael.Groves@cesg.gsi.gov.uk +# RFC6510 || L. Berger, G. Swallow || lberger@labn.net, swallow@cisco.com +# RFC6511 || Z. Ali, G. Swallow, R. Aggarwal || zali@cisco.com, swallow@cisco.com, raggarwa_1@yahoo.com +# RFC6512 || IJ. Wijnands, E. Rosen, M. Napierala, N. Leymann || ice@cisco.com, erosen@cisco.com, mnapierala@att.com, n.leymann@telekom.de +# RFC6513 || E. Rosen, Ed., R. Aggarwal, Ed. || erosen@cisco.com, raggarwa_1@yahoo.com +# RFC6514 || R. Aggarwal, E. Rosen, T. Morin, Y. Rekhter || raggarwa_1@yahoo.com, erosen@cisco.com, thomas.morin@orange-ftgroup.com, yakov@juniper.net +# RFC6515 || R. Aggarwal, E. Rosen || raggarwa_1@yahoo.com, erosen@cisco.com +# RFC6516 || Y. Cai, E. Rosen, Ed., I. Wijnands || ycai@cisco.com, erosen@cisco.com, ice@cisco.com +# RFC6517 || T. Morin, Ed., B. Niven-Jenkins, Ed., Y. Kamite, R. Zhang, N. Leymann, N. Bitar || thomas.morin@orange.com, ben@niven-jenkins.co.uk, y.kamite@ntt.com, raymond.zhang@alcatel-lucent.com, n.leymann@telekom.de, nabil.n.bitar@verizon.com +# RFC6518 || G. Lebovitz, M. Bhatia || gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com +# RFC6519 || R. Maglione, A. Durand || roberta.maglione@telecomitalia.it, adurand@juniper.net +# RFC6520 || R. Seggelmann, M. Tuexen, M. Williams || seggelmann@fh-muenster.de, tuexen@fh-muenster.de, michael.glenn.williams@gmail.com +# RFC6521 || A. Makela, J. Korhonen || antti.t.makela@iki.fi, jouni.nospam@gmail.com +# RFC6522 || M. Kucherawy, Ed. || msk@cloudmark.com +# RFC6525 || R. Stewart, M. Tuexen, P. Lei || randall@lakerest.net, tuexen@fh-muenster.de, peterlei@cisco.com +# RFC6526 || B. Claise, P. Aitken, A. Johnson, G. Muenz || bclaise@cisco.com, paitken@cisco.com, andrjohn@cisco.com, muenz@net.in.tum.de +# RFC6527 || K. Tata || tata_kalyan@yahoo.com +# RFC6528 || F. Gont, S. Bellovin || fgont@si6networks.com, bellovin@acm.org +# RFC6529 || A. McKenzie, S. Crocker || amckenzie3@yahoo.com, steve@stevecrocker.com +# RFC6530 || J. Klensin, Y. Ko || john-ietf@jck.com, yangwooko@gmail.com +# RFC6531 || J. Yao, W. Mao || yaojk@cnnic.cn, maowei_ietf@cnnic.cn +# RFC6532 || A. Yang, S. Steele, N. Freed || abelyang@twnic.net.tw, Shawn.Steele@microsoft.com, ned+ietf@mrochek.com +# RFC6533 || T. Hansen, Ed., C. Newman, A. Melnikov || tony+eaidsn@maillennium.att.com, chris.newman@oracle.com, Alexey.Melnikov@isode.com +# RFC6534 || N. Duffield, A. Morton, J. Sommers || duffield@research.att.com, acmorton@att.com, jsommers@colgate.edu +# RFC6535 || B. Huang, H. Deng, T. Savolainen || bill.huang@chinamobile.com, denghui@chinamobile.com, teemu.savolainen@nokia.com +# RFC6536 || A. Bierman, M. Bjorklund || andy@yumaworks.com, mbj@tail-f.com +# RFC6537 || J. Ahrenholz || jeffrey.m.ahrenholz@boeing.com +# RFC6538 || T. Henderson, A. Gurtov || thomas.r.henderson@boeing.com, gurtov@ee.oulu.fi +# RFC6539 || V. Cakulev, G. Sundaram, I. Broustis || violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com, ioannis.broustis@alcatel-lucent.com +# RFC6540 || W. George, C. Donley, C. Liljenstolpe, L. Howard || wesley.george@twcable.com, C.Donley@cablelabs.com, cdl@asgaard.org, lee.howard@twcable.com +# RFC6541 || M. Kucherawy || msk@cloudmark.com +# RFC6542 || S. Emery || shawn.emery@oracle.com +# RFC6543 || S. Gundavelli || sgundave@cisco.com +# RFC6544 || J. Rosenberg, A. Keranen, B. B. Lowekamp, A. B. Roach || jdrosen@jdrosen.net, ari.keranen@ericsson.com, bbl@lowekamp.net, adam@nostrum.com +# RFC6545 || K. Moriarty || Kathleen.Moriarty@emc.com +# RFC6546 || B. Trammell || trammell@tik.ee.ethz.ch +# RFC6547 || W. George || wesley.george@twcable.com +# RFC6548 || N. Brownlee, Ed., IAB || n.brownlee@auckland.ac.nz, iab@iab.org +# RFC6549 || A. Lindem, A. Roy, S. Mirtorabi || acee.lindem@ericsson.com, akr@cisco.com, sina@cisco.com +# RFC6550 || T. Winter, Ed., P. Thubert, Ed., A. Brandt, J. Hui, R. Kelsey, P. Levis, K. Pister, R. Struik, JP. Vasseur, R. Alexander || wintert@acm.org, pthubert@cisco.com, abr@sdesigns.dk, jhui@archrock.com, kelsey@ember.com, pal@cs.stanford.edu, kpister@dustnetworks.com, rstruik.ext@gmail.com, jpv@cisco.com, roger.alexander@cooperindustries.com +# RFC6551 || JP. Vasseur, Ed., M. Kim, Ed., K. Pister, N. Dejean, D. Barthel || jpv@cisco.com, mjkim@kt.com, kpister@dustnetworks.com, nicolas.dejean@coronis.com, dominique.barthel@orange-ftgroup.com +# RFC6552 || P. Thubert, Ed. || pthubert@cisco.com +# RFC6553 || J. Hui, JP. Vasseur || jonhui@cisco.com, jpv@cisco.com +# RFC6554 || J. Hui, JP. Vasseur, D. Culler, V. Manral || jonhui@cisco.com, jpv@cisco.com, culler@cs.berkeley.edu, vishwas.manral@hp.com +# RFC6555 || D. Wing, A. Yourtchenko || dwing-ietf@fuggles.com, ayourtch@cisco.com +# RFC6556 || F. Baker || fred@cisco.com +# RFC6557 || E. Lear, P. Eggert || lear@cisco.com, eggert@cs.ucla.edu +# RFC6558 || A. Melnikov, B. Leiba, K. Li || Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com +# RFC6559 || D. Farinacci, IJ. Wijnands, S. Venaas, M. Napierala || dino@cisco.com, ice@cisco.com, stig@cisco.com, mnapierala@att.com +# RFC6560 || G. Richards || gareth.richards@rsa.com +# RFC6561 || J. Livingood, N. Mody, M. O'Reirdan || jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, michael_oreirdan@cable.comcast.com +# RFC6562 || C. Perkins, JM. Valin || csp@csperkins.org, jmvalin@jmvalin.ca +# RFC6563 || S. Jiang, D. Conrad, B. Carpenter || jiangsheng@huawei.com, drc@cloudflare.com, brian.e.carpenter@gmail.com +# RFC6564 || S. Krishnan, J. Woodyatt, E. Kline, J. Hoagland, M. Bhatia || suresh.krishnan@ericsson.com, jhw@apple.com, ek@google.com, Jim_Hoagland@symantec.com, manav.bhatia@alcatel-lucent.com +# RFC6565 || P. Pillay-Esnault, P. Moyer, J. Doyle, E. Ertekin, M. Lundberg || ppe@cisco.com, pete@pollere.net, jdoyle@doyleassociates.net, ertekin_emre@bah.com, lundberg_michael@bah.com +# RFC6566 || Y. Lee, Ed., G. Bernstein, Ed., D. Li, G. Martinelli || leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, giomarti@cisco.com +# RFC6567 || A. Johnston, L. Liess || alan.b.johnston@gmail.com, laura.liess.dt@gmail.com +# RFC6568 || E. Kim, D. Kaspar, JP. Vasseur || eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, jpv@cisco.com +# RFC6569 || JM. Valin, S. Borilin, K. Vos, C. Montgomery, R. Chen || jmvalin@jmvalin.ca, borilin@spiritdsp.net, koen.vos@skype.net, xiphmont@xiph.org, rchen@broadcom.com +# RFC6570 || J. Gregorio, R. Fielding, M. Hadley, M. Nottingham, D. Orchard || joe@bitworking.org, fielding@gbiv.com, mhadley@mitre.org, mnot@mnot.net, orchard@pacificspirit.com +# RFC6571 || C. Filsfils, Ed., P. Francois, Ed., M. Shand, B. Decraene, J. Uttaro, N. Leymann, M. Horneffer || cf@cisco.com, pierre.francois@imdea.org, imc.shand@googlemail.com, bruno.decraene@orange.com, uttaro@att.com, N.Leymann@telekom.de, Martin.Horneffer@telekom.de +# RFC6572 || F. Xia, B. Sarikaya, J. Korhonen, Ed., S. Gundavelli, D. Damic || xiayangsong@huawei.com, sarikaya@ieee.org, jouni.nospam@gmail.com, sgundave@cisco.com, damjan.damic@siemens.com +# RFC6573 || M. Amundsen || mca@amundsen.com +# RFC6574 || H. Tschofenig, J. Arkko || Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net +# RFC6575 || H. Shah, Ed., E. Rosen, Ed., G. Heron, Ed., V. Kompella, Ed. || hshah@ciena.com, erosen@cisco.com, giheron@cisco.com, vach.kompella@alcatel-lucent.com +# RFC6576 || R. Geib, Ed., A. Morton, R. Fardid, A. Steinmitz || Ruediger.Geib@telekom.de, acmorton@att.com, rfardid@cariden.com, Alexander.Steinmitz@telekom.de +# RFC6577 || M. Kucherawy || msk@cloudmark.com +# RFC6578 || C. Daboo, A. Quillaud || cyrus@daboo.name, arnaud.quillaud@oracle.com +# RFC6579 || M. Yevstifeyev || evnikita2@gmail.com +# RFC6580 || M. Ko, D. Black || mkosjc@gmail.com, david.black@emc.com +# RFC6581 || A. Kanevsky, Ed., C. Bestler, Ed., R. Sharp, S. Wise || arkady.kanevsky@gmail.com, Caitlin.Bestler@nexenta.com, robert.o.sharp@intel.com, swise@opengridcomputing.com +# RFC6582 || T. Henderson, S. Floyd, A. Gurtov, Y. Nishida || thomas.r.henderson@boeing.com, floyd@acm.org, gurtov@ee.oulu.fi, nishida@wide.ad.jp +# RFC6583 || I. Gashinsky, J. Jaeggli, W. Kumari || igor@yahoo-inc.com, jjaeggli@zynga.com, warren@kumari.net +# RFC6584 || V. Roca || vincent.roca@inria.fr +# RFC6585 || M. Nottingham, R. Fielding || mnot@mnot.net, fielding@gbiv.com +# RFC6586 || J. Arkko, A. Keranen || jari.arkko@piuha.net, ari.keranen@ericsson.com +# RFC6587 || R. Gerhards, C. Lonvick || rgerhards@adiscon.com, clonvick@cisco.com +# RFC6588 || C. Ishikawa || chiaki.ishikawa@ubin.jp +# RFC6589 || J. Livingood || jason_livingood@cable.comcast.com +# RFC6590 || J. Falk, Ed., M. Kucherawy, Ed. || ietf@cybernothing.org, msk@cloudmark.com +# RFC6591 || H. Fontana || hilda@hfontana.com +# RFC6592 || C. Pignataro || cpignata@cisco.com +# RFC6593 || C. Pignataro, J. Clarke, G. Salgueiro || cpignata@cisco.com, jclarke@cisco.com, gsalguei@cisco.com +# RFC6594 || O. Sury || ondrej.sury@nic.cz +# RFC6595 || K. Wierenga, E. Lear, S. Josefsson || klaas@cisco.com, lear@cisco.com, simon@josefsson.org +# RFC6596 || M. Ohye, J. Kupke || maileohye@gmail.com, joachim@kupke.za.net +# RFC6597 || J. Downs, Ed., J. Arbeiter, Ed. || jeff_downs@partech.com, jimsgti@gmail.com +# RFC6598 || J. Weil, V. Kuarsingh, C. Donley, C. Liljenstolpe, M. Azinger || jason.weil@twcable.com, victor.kuarsingh@gmail.com, c.donley@cablelabs.com, cdl@asgaard.org, marla.azinger@frontiercorp.com +# RFC6601 || G. Ash, Ed., D. McDysan || gash5107@yahoo.com, dave.mcdysan@verizon.com +# RFC6602 || F. Abinader, Ed., S. Gundavelli, Ed., K. Leung, S. Krishnan, D. Premec || fabinader@gmail.com, sgundave@cisco.com, kleung@cisco.com, suresh.krishnan@ericsson.com, domagoj.premec@gmail.com +# RFC6603 || J. Korhonen, Ed., T. Savolainen, S. Krishnan, O. Troan || jouni.nospam@gmail.com, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com, ot@cisco.com +# RFC6604 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6605 || P. Hoffman, W.C.A. Wijngaards || paul.hoffman@vpnc.org, wouter@nlnetlabs.nl +# RFC6606 || E. Kim, D. Kaspar, C. Gomez, C. Bormann || eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, carlesgo@entel.upc.edu, cabo@tzi.org +# RFC6607 || K. Kinnear, R. Johnson, M. Stapp || kkinnear@cisco.com, raj@cisco.com, mjs@cisco.com +# RFC6608 || J. Dong, M. Chen, A. Suryanarayana || jie.dong@huawei.com, mach.chen@huawei.com, asuryana@cisco.com +# RFC6609 || C. Daboo, A. Stone || cyrus@daboo.name, aaron@serendipity.cx +# RFC6610 || H. Jang, A. Yegin, K. Chowdhury, J. Choi, T. Lemon || heejin.jang@gmail.com, alper.yegin@yegin.org, kc@radiomobiles.com, jinchoe@gmail.com, Ted.Lemon@nominum.com +# RFC6611 || K. Chowdhury, Ed., A. Yegin || kc@radiomobiles.com, alper.yegin@yegin.org +# RFC6612 || G. Giaretta, Ed. || gerardog@qualcomm.com +# RFC6613 || A. DeKok || aland@freeradius.org +# RFC6614 || S. Winter, M. McCauley, S. Venaas, K. Wierenga || stefan.winter@restena.lu, mikem@open.com.au, stig@cisco.com, klaas@cisco.com +# RFC6615 || T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz || Thomas.Dietz@neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de +# RFC6616 || E. Lear, H. Tschofenig, H. Mauldin, S. Josefsson || lear@cisco.com, Hannes.Tschofenig@gmx.net, hmauldin@cisco.com, simon@josefsson.org +# RFC6617 || D. Harkins || dharkins@arubanetworks.com +# RFC6618 || J. Korhonen, Ed., B. Patil, H. Tschofenig, D. Kroeselberg || jouni.nospam@gmail.com, basavaraj.patil@nokia.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com +# RFC6619 || J. Arkko, L. Eggert, M. Townsley || jari.arkko@piuha.net, lars@netapp.com, townsley@cisco.com +# RFC6620 || E. Nordmark, M. Bagnulo, E. Levy-Abegnoli || nordmark@acm.org, marcelo@it.uc3m.es, elevyabe@cisco.com +# RFC6621 || J. Macker, Ed. || macker@itd.nrl.navy.mil +# RFC6622 || U. Herberg, T. Clausen || ulrich@herberg.name, T.Clausen@computer.org +# RFC6623 || E. Burger || eburger@standardstrack.com +# RFC6624 || K. Kompella, B. Kothari, R. Cherukuri || kireeti@juniper.net, bhupesh@cisco.com, cherukuri@juniper.net +# RFC6625 || E. Rosen, Ed., Y. Rekhter, Ed., W. Hendrickx, R. Qiu || erosen@cisco.com, yakov@juniper.net, wim.henderickx@alcatel-lucent.be, rayq@huawei.com +# RFC6626 || G. Tsirtsis, V. Park, V. Narayanan, K. Leung || tsirtsis@googlemail.com, vpark@qualcomm.com, vidyan@qualcomm.com, kleung@cisco.com +# RFC6627 || G. Karagiannis, K. Chan, T. Moncaster, M. Menth, P. Eardley, B. Briscoe || g.karagiannis@utwente.nl, khchan.work@gmail.com, Toby.Moncaster@cl.cam.ac.uk, menth@informatik.uni-tuebingen.de, philip.eardley@bt.com, bob.briscoe@bt.com +# RFC6628 || S. Shin, K. Kobara || seonghan.shin@aist.go.jp, kobara_conf@m.aist.go.jp +# RFC6629 || J. Abley, M. Bagnulo, A. Garcia-Martinez || joe.abley@icann.org, marcelo@it.uc3m.es, alberto@it.uc3m.es +# RFC6630 || Z. Cao, H. Deng, Q. Wu, G. Zorn, Ed. || zehn.cao@gmail.com, denghui02@gmail.com, sunseawq@huawei.com, glenzorn@gmail.com +# RFC6631 || D. Kuegler, Y. Sheffer || dennis.kuegler@bsi.bund.de, yaronf.ietf@gmail.com +# RFC6632 || M. Ersue, Ed., B. Claise || mehmet.ersue@nsn.com, bclaise@cisco.com +# RFC6633 || F. Gont || fgont@si6networks.com +# RFC6635 || O. Kolkman, Ed., J. Halpern, Ed., IAB || olaf@nlnetlabs.nl, joel.halpern@ericsson.com, iab@iab.org +# RFC6636 || H. Asaeda, H. Liu, Q. Wu || asaeda@wide.ad.jp, helen.liu@huawei.com, bill.wu@huawei.com +# RFC6637 || A. Jivsov || Andrey_Jivsov@symantec.com +# RFC6638 || C. Daboo, B. Desruisseaux || cyrus@daboo.name, bernard.desruisseaux@oracle.com +# RFC6639 || D. King, Ed., M. Venkatesan, Ed. || daniel@olddog.co.uk, venkat.mahalingams@gmail.com +# RFC6640 || W. George || wesley.george@twcable.com +# RFC6641 || C. Everhart, W. Adamson, J. Zhang || everhart@netapp.com, andros@netapp.com, jiayingz@google.com +# RFC6642 || Q. Wu, Ed., F. Xia, R. Even || sunseawq@huawei.com, xiayangsong@huawei.com, even.roni@huawei.com +# RFC6643 || J. Schoenwaelder || j.schoenwaelder@jacobs-university.de +# RFC6644 || D. Evans, R. Droms, S. Jiang || N7DR@ipfonix.com, rdroms@cisco.com, jiangsheng@huawei.com +# RFC6645 || J. Novak || janovak@cisco.com +# RFC6646 || H. Song, N. Zong, Y. Yang, R. Alimi || haibin.song@huawei.com, zongning@huawei.com, yry@cs.yale.edu, ralimi@google.com +# RFC6647 || M. Kucherawy, D. Crocker || superuser@gmail.com, dcrocker@bbiw.net +# RFC6648 || P. Saint-Andre, D. Crocker, M. Nottingham || ietf@stpeter.im, dcrocker@bbiw.net, mnot@mnot.net +# RFC6649 || L. Hornquist Astrand, T. Yu || lha@apple.com, tlyu@mit.edu +# RFC6650 || J. Falk, M. Kucherawy, Ed. || none, superuser@gmail.com +# RFC6651 || M. Kucherawy || superuser@gmail.com +# RFC6652 || S. Kitterman || scott@kitterman.com +# RFC6653 || B. Sarikaya, F. Xia, T. Lemon || sarikaya@ieee.org, xiayangsong@huawei.com, mellon@nominum.com +# RFC6654 || T. Tsou, C. Zhou, T. Taylor, Q. Chen || Tina.Tsou.Zouting@huawei.com, cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, chenqi.0819@gmail.com +# RFC6655 || D. McGrew, D. Bailey || mcgrew@cisco.com, dbailey@rsa.com +# RFC6656 || R. Johnson, K. Kinnear, M. Stapp || raj@cisco.com, kkinnear@cisco.com, mjs@cisco.com +# RFC6657 || A. Melnikov, J. Reschke || Alexey.Melnikov@isode.com, julian.reschke@greenbytes.de +# RFC6658 || S. Bryant, Ed., L. Martini, G. Swallow, A. Malis || stbryant@cisco.com, lmartini@cisco.com, swallow@cisco.com, andrew.g.malis@verizon.com +# RFC6659 || A. Begen || abegen@cisco.com +# RFC6660 || B. Briscoe, T. Moncaster, M. Menth || bob.briscoe@bt.com, toby.moncaster@cl.cam.ac.uk, menth@uni-tuebingen.de +# RFC6661 || A. Charny, F. Huang, G. Karagiannis, M. Menth, T. Taylor, Ed. || anna@mwsm.com, huangfuqing@huawei.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com +# RFC6662 || A. Charny, J. Zhang, G. Karagiannis, M. Menth, T. Taylor, Ed. || anna@mwsm.com, joyzhang@cisco.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com +# RFC6663 || G. Karagiannis, T. Taylor, K. Chan, M. Menth, P. Eardley || g.karagiannis@utwente.nl, tom.taylor.stds@gmail.com, khchan.work@gmail.com, menth@uni-tuebingen.de, philip.eardley@bt.com +# RFC6664 || J. Schaad || ietf@augustcellars.com +# RFC6665 || A.B. Roach || adam@nostrum.com +# RFC6666 || N. Hilliard, D. Freedman || nick@inex.ie, david.freedman@uk.clara.net +# RFC6667 || K. Raza, S. Boutros, C. Pignataro || skraza@cisco.com, sboutros@cisco.com, cpignata@cisco.com +# RFC6668 || D. Bider, M. Baushke || ietf-ssh2@denisbider.com, mdb@juniper.net +# RFC6669 || N. Sprecher, L. Fang || nurit.sprecher@nsn.com, lufang@cisco.com +# RFC6670 || N. Sprecher, KY. Hong || nurit.sprecher@nsn.com, hongk@cisco.com +# RFC6671 || M. Betts || malcolm.betts@zte.com.cn +# RFC6672 || S. Rose, W. Wijngaards || scott.rose@nist.gov, wouter@nlnetlabs.nl +# RFC6673 || A. Morton || acmorton@att.com +# RFC6674 || F. Brockners, S. Gundavelli, S. Speicher, D. Ward || fbrockne@cisco.com, sgundave@cisco.com, sebastian.speicher@telekom.de, wardd@cisco.com +# RFC6675 || E. Blanton, M. Allman, L. Wang, I. Jarvinen, M. Kojo, Y. Nishida || elb@psg.com, mallman@icir.org, liliw@juniper.net, ilpo.jarvinen@helsinki.fi, kojo@cs.helsinki.fi, nishida@wide.ad.jp +# RFC6676 || S. Venaas, R. Parekh, G. Van de Velde, T. Chown, M. Eubanks || stig@cisco.com, riparekh@cisco.com, gvandeve@cisco.com, tjc@ecs.soton.ac.uk, marshall.eubanks@iformata.com +# RFC6677 || S. Hartman, Ed., T. Clancy, K. Hoeper || hartmans-ietf@mit.edu, tcc@vt.edu, khoeper@motorolasolutions.com +# RFC6678 || K. Hoeper, S. Hanna, H. Zhou, J. Salowey, Ed. || khoeper@motorolasolutions.com, shanna@juniper.net, hzhou@cisco.com, jsalowey@cisco.com +# RFC6679 || M. Westerlund, I. Johansson, C. Perkins, P. O'Hanlon, K. Carlberg || magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com, csp@csperkins.org, piers.ohanlon@oii.ox.ac.uk, carlberg@g11.org.uk +# RFC6680 || N. Williams, L. Johansson, S. Hartman, S. Josefsson || nico@cryptonector.com, leifj@sunet.se, hartmans-ietf@mit.edu, simon@josefsson.org +# RFC6681 || M. Watson, T. Stockhammer, M. Luby || watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com +# RFC6682 || M. Watson, T. Stockhammer, M. Luby || watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com +# RFC6683 || A. Begen, T. Stockhammer || abegen@cisco.com, stockhammer@nomor.de +# RFC6684 || B. Trammell || trammell@tik.ee.ethz.ch +# RFC6685 || B. Trammell || trammell@tik.ee.ethz.ch +# RFC6686 || M. Kucherawy || superuser@gmail.com +# RFC6687 || J. Tripathi, Ed., J. de Oliveira, Ed., JP. Vasseur, Ed. || jt369@drexel.edu, jau@coe.drexel.edu, jpv@cisco.com +# RFC6688 || D. Black, Ed., J. Glasgow, S. Faibish || david.black@emc.com, jglasgow@google.com, sfaibish@emc.com +# RFC6689 || L. Berger || lberger@labn.net +# RFC6690 || Z. Shelby || zach@sensinode.com +# RFC6691 || D. Borman || david.borman@quantum.com +# RFC6692 || R. Clayton, M. Kucherawy || richard.clayton@cl.cam.ac.uk, superuser@gmail.com +# RFC6693 || A. Lindgren, A. Doria, E. Davies, S. Grasic || andersl@sics.se, avri@acm.org, elwynd@folly.org.uk, samo.grasic@ltu.se +# RFC6694 || S. Moonesamy, Ed. || sm+ietf@elandsys.com +# RFC6695 || R. Asati || rajiva@cisco.com +# RFC6696 || Z. Cao, B. He, Y. Shi, Q. Wu, Ed., G. Zorn, Ed. || caozhen@chinamobile.com, hebaohong@catr.cn, shiyang1@huawei.com, bill.wu@huawei.com, glenzorn@gmail.com +# RFC6697 || G. Zorn, Ed., Q. Wu, T. Taylor, Y. Nir, K. Hoeper, S. Decugis || glenzorn@gmail.com, bill.wu@huawei.com, tom.taylor.stds@gmail.com, ynir@checkpoint.com, khoeper@motorolasolutions.com, sdecugis@freediameter.net +# RFC6698 || P. Hoffman, J. Schlyter || paul.hoffman@vpnc.org, jakob@kirei.se +# RFC6701 || A. Farrel, P. Resnick || adrian@olddog.co.uk, presnick@qti.qualcomm.com +# RFC6702 || T. Polk, P. Saint-Andre || tim.polk@nist.gov, ietf@stpeter.im +# RFC6703 || A. Morton, G. Ramachandran, G. Maguluri || acmorton@att.com, gomathi@att.com, gmaguluri@att.com +# RFC6704 || D. Miles, W. Dec, J. Bristow, R. Maglione || davidmiles@google.com, wdec@cisco.com, James.Bristow@swisscom.com, roberta.maglione@telecomitalia.it +# RFC6705 || S. Krishnan, R. Koodli, P. Loureiro, Q. Wu, A. Dutta || suresh.krishnan@ericsson.com, rkoodli@cisco.com, loureiro@neclab.eu, Sunseawq@huawei.com, adutta@niksun.com +# RFC6706 || F. Templin, Ed. || fltemplin@acm.org +# RFC6707 || B. Niven-Jenkins, F. Le Faucheur, N. Bitar || ben@velocix.com, flefauch@cisco.com, nabil.n.bitar@verizon.com +# RFC6708 || S. Kiesel, Ed., S. Previdi, M. Stiemerling, R. Woundy, Y. Yang || ietf-alto@skiesel.de, sprevidi@cisco.com, martin.stiemerling@neclab.eu, Richard_Woundy@cable.comcast.com, yry@cs.yale.edu +# RFC6709 || B. Carpenter, B. Aboba, Ed., S. Cheshire || brian.e.carpenter@gmail.com, bernard_aboba@hotmail.com, cheshire@apple.com +# RFC6710 || A. Melnikov, K. Carlberg || Alexey.Melnikov@isode.com, carlberg@g11.org.uk +# RFC6711 || L. Johansson || leifj@nordu.net +# RFC6712 || T. Kause, M. Peylo || toka@ssh.com, martin.peylo@nsn.com +# RFC6713 || J. Levine || standards@taugh.com +# RFC6714 || C. Holmberg, S. Blau, E. Burger || christer.holmberg@ericsson.com, staffan.blau@ericsson.com, eburger@standardstrack.com +# RFC6715 || D. Cauchie, B. Leiba, K. Li || dany.cauchie@orange.com, barryleiba@computer.org, likepeng@huawei.com +# RFC6716 || JM. Valin, K. Vos, T. Terriberry || jmvalin@jmvalin.ca, koenvos74@gmail.com, tterriberry@mozilla.com +# RFC6717 || H. Hotz, R. Allbery || hotz@jpl.nasa.gov, rra@stanford.edu +# RFC6718 || P. Muley, M. Aissaoui, M. Bocci || praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com +# RFC6719 || O. Gnawali, P. Levis || gnawali@cs.uh.edu, pal@cs.stanford.edu +# RFC6720 || C. Pignataro, R. Asati || cpignata@cisco.com, rajiva@cisco.com +# RFC6721 || J. Snell || jasnell@us.ibm.com +# RFC6722 || P. Hoffman, Ed. || paul.hoffman@vpnc.org +# RFC6723 || L. Jin, Ed., R. Key, Ed., S. Delord, T. Nadeau, S. Boutros || lizhong.jin@zte.com.cn, raymond.key@ieee.org, simon.delord@gmail.com, tnadeau@juniper.net, sboutros@cisco.com +# RFC6724 || D. Thaler, Ed., R. Draves, A. Matsumoto, T. Chown || dthaler@microsoft.com, richdr@microsoft.com, arifumi@nttv6.net, tjc@ecs.soton.ac.uk +# RFC6725 || S. Rose || scottr.nist@gmail.com +# RFC6726 || T. Paila, R. Walsh, M. Luby, V. Roca, R. Lehtonen || toni.paila@gmail.com, roderick.walsh@tut.fi, luby@qti.qualcomm.com, vincent.roca@inria.fr, rami.lehtonen@teliasonera.com +# RFC6727 || T. Dietz, Ed., B. Claise, J. Quittek || dietz@neclab.eu, bclaise@cisco.com, quittek@neclab.eu +# RFC6728 || G. Muenz, B. Claise, P. Aitken || muenz@net.in.tum.de, bclaise@cisco.com, paitken@cisco.com +# RFC6729 || D. Crocker, M. Kucherawy || dcrocker@bbiw.net, superuser@gmail.com +# RFC6730 || S. Krishnan, J. Halpern || suresh.krishnan@ericsson.com, joel.halpern@ericsson.com +# RFC6731 || T. Savolainen, J. Kato, T. Lemon || teemu.savolainen@nokia.com, kato@syce.net, Ted.Lemon@nominum.com +# RFC6732 || V. Kuarsingh, Ed., Y. Lee, O. Vautrin || victor.kuarsingh@gmail.com, yiu_lee@cable.comcast.com, olivier@juniper.net +# RFC6733 || V. Fajardo, Ed., J. Arkko, J. Loughney, G. Zorn, Ed. || vf0213@gmail.com, jari.arkko@ericsson.com, john.loughney@nokia.com, glenzorn@gmail.com +# RFC6734 || G. Zorn, Q. Wu, V. Cakulev || glenzorn@gmail.com, sunseawq@huawei.com, violeta.cakulev@alcatel-lucent.com +# RFC6735 || K. Carlberg, Ed., T. Taylor || carlberg@g11.org.uk, tom.taylor.stds@gmail.com +# RFC6736 || F. Brockners, S. Bhandari, V. Singh, V. Fajardo || fbrockne@cisco.com, shwethab@cisco.com, vaneeta.singh@gmail.com, vf0213@gmail.com +# RFC6737 || K. Jiao, G. Zorn || kangjiao@huawei.com, gwz@net-zen.net +# RFC6738 || V. Cakulev, A. Lior, S. Mizikovsky || violeta.cakulev@alcatel-lucent.com, avi.ietf@lior.org, Simon.Mizikovsky@alcatel-lucent.com +# RFC6739 || H. Schulzrinne, H. Tschofenig || hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net +# RFC6740 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6741 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6742 || RJ Atkinson, SN Bhatti, S. Rose || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk, scottr.nist@gmail.com +# RFC6743 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6744 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6745 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6746 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6747 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6748 || RJ Atkinson, SN Bhatti || rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk +# RFC6749 || D. Hardt, Ed. || dick.hardt@gmail.com +# RFC6750 || M. Jones, D. Hardt || mbj@microsoft.com, dick.hardt@gmail.com +# RFC6751 || R. Despres, Ed., B. Carpenter, D. Wing, S. Jiang || despres.remi@laposte.net, brian.e.carpenter@gmail.com, dwing-ietf@fuggles.com, shengjiang@huawei.com +# RFC6752 || A. Kirkham || tkirkham@paloaltonetworks.com +# RFC6753 || J. Winterbottom, H. Tschofenig, H. Schulzrinne, M. Thomson || james.winterbottom@commscope.com, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, martin.thomson@skype.net +# RFC6754 || Y. Cai, L. Wei, H. Ou, V. Arya, S. Jethwani || yiqunc@microsoft.com, lwei@cisco.com, hou@cisco.com, varya@directv.com, sjethwani@directv.com +# RFC6755 || B. Campbell, H. Tschofenig || brian.d.campbell@gmail.com, hannes.tschofenig@gmx.net +# RFC6756 || S. Trowbridge, Ed., E. Lear, Ed., G. Fishman, Ed., S. Bradner, Ed. || steve.trowbridge@alcatel-lucent.com, lear@cisco.com, gryfishman@aol.com, sob@harvard.edu +# RFC6757 || S. Gundavelli, Ed., J. Korhonen, Ed., M. Grayson, K. Leung, R. Pazhyannur || sgundave@cisco.com, jouni.nospam@gmail.com, mgrayson@cisco.com, kleung@cisco.com, rpazhyan@cisco.com +# RFC6758 || A. Melnikov, K. Carlberg || Alexey.Melnikov@isode.com, carlberg@g11.org.uk +# RFC6759 || B. Claise, P. Aitken, N. Ben-Dvora || bclaise@cisco.com, paitken@cisco.com, nirbd@cisco.com +# RFC6760 || S. Cheshire, M. Krochmal || cheshire@apple.com, marc@apple.com +# RFC6761 || S. Cheshire, M. Krochmal || cheshire@apple.com, marc@apple.com +# RFC6762 || S. Cheshire, M. Krochmal || cheshire@apple.com, marc@apple.com +# RFC6763 || S. Cheshire, M. Krochmal || cheshire@apple.com, marc@apple.com +# RFC6764 || C. Daboo || cyrus@daboo.name +# RFC6765 || E. Beili, M. Morgenstern || edward.beili@actelis.com, moti.morgenstern@ecitele.com +# RFC6766 || E. Beili || edward.beili@actelis.com +# RFC6767 || E. Beili, M. Morgenstern || edward.beili@actelis.com, moti.morgenstern@ecitele.com +# RFC6768 || E. Beili || edward.beili@actelis.com +# RFC6769 || R. Raszuk, J. Heitz, A. Lo, L. Zhang, X. Xu || robert@raszuk.net, jakob.heitz@ericsson.com, altonlo@aristanetworks.com, lixia@cs.ucla.edu, xuxh@huawei.com +# RFC6770 || G. Bertrand, Ed., E. Stephan, T. Burbridge, P. Eardley, K. Ma, G. Watson || gilles.bertrand@orange.com, emile.stephan@orange.com, trevor.burbridge@bt.com, philip.eardley@bt.com, kevin.ma@azukisystems.com, gwatson@velocix.com +# RFC6771 || L. Eggert, G. Camarillo || lars@netapp.com, Gonzalo.Camarillo@ericsson.com +# RFC6772 || H. Schulzrinne, Ed., H. Tschofenig, Ed., J. Cuellar, J. Polk, J. Morris, M. Thomson || schulzrinne@cs.columbia.edu, Hannes.Tschofenig@gmx.net, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, ietf@jmorris.org, martin.thomson@gmail.com +# RFC6773 || T. Phelan, G. Fairhurst, C. Perkins || tphelan@sonusnet.com, gorry@erg.abdn.ac.uk, csp@csperkins.org +# RFC6774 || R. Raszuk, Ed., R. Fernando, K. Patel, D. McPherson, K. Kumaki || robert@raszuk.net, rex@cisco.com, keyupate@cisco.com, dmcpherson@verisign.com, ke-kumaki@kddi.com +# RFC6775 || Z. Shelby, Ed., S. Chakrabarti, E. Nordmark, C. Bormann || zach@sensinode.com, samita.chakrabarti@ericsson.com, nordmark@cisco.com, cabo@tzi.org +# RFC6776 || A. Clark, Q. Wu || alan.d.clark@telchemy.com, sunseawq@huawei.com +# RFC6777 || W. Sun, Ed., G. Zhang, Ed., J. Gao, G. Xie, R. Papneja || sun.weiqiang@gmail.com, zhangguoying@catr.cn, gjhhit@huawei.com, xieg@cs.ucr.edu, rajiv.papneja@huawei.com +# RFC6778 || R. Sparks || RjS@nostrum.com +# RFC6779 || U. Herberg, R. Cole, I. Chakeres || ulrich@herberg.name, robert.g.cole@us.army.mil, ian.chakeres@gmail.com +# RFC6780 || L. Berger, F. Le Faucheur, A. Narayanan || lberger@labn.net, flefauch@cisco.com, ashokn@cisco.com +# RFC6781 || O. Kolkman, W. Mekking, R. Gieben || olaf@nlnetlabs.nl, matthijs@nlnetlabs.nl, miek.gieben@sidn.nl +# RFC6782 || V. Kuarsingh, Ed., L. Howard || victor.kuarsingh@gmail.com, lee.howard@twcable.com +# RFC6783 || J. Levine, R. Gellens || standards@taugh.com, rg+ietf@qti.qualcomm.com +# RFC6784 || S. Sakane, M. Ishiyama || ssakane@cisco.com, masahiro.ishiyama@toshiba.co.jp +# RFC6785 || B. Leiba || barryleiba@computer.org +# RFC6786 || A. Yegin, R. Cragie || alper.yegin@yegin.org, robert.cragie@gridmerge.com +# RFC6787 || D. Burnett, S. Shanmugham || dburnett@voxeo.com, sarvi@cisco.com +# RFC6788 || S. Krishnan, A. Kavanagh, B. Varga, S. Ooghe, E. Nordmark || suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com, balazs.a.varga@ericsson.com, sven.ooghe@alcatel-lucent.com, nordmark@cisco.com +# RFC6789 || B. Briscoe, Ed., R. Woundy, Ed., A. Cooper, Ed. || bob.briscoe@bt.com, richard_woundy@cable.comcast.com, acooper@cdt.org +# RFC6790 || K. Kompella, J. Drake, S. Amante, W. Henderickx, L. Yong || kireeti.kompella@gmail.com, jdrake@juniper.net, shane@level3.net, wim.henderickx@alcatel-lucent.com, lucy.yong@huawei.com +# RFC6791 || X. Li, C. Bao, D. Wing, R. Vaithianathan, G. Huston || xing@cernet.edu.cn, congxiao@cernet.edu.cn, dwing-ietf@fuggles.com, rvaithia@cisco.com, gih@apnic.net +# RFC6792 || Q. Wu, Ed., G. Hunt, P. Arden || sunseawq@huawei.com, r.geoff.hunt@gmail.com, philip.arden@bt.com +# RFC6793 || Q. Vohra, E. Chen || quaizar.vohra@gmail.com, enkechen@cisco.com +# RFC6794 || V. Hilt, G. Camarillo, J. Rosenberg || volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net +# RFC6795 || V. Hilt, G. Camarillo || volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com +# RFC6796 || V. Hilt, G. Camarillo, J. Rosenberg, D. Worley || volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net, worley@ariadne.com +# RFC6797 || J. Hodges, C. Jackson, A. Barth || Jeff.Hodges@PayPal.com, collin.jackson@sv.cmu.edu, ietf@adambarth.com +# RFC6798 || A. Clark, Q. Wu || alan.d.clark@telchemy.com, sunseawq@huawei.com +# RFC6801 || U. Kozat, A. Begen || kozat@docomolabs-usa.com, abegen@cisco.com +# RFC6802 || S. Baillargeon, C. Flinta, A. Johnsson || steve.baillargeon@ericsson.com, christofer.flinta@ericsson.com, andreas.a.johnsson@ericsson.com +# RFC6803 || G. Hudson || ghudson@mit.edu +# RFC6804 || B. Manning || bmanning@sfc.keio.ac.jp +# RFC6805 || D. King, Ed., A. Farrel, Ed. || daniel@olddog.co.uk, adrian@olddog.co.uk +# RFC6806 || S. Hartman, Ed., K. Raeburn, L. Zhu || hartmans-ietf@mit.edu, raeburn@mit.edu, lzhu@microsoft.com +# RFC6807 || D. Farinacci, G. Shepherd, S. Venaas, Y. Cai || dino@cisco.com, gjshep@gmail.com, stig@cisco.com, yiqunc@microsoft.com +# RFC6808 || L. Ciavattone, R. Geib, A. Morton, M. Wieser || lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de +# RFC6809 || C. Holmberg, I. Sedlacek, H. Kaplan || christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, hkaplan@acmepacket.com +# RFC6810 || R. Bush, R. Austein || randy@psg.com, sra@hactrn.net +# RFC6811 || P. Mohapatra, J. Scudder, D. Ward, R. Bush, R. Austein || pmohapat@cisco.com, jgs@juniper.net, dward@cisco.com, randy@psg.com, sra@hactrn.net +# RFC6812 || M. Chiba, A. Clemm, S. Medley, J. Salowey, S. Thombare, E. Yedavalli || mchiba@cisco.com, alex@cisco.com, stmedley@cisco.com, jsalowey@cisco.com, thombare@cisco.com, eshwar@cisco.com +# RFC6813 || J. Salowey, S. Hanna || jsalowey@cisco.com, shanna@juniper.net +# RFC6814 || C. Pignataro, F. Gont || cpignata@cisco.com, fgont@si6networks.com +# RFC6815 || S. Bradner, K. Dubray, J. McQuaid, A. Morton || sob@harvard.edu, kdubray@juniper.net, jim@turnipvideo.com, acmorton@att.com +# RFC6816 || V. Roca, M. Cunche, J. Lacan || vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr +# RFC6817 || S. Shalunov, G. Hazel, J. Iyengar, M. Kuehlewind || shalunov@shlang.com, greg@bittorrent.com, jiyengar@fandm.edu, mirja.kuehlewind@ikr.uni-stuttgart.de +# RFC6818 || P. Yee || peter@akayla.com +# RFC6819 || T. Lodderstedt, Ed., M. McGloin, P. Hunt || torsten@lodderstedt.net, mark.mcgloin@ie.ibm.com, phil.hunt@yahoo.com +# RFC6820 || T. Narten, M. Karir, I. Foo || narten@us.ibm.com, mkarir@merit.edu, Ian.Foo@huawei.com +# RFC6821 || E. Marocco, A. Fusco, I. Rimac, V. Gurbani || enrico.marocco@telecomitalia.it, antonio2.fusco@telecomitalia.it, rimac@bell-labs.com, vkg@bell-labs.com +# RFC6822 || S. Previdi, Ed., L. Ginsberg, M. Shand, A. Roy, D. Ward || sprevidi@cisco.com, ginsberg@cisco.com, imc.shand@gmail.com, akr@cisco.com, wardd@cisco.com +# RFC6823 || L. Ginsberg, S. Previdi, M. Shand || ginsberg@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com +# RFC6824 || A. Ford, C. Raiciu, M. Handley, O. Bonaventure || alanford@cisco.com, costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, olivier.bonaventure@uclouvain.be +# RFC6825 || M. Miyazawa, T. Otani, K. Kumaki, T. Nadeau || ma-miyazawa@kddilabs.jp, Tm-otani@kddi.com, ke-kumaki@kddi.com, tnadeau@juniper.net +# RFC6826 || IJ. Wijnands, Ed., T. Eckert, N. Leymann, M. Napierala || ice@cisco.com, eckert@cisco.com, n.leymann@telekom.de, mnapierala@att.com +# RFC6827 || A. Malis, Ed., A. Lindem, Ed., D. Papadimitriou, Ed. || andrew.g.malis@verizon.com, acee.lindem@ericsson.com, dimitri.papadimitriou@alcatel-lucent.com +# RFC6828 || J. Xia || xiajinwei@huawei.com +# RFC6829 || M. Chen, P. Pan, C. Pignataro, R. Asati || mach@huawei.com, ppan@infinera.com, cpignata@cisco.com, rajiva@cisco.com +# RFC6830 || D. Farinacci, V. Fuller, D. Meyer, D. Lewis || farinacci@gmail.com, vaf@vaf.net, dmm@1-4-5.net, darlewis@cisco.com +# RFC6831 || D. Farinacci, D. Meyer, J. Zwiebel, S. Venaas || farinacci@gmail.com, dmm@cisco.com, jzwiebel@cruzio.com, stig@cisco.com +# RFC6832 || D. Lewis, D. Meyer, D. Farinacci, V. Fuller || darlewis@cisco.com, dmm@1-4-5.net, farinacci@gmail.com, vaf@vaf.net +# RFC6833 || V. Fuller, D. Farinacci || vaf@vaf.net, farinacci@gmail.com +# RFC6834 || L. Iannone, D. Saucez, O. Bonaventure || luigi.iannone@telecom-paristech.fr, damien.saucez@inria.fr, olivier.bonaventure@uclouvain.be +# RFC6835 || D. Farinacci, D. Meyer || farinacci@gmail.com, dmm@cisco.com +# RFC6836 || V. Fuller, D. Farinacci, D. Meyer, D. Lewis || vaf@vaf.net, farinacci@gmail.com, dmm@1-4-5.net, darlewis@cisco.com +# RFC6837 || E. Lear || lear@cisco.com +# RFC6838 || N. Freed, J. Klensin, T. Hansen || ned+ietf@mrochek.com, john+ietf@jck.com, tony+mtsuffix@maillennium.att.com +# RFC6839 || T. Hansen, A. Melnikov || tony+sss@maillennium.att.com, Alexey.Melnikov@isode.com +# RFC6840 || S. Weiler, Ed., D. Blacka, Ed. || weiler@tislabs.com, davidb@verisign.com +# RFC6841 || F. Ljunggren, AM. Eklund Lowinder, T. Okubo || fredrik@kirei.se, amel@iis.se, tomofumi.okubo@icann.org +# RFC6842 || N. Swamy, G. Halwasia, P. Jhingran || nn.swamy@samsung.com, ghalwasi@cisco.com, pjhingra@cisco.com +# RFC6843 || A. Clark, K. Gross, Q. Wu || alan.d.clark@telchemy.com, kevin.gross@avanw.com, sunseawq@huawei.com +# RFC6844 || P. Hallam-Baker, R. Stradling || philliph@comodo.com, rob.stradling@comodo.com +# RFC6845 || N. Sheth, L. Wang, J. Zhang || nsheth@contrailsystems.com, liliw@juniper.net, zzhang@juniper.net +# RFC6846 || G. Pelletier, K. Sandlund, L-E. Jonsson, M. West || ghyslain.pelletier@interdigital.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk +# RFC6847 || D. Melman, T. Mizrahi, D. Eastlake 3rd || davidme@marvell.com, talmi@marvell.com, d3e3e3@gmail.com +# RFC6848 || J. Winterbottom, M. Thomson, R. Barnes, B. Rosen, R. George || james.winterbottom@commscope.com, martin.thomson@gmail.com, rbarnes@bbn.com, br@brianrosen.net, robinsgv@gmail.com +# RFC6849 || H. Kaplan, Ed., K. Hedayat, N. Venna, P. Jones, N. Stratton || hkaplan@acmepacket.com, kh274@cornell.edu, vnagarjuna@saperix.com, paulej@packetizer.com, nathan@robotics.net +# RFC6850 || A. Rijhsinghani, K. Zebrose || anil@charter.net, zebrose@alum.mit.edu +# RFC6851 || A. Gulbrandsen, N. Freed, Ed. || arnt@gulbrandsen.priv.no, ned+ietf@mrochek.com +# RFC6852 || R. Housley, S. Mills, J. Jaffe, B. Aboba, L. St.Amour || housley@vigilsec.com, s.mills@ieee.org, jeff@w3.org, bernard_aboba@hotmail.com, st.amour@isoc.org +# RFC6853 || J. Brzozowski, J. Tremblay, J. Chen, T. Mrugalski || john_brzozowski@cable.comcast.com, jf@jftremblay.com, jack.chen@twcable.com, tomasz.mrugalski@gmail.com +# RFC6854 || B. Leiba || barryleiba@computer.org +# RFC6855 || P. Resnick, Ed., C. Newman, Ed., S. Shen, Ed. || presnick@qti.qualcomm.com, chris.newman@oracle.com, shenshuo@cnnic.cn +# RFC6856 || R. Gellens, C. Newman, J. Yao, K. Fujiwara || rg+ietf@qualcomm.com, chris.newman@oracle.com, yaojk@cnnic.cn, fujiwara@jprs.co.jp +# RFC6857 || K. Fujiwara || fujiwara@jprs.co.jp +# RFC6858 || A. Gulbrandsen || arnt@gulbrandsen.priv.no +# RFC6859 || B. Leiba || barryleiba@computer.org +# RFC6860 || Y. Yang, A. Retana, A. Roy || yiya@cisco.com, aretana@cisco.com, akr@cisco.com +# RFC6861 || I. Dzmanashvili || ioseb.dzmanashvili@gmail.com +# RFC6862 || G. Lebovitz, M. Bhatia, B. Weis || gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com, bew@cisco.com +# RFC6863 || S. Hartman, D. Zhang || hartmans-ietf@mit.edu, zhangdacheng@huawei.com +# RFC6864 || J. Touch || touch@isi.edu +# RFC6865 || V. Roca, M. Cunche, J. Lacan, A. Bouabdallah, K. Matsuzono || vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr, abouabdallah@cdta.dz, kazuhisa@sfc.wide.ad.jp +# RFC6866 || B. Carpenter, S. Jiang || brian.e.carpenter@gmail.com, jiangsheng@huawei.com +# RFC6867 || Y. Nir, Q. Wu || ynir@checkpoint.com, sunseawq@huawei.com +# RFC6868 || C. Daboo || cyrus@daboo.name +# RFC6869 || G. Salgueiro, J. Clarke, P. Saint-Andre || gsalguei@cisco.com, jclarke@cisco.com, ietf@stpeter.im +# RFC6870 || P. Muley, Ed., M. Aissaoui, Ed. || praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com +# RFC6871 || R. Gilman, R. Even, F. Andreasen || bob_gilman@comcast.net, roni.even@mail01.huawei.com, fandreas@cisco.com +# RFC6872 || V. Gurbani, Ed., E. Burger, Ed., T. Anjali, H. Abdelnur, O. Festor || vkg@bell-labs.com, eburger@standardstrack.com, tricha@ece.iit.edu, humbol@gmail.com, Olivier.Festor@loria.fr +# RFC6873 || G. Salgueiro, V. Gurbani, A. B. Roach || gsalguei@cisco.com, vkg@bell-labs.com, adam@nostrum.com +# RFC6874 || B. Carpenter, S. Cheshire, R. Hinden || brian.e.carpenter@gmail.com, cheshire@apple.com, bob.hinden@gmail.com +# RFC6875 || S. Kamei, T. Momose, T. Inoue, T. Nishitani || skame@nttv6.jp, tmomose@cisco.com, inoue@jp.ntt.net, tomohiro.nishitani@ntt.com +# RFC6876 || P. Sangster, N. Cam-Winget, J. Salowey || paul_sangster@symantec.com, ncamwing@cisco.com, jsalowey@cisco.com +# RFC6877 || M. Mawatari, M. Kawashima, C. Byrne || mawatari@jpix.ad.jp, kawashimam@vx.jp.nec.com, cameron.byrne@t-mobile.com +# RFC6878 || A.B. Roach || adam@nostrum.com +# RFC6879 || S. Jiang, B. Liu, B. Carpenter || jiangsheng@huawei.com, leo.liubing@huawei.com, brian.e.carpenter@gmail.com +# RFC6880 || L. Johansson || leifj@sunet.se +# RFC6881 || B. Rosen, J. Polk || br@brianrosen.net, jmpolk@cisco.com +# RFC6882 || K. Kumaki, Ed., T. Murai, D. Cheng, S. Matsushima, P. Jiang || ke-kumaki@kddi.com, murai@fnsc.co.jp, dean.cheng@huawei.com, satoru.matsushima@g.softbank.co.jp, pe-jiang@kddi.com +# RFC6883 || B. Carpenter, S. Jiang || brian.e.carpenter@gmail.com, jiangsheng@huawei.com +# RFC6884 || Z. Fang || zfang@qualcomm.com +# RFC6885 || M. Blanchet, A. Sullivan || Marc.Blanchet@viagenie.ca, asullivan@dyn.com +# RFC6886 || S. Cheshire, M. Krochmal || cheshire@apple.com, marc@apple.com +# RFC6887 || D. Wing, Ed., S. Cheshire, M. Boucadair, R. Penno, P. Selkirk || dwing-ietf@fuggles.com, cheshire@apple.com, mohamed.boucadair@orange.com, repenno@cisco.com, pselkirk@isc.org +# RFC6888 || S. Perreault, Ed., I. Yamagata, S. Miyakawa, A. Nakagawa, H. Ashida || simon.perreault@viagenie.ca, ikuhei@nttv6.jp, miyakawa@nttv6.jp, a-nakagawa@jpix.ad.jp, hiashida@cisco.com +# RFC6889 || R. Penno, T. Saxena, M. Boucadair, S. Sivakumar || rpenno@juniper.net, tasaxena@cisco.com, mohamed.boucadair@orange.com, ssenthil@cisco.com +# RFC6890 || M. Cotton, L. Vegoda, R. Bonica, Ed., B. Haberman || michelle.cotton@icann.org, leo.vegoda@icann.org, rbonica@juniper.net, brian@innovationslab.net +# RFC6891 || J. Damas, M. Graff, P. Vixie || joao@bondis.org, explorer@flame.org, vixie@isc.org +# RFC6892 || E. Wilde || erik.wilde@emc.com +# RFC6893 || P. Higgs, P. Szucs || paul.higgs@ericsson.com, paul.szucs@eu.sony.com +# RFC6894 || R. Papneja, S. Vapiwala, J. Karthik, S. Poretsky, S. Rao, JL. Le Roux || rajiv.papneja@huawei.com, svapiwal@cisco.com, jkarthik@cisco.com, sporetsky@allot.com, shankar.rao@du.edu, jeanlouis.leroux@orange.com +# RFC6895 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6896 || S. Barbato, S. Dorigotti, T. Fossati, Ed. || tat@koanlogic.com, stewy@koanlogic.com, tho@koanlogic.com +# RFC6897 || M. Scharf, A. Ford || michael.scharf@alcatel-lucent.com, alanford@cisco.com +# RFC6898 || D. Li, D. Ceccarelli, L. Berger || huawei.danli@huawei.com, daniele.ceccarelli@ericsson.com, lberger@labn.net +# RFC6901 || P. Bryan, Ed., K. Zyp, M. Nottingham, Ed. || pbryan@anode.ca, kris@sitepen.com, mnot@mnot.net +# RFC6902 || P. Bryan, Ed., M. Nottingham, Ed. || pbryan@anode.ca, mnot@mnot.net +# RFC6903 || J. Snell || jasnell@gmail.com +# RFC6904 || J. Lennox || jonathan@vidyo.com +# RFC6905 || T. Senevirathne, D. Bond, S. Aldrin, Y. Li, R. Watve || tsenevir@cisco.com, mokon@mokon.net, aldrin.ietf@gmail.com, liyizhou@huawei.com, rwatve@cisco.com +# RFC6906 || E. Wilde || erik.wilde@emc.com +# RFC6907 || T. Manderson, K. Sriram, R. White || terry.manderson@icann.org, ksriram@nist.gov, russ@riw.us +# RFC6908 || Y. Lee, R. Maglione, C. Williams, C. Jacquenet, M. Boucadair || yiu_lee@cable.comcast.com, robmgl@cisco.com, carlw@mcsr-labs.org, christian.jacquenet@orange.com, mohamed.boucadair@orange.com +# RFC6909 || S. Gundavelli, Ed., X. Zhou, J. Korhonen, G. Feige, R. Koodli || sgundave@cisco.com, zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, gfeige@cisco.com, rkoodli@cisco.com +# RFC6910 || D. Worley, M. Huelsemann, R. Jesske, D. Alexeitsev || worley@ariadne.com, martin.huelsemann@telekom.de, r.jesske@telekom.de, alexeitsev@teleflash.com +# RFC6911 || W. Dec, Ed., B. Sarikaya, G. Zorn, Ed., D. Miles, B. Lourdelet || wdec@cisco.com, sarikaya@ieee.org, glenzorn@gmail.com, davidmiles@google.com, blourdel@juniper.net +# RFC6912 || A. Sullivan, D. Thaler, J. Klensin, O. Kolkman || asullivan@dyn.com, dthaler@microsoft.com, john-ietf@jck.com, olaf@NLnetLabs.nl +# RFC6913 || D. Hanes, G. Salgueiro, K. Fleming || dhanes@cisco.com, gsalguei@cisco.com, kevin@kpfleming.us +# RFC6914 || J. Rosenberg || jdrosen@jdrosen.net +# RFC6915 || R. Bellis || ray.bellis@nominet.org.uk +# RFC6916 || R. Gagliano, S. Kent, S. Turner || rogaglia@cisco.com, kent@bbn.com, turners@ieca.com +# RFC6917 || C. Boulton, L. Miniero, G. Munson || chris@ns-technologies.com, lorenzo@meetecho.com, gamunson@gmail.com +# RFC6918 || F. Gont, C. Pignataro || fgont@si6networks.com, cpignata@cisco.com +# RFC6919 || R. Barnes, S. Kent, E. Rescorla || rlb@ipv.sx, kent@bbn.com, ekr@rtfm.com +# RFC6920 || S. Farrell, D. Kutscher, C. Dannewitz, B. Ohlman, A. Keranen, P. Hallam-Baker || stephen.farrell@cs.tcd.ie, kutscher@neclab.eu, cdannewitz@googlemail.com, Borje.Ohlman@ericsson.com, ari.keranen@ericsson.com, philliph@comodo.com +# RFC6921 || R. Hinden || bob.hinden@gmail.com +# RFC6922 || Y. Shafranovich || ietf@shaftek.org +# RFC6923 || R. Winter, E. Gray, H. van Helvoort, M. Betts || rolf.winter@neclab.eu, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, malcolm.betts@zte.com.cn +# RFC6924 || B. Leiba || barryleiba@computer.org +# RFC6925 || B. Joshi, R. Desetti, M. Stapp || bharat_joshi@infosys.com, ramakrishnadtv@infosys.com, mjs@cisco.com +# RFC6926 || K. Kinnear, M. Stapp, R. Desetti, B. Joshi, N. Russell, P. Kurapati, B. Volz || kkinnear@cisco.com, mjs@cisco.com, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com, neil.e.russell@gmail.com, kurapati@juniper.net, volz@cisco.com +# RFC6927 || J. Levine, P. Hoffman || standards@taugh.com, paul.hoffman@vpnc.org +# RFC6928 || J. Chu, N. Dukkipati, Y. Cheng, M. Mathis || hkchu@google.com, nanditad@google.com, ycheng@google.com, mattmathis@google.com +# RFC6929 || A. DeKok, A. Lior || aland@networkradius.com, avi.ietf@lior.org +# RFC6930 || D. Guo, S. Jiang, Ed., R. Despres, R. Maglione || guoseu@huawei.com, jiangsheng@huawei.com, despres.remi@laposte.net, robmgl@cisco.com +# RFC6931 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC6932 || D. Harkins, Ed. || dharkins@arubanetworks.com +# RFC6933 || A. Bierman, D. Romascanu, J. Quittek, M. Chandramouli || andy@yumaworks.com, dromasca@gmail.com , quittek@neclab.eu, moulchan@cisco.com +# RFC6934 || N. Bitar, Ed., S. Wadhwa, Ed., T. Haag, H. Li || nabil.n.bitar@verizon.com, sanjay.wadhwa@alcatel-lucent.com, HaagT@telekom.de, hongyu.lihongyu@huawei.com +# RFC6935 || M. Eubanks, P. Chimento, M. Westerlund || marshall.eubanks@gmail.com, Philip.Chimento@jhuapl.edu, magnus.westerlund@ericsson.com +# RFC6936 || G. Fairhurst, M. Westerlund || gorry@erg.abdn.ac.uk, magnus.westerlund@ericsson.com +# RFC6937 || M. Mathis, N. Dukkipati, Y. Cheng || mattmathis@google.com, nanditad@google.com, ycheng@google.com +# RFC6938 || J. Scudder || jgs@juniper.net +# RFC6939 || G. Halwasia, S. Bhandari, W. Dec || ghalwasi@cisco.com, shwethab@cisco.com, wdec@cisco.com +# RFC6940 || C. Jennings, B. Lowekamp, Ed., E. Rescorla, S. Baset, H. Schulzrinne || fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, salman@cs.columbia.edu, hgs@cs.columbia.edu +# RFC6941 || L. Fang, Ed., B. Niven-Jenkins, Ed., S. Mansfield, Ed., R. Graveman, Ed. || lufang@cisco.com, ben@niven-jenkins.co.uk, scott.mansfield@ericsson.com, rfg@acm.org +# RFC6942 || J. Bournelle, L. Morand, S. Decugis, Q. Wu, G. Zorn || julien.bournelle@orange.com, lionel.morand@orange.com, sdecugis@freediameter.net, sunseawq@huawei.com, glenzorn@gmail.com +# RFC6943 || D. Thaler, Ed. || dthaler@microsoft.com +# RFC6944 || S. Rose || scottr.nist@gmail.com +# RFC6945 || R. Bush, B. Wijnen, K. Patel, M. Baer || randy@psg.com, bertietf@bwijnen.net, keyupate@cisco.com, baerm@tislabs.com +# RFC6946 || F. Gont || fgont@si6networks.com +# RFC6947 || M. Boucadair, H. Kaplan, R. Gilman, S. Veikkolainen || mohamed.boucadair@orange.com, hkaplan@acmepacket.com, bob_gilman@comcast.net, Simo.Veikkolainen@nokia.com +# RFC6948 || A. Keranen, J. Arkko || ari.keranen@ericsson.com, jari.arkko@piuha.net +# RFC6949 || H. Flanagan, N. Brownlee || rse@rfc-editor.org, rfc-ise@rfc-editor.org +# RFC6950 || J. Peterson, O. Kolkman, H. Tschofenig, B. Aboba || jon.peterson@neustar.biz, olaf@nlnetlabs.nl, Hannes.Tschofenig@gmx.net, Bernard_aboba@hotmail.com +# RFC6951 || M. Tuexen, R. Stewart || tuexen@fh-muenster.de, randall@lakerest.net +# RFC6952 || M. Jethanandani, K. Patel, L. Zheng || mjethanandani@gmail.com, keyupate@cisco.com, vero.zheng@huawei.com +# RFC6953 || A. Mancuso, Ed., S. Probasco, B. Patil || amancuso@google.com, scott@probasco.me, basavpat@cisco.com +# RFC6954 || J. Merkle, M. Lochter || johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de +# RFC6955 || J. Schaad, H. Prafullchandra || ietf@augustcellars.com, HPrafullchandra@hytrust.com +# RFC6956 || W. Wang, E. Haleplidis, K. Ogawa, C. Li, J. Halpern || wmwang@zjsu.edu.cn, ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, chuanhuang_li@zjsu.edu.cn, joel.halpern@ericsson.com +# RFC6957 || F. Costa, J-M. Combes, Ed., X. Pougnard, H. Li || fabio.costa@orange.com, jeanmichel.combes@orange.com, xavier.pougnard@orange.com, lihy@huawei.com +# RFC6958 || A. Clark, S. Zhang, J. Zhao, Q. Wu, Ed. || alan.d.clark@telchemy.com, zhangyx@sttri.com.cn, zhaojing@sttri.com.cn, sunseawq@huawei.com +# RFC6959 || D. McPherson, F. Baker, J. Halpern || dmcpherson@verisign.com, fred@cisco.com, joel.halpern@ericsson.com +# RFC6960 || S. Santesson, M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams || sts@aaa-sec.com, mmyers@fastq.com, none, ambarish@gmail.com, slava.galperin@gmail.com, cadams@eecs.uottawa.ca +# RFC6961 || Y. Pettersen || yngve@spec-work.net +# RFC6962 || B. Laurie, A. Langley, E. Kasper || benl@google.com, agl@google.com, ekasper@google.com +# RFC6963 || P. Saint-Andre || ietf@stpeter.im +# RFC6964 || F. Templin || fltemplin@acm.org +# RFC6965 || L. Fang, Ed., N. Bitar, R. Zhang, M. Daikoku, P. Pan || lufang@cisco.com, nabil.bitar@verizon.com, raymond.zhang@alcatel-lucent.com, ms-daikoku@kddi.com, ppan@infinera.com +# RFC6967 || M. Boucadair, J. Touch, P. Levis, R. Penno || mohamed.boucadair@orange.com, touch@isi.edu, pierre.levis@orange.com, repenno@cisco.com +# RFC6968 || V. Roca, B. Adamson || vincent.roca@inria.fr, adamson@itd.nrl.navy.mil +# RFC6969 || A. Retana, D. Cheng || aretana@cisco.com, dean.cheng@huawei.com +# RFC6970 || M. Boucadair, R. Penno, D. Wing || mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com +# RFC6971 || U. Herberg, Ed., A. Cardenas, T. Iwao, M. Dow, S. Cespedes || ulrich.herberg@us.fujitsu.com, alvaro.cardenas@me.com, smartnetpro-iwao_std@ml.css.fujitsu.com, m.dow@freescale.com, scespedes@icesi.edu.co +# RFC6972 || Y. Zhang, N. Zong || hishigh@gmail.com, zongning@huawei.com +# RFC6973 || A. Cooper, H. Tschofenig, B. Aboba, J. Peterson, J. Morris, M. Hansen, R. Smith || acooper@cdt.org, Hannes.Tschofenig@gmx.net, bernard_aboba@hotmail.com, jon.peterson@neustar.biz, ietf@jmorris.org, marit.hansen@datenschutzzentrum.de, rhys.smith@ja.net +# RFC6974 || Y. Weingarten, S. Bryant, D. Ceccarelli, D. Caviglia, F. Fondelli, M. Corsi, B. Wu, X. Dai || wyaacov@gmail.com, stbryant@cisco.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, francesco.fondelli@ericsson.com, corsi.marco@gmail.com, wu.bo@zte.com.cn, dai.xuehui@zte.com.cn +# RFC6975 || S. Crocker, S. Rose || steve@shinkuro.com, scottr.nist@gmail.com +# RFC6976 || M. Shand, S. Bryant, S. Previdi, C. Filsfils, P. Francois, O. Bonaventure || imc.shand@googlemail.com, stbryant@cisco.com, sprevidi@cisco.com, cfilsfil@cisco.com, pierre.francois@imdea.org, Olivier.Bonaventure@uclouvain.be +# RFC6977 || M. Boucadair, X. Pougnard || mohamed.boucadair@orange.com, xavier.pougnard@orange.com +# RFC6978 || J. Touch || touch@isi.edu +# RFC6979 || T. Pornin || pornin@bolet.org +# RFC6980 || F. Gont || fgont@si6networks.com +# RFC6981 || S. Bryant, S. Previdi, M. Shand || stbryant@cisco.com, sprevidi@cisco.com, imc.shand@googlemail.com +# RFC6982 || Y. Sheffer, A. Farrel || yaronf.ietf@gmail.com, adrian@olddog.co.uk +# RFC6983 || R. van Brandenburg, O. van Deventer, F. Le Faucheur, K. Leung || ray.vanbrandenburg@tno.nl, oskar.vandeventer@tno.nl, flefauch@cisco.com, kleung@cisco.com +# RFC6984 || W. Wang, K. Ogawa, E. Haleplidis, M. Gao, J. Hadi Salim || wmwang@zjsu.edu.cn, ogawa.kentaro@lab.ntt.co.jp, ehalep@ece.upatras.gr, gaoming@mail.zjgsu.edu.cn, hadi@mojatatu.com +# RFC6985 || A. Morton || acmorton@att.com +# RFC6986 || V. Dolmatov, Ed., A. Degtyarev || dol@cryptocom.ru, alexey@renatasystems.org +# RFC6987 || A. Retana, L. Nguyen, A. Zinin, R. White, D. McPherson || aretana@cisco.com, lhnguyen@cisco.com, alex.zinin@gmail.com, Russ.White@vce.com, dmcpherson@verisign.com +# RFC6988 || J. Quittek, Ed., M. Chandramouli, R. Winter, T. Dietz, B. Claise || quittek@neclab.eu, moulchan@cisco.com, Rolf.Winter@neclab.eu, Thomas.Dietz@neclab.eu, bclaise@cisco.com +# RFC6989 || Y. Sheffer, S. Fluhrer || yaronf.ietf@gmail.com, sfluhrer@cisco.com +# RFC6990 || R. Huang, Q. Wu, H. Asaeda, G. Zorn || rachel.huang@huawei.com, bill.wu@huawei.com, asaeda@nict.go.jp, glenzorn@gmail.com +# RFC6991 || J. Schoenwaelder, Ed. || j.schoenwaelder@jacobs-university.de +# RFC6992 || D. Cheng, M. Boucadair, A. Retana || dean.cheng@huawei.com, mohamed.boucadair@orange.com, aretana@cisco.com +# RFC6993 || P. Saint-Andre || ietf@stpeter.im +# RFC6994 || J. Touch || touch@isi.edu +# RFC6996 || J. Mitchell || Jon.Mitchell@microsoft.com +# RFC6997 || M. Goyal, Ed., E. Baccelli, M. Philipp, A. Brandt, J. Martocci || mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, matthias-philipp@gmx.de, abr@sdesigns.dk, jerald.p.martocci@jci.com +# RFC6998 || M. Goyal, Ed., E. Baccelli, A. Brandt, J. Martocci || mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, abr@sdesigns.dk, jerald.p.martocci@jci.com +# RFC7001 || M. Kucherawy || superuser@gmail.com +# RFC7002 || A. Clark, G. Zorn, Q. Wu || alan.d.clark@telchemy.com, glenzorn@gmail.com, sunseawq@huawei.com +# RFC7003 || A. Clark, R. Huang, Q. Wu, Ed. || alan.d.clark@telchemy.com, Rachel@huawei.com, sunseawq@huawei.com +# RFC7004 || G. Zorn, R. Schott, Q. Wu, Ed., R. Huang || glenzorn@gmail.com, Roland.Schott@telekom.de, sunseawq@huawei.com, Rachel@huawei.com +# RFC7005 || A. Clark, V. Singh, Q. Wu || alan.d.clark@telchemy.com, varun@comnet.tkk.fi, sunseawq@huawei.com +# RFC7006 || M. Garcia-Martin, S. Veikkolainen, R. Gilman || miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com, bob_gilman@comcast.net +# RFC7007 || T. Terriberry || tterribe@xiph.org +# RFC7008 || S. Kiyomoto, W. Shin || kiyomoto@kddilabs.jp, ohpato@hanmail.net +# RFC7009 || T. Lodderstedt, Ed., S. Dronia, M. Scurtescu || torsten@lodderstedt.net, sdronia@gmx.de, mscurtescu@google.com +# RFC7010 || B. Liu, S. Jiang, B. Carpenter, S. Venaas, W. George || leo.liubing@huawei.com, jiangsheng@huawei.com, brian.e.carpenter@gmail.com, stig@cisco.com, wesley.george@twcable.com +# RFC7011 || B. Claise, Ed., B. Trammell, Ed., P. Aitken || bclaise@cisco.com, trammell@tik.ee.ethz.ch, paitken@cisco.com +# RFC7012 || B. Claise, Ed., B. Trammell, Ed. || bclaise@cisco.com, trammell@tik.ee.ethz.ch +# RFC7013 || B. Trammell, B. Claise || trammell@tik.ee.ethz.ch, bclaise@cisco.com +# RFC7014 || S. D'Antonio, T. Zseby, C. Henke, L. Peluso || salvatore.dantonio@uniparthenope.it, tanja@caida.org, christian.henke@tektronix.com, lorenzo.peluso@unina.it +# RFC7015 || B. Trammell, A. Wagner, B. Claise || trammell@tik.ee.ethz.ch, arno@wagner.name, bclaise@cisco.com +# RFC7016 || M. Thornburgh || mthornbu@adobe.com +# RFC7017 || R. Sparks || rjsparks@nostrum.com +# RFC7018 || V. Manral, S. Hanna || vishwas.manral@hp.com, shanna@juniper.net +# RFC7019 || J. Buford, M. Kolberg, Ed. || buford@avaya.com, mkolberg@ieee.org +# RFC7020 || R. Housley, J. Curran, G. Huston, D. Conrad || housley@vigilsec.com, jcurran@arin.net, gih@apnic.net, drc@virtualized.org +# RFC7021 || C. Donley, Ed., L. Howard, V. Kuarsingh, J. Berg, J. Doshi || c.donley@cablelabs.com, william.howard@twcable.com, victor@jvknet.com, j.berg@cablelabs.com, jineshd@juniper.net +# RFC7022 || A. Begen, C. Perkins, D. Wing, E. Rescorla || abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com, ekr@rtfm.com +# RFC7023 || D. Mohan, Ed., N. Bitar, Ed., A. Sajassi, Ed., S. DeLord, P. Niger, R. Qiu || dinmohan@hotmail.com, nabil.n.bitar@verizon.com, sajassi@cisco.com, simon.delord@gmail.com, philippe.niger@orange.com, rqiu@juniper.net +# RFC7024 || H. Jeng, J. Uttaro, L. Jalil, B. Decraene, Y. Rekhter, R. Aggarwal || hj2387@att.com, ju1738@att.com, luay.jalil@verizon.com, bruno.decraene@orange.com, yakov@juniper.net, raggarwa_1@yahoo.com +# RFC7025 || T. Otani, K. Ogaki, D. Caviglia, F. Zhang, C. Margaria || tm-otani@kddi.com, ke-oogaki@kddi.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, cyril.margaria@coriant.com +# RFC7026 || A. Farrel, S. Bryant || adrian@olddog.co.uk, stbryant@cisco.com +# RFC7027 || J. Merkle, M. Lochter || johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de +# RFC7028 || JC. Zuniga, LM. Contreras, CJ. Bernardos, S. Jeon, Y. Kim || JuanCarlos.Zuniga@InterDigital.com, lmcm@tid.es, cjbc@it.uc3m.es, seiljeon@av.it.pt, yhkim@dcn.ssu.ac.kr +# RFC7029 || S. Hartman, M. Wasserman, D. Zhang || hartmans-ietf@mit.edu, mrw@painless-security.com, zhangdacheng@huawei.com +# RFC7030 || M. Pritikin, Ed., P. Yee, Ed., D. Harkins, Ed. || pritikin@cisco.com, peter@akayla.com, dharkins@arubanetworks.com +# RFC7031 || T. Mrugalski, K. Kinnear || tomasz.mrugalski@gmail.com, kkinnear@cisco.com +# RFC7032 || T. Beckhaus, Ed., B. Decraene, K. Tiruveedhula, M. Konstantynowicz, Ed., L. Martini || thomas.beckhaus@telekom.de, bruno.decraene@orange.com, kishoret@juniper.net, maciek@cisco.com, lmartini@cisco.com +# RFC7033 || P. Jones, G. Salgueiro, M. Jones, J. Smarr || paulej@packetizer.com, gsalguei@cisco.com, mbj@microsoft.com, jsmarr@google.com +# RFC7034 || D. Ross, T. Gondrom || dross@microsoft.com, tobias.gondrom@gondrom.org +# RFC7035 || M. Thomson, B. Rosen, D. Stanley, G. Bajko, A. Thomson || martin.thomson@skype.net, br@brianrosen.net, dstanley@arubanetworks.com, Gabor.Bajko@nokia.com, athomson@lgscout.com +# RFC7036 || R. Housley || housley@vigilsec.com +# RFC7037 || L. Yeh, M. Boucadair || leaf.yeh.sdo@gmail.com, mohamed.boucadair@orange.com +# RFC7038 || R. Ogier || ogier@earthlink.net +# RFC7039 || J. Wu, J. Bi, M. Bagnulo, F. Baker, C. Vogt, Ed. || jianping@cernet.edu.cn, junbi@tsinghua.edu.cn, marcelo@it.uc3m.es, fred@cisco.com, mail@christianvogt.net +# RFC7040 || Y. Cui, J. Wu, P. Wu, O. Vautrin, Y. Lee || yong@csnet1.cs.tsinghua.edu.cn, jianping@cernet.edu.cn, pengwu.thu@gmail.com, Olivier@juniper.net, yiu_lee@cable.comcast.com +# RFC7041 || F. Balus, Ed., A. Sajassi, Ed., N. Bitar, Ed. || florin.balus@alcatel-lucent.com, sajassi@cisco.com, nabil.n.bitar@verizon.com +# RFC7042 || D. Eastlake 3rd, J. Abley || d3e3e3@gmail.com, jabley@dyn.com +# RFC7043 || J. Abley || jabley@dyn.com +# RFC7044 || M. Barnes, F. Audet, S. Schubert, J. van Elburg, C. Holmberg || mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com +# RFC7045 || B. Carpenter, S. Jiang || brian.e.carpenter@gmail.com, jiangsheng@huawei.com +# RFC7046 || M. Waehlisch, T. Schmidt, S. Venaas || mw@link-lab.net, Schmidt@informatik.haw-hamburg.de, stig@cisco.com +# RFC7047 || B. Pfaff, B. Davie, Ed. || blp@nicira.com, bsd@nicira.com +# RFC7048 || E. Nordmark, I. Gashinsky || nordmark@acm.org, igor@yahoo-inc.com +# RFC7049 || C. Bormann, P. Hoffman || cabo@tzi.org, paul.hoffman@vpnc.org +# RFC7050 || T. Savolainen, J. Korhonen, D. Wing || teemu.savolainen@nokia.com, jouni.nospam@gmail.com, dwing-ietf@fuggles.com +# RFC7051 || J. Korhonen, Ed., T. Savolainen, Ed. || jouni.nospam@gmail.com, teemu.savolainen@nokia.com +# RFC7052 || G. Schudel, A. Jain, V. Moreno || gschudel@cisco.com, atjain@juniper.net, vimoreno@cisco.com +# RFC7053 || M. Tuexen, I. Ruengeler, R. Stewart || tuexen@fh-muenster.de, i.ruengeler@fh-muenster.de, randall@lakerest.net +# RFC7054 || A. Farrel, H. Endo, R. Winter, Y. Koike, M. Paul || adrian@olddog.co.uk, hideki.endo.es@hitachi.com, rolf.winter@neclab.eu, koike.yoshinori@lab.ntt.co.jp, Manuel.Paul@telekom.de +# RFC7055 || S. Hartman, Ed., J. Howlett || hartmans-ietf@mit.edu, josh.howlett@ja.net +# RFC7056 || S. Hartman, J. Howlett || hartmans-ietf@mit.edu, josh.howlett@ja.net +# RFC7057 || S. Winter, J. Salowey || stefan.winter@restena.lu, jsalowey@cisco.com +# RFC7058 || A. Amirante, T. Castaldi, L. Miniero, S P. Romano || alessandro.amirante@unina.it, tcastaldi@meetecho.com, lorenzo@meetecho.com, spromano@unina.it +# RFC7059 || S. Steffann, I. van Beijnum, R. van Rein || sander@steffann.nl, iljitsch@muada.com, rick@openfortress.nl +# RFC7060 || M. Napierala, E. Rosen, IJ. Wijnands || mnapierala@att.com, erosen@cisco.com, ice@cisco.com +# RFC7061 || R. Sinnema, E. Wilde || remon.sinnema@emc.com, erik.wilde@emc.com +# RFC7062 || F. Zhang, Ed., D. Li, H. Li, S. Belotti, D. Ceccarelli || zhangfatai@huawei.com, huawei.danli@huawei.com, lihan@chinamobile.com, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com +# RFC7063 || L. Zheng, J. Zhang, R. Parekh || vero.zheng@huawei.com, zzhang@juniper.net, riparekh@cisco.com +# RFC7064 || S. Nandakumar, G. Salgueiro, P. Jones, M. Petit-Huguenin || snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com, petithug@acm.org +# RFC7065 || M. Petit-Huguenin, S. Nandakumar, G. Salgueiro, P. Jones || petithug@acm.org, snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com +# RFC7066 || J. Korhonen, Ed., J. Arkko, Ed., T. Savolainen, S. Krishnan || jouni.nospam@gmail.com, jari.arkko@piuha.net, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com +# RFC7067 || L. Dunbar, D. Eastlake 3rd, R. Perlman, I. Gashinsky || ldunbar@huawei.com, d3e3e3@gmail.com, Radia@alum.mit.edu, igor@yahoo-inc.com +# RFC7068 || E. McMurry, B. Campbell || emcmurry@computer.org, ben@nostrum.com +# RFC7069 || R. Alimi, A. Rahman, D. Kutscher, Y. Yang, H. Song, K. Pentikousis || ralimi@google.com, Akbar.Rahman@InterDigital.com, dirk.kutscher@neclab.eu, yry@cs.yale.edu, haibin.song@huawei.com, k.pentikousis@eict.de +# RFC7070 || N. Borenstein, M. Kucherawy || nsb@guppylake.com, superuser@gmail.com +# RFC7071 || N. Borenstein, M. Kucherawy || nsb@guppylake.com, superuser@gmail.com +# RFC7072 || N. Borenstein, M. Kucherawy || nsb@guppylake.com, superuser@gmail.com +# RFC7073 || N. Borenstein, M. Kucherawy || nsb@guppylake.com, superuser@gmail.com +# RFC7074 || L. Berger, J. Meuric || lberger@labn.net, julien.meuric@orange.com +# RFC7075 || T. Tsou, R. Hao, T. Taylor, Ed. || tina.tsou.zouting@huawei.com, ruibing_hao@cable.comcast.com, tom.taylor.stds@gmail.com +# RFC7076 || M. Joseph, J. Susoy || mark@p6r.com, jim@p6r.com +# RFC7077 || S. Krishnan, S. Gundavelli, M. Liebsch, H. Yokota, J. Korhonen || suresh.krishnan@ericsson.com, sgundave@cisco.com, marco.liebsch@neclab.eu, yokota@kddilabs.jp, jouni.nospam@gmail.com +# RFC7078 || A. Matsumoto, T. Fujisaki, T. Chown || arifumi@nttv6.net, fujisaki@nttv6.net, tjc@ecs.soton.ac.uk +# RFC7079 || N. Del Regno, Ed., A. Malis, Ed. || nick.delregno@verizon.com, amalis@gmail.com +# RFC7080 || A. Sajassi, S. Salam, N. Bitar, F. Balus || sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, florin.balus@nuagenetworks.net +# RFC7081 || E. Ivov, P. Saint-Andre, E. Marocco || emcho@jitsi.org, ietf@stpeter.im, enrico.marocco@telecomitalia.it +# RFC7082 || R. Shekh-Yusef, M. Barnes || rifaat.ietf@gmail.com, mary.ietf.barnes@gmail.com +# RFC7083 || R. Droms || rdroms@cisco.com +# RFC7084 || H. Singh, W. Beebee, C. Donley, B. Stark || shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com +# RFC7085 || J. Levine, P. Hoffman || standards@taugh.com, paul.hoffman@cybersecurity.org +# RFC7086 || A. Keranen, G. Camarillo, J. Maenpaa || Ari.Keranen@ericsson.com, Gonzalo.Camarillo@ericsson.com, Jouni.Maenpaa@ericsson.com +# RFC7087 || H. van Helvoort, Ed., L. Andersson, Ed., N. Sprecher, Ed. || Huub.van.Helvoort@huawei.com, loa@mail01.huawei.com, nurit.sprecher@nsn.com +# RFC7088 || D. Worley || worley@ariadne.com +# RFC7089 || H. Van de Sompel, M. Nelson, R. Sanderson || hvdsomp@gmail.com, mln@cs.odu.edu, azaroth42@gmail.com +# RFC7090 || H. Schulzrinne, H. Tschofenig, C. Holmberg, M. Patel || hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net, christer.holmberg@ericsson.com, Milan.Patel@huawei.com +# RFC7091 || V. Dolmatov, Ed., A. Degtyarev || dol@cryptocom.ru, alexey@renatasystems.org +# RFC7092 || H. Kaplan, V. Pascual || hadriel.kaplan@oracle.com, victor.pascual@quobis.com +# RFC7093 || S. Turner, S. Kent, J. Manger || turners@ieca.com, kent@bbn.com, james.h.manger@team.telstra.com +# RFC7094 || D. McPherson, D. Oran, D. Thaler, E. Osterweil || dmcpherson@verisign.com, oran@cisco.com, dthaler@microsoft.com, eosterweil@verisign.com +# RFC7095 || P. Kewisch || mozilla@kewis.ch +# RFC7096 || S. Belotti, Ed., P. Grandi, D. Ceccarelli, Ed., D. Caviglia, F. Zhang, D. Li || sergio.belotti@alcatel-lucent.com, pietro_vittorio.grandi@alcatel-lucent.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, danli@huawei.com +# RFC7097 || J. Ott, V. Singh, Ed., I. Curcio || jo@comnet.tkk.fi, varun@comnet.tkk.fi, igor.curcio@nokia.com +# RFC7098 || B. Carpenter, S. Jiang, W. Tarreau || brian.e.carpenter@gmail.com, jiangsheng@huawei.com, willy@haproxy.com +# RFC7100 || P. Resnick || presnick@qti.qualcomm.com +# RFC7101 || S. Ginoza || sginoza@amsl.com +# RFC7102 || JP. Vasseur || jpv@cisco.com +# RFC7103 || M. Kucherawy, G. Shapiro, N. Freed || superuser@gmail.com, gshapiro@proofpoint.com, ned.freed@mrochek.com +# RFC7104 || A. Begen, Y. Cai, H. Ou || abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com +# RFC7105 || M. Thomson, J. Winterbottom || martin.thomson@gmail.com, a.james.winterbottom@gmail.com +# RFC7106 || E. Ivov || emcho@jitsi.org +# RFC7107 || R. Housley || housley@vigilsec.com +# RFC7108 || J. Abley, T. Manderson || jabley@dyn.com, terry.manderson@icann.org +# RFC7109 || H. Yokota, D. Kim, B. Sarikaya, F. Xia || yokota@kddilabs.jp, dskim@jejutp.or.kr, sarikaya@ieee.org, xiayangsong@huawei.com +# RFC7110 || M. Chen, W. Cao, S. Ning, F. Jounay, S. Delord || mach.chen@huawei.com, wayne.caowei@huawei.com, ning.so@tatacommunications.com, frederic.jounay@orange.ch, simon.delord@alcatel-lucent.com +# RFC7111 || M. Hausenblas, E. Wilde, J. Tennison || mhausenblas@maprtech.com, dret@berkeley.edu, jeni@jenitennison.com +# RFC7112 || F. Gont, V. Manral, R. Bonica || fgont@si6networks.com, vishwas@ionosnetworks.com, rbonica@juniper.net +# RFC7113 || F. Gont || fgont@si6networks.com +# RFC7114 || B. Leiba || barryleiba@computer.org +# RFC7115 || R. Bush || randy@psg.com +# RFC7116 || K. Scott, M. Blanchet || kscott@mitre.org, marc.blanchet@viagenie.ca +# RFC7117 || R. Aggarwal, Ed., Y. Kamite, L. Fang, Y. Rekhter, C. Kodeboniya || raggarwa_1@yahoo.com, y.kamite@ntt.com, lufang@microsoft.com, yakov@juniper.net, chaitk@yahoo.com +# RFC7118 || I. Baz Castillo, J. Millan Villegas, V. Pascual || ibc@aliax.net, jmillan@aliax.net, victor.pascual@quobis.com +# RFC7119 || B. Claise, A. Kobayashi, B. Trammell || bclaise@cisco.com, akoba@nttv6.net, trammell@tik.ee.ethz.ch +# RFC7120 || M. Cotton || michelle.cotton@icann.org +# RFC7121 || K. Ogawa, W. Wang, E. Haleplidis, J. Hadi Salim || k.ogawa@ntt.com, wmwang@mail.zjgsu.edu.cn, ehalep@ece.upatras.gr, hadi@mojatatu.com +# RFC7122 || H. Kruse, S. Jero, S. Ostermann || kruse@ohio.edu, sjero@purdue.edu, ostermann@eecs.ohiou.edu +# RFC7123 || F. Gont, W. Liu || fgont@si6networks.com, liushucheng@huawei.com +# RFC7124 || E. Beili || edward.beili@actelis.com +# RFC7125 || B. Trammell, P. Aitken || trammell@tik.ee.ethz.ch, paitken@cisco.com +# RFC7126 || F. Gont, R. Atkinson, C. Pignataro || fgont@si6networks.com, rja.lists@gmail.com, cpignata@cisco.com +# RFC7127 || O. Kolkman, S. Bradner, S. Turner || olaf@nlnetlabs.nl, sob@harvard.edu, turners@ieca.com +# RFC7128 || R. Bush, R. Austein, K. Patel, H. Gredler, M. Waehlisch || randy@psg.com, sra@hactrn.net, keyupate@cisco.com, hannes@juniper.net, waehlisch@ieee.org +# RFC7129 || R. Gieben, W. Mekking || miek@google.com, matthijs@nlnetlabs.nl +# RFC7130 || M. Bhatia, Ed., M. Chen, Ed., S. Boutros, Ed., M. Binderberger, Ed., J. Haas, Ed. || manav.bhatia@alcatel-lucent.com, mach@huawei.com, sboutros@cisco.com, mbinderb@cisco.com, jhaas@juniper.net +# RFC7131 || M. Barnes, F. Audet, S. Schubert, H. van Elburg, C. Holmberg || mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com +# RFC7132 || S. Kent, A. Chi || kent@bbn.com, achi@cs.unc.edu +# RFC7133 || S. Kashima, A. Kobayashi, Ed., P. Aitken || kashima@nttv6.net, akoba@nttv6.net, paitken@cisco.com +# RFC7134 || B. Rosen || br@brianrosen.net +# RFC7135 || J. Polk || jmpolk@cisco.com +# RFC7136 || B. Carpenter, S. Jiang || brian.e.carpenter@gmail.com, jiangsheng@huawei.com +# RFC7137 || A. Retana, S. Ratliff || aretana@cisco.com, sratliff@cisco.com +# RFC7138 || D. Ceccarelli, Ed., F. Zhang, S. Belotti, R. Rao, J. Drake || daniele.ceccarelli@ericsson.com, zhangfatai@huawei.com, sergio.belotti@alcatel-lucent.com, rrao@infinera.com, jdrake@juniper.net +# RFC7139 || F. Zhang, Ed., G. Zhang, S. Belotti, D. Ceccarelli, K. Pithewan || zhangfatai@huawei.com, zhangguoying@mail.ritt.com.cn, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com, kpithewan@infinera.com +# RFC7140 || L. Jin, F. Jounay, IJ. Wijnands, N. Leymann || lizho.jin@gmail.com, frederic.jounay@orange.ch, ice@cisco.com, n.leymann@telekom.de +# RFC7141 || B. Briscoe, J. Manner || bob.briscoe@bt.com, jukka.manner@aalto.fi +# RFC7142 || M. Shand, L. Ginsberg || imc.shand@googlemail.com, ginsberg@cisco.com +# RFC7143 || M. Chadalapaka, J. Satran, K. Meth, D. Black || cbm@chadalapaka.com, julians@infinidat.com, meth@il.ibm.com, david.black@emc.com +# RFC7144 || F. Knight, M. Chadalapaka || knight@netapp.com, cbm@chadalapaka.com +# RFC7145 || M. Ko, A. Nezhinsky || mkosjc@gmail.com, alexandern@mellanox.com +# RFC7146 || D. Black, P. Koning || david.black@emc.com, paul_koning@Dell.com +# RFC7147 || M. Bakke, P. Venkatesen || mark_bakke@dell.com, prakashvn@hcl.com +# RFC7148 || X. Zhou, J. Korhonen, C. Williams, S. Gundavelli, CJ. Bernardos || zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, carlw@mcsr-labs.org, sgundave@cisco.com, cjbc@it.uc3m.es +# RFC7149 || M. Boucadair, C. Jacquenet || mohamed.boucadair@orange.com, christian.jacquenet@orange.com +# RFC7150 || F. Zhang, A. Farrel || zhangfatai@huawei.com, adrian@olddog.co.uk +# RFC7151 || P. Hethmon, R. McMurray || phethmon@hethmon.com, robmcm@microsoft.com +# RFC7152 || R. Key, Ed., S. DeLord, F. Jounay, L. Huang, Z. Liu, M. Paul || raymond.key@ieee.org, simon.delord@gmail.com, frederic.jounay@orange.ch, huanglu@chinamobile.com, zhliu@gsta.com, manuel.paul@telekom.de +# RFC7153 || E. Rosen, Y. Rekhter || erosen@cisco.com, yakov@juniper.net +# RFC7154 || S. Moonesamy, Ed. || sm+ietf@elandsys.com +# RFC7155 || G. Zorn, Ed. || glenzorn@gmail.com +# RFC7156 || G. Zorn, Q. Wu, J. Korhonen || glenzorn@gmail.com, bill.wu@huawei.com, jouni.nospam@gmail.com +# RFC7157 || O. Troan, Ed., D. Miles, S. Matsushima, T. Okimoto, D. Wing || ot@cisco.com, davidmiles@google.com, satoru.matsushima@g.softbank.co.jp, t.okimoto@west.ntt.co.jp, dwing-ietf@fuggles.com +# RFC7158 || T. Bray, Ed. || tbray@textuality.com +# RFC7159 || T. Bray, Ed. || tbray@textuality.com +# RFC7160 || M. Petit-Huguenin, G. Zorn, Ed. || petithug@acm.org, glenzorn@gmail.com +# RFC7161 || LM. Contreras, CJ. Bernardos, I. Soto || lmcm@tid.es, cjbc@it.uc3m.es, isoto@it.uc3m.es +# RFC7162 || A. Melnikov, D. Cridland || Alexey.Melnikov@isode.com, dave.cridland@surevine.com +# RFC7163 || C. Holmberg, I. Sedlacek || christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com +# RFC7164 || K. Gross, R. Brandenburg || kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl +# RFC7165 || R. Barnes || rlb@ipv.sx +# RFC7166 || M. Bhatia, V. Manral, A. Lindem || manav.bhatia@alcatel-lucent.com, vishwas@ionosnetworks.com, acee.lindem@ericsson.com +# RFC7167 || D. Frost, S. Bryant, M. Bocci, L. Berger || frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com, lberger@labn.net +# RFC7168 || I. Nazar || inazar@deviantart.com +# RFC7169 || S. Turner || turners@ieca.com +# RFC7170 || H. Zhou, N. Cam-Winget, J. Salowey, S. Hanna || hzhou@cisco.com, ncamwing@cisco.com, jsalowey@cisco.com, steve.hanna@infineon.com +# RFC7171 || N. Cam-Winget, P. Sangster || ncamwing@cisco.com, paul_sangster@symantec.com +# RFC7172 || D. Eastlake 3rd, M. Zhang, P. Agarwal, R. Perlman, D. Dutt || d3e3e3@gmail.com, zhangmingui@huawei.com, pagarwal@broadcom.com, Radia@alum.mit.edu, ddutt.ietf@hobbesdutt.com +# RFC7173 || L. Yong, D. Eastlake 3rd, S. Aldrin, J. Hudson || lucy.yong@huawei.com, d3e3e3@gmail.com, sam.aldrin@huawei.com, jon.hudson@gmail.com +# RFC7174 || S. Salam, T. Senevirathne, S. Aldrin, D. Eastlake 3rd || ssalam@cisco.com, tsenevir@cisco.com, sam.aldrin@gmail.com, d3e3e3@gmail.com +# RFC7175 || V. Manral, D. Eastlake 3rd, D. Ward, A. Banerjee || vishwas@ionosnetworks.com, d3e3e3@gmail.com, dward@cisco.com, ayabaner@gmail.com +# RFC7176 || D. Eastlake 3rd, T. Senevirathne, A. Ghanwani, D. Dutt, A. Banerjee || d3e3e3@gmail.com, tsenevir@cisco.com, anoop@alumni.duke.edu, ddutt.ietf@hobbesdutt.com, ayabaner@gmail.com +# RFC7177 || D. Eastlake 3rd, R. Perlman, A. Ghanwani, H. Yang, V. Manral || d3e3e3@gmail.com, radia@alum.mit.edu, anoop@alumni.duke.edu, howardy@cisco.com, vishwas@ionosnetworks.com +# RFC7178 || D. Eastlake 3rd, V. Manral, Y. Li, S. Aldrin, D. Ward || d3e3e3@gmail.com, vishwas@ionosnetworks.com, liyizhou@huawei.com, sam.aldrin@huawei.com, dward@cisco.com +# RFC7179 || D. Eastlake 3rd, A. Ghanwani, V. Manral, Y. Li, C. Bestler || d3e3e3@gmail.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, liyizhou@huawei.com, caitlin.bestler@nexenta.com +# RFC7180 || D. Eastlake 3rd, M. Zhang, A. Ghanwani, V. Manral, A. Banerjee || d3e3e3@gmail.com, zhangmingui@huawei.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, ayabaner@gmail.com +# RFC7181 || T. Clausen, C. Dearlove, P. Jacquet, U. Herberg || T.Clausen@computer.org, chris.dearlove@baesystems.com, philippe.jacquet@alcatel-lucent.com, ulrich@herberg.name +# RFC7182 || U. Herberg, T. Clausen, C. Dearlove || ulrich@herberg.name, T.Clausen@computer.org, chris.dearlove@baesystems.com +# RFC7183 || U. Herberg, C. Dearlove, T. Clausen || ulrich@herberg.name, chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7184 || U. Herberg, R. Cole, T. Clausen || ulrich@herberg.name, robert.g.cole@us.army.mil, T.Clausen@computer.org +# RFC7185 || C. Dearlove, T. Clausen, P. Jacquet || chris.dearlove@baesystems.com, T.Clausen@computer.org, philippe.jacquet@alcatel-lucent.com +# RFC7186 || J. Yi, U. Herberg, T. Clausen || jiazi@jiaziyi.com, ulrich@herberg.name, T.Clausen@computer.org +# RFC7187 || C. Dearlove, T. Clausen || chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7188 || C. Dearlove, T. Clausen || chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7189 || G. Mirsky || gregory.mirsky@ericsson.com +# RFC7190 || C. Villamizar || curtis@occnc.com +# RFC7191 || R. Housley || housley@vigilsec.com +# RFC7192 || S. Turner || turners@ieca.com +# RFC7193 || S. Turner, R. Housley, J. Schaad || turners@ieca.com, housley@vigilsec.com, ietf@augustcellars.com +# RFC7194 || R. Hartmann || richih.mailinglist@gmail.com +# RFC7195 || M. Garcia-Martin, S. Veikkolainen || miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com +# RFC7196 || C. Pelsser, R. Bush, K. Patel, P. Mohapatra, O. Maennel || cristel@iij.ad.jp, randy@psg.com, keyupate@cisco.com, mpradosh@yahoo.com, o@maennel.net +# RFC7197 || A. Begen, Y. Cai, H. Ou || abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com +# RFC7198 || A. Begen, C. Perkins || abegen@cisco.com, csp@csperkins.org +# RFC7199 || R. Barnes, M. Thomson, J. Winterbottom, H. Tschofenig || rlb@ipv.sx, martin.thomson@gmail.com, a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net +# RFC7200 || C. Shen, H. Schulzrinne, A. Koike || charles@cs.columbia.edu, schulzrinne@cs.columbia.edu, koike.arata@lab.ntt.co.jp +# RFC7201 || M. Westerlund, C. Perkins || magnus.westerlund@ericsson.com, csp@csperkins.org +# RFC7202 || C. Perkins, M. Westerlund || csp@csperkins.org, magnus.westerlund@ericsson.com +# RFC7203 || T. Takahashi, K. Landfield, Y. Kadobayashi || takeshi_takahashi@nict.go.jp, kent_landfield@mcafee.com, youki-k@is.aist-nara.ac.jp +# RFC7204 || T. Haynes || tdh@excfb.com +# RFC7205 || A. Romanow, S. Botzko, M. Duckworth, R. Even, Ed. || allyn@cisco.com, stephen.botzko@polycom.com, mark.duckworth@polycom.com, roni.even@mail01.huawei.com +# RFC7206 || P. Jones, G. Salgueiro, J. Polk, L. Liess, H. Kaplan || paulej@packetizer.com, gsalguei@cisco.com, jmpolk@cisco.com, laura.liess.dt@gmail.com, hadriel.kaplan@oracle.com +# RFC7207 || M. Ortseifen, G. Dickfeld || iso20022@bundesbank.de, iso20022@bundesbank.de +# RFC7208 || S. Kitterman || scott@kitterman.com +# RFC7209 || A. Sajassi, R. Aggarwal, J. Uttaro, N. Bitar, W. Henderickx, A. Isaac || sajassi@cisco.com, raggarwa_1@yahoo.com, uttaro@att.com, nabil.n.bitar@verizon.com, wim.henderickx@alcatel-lucent.com, aisaac71@bloomberg.net +# RFC7210 || R. Housley, T. Polk, S. Hartman, D. Zhang || housley@vigilsec.com, tim.polk@nist.gov, hartmans-ietf@mit.edu, zhangdacheng@huawei.com +# RFC7211 || S. Hartman, D. Zhang || hartmans-ietf@mit.edu, zhangdacheng@huawei.com +# RFC7212 || D. Frost, S. Bryant, M. Bocci || frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com +# RFC7213 || D. Frost, S. Bryant, M. Bocci || frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com +# RFC7214 || L. Andersson, C. Pignataro || loa@mail01.huawei.com, cpignata@cisco.com +# RFC7215 || L. Jakab, A. Cabellos-Aparicio, F. Coras, J. Domingo-Pascual, D. Lewis || lojakab@cisco.com, acabello@ac.upc.edu, fcoras@ac.upc.edu, jordi.domingo@ac.upc.edu, darlewis@cisco.com +# RFC7216 || M. Thomson, R. Bellis || martin.thomson@gmail.com, ray.bellis@nominet.org.uk +# RFC7217 || F. Gont || fgont@si6networks.com +# RFC7218 || O. Gudmundsson || ogud@ogud.com +# RFC7219 || M. Bagnulo, A. Garcia-Martinez || marcelo@it.uc3m.es, alberto@it.uc3m.es +# RFC7220 || M. Boucadair, R. Penno, D. Wing || mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com +# RFC7221 || A. Farrel, D. Crocker, Ed. || adrian@olddog.co.uk, dcrocker@bbiw.net +# RFC7222 || M. Liebsch, P. Seite, H. Yokota, J. Korhonen, S. Gundavelli || liebsch@neclab.eu, pierrick.seite@orange.com, yokota@kddilabs.jp, jouni.nospam@gmail.com, sgundave@cisco.com +# RFC7223 || M. Bjorklund || mbj@tail-f.com +# RFC7224 || M. Bjorklund || mbj@tail-f.com +# RFC7225 || M. Boucadair || mohamed.boucadair@orange.com +# RFC7226 || C. Villamizar, Ed., D. McDysan, Ed., S. Ning, A. Malis, L. Yong || curtis@occnc.com, dave.mcdysan@verizon.com, ning.so@tatacommunications.com, agmalis@gmail.com, lucy.yong@huawei.com +# RFC7227 || D. Hankins, T. Mrugalski, M. Siodelski, S. Jiang, S. Krishnan || dhankins@google.com, tomasz.mrugalski@gmail.com, msiodelski@gmail.com, jiangsheng@huawei.com, suresh.krishnan@ericsson.com +# RFC7228 || C. Bormann, M. Ersue, A. Keranen || cabo@tzi.org, mehmet.ersue@nsn.com, ari.keranen@ericsson.com +# RFC7229 || R. Housley || housley@vigilsec.com +# RFC7230 || R. Fielding, Ed., J. Reschke, Ed. || fielding@gbiv.com, julian.reschke@greenbytes.de +# RFC7231 || R. Fielding, Ed., J. Reschke, Ed. || fielding@gbiv.com, julian.reschke@greenbytes.de +# RFC7232 || R. Fielding, Ed., J. Reschke, Ed. || fielding@gbiv.com, julian.reschke@greenbytes.de +# RFC7233 || R. Fielding, Ed., Y. Lafon, Ed., J. Reschke, Ed. || fielding@gbiv.com, ylafon@w3.org, julian.reschke@greenbytes.de +# RFC7234 || R. Fielding, Ed., M. Nottingham, Ed., J. Reschke, Ed. || fielding@gbiv.com, mnot@mnot.net, julian.reschke@greenbytes.de +# RFC7235 || R. Fielding, Ed., J. Reschke, Ed. || fielding@gbiv.com, julian.reschke@greenbytes.de +# RFC7236 || J. Reschke || julian.reschke@greenbytes.de +# RFC7237 || J. Reschke || julian.reschke@greenbytes.de +# RFC7238 || J. Reschke || julian.reschke@greenbytes.de +# RFC7239 || A. Petersson, M. Nilsson || andreas@sbin.se, nilsson@opera.com +# RFC7240 || J. Snell || jasnell@gmail.com +# RFC7241 || S. Dawkins, P. Thaler, D. Romascanu, B. Aboba, Ed. || spencerdawkins.ietf@gmail.com, pthaler@broadcom.com, dromasca@gmail.com , bernard_aboba@hotmail.com +# RFC7242 || M. Demmer, J. Ott, S. Perreault || demmer@cs.berkeley.edu, jo@netlab.tkk.fi, simon@per.reau.lt +# RFC7243 || V. Singh, Ed., J. Ott, I. Curcio || varun@comnet.tkk.fi, jo@comnet.tkk.fi, igor.curcio@nokia.com +# RFC7244 || H. Asaeda, Q. Wu, R. Huang || asaeda@nict.go.jp, bill.wu@huawei.com, Rachel@huawei.com +# RFC7245 || A. Hutton, Ed., L. Portman, Ed., R. Jain, K. Rehor || andrew.hutton@unify.com, leon.portman@gmail.com, rajnish.jain@outlook.com, krehor@cisco.com +# RFC7246 || IJ. Wijnands, Ed., P. Hitchen, N. Leymann, W. Henderickx, A. Gulko, J. Tantsura || ice@cisco.com, paul.hitchen@bt.com, n.leymann@telekom.de, wim.henderickx@alcatel-lucent.com, arkadiy.gulko@thomsonreuters.com, jeff.tantsura@ericsson.com +# RFC7247 || P. Saint-Andre, A. Houri, J. Hildebrand || ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com +# RFC7248 || P. Saint-Andre, A. Houri, J. Hildebrand || ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com +# RFC7249 || R. Housley || housley@vigilsec.com +# RFC7250 || P. Wouters, Ed., H. Tschofenig, Ed., J. Gilmore, S. Weiler, T. Kivinen || pwouters@redhat.com, Hannes.Tschofenig@gmx.net, gnu@toad.com, weiler@tislabs.com, kivinen@iki.fi +# RFC7251 || D. McGrew, D. Bailey, M. Campagna, R. Dugal || mcgrew@cisco.com, danbailey@sth.rub.de, mcampagna@gmail.com, rdugal@certicom.com +# RFC7252 || Z. Shelby, K. Hartke, C. Bormann || zach.shelby@arm.com, hartke@tzi.org, cabo@tzi.org +# RFC7253 || T. Krovetz, P. Rogaway || ted@krovetz.net, rogaway@cs.ucdavis.edu +# RFC7254 || M. Montemurro, Ed., A. Allen, D. McDonald, P. Gosden || mmontemurro@blackberry.com, aallen@blackberry.com, david.mcdonald@meteor.ie, pgosden@gsma.com +# RFC7255 || A. Allen, Ed. || aallen@blackberry.com +# RFC7256 || F. Le Faucheur, R. Maglione, T. Taylor || flefauch@cisco.com, robmgl@cisco.com, tom.taylor.stds@gmail.com +# RFC7257 || T. Nadeau, Ed., A. Kiran Koushik, Ed., R. Mediratta, Ed. || tnadeau@lucidvision.com, kkoushik@brocade.com, romedira@cisco.com +# RFC7258 || S. Farrell, H. Tschofenig || stephen.farrell@cs.tcd.ie, Hannes.Tschofenig@gmx.net +# RFC7259 || P. Saint-Andre || ietf@stpeter.im +# RFC7260 || A. Takacs, D. Fedyk, J. He || attila.takacs@ericsson.com, don.fedyk@hp.com, hejia@huawei.com +# RFC7261 || M. Perumal, P. Ravindran || mperumal@cisco.com, partha@parthasarathi.co.in +# RFC7262 || A. Romanow, S. Botzko, M. Barnes || allyn@cisco.com, stephen.botzko@polycom.com, mary.ietf.barnes@gmail.com +# RFC7263 || N. Zong, X. Jiang, R. Even, Y. Zhang || zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com +# RFC7264 || N. Zong, X. Jiang, R. Even, Y. Zhang || zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com +# RFC7265 || P. Kewisch, C. Daboo, M. Douglass || mozilla@kewis.ch, cyrus@daboo.name, douglm@rpi.edu +# RFC7266 || A. Clark, Q. Wu, R. Schott, G. Zorn || alan.d.clark@telchemy.com, sunseawq@huawei.com, Roland.Schott@telekom.de, gwz@net-zen.net +# RFC7267 || L. Martini, Ed., M. Bocci, Ed., F. Balus, Ed. || lmartini@cisco.com, matthew.bocci@alcatel-lucent.com, florin@nuagenetworks.net +# RFC7268 || B. Aboba, J. Malinen, P. Congdon, J. Salowey, M. Jones || Bernard_Aboba@hotmail.com, j@w1.fi, paul.congdon@tallac.com, jsalowey@cisco.com, mark@azu.ca +# RFC7269 || G. Chen, Z. Cao, C. Xie, D. Binet || chengang@chinamobile.com, caozhen@chinamobile.com, xiechf@ctbri.com.cn, david.binet@orange.com +# RFC7270 || A. Yourtchenko, P. Aitken, B. Claise || ayourtch@cisco.com, paitken@cisco.com, bclaise@cisco.com +# RFC7271 || J. Ryoo, Ed., E. Gray, Ed., H. van Helvoort, A. D'Alessandro, T. Cheung, E. Osborne || ryoo@etri.re.kr, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, alessandro.dalessandro@telecomitalia.it, cts@etri.re.kr, eric.osborne@notcom.com +# RFC7272 || R. van Brandenburg, H. Stokking, O. van Deventer, F. Boronat, M. Montagud, K. Gross || ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl, oskar.vandeventer@tno.nl, fboronat@dcom.upv.es, mamontor@posgrado.upv.es, kevin.gross@avanw.com +# RFC7273 || A. Williams, K. Gross, R. van Brandenburg, H. Stokking || aidan.williams@audinate.com, kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl +# RFC7274 || K. Kompella, L. Andersson, A. Farrel || kireeti.kompella@gmail.com, loa@mail01.huawei.com, adrian@olddog.co.uk +# RFC7275 || L. Martini, S. Salam, A. Sajassi, M. Bocci, S. Matsushima, T. Nadeau || lmartini@cisco.com, ssalam@cisco.com, sajassi@cisco.com, matthew.bocci@alcatel-lucent.com, satoru.matsushima@gmail.com, tnadeau@brocade.com +# RFC7276 || T. Mizrahi, N. Sprecher, E. Bellagamba, Y. Weingarten || talmi@marvell.com, nurit.sprecher@nsn.com, elisa.bellagamba@ericsson.com, wyaacov@gmail.com +# RFC7277 || M. Bjorklund || mbj@tail-f.com +# RFC7278 || C. Byrne, D. Drown, A. Vizdal || cameron.byrne@t-mobile.com, dan@drown.org, ales.vizdal@t-mobile.cz +# RFC7279 || M. Shore, C. Pignataro || melinda.shore@nomountain.net, cpignata@cisco.com +# RFC7280 || G. Fairhurst || gorry@erg.abdn.ac.uk +# RFC7281 || A. Melnikov || Alexey.Melnikov@isode.com +# RFC7282 || P. Resnick || presnick@qti.qualcomm.com +# RFC7283 || Y. Cui, Q. Sun, T. Lemon || yong@csnet1.cs.tsinghua.edu.cn, sunqi@csnet1.cs.tsinghua.edu.cn, Ted.Lemon@nominum.com +# RFC7284 || M. Lanthaler || mail@markus-lanthaler.com +# RFC7285 || R. Alimi, Ed., R. Penno, Ed., Y. Yang, Ed., S. Kiesel, S. Previdi, W. Roome, S. Shalunov, R. Woundy || ralimi@google.com, repenno@cisco.com, yry@cs.yale.edu, ietf-alto@skiesel.de, sprevidi@cisco.com, w.roome@alcatel-lucent.com, shalunov@shlang.com, Richard_Woundy@cable.comcast.com +# RFC7286 || S. Kiesel, M. Stiemerling, N. Schwan, M. Scharf, H. Song || ietf-alto@skiesel.de, mls.ietf@gmail.com, ietf@nico-schwan.de, michael.scharf@alcatel-lucent.com, haibin.song@huawei.com +# RFC7287 || T. Schmidt, Ed., S. Gao, H. Zhang, M. Waehlisch || Schmidt@informatik.haw-hamburg.de, shgao@bjtu.edu.cn, hkzhang@bjtu.edu.cn, mw@link-lab.net +# RFC7288 || D. Thaler || dthaler@microsoft.com +# RFC7289 || V. Kuarsingh, Ed., J. Cianfarani || victor@jvknet.com, john.cianfarani@rci.rogers.com +# RFC7290 || L. Ciavattone, R. Geib, A. Morton, M. Wieser || lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de +# RFC7291 || M. Boucadair, R. Penno, D. Wing || mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com +# RFC7292 || K. Moriarty, Ed., M. Nystrom, S. Parkinson, A. Rusch, M. Scott || Kathleen.Moriarty@emc.com, mnystrom@microsoft.com, sean.parkinson@rsa.com, andreas.rusch@rsa.com, michael2.scott@rsa.com +# RFC7293 || W. Mills, M. Kucherawy || wmills_92105@yahoo.com, msk@fb.com +# RFC7294 || A. Clark, G. Zorn, C. Bi, Q. Wu || alan.d.clark@telchemy.com, gwz@net-zen.net, bijy@sttri.com.cn, sunseawq@huawei.com +# RFC7295 || H. Tschofenig, L. Eggert, Z. Sarker || Hannes.Tschofenig@gmx.net, lars@netapp.com, Zaheduzzaman.Sarker@ericsson.com +# RFC7296 || C. Kaufman, P. Hoffman, Y. Nir, P. Eronen, T. Kivinen || charliekaufman@outlook.com, paul.hoffman@vpnc.org, nir.ietf@gmail.com, pe@iki.fi, kivinen@iki.fi +# RFC7297 || M. Boucadair, C. Jacquenet, N. Wang || mohamed.boucadair@orange.com, christian.jacquenet@orange.com, n.wang@surrey.ac.uk +# RFC7298 || D. Ovsienko || infrastation@yandex.ru +# RFC7299 || R. Housley || housley@vigilsec.com +# RFC7300 || J. Haas, J. Mitchell || jhaas@juniper.net, jon.mitchell@microsoft.com +# RFC7301 || S. Friedl, A. Popov, A. Langley, E. Stephan || sfriedl@cisco.com, andreipo@microsoft.com, agl@google.com, emile.stephan@orange.com +# RFC7302 || P. Lemieux || pal@sandflow.com +# RFC7303 || H. Thompson, C. Lilley || ht@inf.ed.ac.uk, chris@w3.org +# RFC7304 || W. Kumari || warren@kumari.net +# RFC7305 || E. Lear, Ed. || lear@cisco.com +# RFC7306 || H. Shah, F. Marti, W. Noureddine, A. Eiriksson, R. Sharp || hemal@broadcom.com, felix@chelsio.com, asgeir@chelsio.com, wael@chelsio.com, robert.o.sharp@intel.com +# RFC7307 || Q. Zhao, K. Raza, C. Zhou, L. Fang, L. Li, D. King || quintin.zhao@huawei.com, skraza@cisco.com, czhou@cisco.com, lufang@microsoft.com, lilianyuan@chinamobile.com, daniel@olddog.co.uk +# RFC7308 || E. Osborne || none +# RFC7309 || Z. Liu, L. Jin, R. Chen, D. Cai, S. Salam || zhliu@gsta.com, lizho.jin@gmail.com, chen.ran@zte.com.cn, dcai@cisco.com, ssalam@cisco.com +# RFC7310 || J. Lindsay, H. Foerster || lindsay@worldcastsystems.com, foerster@worldcastsystems.com +# RFC7311 || P. Mohapatra, R. Fernando, E. Rosen, J. Uttaro || mpradosh@yahoo.com, rex@cisco.com, erosen@cisco.com, uttaro@att.com +# RFC7312 || J. Fabini, A. Morton || joachim.fabini@tuwien.ac.at, acmorton@att.com +# RFC7313 || K. Patel, E. Chen, B. Venkatachalapathy || keyupate@cisco.com, enkechen@cisco.com, balaji_pv@hotmail.com +# RFC7314 || M. Andrews || marka@isc.org +# RFC7315 || R. Jesske, K. Drage, C. Holmberg || r.jesske@telekom.de, drage@alcatel-lucent.com, christer.holmberg@ericsson.com +# RFC7316 || J. van Elburg, K. Drage, M. Ohsugi, S. Schubert, K. Arai || ietf.hanserik@gmail.com, drage@alcatel-lucent.com, mayumi.ohsugi@ntt-at.co.jp, shida@ntt-at.com, arai.kenjiro@lab.ntt.co.jp +# RFC7317 || A. Bierman, M. Bjorklund || andy@yumaworks.com, mbj@tail-f.com +# RFC7318 || A. Newton, G. Huston || andy@arin.net, gih@apnic.net +# RFC7319 || D. Eastlake 3rd || d3e3e3@gmail.com +# RFC7320 || M. Nottingham || mnot@mnot.net +# RFC7321 || D. McGrew, P. Hoffman || mcgrew@cisco.com, paul.hoffman@vpnc.org +# RFC7322 || H. Flanagan, S. Ginoza || rse@rfc-editor.org, rfc-editor@rfc-editor.org +# RFC7323 || D. Borman, B. Braden, V. Jacobson, R. Scheffenegger, Ed. || david.borman@quantum.com, braden@isi.edu, vanj@google.com, rs@netapp.com +# RFC7324 || E. Osborne || eric.osborne@notcom.com +# RFC7325 || C. Villamizar, Ed., K. Kompella, S. Amante, A. Malis, C. Pignataro || curtis@occnc.com, kireeti@juniper.net, amante@apple.com, agmalis@gmail.com, cpignata@cisco.com +# RFC7326 || J. Parello, B. Claise, B. Schoening, J. Quittek || jparello@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@netlab.nec.de +# RFC7328 || R. Gieben || miek@google.com +# RFC7329 || H. Kaplan || hadrielk@yahoo.com +# RFC7330 || T. Nadeau, Z. Ali, N. Akiya || tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com +# RFC7331 || T. Nadeau, Z. Ali, N. Akiya || tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com +# RFC7332 || H. Kaplan, V. Pascual || hadrielk@yahoo.com, victor.pascual@quobis.com +# RFC7333 || H. Chan, Ed., D. Liu, P. Seite, H. Yokota, J. Korhonen || h.a.chan@ieee.org, liudapeng@chinamobile.com, pierrick.seite@orange.com, hidetoshi.yokota@landisgyr.com, jouni.nospam@gmail.com +# RFC7334 || Q. Zhao, D. Dhody, D. King, Z. Ali, R. Casellas || quintin.zhao@huawei.com, dhruv.dhody@huawei.com, daniel@olddog.co.uk, zali@cisco.com, ramon.casellas@cttc.es +# RFC7335 || C. Byrne || cameron.byrne@t-mobile.com +# RFC7336 || L. Peterson, B. Davie, R. van Brandenburg, Ed. || lapeters@akamai.com, bdavie@vmware.com, ray.vanbrandenburg@tno.nl +# RFC7337 || K. Leung, Ed., Y. Lee, Ed. || kleung@cisco.com, yiu_lee@cable.comcast.com +# RFC7338 || F. Jounay, Ed., Y. Kamite, Ed., G. Heron, M. Bocci || frederic.jounay@orange.ch, y.kamite@ntt.com, giheron@cisco.com, Matthew.Bocci@alcatel-lucent.com +# RFC7339 || V. Gurbani, Ed., V. Hilt, H. Schulzrinne || vkg@bell-labs.com, volker.hilt@bell-labs.com, hgs@cs.columbia.edu +# RFC7340 || J. Peterson, H. Schulzrinne, H. Tschofenig || jon.peterson@neustar.biz, hgs@cs.columbia.edu, Hannes.Tschofenig@gmx.net +# RFC7341 || Q. Sun, Y. Cui, M. Siodelski, S. Krishnan, I. Farrer || sunqi@csnet1.cs.tsinghua.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, msiodelski@gmail.com, suresh.krishnan@ericsson.com, ian.farrer@telekom.de +# RFC7342 || L. Dunbar, W. Kumari, I. Gashinsky || ldunbar@huawei.com, warren@kumari.net, igor@yahoo-inc.com +# RFC7343 || J. Laganier, F. Dupont || julien.ietf@gmail.com, fdupont@isc.org +# RFC7344 || W. Kumari, O. Gudmundsson, G. Barwood || warren@kumari.net, ogud@ogud.com, george.barwood@blueyonder.co.uk +# RFC7345 || C. Holmberg, I. Sedlacek, G. Salgueiro || christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, gsalguei@cisco.com +# RFC7346 || R. Droms || rdroms.ietf@gmail.com +# RFC7347 || H. van Helvoort, Ed., J. Ryoo, Ed., H. Zhang, F. Huang, H. Li, A. D'Alessandro || huub@van-helvoort.eu, ryoo@etri.re.kr, zhanghaiyan@huawei.com, feng.huang@philips.com, lihan@chinamobile.com, alessandro.dalessandro@telecomitalia.it +# RFC7348 || M. Mahalingam, D. Dutt, K. Duda, P. Agarwal, L. Kreeger, T. Sridhar, M. Bursell, C. Wright || mallik_mahalingam@yahoo.com, ddutt.ietf@hobbesdutt.com, kduda@arista.com, pagarwal@broadcom.com, kreeger@cisco.com, tsridhar@vmware.com, mike.bursell@intel.com, chrisw@redhat.com +# RFC7349 || L. Zheng, M. Chen, M. Bhatia || vero.zheng@huawei.com, mach.chen@huawei.com, manav@ionosnetworks.com +# RFC7350 || M. Petit-Huguenin, G. Salgueiro || marcph@getjive.com, gsalguei@cisco.com +# RFC7351 || E. Wilde || dret@berkeley.edu +# RFC7352 || S. Bosch || stephan@rename-it.nl +# RFC7353 || S. Bellovin, R. Bush, D. Ward || bellovin@acm.org, randy@psg.com, dward@cisco.com +# RFC7354 || A. Adolf, P. Siebert || alexander.adolf@condition-alpha.com, dvb@dvb.org +# RFC7355 || G. Salgueiro, V. Pascual, A. Roman, S. Garcia || gsalguei@cisco.com, victor.pascual@quobis.com, anton.roman@quobis.com, sergio.garcia@quobis.com +# RFC7356 || L. Ginsberg, S. Previdi, Y. Yang || ginsberg@cisco.com, sprevidi@cisco.com, yiya@cisco.com +# RFC7357 || H. Zhai, F. Hu, R. Perlman, D. Eastlake 3rd, O. Stokes || zhai.hongjun@zte.com.cn, hu.fangwei@zte.com.cn, Radia@alum.mit.edu, d3e3e3@gmail.com, ostokes@extremenetworks.com +# RFC7358 || K. Raza, S. Boutros, L. Martini, N. Leymann || skraza@cisco.com, sboutros@cisco.com, lmartini@cisco.com, n.leymann@telekom.de +# RFC7359 || F. Gont || fgont@si6networks.com +# RFC7360 || A. DeKok || aland@freeradius.org +# RFC7361 || P. Dutta, F. Balus, O. Stokes, G. Calvignac, D. Fedyk || pranjal.dutta@alcatel-lucent.com, florin.balus@alcatel-lucent.com, ostokes@extremenetworks.com, geraldine.calvignac@orange.com, don.fedyk@hp.com +# RFC7362 || E. Ivov, H. Kaplan, D. Wing || emcho@jitsi.org, hadrielk@yahoo.com, dwing-ietf@fuggles.com +# RFC7363 || J. Maenpaa, G. Camarillo || Jouni.Maenpaa@ericsson.com, Gonzalo.Camarillo@ericsson.com +# RFC7364 || T. Narten, Ed., E. Gray, Ed., D. Black, L. Fang, L. Kreeger, M. Napierala || narten@us.ibm.com, Eric.Gray@Ericsson.com, david.black@emc.com, lufang@microsoft.com, kreeger@cisco.com, mnapierala@att.com +# RFC7365 || M. Lasserre, F. Balus, T. Morin, N. Bitar, Y. Rekhter || marc.lasserre@alcatel-lucent.com, florin.balus@alcatel-lucent.com, thomas.morin@orange.com, nabil.n.bitar@verizon.com, yakov@juniper.net +# RFC7366 || P. Gutmann || pgut001@cs.auckland.ac.nz +# RFC7367 || R. Cole, J. Macker, B. Adamson || robert.g.cole@us.army.mil, macker@itd.nrl.navy.mil, adamson@itd.nrl.navy.mil +# RFC7368 || T. Chown, Ed., J. Arkko, A. Brandt, O. Troan, J. Weil || tjc@ecs.soton.ac.uk, jari.arkko@piuha.net, Anders_Brandt@sigmadesigns.com, ot@cisco.com, jason.weil@twcable.com +# RFC7369 || A. Takacs, B. Gero, H. Long || attila.takacs@ericsson.com, balazs.peter.gero@ericsson.com, lonho@huawei.com +# RFC7370 || L. Ginsberg || ginsberg@cisco.com +# RFC7371 || M. Boucadair, S. Venaas || mohamed.boucadair@orange.com, stig@cisco.com +# RFC7372 || M. Kucherawy || superuser@gmail.com +# RFC7373 || B. Trammell || ietf@trammell.ch +# RFC7374 || J. Maenpaa, G. Camarillo || Jouni.Maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com +# RFC7375 || J. Peterson || jon.peterson@neustar.biz +# RFC7376 || T. Reddy, R. Ravindranath, M. Perumal, A. Yegin || tireddy@cisco.com, rmohanr@cisco.com, muthu.arul@gmail.com, alper.yegin@yegin.org +# RFC7377 || B. Leiba, A. Melnikov || barryleiba@computer.org, alexey.melnikov@isode.com +# RFC7378 || H. Tschofenig, H. Schulzrinne, B. Aboba, Ed. || Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, Bernard_Aboba@hotmail.com +# RFC7379 || Y. Li, W. Hao, R. Perlman, J. Hudson, H. Zhai || liyizhou@huawei.com, haoweiguo@huawei.com, radia@alum.mit.edu, jon.hudson@gmail.com, honjun.zhai@tom.com +# RFC7380 || J. Tong, C. Bi, Ed., R. Even, Q. Wu, Ed., R. Huang || tongjg@sttri.com.cn, bijy@sttri.com.cn, roni.even@mail01.huawei.com, bill.wu@huawei.com, rachel.huang@huawei.com +# RFC7381 || K. Chittimaneni, T. Chown, L. Howard, V. Kuarsingh, Y. Pouffary, E. Vyncke || kk@dropbox.com, tjc@ecs.soton.ac.uk, lee.howard@twcable.com, victor@jvknet.com, yanick.pouffary@hp.com, evyncke@cisco.com +# RFC7382 || S. Kent, D. Kong, K. Seo || skent@bbn.com, dkong@bbn.com, kseo@bbn.com +# RFC7383 || V. Smyslov || svan@elvis.ru +# RFC7384 || T. Mizrahi || talmi@marvell.com +# RFC7385 || L. Andersson, G. Swallow || loa@mail01.huawei.com, swallow@cisco.com +# RFC7386 || P. Hoffman, J. Snell || paul.hoffman@vpnc.org, jasnell@gmail.com +# RFC7387 || R. Key, Ed., L. Yong, Ed., S. Delord, F. Jounay, L. Jin || raymond.key@ieee.org, lucy.yong@huawei.com, simon.delord@gmail.com, frederic.jounay@orange.ch, lizho.jin@gmail.com +# RFC7388 || J. Schoenwaelder, A. Sehgal, T. Tsou, C. Zhou || j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de, tina.tsou.zouting@huawei.com, cathyzhou@huawei.com +# RFC7389 || R. Wakikawa, R. Pazhyannur, S. Gundavelli, C. Perkins || ryuji.wakikawa@gmail.com, rpazhyan@cisco.com, sgundave@cisco.com, charliep@computer.org +# RFC7390 || A. Rahman, Ed., E. Dijk, Ed. || Akbar.Rahman@InterDigital.com, esko.dijk@philips.com +# RFC7391 || J. Hadi Salim || hadi@mojatatu.com +# RFC7392 || P. Dutta, M. Bocci, L. Martini || pranjal.dutta@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com, lmartini@cisco.com +# RFC7393 || X. Deng, M. Boucadair, Q. Zhao, J. Huang, C. Zhou || dxhbupt@gmail.com, mohamed.boucadair@orange.com, zhaoqin.bupt@gmail.com, james.huang@huawei.com, cathy.zhou@huawei.com +# RFC7394 || S. Boutros, S. Sivabalan, G. Swallow, S. Saxena, V. Manral, S. Aldrin || sboutros@cisco.com, msiva@cisco.com, swallow@cisco.com, ssaxena@cisco.com, vishwas@ionosnetworks.com, aldrin.ietf@gmail.com +# RFC7395 || L. Stout, Ed., J. Moffitt, E. Cestari || lance@andyet.net, jack@metajack.im, eric@cstar.io +# RFC7396 || P. Hoffman, J. Snell || paul.hoffman@vpnc.org, jasnell@gmail.com +# RFC7397 || J. Gilger, H. Tschofenig || Gilger@ITSec.RWTH-Aachen.de, Hannes.tschofenig@gmx.net +# RFC7398 || M. Bagnulo, T. Burbridge, S. Crawford, P. Eardley, A. Morton || marcelo@it.uc3m.es, trevor.burbridge@bt.com, sam@samknows.com, philip.eardley@bt.com, acmorton@att.com +# RFC7399 || A. Farrel, D. King || adrian@olddog.co.uk, daniel@olddog.co.uk +# RFC7400 || C. Bormann || cabo@tzi.org +# RFC7401 || R. Moskowitz, Ed., T. Heer, P. Jokela, T. Henderson || rgm@labs.htt-consult.com, tobias.heer@belden.com, petri.jokela@nomadiclab.com, tomhend@u.washington.edu +# RFC7402 || P. Jokela, R. Moskowitz, J. Melen || petri.jokela@nomadiclab.com, rgm@labs.htt-consult.com, jan.melen@nomadiclab.com +# RFC7403 || H. Kaplan || hadrielk@yahoo.com +# RFC7404 || M. Behringer, E. Vyncke || mbehring@cisco.com, evyncke@cisco.com +# RFC7405 || P. Kyzivat || pkyzivat@alum.mit.edu +# RFC7406 || H. Schulzrinne, S. McCann, G. Bajko, H. Tschofenig, D. Kroeselberg || hgs+ecrit@cs.columbia.edu, smccann@blackberry.com, gabor.bajko@mediatek.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com +# RFC7407 || M. Bjorklund, J. Schoenwaelder || mbj@tail-f.com, j.schoenwaelder@jacobs-university.de +# RFC7408 || E. Haleplidis || ehalep@ece.upatras.gr +# RFC7409 || E. Haleplidis, J. Halpern || ehalep@ece.upatras.gr, joel.halpern@ericsson.com +# RFC7410 || M. Kucherawy || superuser@gmail.com +# RFC7411 || T. Schmidt, Ed., M. Waehlisch, R. Koodli, G. Fairhurst, D. Liu || t.schmidt@haw-hamburg.de, mw@link-lab.net, rajeev.koodli@intel.com, gorry@erg.abdn.ac.uk, liudapeng@chinamobile.com +# RFC7412 || Y. Weingarten, S. Aldrin, P. Pan, J. Ryoo, G. Mirsky || wyaacov@gmail.com, aldrin.ietf@gmail.com, ppan@infinera.com, ryoo@etri.re.kr, gregory.mirsky@ericsson.com +# RFC7413 || Y. Cheng, J. Chu, S. Radhakrishnan, A. Jain || ycheng@google.com, hkchu@google.com, sivasankar@cs.ucsd.edu, arvind@google.com +# RFC7414 || M. Duke, R. Braden, W. Eddy, E. Blanton, A. Zimmermann || m.duke@f5.com, braden@isi.edu, wes@mti-systems.com, elb@interruptsciences.com, alexander.zimmermann@netapp.com +# RFC7415 || E. Noel, P. Williams || ecnoel@att.com, phil.m.williams@bt.com +# RFC7416 || T. Tsao, R. Alexander, M. Dohler, V. Daza, A. Lozano, M. Richardson, Ed. || tzetatsao@eaton.com, rogeralexander@eaton.com, mischa.dohler@kcl.ac.uk, vanesa.daza@upf.edu, angel.lozano@upf.edu, mcr+ietf@sandelman.ca +# RFC7417 || G. Karagiannis, A. Bhargava || georgios.karagiannis@huawei.com, anuragb@cisco.com +# RFC7418 || S. Dawkins, Ed. || spencerdawkins.ietf@gmail.com +# RFC7419 || N. Akiya, M. Binderberger, G. Mirsky || nobo@cisco.com, mbinderb@cisco.com, gregory.mirsky@ericsson.com +# RFC7420 || A. Koushik, E. Stephan, Q. Zhao, D. King, J. Hardwick || kkoushik@brocade.com, emile.stephan@orange.com, qzhao@huawei.com, daniel@olddog.co.uk, jonathan.hardwick@metaswitch.com +# RFC7421 || B. Carpenter, Ed., T. Chown, F. Gont, S. Jiang, A. Petrescu, A. Yourtchenko || brian.e.carpenter@gmail.com, tjc@ecs.soton.ac.uk, fgont@si6networks.com, jiangsheng@huawei.com, alexandru.petrescu@cea.fr, ayourtch@cisco.com +# RFC7422 || C. Donley, C. Grundemann, V. Sarawat, K. Sundaresan, O. Vautrin || c.donley@cablelabs.com, cgrundemann@gmail.com, v.sarawat@cablelabs.com, k.sundaresan@cablelabs.com, Olivier@juniper.net +# RFC7423 || L. Morand, Ed., V. Fajardo, H. Tschofenig || lionel.morand@orange.com, vf0213@gmail.com, Hannes.Tschofenig@gmx.net +# RFC7424 || R. Krishnan, L. Yong, A. Ghanwani, N. So, B. Khasnabish || ramkri123@gmail.com, lucy.yong@huawei.com, anoop@alumni.duke.edu, ningso@yahoo.com, vumip1@gmail.com +# RFC7425 || M. Thornburgh || mthornbu@adobe.com +# RFC7426 || E. Haleplidis, Ed., K. Pentikousis, Ed., S. Denazis, J. Hadi Salim, D. Meyer, O. Koufopavlou || ehalep@ece.upatras.gr, k.pentikousis@eict.de, sdena@upatras.gr, hadi@mojatatu.com, dmm@1-4-5.net, odysseas@ece.upatras.gr +# RFC7427 || T. Kivinen, J. Snyder || kivinen@iki.fi, jms@opus1.com +# RFC7428 || A. Brandt, J. Buron || anders_brandt@sigmadesigns.com, jakob_buron@sigmadesigns.com +# RFC7429 || D. Liu, Ed., JC. Zuniga, Ed., P. Seite, H. Chan, CJ. Bernardos || liudapeng@chinamobile.com, JuanCarlos.Zuniga@InterDigital.com, pierrick.seite@orange.com, h.a.chan@ieee.org, cjbc@it.uc3m.es +# RFC7430 || M. Bagnulo, C. Paasch, F. Gont, O. Bonaventure, C. Raiciu || marcelo@it.uc3m.es, christoph.paasch@gmail.com, fgont@si6networks.com, Olivier.Bonaventure@uclouvain.be, costin.raiciu@cs.pub.ro +# RFC7431 || A. Karan, C. Filsfils, IJ. Wijnands, Ed., B. Decraene || apoorva@cisco.com, cfilsfil@cisco.com, ice@cisco.com, bruno.decraene@orange.com +# RFC7432 || A. Sajassi, Ed., R. Aggarwal, N. Bitar, A. Isaac, J. Uttaro, J. Drake, W. Henderickx || sajassi@cisco.com, raggarwa_1@yahoo.com, nabil.n.bitar@verizon.com, aisaac71@bloomberg.net, uttaro@att.com, jdrake@juniper.net, wim.henderickx@alcatel-lucent.com +# RFC7433 || A. Johnston, J. Rafferty || alan.b.johnston@gmail.com, jay@humancomm.com +# RFC7434 || K. Drage, Ed., A. Johnston || keith.drage@alcatel-lucent.com, alan.b.johnston@gmail.com +# RFC7435 || V. Dukhovni || ietf-dane@dukhovni.org +# RFC7436 || H. Shah, E. Rosen, F. Le Faucheur, G. Heron || hshah@ciena.com, erosen@juniper.net, flefauch@cisco.com, giheron@cisco.com +# RFC7437 || M. Kucherawy, Ed. || superuser@gmail.com +# RFC7438 || IJ. Wijnands, Ed., E. Rosen, A. Gulko, U. Joorde, J. Tantsura || ice@cisco.com, erosen@juniper.net, arkadiy.gulko@thomsonreuters.com, uwe.joorde@telekom.de, jeff.tantsura@ericsson.com +# RFC7439 || W. George, Ed., C. Pignataro, Ed. || wesley.george@twcable.com, cpignata@cisco.com +# RFC7440 || P. Masotta || patrick.masotta.ietf@vercot.com +# RFC7441 || IJ. Wijnands, E. Rosen, U. Joorde || ice@cisco.com, erosen@juniper.net, uwe.joorde@telekom.de +# RFC7442 || Y. Rekhter, R. Aggarwal, N. Leymann, W. Henderickx, Q. Zhao, R. Li || yakov@juniper.net, raggarwa_1@yahoo.com, N.Leymann@telekom.de, wim.henderickx@alcatel-lucent.com, quintin.zhao@huawei.com, renwei.li@huawei.com +# RFC7443 || P. Patil, T. Reddy, G. Salgueiro, M. Petit-Huguenin || praspati@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, marc@petit-huguenin.org +# RFC7444 || K. Zeilenga, A. Melnikov || kurt.zeilenga@isode.com, alexey.melnikov@isode.com +# RFC7445 || G. Chen, H. Deng, D. Michaud, J. Korhonen, M. Boucadair || phdgang@gmail.com, denghui@chinamobile.com, dave.michaud@rci.rogers.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com +# RFC7446 || Y. Lee, Ed., G. Bernstein, Ed., D. Li, W. Imajuku || leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp +# RFC7447 || J. Scudder, K. Kompella || jgs@juniper.net, kireeti@juniper.net +# RFC7448 || T. Taylor, Ed., D. Romascanu || tom.taylor.stds@gmail.com, dromasca@gmail.com +# RFC7449 || Y. Lee, Ed., G. Bernstein, Ed., J. Martensson, T. Takeda, T. Tsuritani, O. Gonzalez de Dios || leeyoung@huawei.com, gregb@grotto-networking.com, jonas.martensson@acreo.se, tomonori.takeda@ntt.com, tsuri@kddilabs.jp, oscar.gonzalezdedios@telefonica.com +# RFC7450 || G. Bumgardner || gbumgard@gmail.com +# RFC7451 || S. Hollenbeck || shollenbeck@verisign.com +# RFC7452 || H. Tschofenig, J. Arkko, D. Thaler, D. McPherson || Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net, dthaler@microsoft.com, dmcpherson@verisign.com +# RFC7453 || V. Mahalingam, K. Sampath, S. Aldrin, T. Nadeau || venkat.mahalingams@gmail.com, kannankvs@gmail.com, aldrin.ietf@gmail.com, tnadeau@lucidvision.com +# RFC7454 || J. Durand, I. Pepelnjak, G. Doering || jerduran@cisco.com, ip@ipspace.net, gert@space.net +# RFC7455 || T. Senevirathne, N. Finn, S. Salam, D. Kumar, D. Eastlake 3rd, S. Aldrin, Y. Li || tsenevir@cisco.com, nfinn@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com, aldrin.ietf@gmail.com, liyizhou@huawei.com +# RFC7456 || T. Mizrahi, T. Senevirathne, S. Salam, D. Kumar, D. Eastlake 3rd || talmi@marvell.com, tsenevir@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com +# RFC7457 || Y. Sheffer, R. Holz, P. Saint-Andre || yaronf.ietf@gmail.com, holz@net.in.tum.de, peter@andyet.com +# RFC7458 || R. Valmikam, R. Koodli || valmikam@gmail.com, rajeev.koodli@intel.com +# RFC7459 || M. Thomson, J. Winterbottom || martin.thomson@gmail.com, a.james.winterbottom@gmail.com +# RFC7460 || M. Chandramouli, B. Claise, B. Schoening, J. Quittek, T. Dietz || moulchan@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@neclab.eu, Thomas.Dietz@neclab.eu +# RFC7461 || J. Parello, B. Claise, M. Chandramouli || jparello@cisco.com, bclaise@cisco.com, moulchan@cisco.com +# RFC7462 || L. Liess, Ed., R. Jesske, A. Johnston, D. Worley, P. Kyzivat || laura.liess.dt@gmail.com, r.jesske@telekom.de, alan.b.johnston@gmail.com, worley@ariadne.com, pkyzivat@alum.mit.edu +# RFC7463 || A. Johnston, Ed., M. Soroushnejad, Ed., V. Venkataramanan || alan.b.johnston@gmail.com, msoroush@gmail.com, vvenkatar@gmail.com +# RFC7464 || N. Williams || nico@cryptonector.com +# RFC7465 || A. Popov || andreipo@microsoft.com +# RFC7466 || C. Dearlove, T. Clausen || chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7467 || A. Murdock || Aidan.murdock@ncia.nato.int +# RFC7468 || S. Josefsson, S. Leonard || simon@josefsson.org, dev+ietf@seantek.com +# RFC7469 || C. Evans, C. Palmer, R. Sleevi || cevans@google.com, palmer@google.com, sleevi@google.com +# RFC7470 || F. Zhang, A. Farrel || zhangfatai@huawei.com, adrian@olddog.co.uk +# RFC7471 || S. Giacalone, D. Ward, J. Drake, A. Atlas, S. Previdi || spencer.giacalone@gmail.com, dward@cisco.com, jdrake@juniper.net, akatlas@juniper.net, sprevidi@cisco.com +# RFC7472 || I. McDonald, M. Sweet || blueroofmusic@gmail.com, msweet@apple.com +# RFC7473 || K. Raza, S. Boutros || skraza@cisco.com, sboutros@cisco.com +# RFC7474 || M. Bhatia, S. Hartman, D. Zhang, A. Lindem, Ed. || manav@ionosnetworks.com, hartmans-ietf@mit.edu, dacheng.zhang@gmail.com, acee@cisco.com +# RFC7475 || S. Dawkins || spencerdawkins.ietf@gmail.com +# RFC7476 || K. Pentikousis, Ed., B. Ohlman, D. Corujo, G. Boggia, G. Tyson, E. Davies, A. Molinaro, S. Eum || k.pentikousis@eict.de, Borje.Ohlman@ericsson.com, dcorujo@av.it.pt, g.boggia@poliba.it, gareth.tyson@eecs.qmul.ac.uk, davieseb@scss.tcd.ie, antonella.molinaro@unirc.it, suyong@nict.go.jp +# RFC7477 || W. Hardaker || ietf@hardakers.net +# RFC7478 || C. Holmberg, S. Hakansson, G. Eriksson || christer.holmberg@ericsson.com, stefan.lk.hakansson@ericsson.com, goran.ap.eriksson@ericsson.com +# RFC7479 || S. Moonesamy || sm+ietf@elandsys.com +# RFC7480 || A. Newton, B. Ellacott, N. Kong || andy@arin.net, bje@apnic.net, nkong@cnnic.cn +# RFC7481 || S. Hollenbeck, N. Kong || shollenbeck@verisign.com, nkong@cnnic.cn +# RFC7482 || A. Newton, S. Hollenbeck || andy@arin.net, shollenbeck@verisign.com +# RFC7483 || A. Newton, S. Hollenbeck || andy@arin.net, shollenbeck@verisign.com +# RFC7484 || M. Blanchet || Marc.Blanchet@viagenie.ca +# RFC7485 || L. Zhou, N. Kong, S. Shen, S. Sheng, A. Servin || zhoulinlin@cnnic.cn, nkong@cnnic.cn, shenshuo@cnnic.cn, steve.sheng@icann.org, arturo.servin@gmail.com +# RFC7486 || S. Farrell, P. Hoffman, M. Thomas || stephen.farrell@cs.tcd.ie, paul.hoffman@vpnc.org, mike@phresheez.com +# RFC7487 || E. Bellagamba, A. Takacs, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward || elisa.bellagamba@ericsson.com, attila.takacs@ericsson.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com +# RFC7488 || M. Boucadair, R. Penno, D. Wing, P. Patil, T. Reddy || mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, tireddy@cisco.com +# RFC7489 || M. Kucherawy, Ed., E. Zwicky, Ed. || superuser@gmail.com, zwicky@yahoo-inc.com +# RFC7490 || S. Bryant, C. Filsfils, S. Previdi, M. Shand, N. So || stbryant@cisco.com, cfilsfil@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com, ningso@vinci-systems.com +# RFC7491 || D. King, A. Farrel || daniel@olddog.co.uk, adrian@olddog.co.uk +# RFC7492 || M. Bhatia, D. Zhang, M. Jethanandani || manav@ionosnetworks.com, dacheng.zhang@gmail.com, mjethanandani@gmail.com +# RFC7493 || T. Bray, Ed. || tbray@textuality.com +# RFC7494 || C. Shao, H. Deng, R. Pazhyannur, F. Bari, R. Zhang, S. Matsushima || shaochunju@chinamobile.com, denghui@chinamobile.com, rpazhyan@cisco.com, farooq.bari@att.com, zhangr@gsta.com, satoru.matsushima@g.softbank.co.jp +# RFC7495 || A. Montville, D. Black || adam.w.montville@gmail.com, david.black@emc.com +# RFC7496 || M. Tuexen, R. Seggelmann, R. Stewart, S. Loreto || tuexen@fh-muenster.de, rfc@robin-seggelmann.com, randall@lakerest.net, Salvatore.Loreto@ericsson.com +# RFC7497 || A. Morton || acmorton@att.com +# RFC7498 || P. Quinn, Ed., T. Nadeau, Ed. || paulq@cisco.com, tnadeau@lucidvision.com +# RFC7499 || A. Perez-Mendez, Ed., R. Marin-Lopez, F. Pereniguez-Garcia, G. Lopez-Millan, D. Lopez, A. DeKok || alex@um.es, rafa@um.es, pereniguez@um.es, gabilm@um.es, diego@tid.es, aland@networkradius.com +# RFC7500 || R. Housley, Ed., O. Kolkman, Ed. || housley@vigilsec.com, kolkman@isoc.org +# RFC7501 || C. Davids, V. Gurbani, S. Poretsky || davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com +# RFC7502 || C. Davids, V. Gurbani, S. Poretsky || davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com +# RFC7503 || A. Lindem, J. Arkko || acee@cisco.com, jari.arkko@piuha.net +# RFC7504 || J. Klensin || john-ietf@jck.com +# RFC7505 || J. Levine, M. Delany || standards@taugh.com, mx0dot@yahoo.com +# RFC7506 || K. Raza, N. Akiya, C. Pignataro || skraza@cisco.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com +# RFC7507 || B. Moeller, A. Langley || bmoeller@acm.org, agl@google.com +# RFC7508 || L. Cailleux, C. Bonatti || laurent.cailleux@intradef.gouv.fr, bonatti252@ieca.com +# RFC7509 || R. Huang, V. Singh || rachel.huang@huawei.com, varun@comnet.tkk.fi +# RFC7510 || X. Xu, N. Sheth, L. Yong, R. Callon, D. Black || xuxiaohu@huawei.com, nsheth@juniper.net, lucy.yong@huawei.com, rcallon@juniper.net, david.black@emc.com +# RFC7511 || M. Wilhelm || max@rfc2324.org +# RFC7512 || J. Pechanec, D. Moffat || Jan.Pechanec@Oracle.COM, Darren.Moffat@Oracle.COM +# RFC7513 || J. Bi, J. Wu, G. Yao, F. Baker || junbi@tsinghua.edu.cn, jianping@cernet.edu.cn, yaoguang@cernet.edu.cn, fred@cisco.com +# RFC7514 || M. Luckie || mjl@caida.org +# RFC7515 || M. Jones, J. Bradley, N. Sakimura || mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp +# RFC7516 || M. Jones, J. Hildebrand || mbj@microsoft.com, jhildebr@cisco.com +# RFC7517 || M. Jones || mbj@microsoft.com +# RFC7518 || M. Jones || mbj@microsoft.com +# RFC7519 || M. Jones, J. Bradley, N. Sakimura || mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp +# RFC7520 || M. Miller || mamille2@cisco.com +# RFC7521 || B. Campbell, C. Mortimore, M. Jones, Y. Goland || brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com, yarong@microsoft.com +# RFC7522 || B. Campbell, C. Mortimore, M. Jones || brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com +# RFC7523 || M. Jones, B. Campbell, C. Mortimore || mbj@microsoft.com, brian.d.campbell@gmail.com, cmortimore@salesforce.com +# RFC7524 || Y. Rekhter, E. Rosen, R. Aggarwal, T. Morin, I. Grosclaude, N. Leymann, S. Saad || yakov@juniper.net, erosen@juniper.net, raggarwa_1@yahoo.com, thomas.morin@orange.com, irene.grosclaude@orange.com, n.leymann@telekom.de, samirsaad1@outlook.com +# RFC7525 || Y. Sheffer, R. Holz, P. Saint-Andre || yaronf.ietf@gmail.com, ralph.ietf@gmail.com, peter@andyet.com +# RFC7526 || O. Troan, B. Carpenter, Ed. || ot@cisco.com, brian.e.carpenter@gmail.com +# RFC7527 || R. Asati, H. Singh, W. Beebee, C. Pignataro, E. Dart, W. George || rajiva@cisco.com, shemant@cisco.com, wbeebee@cisco.com, cpignata@cisco.com, dart@es.net, wesley.george@twcable.com +# RFC7528 || P. Higgs, J. Piesing || paul.higgs@ericsson.com, jon.piesing@tpvision.com +# RFC7529 || C. Daboo, G. Yakushev || cyrus@daboo.name, gyakushev@yahoo.com +# RFC7530 || T. Haynes, Ed., D. Noveck, Ed. || thomas.haynes@primarydata.com, dave_noveck@dell.com +# RFC7531 || T. Haynes, Ed., D. Noveck, Ed. || thomas.haynes@primarydata.com, dave_noveck@dell.com +# RFC7532 || J. Lentini, R. Tewari, C. Lever, Ed. || jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com +# RFC7533 || J. Lentini, R. Tewari, C. Lever, Ed. || jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com +# RFC7534 || J. Abley, W. Sotomayor || jabley@dyn.com, wfms@ottix.net +# RFC7535 || J. Abley, B. Dickson, W. Kumari, G. Michaelson || jabley@dyn.com, bdickson@twitter.com, warren@kumari.net, ggm@apnic.net +# RFC7536 || M. Linsner, P. Eardley, T. Burbridge, F. Sorensen || mlinsner@cisco.com, philip.eardley@bt.com, trevor.burbridge@bt.com, frode.sorensen@nkom.no +# RFC7537 || B. Decraene, N. Akiya, C. Pignataro, L. Andersson, S. Aldrin || bruno.decraene@orange.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com, loa@mail01.huawei.com, aldrin.ietf@gmail.com +# RFC7538 || J. Reschke || julian.reschke@greenbytes.de +# RFC7539 || Y. Nir, A. Langley || ynir.ietf@gmail.com, agl@google.com +# RFC7540 || M. Belshe, R. Peon, M. Thomson, Ed. || mike@belshe.com, fenix@google.com, martin.thomson@gmail.com +# RFC7541 || R. Peon, H. Ruellan || fenix@google.com, herve.ruellan@crf.canon.fr +# RFC7542 || A. DeKok || aland@freeradius.org +# RFC7543 || H. Jeng, L. Jalil, R. Bonica, K. Patel, L. Yong || hj2387@att.com, luay.jalil@verizon.com, rbonica@juniper.net, keyupate@cisco.com, lucy.yong@huawei.com +# RFC7544 || M. Mohali || marianne.mohali@orange.com +# RFC7545 || V. Chen, Ed., S. Das, L. Zhu, J. Malyar, P. McCann || vchen@google.com, sdas@appcomsci.com, lei.zhu@huawei.com, jmalyar@iconectiv.com, peter.mccann@huawei.com +# RFC7546 || B. Kaduk || kaduk@mit.edu +# RFC7547 || M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, U. Herberg || mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, ulrich@herberg.name +# RFC7548 || M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, A. Sehgal || mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de +# RFC7549 || C. Holmberg, J. Holm, R. Jesske, M. Dolly || christer.holmberg@ericsson.com, jan.holm@ericsson.com, r.jesske@telekom.de, md3135@att.com +# RFC7550 || O. Troan, B. Volz, M. Siodelski || ot@cisco.com, volz@cisco.com, msiodelski@gmail.com +# RFC7551 || F. Zhang, Ed., R. Jing, R. Gandhi, Ed. || zhangfei7@huawei.com, jingrq@ctbri.com.cn, rgandhi@cisco.com +# RFC7552 || R. Asati, C. Pignataro, K. Raza, V. Manral, R. Papneja || rajiva@cisco.com, cpignata@cisco.com, skraza@cisco.com, vishwas@ionosnetworks.com, rajiv.papneja@huawei.com +# RFC7553 || P. Faltstrom, O. Kolkman || paf@netnod.se, kolkman@isoc.org +# RFC7554 || T. Watteyne, Ed., M. Palattella, L. Grieco || twatteyne@linear.com, maria-rita.palattella@uni.lu, a.grieco@poliba.it +# RFC7555 || G. Swallow, V. Lim, S. Aldrin || swallow@cisco.com, vlim@cisco.com, aldrin.ietf@gmail.com +# RFC7556 || D. Anipko, Ed. || dmitry.anipko@gmail.com +# RFC7557 || J. Chroboczek || jch@pps.univ-paris-diderot.fr +# RFC7558 || K. Lynn, S. Cheshire, M. Blanchet, D. Migault || kerry.lynn@verizon.com, cheshire@apple.com, Marc.Blanchet@viagenie.ca, daniel.migault@ericsson.com +# RFC7559 || S. Krishnan, D. Anipko, D. Thaler || suresh.krishnan@ericsson.com, dmitry.anipko@gmail.com, dthaler@microsoft.com +# RFC7560 || M. Kuehlewind, Ed., R. Scheffenegger, B. Briscoe || mirja.kuehlewind@tik.ee.ethz.ch, rs@netapp.com, ietf@bobbriscoe.net +# RFC7561 || J. Kaippallimalil, R. Pazhyannur, P. Yegani || john.kaippallimalil@huawei.com, rpazhyan@cisco.com, pyegani@juniper.net +# RFC7562 || D. Thakore || d.thakore@cablelabs.com +# RFC7563 || R. Pazhyannur, S. Speicher, S. Gundavelli, J. Korhonen, J. Kaippallimalil || rpazhyan@cisco.com, sespeich@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, john.kaippallimalil@huawei.com +# RFC7564 || P. Saint-Andre, M. Blanchet || peter@andyet.com, Marc.Blanchet@viagenie.ca +# RFC7565 || P. Saint-Andre || peter@andyet.com +# RFC7566 || L. Goix, K. Li || laurent.goix@econocom-osiatis.com, kepeng.likp@gmail.com +# RFC7567 || F. Baker, Ed., G. Fairhurst, Ed. || fred@cisco.com, gorry@erg.abdn.ac.uk +# RFC7568 || R. Barnes, M. Thomson, A. Pironti, A. Langley || rlb@ipv.sx, martin.thomson@gmail.com, alfredo@pironti.eu, agl@google.com +# RFC7569 || D. Quigley, J. Lu, T. Haynes || dpquigl@davequigley.com, Jarrett.Lu@oracle.com, thomas.haynes@primarydata.com +# RFC7570 || C. Margaria, Ed., G. Martinelli, S. Balls, B. Wright || cmargaria@juniper.net, giomarti@cisco.com, steve.balls@metaswitch.com, ben.wright@metaswitch.com +# RFC7571 || J. Dong, M. Chen, Z. Li, D. Ceccarelli || jie.dong@huawei.com, mach.chen@huawei.com, lizhenqiang@chinamobile.com, daniele.ceccarelli@ericsson.com +# RFC7572 || P. Saint-Andre, A. Houri, J. Hildebrand || peter@andyet.com, avshalom@il.ibm.com, jhildebr@cisco.com +# RFC7573 || P. Saint-Andre, S. Loreto || peter@andyet.com, Salvatore.Loreto@ericsson.com +# RFC7574 || A. Bakker, R. Petrocco, V. Grishchenko || arno@cs.vu.nl, r.petrocco@gmail.com, victor.grishchenko@gmail.com +# RFC7575 || M. Behringer, M. Pritikin, S. Bjarnason, A. Clemm, B. Carpenter, S. Jiang, L. Ciavaglia || mbehring@cisco.com, pritikin@cisco.com, sbjarnas@cisco.com, alex@cisco.com, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, Laurent.Ciavaglia@alcatel-lucent.com +# RFC7576 || S. Jiang, B. Carpenter, M. Behringer || jiangsheng@huawei.com, brian.e.carpenter@gmail.com, mbehring@cisco.com +# RFC7577 || J. Quittek, R. Winter, T. Dietz || quittek@neclab.eu, rolf.winter@neclab.eu, Thomas.Dietz@neclab.eu +# RFC7578 || L. Masinter || masinter@adobe.com +# RFC7579 || G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han || gregb@grotto-networking.com, ylee@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com +# RFC7580 || F. Zhang, Y. Lee, J. Han, G. Bernstein, Y. Xu || zhangfatai@huawei.com, leeyoung@huawei.com, hanjianrui@huawei.com, gregb@grotto-networking.com, xuyunbin@mail.ritt.com.cn +# RFC7581 || G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han || gregb@grotto-networking.com, leeyoung@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com +# RFC7582 || E. Rosen, IJ. Wijnands, Y. Cai, A. Boers || erosen@juniper.net, ice@cisco.com, yiqunc@microsoft.com, arjen@boers.com +# RFC7583 || S. Morris, J. Ihren, J. Dickinson, W. Mekking || stephen@isc.org, johani@netnod.se, jad@sinodun.com, mmekking@dyn.com +# RFC7584 || R. Ravindranath, T. Reddy, G. Salgueiro || rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com +# RFC7585 || S. Winter, M. McCauley || stefan.winter@restena.lu, mikem@airspayce.com +# RFC7586 || Y. Nachum, L. Dunbar, I. Yerushalmi, T. Mizrahi || youval.nachum@gmail.com, ldunbar@huawei.com, yilan@marvell.com, talmi@marvell.com +# RFC7587 || J. Spittka, K. Vos, JM. Valin || jspittka@gmail.com, koenvos74@gmail.com, jmvalin@jmvalin.ca +# RFC7588 || R. Bonica, C. Pignataro, J. Touch || rbonica@juniper.net, cpignata@cisco.com, touch@isi.edu +# RFC7589 || M. Badra, A. Luchuk, J. Schoenwaelder || mohamad.badra@zu.ac.ae, luchuk@snmp.com, j.schoenwaelder@jacobs-university.de +# RFC7590 || P. Saint-Andre, T. Alkemade || peter@andyet.com, me@thijsalkema.de +# RFC7591 || J. Richer, Ed., M. Jones, J. Bradley, M. Machulak, P. Hunt || ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com, phil.hunt@yahoo.com +# RFC7592 || J. Richer, Ed., M. Jones, J. Bradley, M. Machulak || ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com +# RFC7593 || K. Wierenga, S. Winter, T. Wolniewicz || klaas@cisco.com, stefan.winter@restena.lu, twoln@umk.pl +# RFC7594 || P. Eardley, A. Morton, M. Bagnulo, T. Burbridge, P. Aitken, A. Akhter || philip.eardley@bt.com, acmorton@att.com, marcelo@it.uc3m.es, trevor.burbridge@bt.com, paitken@brocade.com, aakhter@gmail.com +# RFC7595 || D. Thaler, Ed., T. Hansen, T. Hardie || dthaler@microsoft.com, tony+urireg@maillennium.att.com, ted.ietf@gmail.com +# RFC7596 || Y. Cui, Q. Sun, M. Boucadair, T. Tsou, Y. Lee, I. Farrer || yong@csnet1.cs.tsinghua.edu.cn, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, tena@huawei.com, yiu_lee@cable.comcast.com, ian.farrer@telekom.de +# RFC7597 || O. Troan, Ed., W. Dec, X. Li, C. Bao, S. Matsushima, T. Murakami, T. Taylor, Ed. || ot@cisco.com, wdec@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com, tom.taylor.stds@gmail.com +# RFC7598 || T. Mrugalski, O. Troan, I. Farrer, S. Perreault, W. Dec, C. Bao, L. Yeh, X. Deng || tomasz.mrugalski@gmail.com, ot@cisco.com, ian.farrer@telekom.de, sperreault@jive.com, wdec@cisco.com, congxiao@cernet.edu.cn, leaf.y.yeh@hotmail.com, dxhbupt@gmail.com +# RFC7599 || X. Li, C. Bao, W. Dec, Ed., O. Troan, S. Matsushima, T. Murakami || xing@cernet.edu.cn, congxiao@cernet.edu.cn, wdec@cisco.com, ot@cisco.com, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com +# RFC7600 || R. Despres, S. Jiang, Ed., R. Penno, Y. Lee, G. Chen, M. Chen || despres.remi@laposte.net, jiangsheng@huawei.com, repenno@cisco.com, yiu_lee@cable.comcast.com, phdgang@gmail.com, maoke@bbix.net +# RFC7601 || M. Kucherawy || superuser@gmail.com +# RFC7602 || U. Chunduri, W. Lu, A. Tian, N. Shen || uma.chunduri@ericsson.com, wenhu.lu@ericsson.com, albert.tian@ericsson.com, naiming@cisco.com +# RFC7603 || B. Schoening, M. Chandramouli, B. Nordman || brad.schoening@verizon.net, moulchan@cisco.com, bnordman@lbl.gov +# RFC7604 || M. Westerlund, T. Zeng || magnus.westerlund@ericsson.com, thomas.zeng@gmail.com +# RFC7605 || J. Touch || touch@isi.edu +# RFC7606 || E. Chen, Ed., J. Scudder, Ed., P. Mohapatra, K. Patel || enkechen@cisco.com, jgs@juniper.net, mpradosh@yahoo.com, keyupate@cisco.com +# RFC7607 || W. Kumari, R. Bush, H. Schiller, K. Patel || warren@kumari.net, randy@psg.com, has@google.com, keyupate@cisco.com +# RFC7608 || M. Boucadair, A. Petrescu, F. Baker || mohamed.boucadair@orange.com, alexandre.petrescu@cea.fr, fred@cisco.com +# RFC7609 || M. Fox, C. Kassimis, J. Stevens || mjfox@us.ibm.com, kassimis@us.ibm.com, sjerry@us.ibm.com +# RFC7610 || F. Gont, W. Liu, G. Van de Velde || fgont@si6networks.com, liushucheng@huawei.com, gunter.van_de_velde@alcatel-lucent.com +# RFC7611 || J. Uttaro, P. Mohapatra, D. Smith, R. Raszuk, J. Scudder || uttaro@att.com, mpradosh@yahoo.com, djsmith@cisco.com, robert@raszuk.net, jgs@juniper.net +# RFC7612 || P. Fleming, I. McDonald || patfleminghtc@gmail.com, blueroofmusic@gmail.com +# RFC7613 || P. Saint-Andre, A. Melnikov || peter@andyet.com, alexey.melnikov@isode.com +# RFC7614 || R. Sparks || rjsparks@nostrum.com +# RFC7615 || J. Reschke || julian.reschke@greenbytes.de +# RFC7616 || R. Shekh-Yusef, Ed., D. Ahrens, S. Bremer || rifaat.ietf@gmail.com, ahrensdc@gmail.com, sophie.bremer@netzkonform.de +# RFC7617 || J. Reschke || julian.reschke@greenbytes.de +# RFC7618 || Y. Cui, Q. Sun, I. Farrer, Y. Lee, Q. Sun, M. Boucadair || yong@csnet1.cs.tsinghua.edu.cn, sunqi.ietf@gmail.com, ian.farrer@telekom.de, yiu_lee@cable.comcast.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com +# RFC7619 || V. Smyslov, P. Wouters || svan@elvis.ru, pwouters@redhat.com +# RFC7620 || M. Boucadair, Ed., B. Chatras, T. Reddy, B. Williams, B. Sarikaya || mohamed.boucadair@orange.com, bruno.chatras@orange.com, tireddy@cisco.com, brandon.williams@akamai.com, sarikaya@ieee.org +# RFC7621 || A.B. Roach || adam@nostrum.com +# RFC7622 || P. Saint-Andre || peter@andyet.com +# RFC7623 || A. Sajassi, Ed., S. Salam, N. Bitar, A. Isaac, W. Henderickx || sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, aisaac@juniper.net, wim.henderickx@alcatel-lucent.com +# RFC7624 || R. Barnes, B. Schneier, C. Jennings, T. Hardie, B. Trammell, C. Huitema, D. Borkmann || rlb@ipv.sx, schneier@schneier.com, fluffy@cisco.com, ted.ietf@gmail.com, ietf@trammell.ch, huitema@huitema.net, daniel@iogearbox.net +# RFC7625 || J. T. Hao, P. Maheshwari, R. Huang, L. Andersson, M. Chen || haojiangtao@huawei.com, praveen.maheshwari@in.airtel.com, river.huang@huawei.com, loa@mail01.huawei.com, mach.chen@huawei.com +# RFC7626 || S. Bortzmeyer || bortzmeyer+ietf@nic.fr +# RFC7627 || K. Bhargavan, Ed., A. Delignat-Lavaud, A. Pironti, A. Langley, M. Ray || karthikeyan.bhargavan@inria.fr, antoine.delignat-lavaud@inria.fr, alfredo.pironti@inria.fr, agl@google.com, maray@microsoft.com +# RFC7628 || W. Mills, T. Showalter, H. Tschofenig || wmills_92105@yahoo.com, tjs@psaux.com, Hannes.Tschofenig@gmx.net +# RFC7629 || S. Gundavelli, Ed., K. Leung, G. Tsirtsis, A. Petrescu || sgundave@cisco.com, kleung@cisco.com, tsirtsis@qualcomm.com, alexandru.petrescu@cea.fr +# RFC7630 || J. Merkle, Ed., M. Lochter || johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de +# RFC7631 || C. Dearlove, T. Clausen || chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7632 || D. Waltermire, D. Harrington || david.waltermire@nist.gov, ietfdbh@gmail.com +# RFC7633 || P. Hallam-Baker || philliph@comodo.com +# RFC7634 || Y. Nir || ynir.ietf@gmail.com +# RFC7635 || T. Reddy, P. Patil, R. Ravindranath, J. Uberti || tireddy@cisco.com, praspati@cisco.com, rmohanr@cisco.com, justin@uberti.name +# RFC7636 || N. Sakimura, Ed., J. Bradley, N. Agarwal || n-sakimura@nri.co.jp, ve7jtb@ve7jtb.com, naa@google.com +# RFC7637 || P. Garg, Ed., Y. Wang, Ed. || pankajg@microsoft.com, yushwang@microsoft.com +# RFC7638 || M. Jones, N. Sakimura || mbj@microsoft.com, n-sakimura@nri.co.jp +# RFC7639 || A. Hutton, J. Uberti, M. Thomson || andrew.hutton@unify.com, justin@uberti.name, martin.thomson@gmail.com +# RFC7640 || B. Constantine, R. Krishnan || barry.constantine@jdsu.com, ramkri123@gmail.com +# RFC7641 || K. Hartke || hartke@tzi.org +# RFC7642 || K. LI, Ed., P. Hunt, B. Khasnabish, A. Nadalin, Z. Zeltsan || kepeng.lkp@alibaba-inc.com, phil.hunt@oracle.com, vumip1@gmail.com, tonynad@microsoft.com, zachary.zeltsan@gmail.com +# RFC7643 || P. Hunt, Ed., K. Grizzle, E. Wahlstroem, C. Mortimore || phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com +# RFC7644 || P. Hunt, Ed., K. Grizzle, M. Ansari, E. Wahlstroem, C. Mortimore || phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, morteza.ansari@cisco.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com +# RFC7645 || U. Chunduri, A. Tian, W. Lu || uma.chunduri@ericsson.com, albert.tian@ericsson.com, wenhu.lu@ericsson.com +# RFC7646 || P. Ebersman, W. Kumari, C. Griffiths, J. Livingood, R. Weber || ebersman-ietf@dragon.net, warren@kumari.net, cgriffiths@gmail.com, jason_livingood@cable.comcast.com, ralf.weber@nominum.com +# RFC7647 || R. Sparks, A.B. Roach || rjsparks@nostrum.com, adam@nostrum.com +# RFC7648 || S. Perreault, M. Boucadair, R. Penno, D. Wing, S. Cheshire || sperreault@jive.com, mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, cheshire@apple.com +# RFC7649 || P. Saint-Andre, D. York || peter@andyet.com, york@isoc.org +# RFC7650 || J. Jimenez, J. Lopez-Vega, J. Maenpaa, G. Camarillo || jaime.jimenez@ericsson.com, jmlvega@ugr.es, jouni.maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com +# RFC7651 || A. Dodd-Noble, S. Gundavelli, J. Korhonen, F. Baboescu, B. Weis || noblea@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, baboescu@broadcom.com, bew@cisco.com +# RFC7652 || M. Cullen, S. Hartman, D. Zhang, T. Reddy || margaret@painless-security.com, hartmans@painless-security.com, zhang_dacheng@hotmail.com, tireddy@cisco.com +# RFC7653 || D. Raghuvanshi, K. Kinnear, D. Kukrety || draghuva@cisco.com, kkinnear@cisco.com, dkukrety@cisco.com +# RFC7654 || S. Banks, F. Calabria, G. Czirjak, R. Machat || sbanks@encrypted.net, fcalabri@cisco.com, gczirjak@juniper.net, rmachat@juniper.net +# RFC7655 || M. Ramalho, Ed., P. Jones, N. Harada, M. Perumal, L. Miao || mramalho@cisco.com, paulej@packetizer.com, harada.noboru@lab.ntt.co.jp, muthu.arul@gmail.com, lei.miao@huawei.com +# RFC7656 || J. Lennox, K. Gross, S. Nandakumar, G. Salgueiro, B. Burman, Ed. || jonathan@vidyo.com, kevin.gross@avanw.com, snandaku@cisco.com, gsalguei@cisco.com, bo.burman@ericsson.com +# RFC7657 || D. Black, Ed., P. Jones || david.black@emc.com, paulej@packetizer.com +# RFC7658 || S. Perreault, T. Tsou, S. Sivakumar, T. Taylor || sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com +# RFC7659 || S. Perreault, T. Tsou, S. Sivakumar, T. Taylor || sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com +# RFC7660 || L. Bertz, S. Manning, B. Hirschman || lyleb551144@gmail.com, sergem913@gmail.com, Brent.Hirschman@gmail.com +# RFC7661 || G. Fairhurst, A. Sathiaseelan, R. Secchi || gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk, raffaello@erg.abdn.ac.uk +# RFC7662 || J. Richer, Ed. || ietf@justin.richer.org +# RFC7663 || B. Trammell, Ed., M. Kuehlewind, Ed. || ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch +# RFC7664 || D. Harkins, Ed. || dharkins@arubanetworks.com +# RFC7665 || J. Halpern, Ed., C. Pignataro, Ed. || jmh@joelhalpern.com, cpignata@cisco.com +# RFC7666 || H. Asai, M. MacFaden, J. Schoenwaelder, K. Shima, T. Tsou || panda@hongo.wide.ad.jp, mrm@vmware.com, j.schoenwaelder@jacobs-university.de, keiichi@iijlab.net, tina.tsou.zouting@huawei.com +# RFC7667 || M. Westerlund, S. Wenger || magnus.westerlund@ericsson.com, stewe@stewe.org +# RFC7668 || J. Nieminen, T. Savolainen, M. Isomaki, B. Patil, Z. Shelby, C. Gomez || johannamaria.nieminen@gmail.com, teemu.savolainen@nokia.com, markus.isomaki@nokia.com, basavaraj.patil@att.com, zach.shelby@arm.com, carlesgo@entel.upc.edu +# RFC7669 || J. Levine || standards@taugh.com +# RFC7670 || T. Kivinen, P. Wouters, H. Tschofenig || kivinen@iki.fi, pwouters@redhat.com, Hannes.Tschofenig@gmx.net +# RFC7671 || V. Dukhovni, W. Hardaker || ietf-dane@dukhovni.org, ietf@hardakers.net +# RFC7672 || V. Dukhovni, W. Hardaker || ietf-dane@dukhovni.org, ietf@hardakers.net +# RFC7673 || T. Finch, M. Miller, P. Saint-Andre || dot@dotat.at, mamille2@cisco.com, peter@andyet.com +# RFC7674 || J. Haas, Ed. || jhaas@juniper.net +# RFC7675 || M. Perumal, D. Wing, R. Ravindranath, T. Reddy, M. Thomson || muthu.arul@gmail.com, dwing-ietf@fuggles.com, rmohanr@cisco.com, tireddy@cisco.com, martin.thomson@gmail.com +# RFC7676 || C. Pignataro, R. Bonica, S. Krishnan || cpignata@cisco.com, rbonica@juniper.net, suresh.krishnan@ericsson.com +# RFC7677 || T. Hansen || tony+scramsha256@maillennium.att.com +# RFC7678 || C. Zhou, T. Taylor, Q. Sun, M. Boucadair || cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com +# RFC7679 || G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed. || almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com +# RFC7680 || G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed. || almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com +# RFC7681 || J. Davin || info@eesst.org +# RFC7682 || D. McPherson, S. Amante, E. Osterweil, L. Blunk, D. Mitchell || dmcpherson@verisign.com, amante@apple.com, eosterweil@verisign.com, ljb@merit.edu, dave@singularity.cx +# RFC7683 || J. Korhonen, Ed., S. Donovan, Ed., B. Campbell, L. Morand || jouni.nospam@gmail.com, srdonovan@usdonovans.com, ben@nostrum.com, lionel.morand@orange.com +# RFC7684 || P. Psenak, H. Gredler, R. Shakir, W. Henderickx, J. Tantsura, A. Lindem || ppsenak@cisco.com, hannes@gredler.at, rjs@rob.sh, wim.henderickx@alcatel-lucent.com, jeff.tantsura@ericsson.com, acee@cisco.com +# RFC7685 || A. Langley || agl@google.com +# RFC7686 || J. Appelbaum, A. Muffett || jacob@appelbaum.net, alecm@fb.com +# RFC7687 || S. Farrell, R. Wenning, B. Bos, M. Blanchet, H. Tschofenig || stephen.farrell@cs.tcd.ie, rigo@w3.org, bert@w3.org, Marc.Blanchet@viagenie.ca, Hannes.Tschofenig@gmx.net +# RFC7688 || Y. Lee, Ed., G. Bernstein, Ed. || leeyoung@huawei.com, gregb@grotto-networking.com +# RFC7689 || G. Bernstein, Ed., S. Xu, Y. Lee, Ed., G. Martinelli, H. Harai || gregb@grotto-networking.com, xsg@nict.go.jp, leeyoung@huawei.com, giomarti@cisco.com, harai@nict.go.jp +# RFC7690 || M. Byerly, M. Hite, J. Jaeggli || suckawha@gmail.com, mhite@hotmail.com, joelja@gmail.com +# RFC7691 || S. Bradner, Ed. || sob@harvard.edu +# RFC7692 || T. Yoshino || tyoshino@google.com +# RFC7693 || M-J. Saarinen, Ed., J-P. Aumasson || m.saarinen@qub.ac.uk, jean-philippe.aumasson@nagra.com +# RFC7694 || J. Reschke || julian.reschke@greenbytes.de +# RFC7695 || P. Pfister, B. Paterson, J. Arkko || pierre.pfister@darou.fr, paterson.b@gmail.com, jari.arkko@piuha.net +# RFC7696 || R. Housley || housley@vigilsec.com +# RFC7697 || P. Pan, S. Aldrin, M. Venkatesan, K. Sampath, T. Nadeau, S. Boutros || none, aldrin.ietf@gmail.com, venkat.mahalingams@gmail.com, kannankvs@gmail.com, tnadeau@lucidvision.com, sboutros@vmware.com +# RFC7698 || O. Gonzalez de Dios, Ed., R. Casellas, Ed., F. Zhang, X. Fu, D. Ceccarelli, I. Hussain || oscar.gonzalezdedios@telefonica.com, ramon.casellas@cttc.es, zhangfatai@huawei.com, fu.xihua@stairnote.com, daniele.ceccarelli@ericsson.com, ihussain@infinera.com +# RFC7699 || A. Farrel, D. King, Y. Li, F. Zhang || adrian@olddog.co.uk, daniel@olddog.co.uk, wsliguotou@hotmail.com, zhangfatai@huawei.com +# RFC7700 || P. Saint-Andre || peter@andyet.com +# RFC7701 || A. Niemi, M. Garcia-Martin, G. Sandbakken || aki.niemi@iki.fi, miguel.a.garcia@ericsson.com, geirsand@cisco.com +# RFC7702 || P. Saint-Andre, S. Ibarra, S. Loreto || peter@andyet.com, saul@ag-projects.com, Salvatore.Loreto@ericsson.com +# RFC7703 || E. Cordeiro, R. Carnier, A. Moreiras || edwin@scordeiro.net, rodrigocarnier@gmail.com, moreiras@nic.br +# RFC7704 || D. Crocker, N. Clark || dcrocker@bbiw.net, narelle.clark@pavonis.com.au +# RFC7705 || W. George, S. Amante || wesley.george@twcable.com, amante@apple.com +# RFC7706 || W. Kumari, P. Hoffman || warren@kumari.net, paul.hoffman@icann.org +# RFC7707 || F. Gont, T. Chown || fgont@si6networks.com, tim.chown@jisc.ac.uk +# RFC7708 || T. Nadeau, L. Martini, S. Bryant || tnadeau@lucidvision.com, lmartini@cisco.com, stewart.bryant@gmail.com +# RFC7709 || A. Malis, Ed., B. Wilson, G. Clapp, V. Shukla || agmalis@gmail.com, bwilson@appcomsci.com, clapp@research.att.com, vishnu.shukla@verizon.com +# RFC7710 || W. Kumari, O. Gudmundsson, P. Ebersman, S. Sheng || warren@kumari.net, olafur@cloudflare.com, ebersman-ietf@dragon.net, steve.sheng@icann.org +# RFC7711 || M. Miller, P. Saint-Andre || mamille2@cisco.com, peter@andyet.com +# RFC7712 || P. Saint-Andre, M. Miller, P. Hancke || peter@andyet.com, mamille2@cisco.com, fippo@andyet.com +# RFC7713 || M. Mathis, B. Briscoe || mattmathis@google.com, ietf@bobbriscoe.net +# RFC7714 || D. McGrew, K. Igoe || mcgrew@cisco.com, mythicalkevin@yahoo.com +# RFC7715 || IJ. Wijnands, Ed., K. Raza, A. Atlas, J. Tantsura, Q. Zhao || ice@cisco.com, skraza@cisco.com, akatlas@juniper.net, jeff.tantsura@ericsson.com, quintin.zhao@huawei.com +# RFC7716 || J. Zhang, L. Giuliano, E. Rosen, Ed., K. Subramanian, D. Pacella || zzhang@juniper.net, lenny@juniper.net, erosen@juniper.net, kartsubr@cisco.com, dante.j.pacella@verizonbusiness.com +# RFC7717 || K. Pentikousis, Ed., E. Zhang, Y. Cui || k.pentikousis@eict.de, emma.zhanglijia@huawei.com, cuiyang@huawei.com +# RFC7718 || A. Morton || acmorton@att.com +# RFC7719 || P. Hoffman, A. Sullivan, K. Fujiwara || paul.hoffman@icann.org, asullivan@dyn.com, fujiwara@jprs.co.jp +# RFC7720 || M. Blanchet, L-J. Liman || Marc.Blanchet@viagenie.ca, liman@netnod.se +# RFC7721 || A. Cooper, F. Gont, D. Thaler || alcoop@cisco.com, fgont@si6networks.com, dthaler@microsoft.com +# RFC7722 || C. Dearlove, T. Clausen || chris.dearlove@baesystems.com, T.Clausen@computer.org +# RFC7723 || S. Kiesel, R. Penno || ietf-pcp@skiesel.de, repenno@cisco.com +# RFC7724 || K. Kinnear, M. Stapp, B. Volz, N. Russell || kkinnear@cisco.com, mjs@cisco.com, volz@cisco.com, neil.e.russell@gmail.com +# RFC7725 || T. Bray || tbray@textuality.com +# RFC7726 || V. Govindan, K. Rajaraman, G. Mirsky, N. Akiya, S. Aldrin || venggovi@cisco.com, kalyanir@cisco.com, gregory.mirsky@ericsson.com, nobo.akiya.dev@gmail.com, aldrin.ietf@gmail.com +# RFC7727 || M. Zhang, H. Wen, J. Hu || zhangmingui@huawei.com, wenhuafeng@huawei.com, hujie@ctbri.com.cn +# RFC7728 || B. Burman, A. Akram, R. Even, M. Westerlund || bo.burman@ericsson.com, akram.muhammadazam@gmail.com, roni.even@mail01.huawei.com, magnus.westerlund@ericsson.com +# RFC7729 || B. Khasnabish, E. Haleplidis, J. Hadi Salim, Ed. || vumip1@gmail.com, ehalep@ece.upatras.gr, hadi@mojatatu.com +# RFC7730 || G. Huston, S. Weiler, G. Michaelson, S. Kent || gih@apnic.net, weiler@tislabs.com, ggm@apnic.net, kent@bbn.com +# RFC7731 || J. Hui, R. Kelsey || jonhui@nestlabs.com, richard.kelsey@silabs.com +# RFC7732 || P. van der Stok, R. Cragie || consultancy@vanderstok.org, robert.cragie@arm.com +# RFC7733 || A. Brandt, E. Baccelli, R. Cragie, P. van der Stok || anders_brandt@sigmadesigns.com, Emmanuel.Baccelli@inria.fr, robert.cragie@arm.com, consultancy@vanderstok.org +# RFC7734 || D. Allan, Ed., J. Tantsura, D. Fedyk, A. Sajassi || david.i.allan@ericsson.com, jeff.tantsura@ericsson.com, don.fedyk@hpe.com, sajassi@cisco.com +# RFC7735 || R. Sparks, T. Kivinen || rjsparks@nostrum.com, kivinen@iki.fi +# RFC7736 || K. Ma || kevin.j.ma@ericsson.com +# RFC7737 || N. Akiya, G. Swallow, C. Pignataro, L. Andersson, M. Chen || nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, loa@mail01.huawei.com, mach.chen@huawei.com +# RFC7738 || M. Blanchet, A. Schiltknecht, P. Shames || Marc.Blanchet@viagenie.ca, audric.schiltknecht@viagenie.ca, peter.m.shames@jpl.nasa.gov +# RFC7739 || F. Gont || fgont@si6networks.com +# RFC7740 || Z. Zhang, Y. Rekhter, A. Dolganow || zzhang@juniper.net, none, andrew.dolganow@alcatel-lucent.com +# RFC7741 || P. Westin, H. Lundin, M. Glover, J. Uberti, F. Galligan || patrik.westin@gmail.com, hlundin@google.com, michaelglover262@gmail.com, justin@uberti.name, fgalligan@google.com +# RFC7742 || A.B. Roach || adam@nostrum.com +# RFC7743 || J. Luo, Ed., L. Jin, Ed., T. Nadeau, Ed., G. Swallow, Ed. || luo.jian@zte.com.cn, lizho.jin@gmail.com, tnadeau@lucidvision.com, swallow@cisco.com +# RFC7744 || L. Seitz, Ed., S. Gerdes, Ed., G. Selander, M. Mani, S. Kumar || ludwig@sics.se, gerdes@tzi.org, goran.selander@ericsson.com, mehdi.mani@itron.com, sandeep.kumar@philips.com +# RFC7745 || T. Manderson || terry.manderson@icann.org +# RFC7746 || R. Bonica, I. Minei, M. Conn, D. Pacella, L. Tomotaki || rbonica@juniper.net, inaminei@google.com, meconn26@gmail.com, dante.j.pacella@verizon.com, luis.tomotaki@verizon.com +# RFC7747 || R. Papneja, B. Parise, S. Hares, D. Lee, I. Varlashkin || rajiv.papneja@huawei.com, bparise@skyportsystems.com, shares@ndzh.com, dlee@ixiacom.com, ilya@nobulus.com +# RFC7748 || A. Langley, M. Hamburg, S. Turner || agl@google.com, mike@shiftleft.org, sean@sn3rd.com +# RFC7749 || J. Reschke || julian.reschke@greenbytes.de +# RFC7750 || J. Hedin, G. Mirsky, S. Baillargeon || jonas.hedin@ericsson.com, gregory.mirsky@ericsson.com, steve.baillargeon@ericsson.com +# RFC7751 || S. Sorce, T. Yu || ssorce@redhat.com, tlyu@mit.edu +# RFC7752 || H. Gredler, Ed., J. Medved, S. Previdi, A. Farrel, S. Ray || hannes@gredler.at, jmedved@cisco.com, sprevidi@cisco.com, adrian@olddog.co.uk, raysaikat@gmail.com +# RFC7753 || Q. Sun, M. Boucadair, S. Sivakumar, C. Zhou, T. Tsou, S. Perreault || sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, ssenthil@cisco.com, cathy.zhou@huawei.com, tina.tsou@philips.com, sperreault@jive.com +# RFC7754 || R. Barnes, A. Cooper, O. Kolkman, D. Thaler, E. Nordmark || rlb@ipv.sx, alcoop@cisco.com, kolkman@isoc.org, dthaler@microsoft.com, nordmark@arista.com +# RFC7755 || T. Anderson || tore@redpill-linpro.com +# RFC7756 || T. Anderson, S. Steffann || tore@redpill-linpro.com, sander@steffann.nl +# RFC7757 || T. Anderson, A. Leiva Popper || tore@redpill-linpro.com, ydahhrk@gmail.com +# RFC7758 || T. Mizrahi, Y. Moses || dew@tx.technion.ac.il, moses@ee.technion.ac.il +# RFC7759 || E. Bellagamba, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward, J. Drake || elisa.bellagamba@gmail.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com, jdrake@juniper.net +# RFC7760 || R. Housley || housley@vigilsec.com +# RFC7761 || B. Fenner, M. Handley, H. Holbrook, I. Kouvelas, R. Parekh, Z. Zhang, L. Zheng || fenner@arista.com, m.handley@cs.ucl.ac.uk, holbrook@arista.com, kouvelas@arista.com, riparekh@cisco.com, zzhang@juniper.net, vero.zheng@huawei.com +# RFC7762 || M. West || mkwst@google.com +# RFC7763 || S. Leonard || dev+ietf@seantek.com +# RFC7764 || S. Leonard || dev+ietf@seantek.com +# RFC7765 || P. Hurtig, A. Brunstrom, A. Petlund, M. Welzl || per.hurtig@kau.se, anna.brunstrom@kau.se, apetlund@simula.no, michawe@ifi.uio.no +# RFC7766 || J. Dickinson, S. Dickinson, R. Bellis, A. Mankin, D. Wessels || jad@sinodun.com, sara@sinodun.com, ray@isc.org, allison.mankin@gmail.com, dwessels@verisign.com +# RFC7767 || S. Vinapamula, S. Sivakumar, M. Boucadair, T. Reddy || sureshk@juniper.net, ssenthil@cisco.com, mohamed.boucadair@orange.com, tireddy@cisco.com +# RFC7768 || T. Tsou, W. Li, T. Taylor, J. Huang || tina.tsou@philips.com, mweiboli@gmail.com, tom.taylor.stds@gmail.com, james.huang@huawei.com +# RFC7769 || S. Sivabalan, S. Boutros, H. Shah, S. Aldrin, M. Venkatesan || msiva@cisco.com, sboutros@cisco.com, hshah@ciena.com, aldrin.ietf@gmail.com, mannan_venkatesan@cable.comcast.com +# RFC7770 || A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer || acee@cisco.com, naiming@cisco.com, jpv@cisco.com, raggarwa_1@yahoo.com, sshaffer@akamai.com +# RFC7771 || A. Malis, Ed., L. Andersson, H. van Helvoort, J. Shin, L. Wang, A. D'Alessandro || agmalis@gmail.com, loa@mail01.huawei.com, huubatwork@gmail.com, jongyoon.shin@sk.com, wangleiyj@chinamobile.com, alessandro.dalessandro@telecomitalia.it +# RFC7772 || A. Yourtchenko, L. Colitti || ayourtch@cisco.com, lorenzo@google.com +# RFC7773 || S. Santesson || sts@aaa-sec.com +# RFC7774 || Y. Doi, M. Gillmore || yusuke.doi@toshiba.co.jp, matthew.gillmore@itron.com +# RFC7775 || L. Ginsberg, S. Litkowski, S. Previdi || ginsberg@cisco.com, stephane.litkowski@orange.com, sprevidi@cisco.com +# RFC7776 || P. Resnick, A. Farrel || presnick@qti.qualcomm.com, adrian@olddog.co.uk +# RFC7777 || S. Hegde, R. Shakir, A. Smirnov, Z. Li, B. Decraene || shraddha@juniper.net, rjs@rob.sh, as@cisco.com, lizhenbin@huawei.com, bruno.decraene@orange.com +# RFC7778 || D. Kutscher, F. Mir, R. Winter, S. Krishnan, Y. Zhang, CJ. Bernardos || kutscher@neclab.eu, faisal.mir@gmail.com, rolf.winter@neclab.eu, suresh.krishnan@ericsson.com, ying.zhang13@hp.com, cjbc@it.uc3m.es +# RFC7779 || H. Rogge, E. Baccelli || henning.rogge@fkie.fraunhofer.de, Emmanuel.Baccelli@inria.fr +# RFC7780 || D. Eastlake 3rd, M. Zhang, R. Perlman, A. Banerjee, A. Ghanwani, S. Gupta || d3e3e3@gmail.com, zhangmingui@huawei.com, radia@alum.mit.edu, ayabaner@cisco.com, anoop@alumni.duke.edu, sujay.gupta@ipinfusion.com +# RFC7781 || H. Zhai, T. Senevirathne, R. Perlman, M. Zhang, Y. Li || honjun.zhai@tom.com, tsenevir@gmail.com, radia@alum.mit.edu, zhangmingui@huawei.com, liyizhou@huawei.com +# RFC7782 || M. Zhang, R. Perlman, H. Zhai, M. Durrani, S. Gupta || zhangmingui@huawei.com, radia@alum.mit.edu, honjun.zhai@tom.com, mdurrani@cisco.com, sujay.gupta@ipinfusion.com +# RFC7783 || T. Senevirathne, J. Pathangi, J. Hudson || tsenevir@gmail.com, pathangi_janardhanan@dell.com, jon.hudson@gmail.com +# RFC7784 || D. Kumar, S. Salam, T. Senevirathne || dekumar@cisco.com, ssalam@cisco.com, tsenevir@gmail.com +# RFC7785 || S. Vinapamula, M. Boucadair || sureshk@juniper.net, mohamed.boucadair@orange.com +# RFC7786 || M. Kuehlewind, Ed., R. Scheffenegger || mirja.kuehlewind@tik.ee.ethz.ch, rs.ietf@gmx.at +# RFC7787 || M. Stenberg, S. Barth || markus.stenberg@iki.fi, cyrus@openwrt.org +# RFC7788 || M. Stenberg, S. Barth, P. Pfister || markus.stenberg@iki.fi, cyrus@openwrt.org, pierre.pfister@darou.fr +# RFC7789 || C. Cardona, P. Francois, P. Lucente || juancamilo.cardona@imdea.org, pifranco@cisco.com, plucente@cisco.com +# RFC7790 || Y. Yoneya, T. Nemoto || yoshiro.yoneya@jprs.co.jp, t.nemo10@kmd.keio.ac.jp +# RFC7791 || D. Migault, Ed., V. Smyslov || daniel.migault@ericsson.com, svan@elvis.ru +# RFC7792 || F. Zhang, X. Zhang, A. Farrel, O. Gonzalez de Dios, D. Ceccarelli || zhangfatai@huawei.com, zhang.xian@huawei.com, adrian@olddog.co.uk, oscar.gonzalezdedios@telefonica.com, daniele.ceccarelli@ericsson.com +# RFC7793 || M. Andrews || marka@isc.org +# RFC7794 || L. Ginsberg, Ed., B. Decraene, S. Previdi, X. Xu, U. Chunduri || ginsberg@cisco.com, bruno.decraene@orange.com, sprevidi@cisco.com, xuxiaohu@huawei.com, uma.chunduri@ericsson.com +# RFC7795 || J. Dong, H. Wang || jie.dong@huawei.com, rainsword.wang@huawei.com +# RFC7796 || Y. Jiang, Ed., L. Yong, M. Paul || jiangyuanlong@huawei.com, lucyyong@huawei.com, Manuel.Paul@telekom.de +# RFC7797 || M. Jones || mbj@microsoft.com +# RFC7798 || Y.-K. Wang, Y. Sanchez, T. Schierl, S. Wenger, M. M. Hannuksela || yekui.wang@gmail.com, yago.sanchez@hhi.fraunhofer.de, thomas.schierl@hhi.fraunhofer.de, stewe@stewe.org, miska.hannuksela@nokia.com +# RFC7799 || A. Morton || acmorton@att.com +# RFC7800 || M. Jones, J. Bradley, H. Tschofenig || mbj@microsoft.com, ve7jtb@ve7jtb.com, Hannes.Tschofenig@gmx.net +# RFC7801 || V. Dolmatov, Ed. || dol@srcc.msu.ru +# RFC7802 || S. Emery, N. Williams || shawn.emery@oracle.com, nico@cryptonector.com +# RFC7803 || B. Leiba || barryleiba@computer.org +# RFC7804 || A. Melnikov || alexey.melnikov@isode.com +# RFC7805 || A. Zimmermann, W. Eddy, L. Eggert || alexander@zimmermann.eu.com, wes@mti-systems.com, lars@netapp.com +# RFC7806 || F. Baker, R. Pan || fred@cisco.com, ropan@cisco.com +# RFC7807 || M. Nottingham, E. Wilde || mnot@mnot.net, erik.wilde@dret.net +# RFC7808 || M. Douglass, C. Daboo || mdouglass@sphericalcowgroup.com, cyrus@daboo.name +# RFC7809 || C. Daboo || cyrus@daboo.name +# RFC7810 || S. Previdi, Ed., S. Giacalone, D. Ward, J. Drake, Q. Wu || sprevidi@cisco.com, spencer.giacalone@gmail.com, wardd@cisco.com, jdrake@juniper.net, sunseawq@huawei.com +# RFC7811 || G. Enyedi, A. Csaszar, A. Atlas, C. Bowers, A. Gopalan || Gabor.Sandor.Enyedi@ericsson.com, Andras.Csaszar@ericsson.com, akatlas@juniper.net, cbowers@juniper.net, abishek@ece.arizona.edu +# RFC7812 || A. Atlas, C. Bowers, G. Enyedi || akatlas@juniper.net, cbowers@juniper.net, Gabor.Sandor.Enyedi@ericsson.com +# RFC7813 || J. Farkas, Ed., N. Bragg, P. Unbehagen, G. Parsons, P. Ashwood-Smith, C. Bowers || janos.farkas@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com, glenn.parsons@ericsson.com, Peter.AshwoodSmith@huawei.com, cbowers@juniper.net +# RFC7814 || X. Xu, C. Jacquenet, R. Raszuk, T. Boyes, B. Fee || xuxiaohu@huawei.com, christian.jacquenet@orange.com, robert@raszuk.net, tboyes@bloomberg.net, bfee@extremenetworks.com +# RFC7815 || T. Kivinen || kivinen@iki.fi +# RFC7816 || S. Bortzmeyer || bortzmeyer+ietf@nic.fr +# RFC7817 || A. Melnikov || alexey.melnikov@isode.com +# RFC7818 || M. Jethanandani || mjethanandani@gmail.com +# RFC7819 || S. Jiang, S. Krishnan, T. Mrugalski || jiangsheng@huawei.com, suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com +# RFC7820 || T. Mizrahi || talmi@marvell.com +# RFC7821 || T. Mizrahi || talmi@marvell.com +# RFC7822 || T. Mizrahi, D. Mayer || talmi@marvell.com, mayer@ntp.org +# RFC7823 || A. Atlas, J. Drake, S. Giacalone, S. Previdi || akatlas@juniper.net, jdrake@juniper.net, spencer.giacalone@gmail.com, sprevidi@cisco.com +# RFC7824 || S. Krishnan, T. Mrugalski, S. Jiang || suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com, jiangsheng@huawei.com +# RFC7825 || J. Goldberg, M. Westerlund, T. Zeng || jgoldber@cisco.com, magnus.westerlund@ericsson.com, thomas.zeng@gmail.com +# RFC7826 || H. Schulzrinne, A. Rao, R. Lanphier, M. Westerlund, M. Stiemerling, Ed. || schulzrinne@cs.columbia.edu, anrao@cisco.com, robla@robla.net, magnus.westerlund@ericsson.com, mls.ietf@gmail.com +# RFC7827 || L. Eggert || lars@netapp.com +# RFC7828 || P. Wouters, J. Abley, S. Dickinson, R. Bellis || pwouters@redhat.com, jabley@dyn.com, sara@sinodun.com, ray@isc.org +# RFC7829 || Y. Nishida, P. Natarajan, A. Caro, P. Amer, K. Nielsen || nishida@wide.ad.jp, prenatar@cisco.com, acaro@bbn.com, amer@udel.edu, karen.nielsen@tieto.com +# RFC7830 || A. Mayrhofer || alex.mayrhofer.ietf@gmail.com +# RFC7831 || J. Howlett, S. Hartman, H. Tschofenig, J. Schaad || josh.howlett@ja.net, hartmans-ietf@mit.edu, Hannes.Tschofenig@gmx.net, ietf@augustcellars.com +# RFC7832 || R. Smith, Ed. || rhys.smith@jisc.ac.uk +# RFC7833 || J. Howlett, S. Hartman, A. Perez-Mendez, Ed. || josh.howlett@ja.net, hartmans-ietf@mit.edu, alex@um.es +# RFC7834 || D. Saucez, L. Iannone, A. Cabellos, F. Coras || damien.saucez@inria.fr, ggx@gigix.net, acabello@ac.upc.edu, fcoras@ac.upc.edu +# RFC7835 || D. Saucez, L. Iannone, O. Bonaventure || damien.saucez@inria.fr, ggx@gigix.net, Olivier.Bonaventure@uclouvain.be +# RFC7836 || S. Smyshlyaev, Ed., E. Alekseev, I. Oshkin, V. Popov, S. Leontiev, V. Podobaev, D. Belyavsky || svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru, lse@CryptoPro.ru, v_podobaev@factor-ts.ru, beldmit@gmail.com +# RFC7837 || S. Krishnan, M. Kuehlewind, B. Briscoe, C. Ralli || suresh.krishnan@ericsson.com, mirja.kuehlewind@tik.ee.ethz.ch, ietf@bobbriscoe.net, ralli@tid.es +# RFC7838 || M. Nottingham, P. McManus, J. Reschke || mnot@mnot.net, mcmanus@ducksong.com, julian.reschke@greenbytes.de +# RFC7839 || S. Bhandari, S. Gundavelli, M. Grayson, B. Volz, J. Korhonen || shwethab@cisco.com, sgundave@cisco.com, mgrayson@cisco.com, volz@cisco.com, jouni.nospam@gmail.com +# RFC7840 || J. Winterbottom, H. Tschofenig, L. Liess || a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net, L.Liess@telekom.de +# RFC7841 || J. Halpern, Ed., L. Daigle, Ed., O. Kolkman, Ed. || jmh@joelhalpern.com, ldaigle@thinkingcat.com, kolkman@isoc.org +# RFC7842 || R. Sparks || rjsparks@nostrum.com +# RFC7843 || A. Ripke, R. Winter, T. Dietz, J. Quittek, R. da Silva || ripke@neclab.eu, winter@neclab.eu, dietz@neclab.eu, quittek@neclab.eu, rafaelalejandro.lopezdasilva@telefonica.com +# RFC7844 || C. Huitema, T. Mrugalski, S. Krishnan || huitema@microsoft.com, tomasz.mrugalski@gmail.com, suresh.krishnan@ericsson.com +# RFC7845 || T. Terriberry, R. Lee, R. Giles || tterribe@xiph.org, ron@debian.org, giles@xiph.org +# RFC7846 || R. Cruz, M. Nunes, J. Xia, R. Huang, Ed., J. Taveira, D. Lingli || rui.cruz@ieee.org, mario.nunes@inov.pt, xiajinwei@huawei.com, rachel.huang@huawei.com, joao.silva@inov.pt, denglingli@chinamobile.com +# RFC7847 || T. Melia, Ed., S. Gundavelli, Ed. || telemaco.melia@gmail.com, sgundave@cisco.com +# RFC7848 || G. Lozano || gustavo.lozano@icann.org +# RFC7849 || D. Binet, M. Boucadair, A. Vizdal, G. Chen, N. Heatley, R. Chandler, D. Michaud, D. Lopez, W. Haeffner || david.binet@orange.com, mohamed.boucadair@orange.com, Ales.Vizdal@T-Mobile.cz, phdgang@gmail.com, nick.heatley@ee.co.uk, ross@eircom.net, dave.michaud@rci.rogers.com, diego.r.lopez@telefonica.com, walter.haeffner@vodafone.com +# RFC7850 || S. Nandakumar || snandaku@cisco.com +# RFC7851 || H. Song, X. Jiang, R. Even, D. Bryan, Y. Sun || haibin.song@huawei.com, jiangxingfeng@huawei.com, ron.even.tlv@gmail.com, dbryan@ethernot.org, sunyi@ict.ac.cn +# RFC7852 || R. Gellens, B. Rosen, H. Tschofenig, R. Marshall, J. Winterbottom || rg+ietf@randy.pensive.org, br@brianrosen.net, Hannes.Tschofenig@gmx.net, rmarshall@telecomsys.com, a.james.winterbottom@gmail.com +# RFC7853 || S. Martin, S. Tuecke, B. McCollam, M. Lidman || sjmartin@uchicago.edu, tuecke@globus.org, bmccollam@uchicago.edu, mattias@uchicago.edu< +# RFC7854 || J. Scudder, Ed., R. Fernando, S. Stuart || jgs@juniper.net, rex@cisco.com, sstuart@google.com +# RFC7855 || S. Previdi, Ed., C. Filsfils, Ed., B. Decraene, S. Litkowski, M. Horneffer, R. Shakir || sprevidi@cisco.com, cfilsfil@cisco.com, bruno.decraene@orange.com, stephane.litkowski@orange.com, Martin.Horneffer@telekom.de, rjs@rob.sh +# RFC7856 || Y. Cui, J. Dong, P. Wu, M. Xu, A. Yla-Jaaski || yong@csnet1.cs.tsinghua.edu.cn, knight.dongjiang@gmail.com, weapon9@gmail.com, xmw@cernet.edu.cn, antti.yla-jaaski@aalto.fi +# RFC7857 || R. Penno, S. Perreault, M. Boucadair, Ed., S. Sivakumar, K. Naito || repenno@cisco.com, sperreault@jive.com, mohamed.boucadair@orange.com, ssenthil@cisco.com, k.naito@nttv6.jp +# RFC7858 || Z. Hu, L. Zhu, J. Heidemann, A. Mankin, D. Wessels, P. Hoffman || zihu@outlook.com, liangzhu@usc.edu, johnh@isi.edu, allison.mankin@gmail.com, dwessels@verisign.com, paul.hoffman@icann.org +# RFC7859 || C. Dearlove || chris.dearlove@baesystems.com +# RFC7860 || J. Merkle, Ed., M. Lochter || johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de +# RFC7861 || A. Adamson, N. Williams || andros@netapp.com, nico@cryptonector.com +# RFC7862 || T. Haynes || thomas.haynes@primarydata.com +# RFC7863 || T. Haynes || thomas.haynes@primarydata.com +# RFC7864 || CJ. Bernardos, Ed. || cjbc@it.uc3m.es +# RFC7865 || R. Ravindranath, P. Ravindran, P. Kyzivat || rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu +# RFC7866 || L. Portman, H. Lum, Ed., C. Eckel, A. Johnston, A. Hutton || leon.portman@gmail.com, henry.lum@genesyslab.com, eckelcu@cisco.com, alan.b.johnston@gmail.com, andrew.hutton@unify.com +# RFC7867 || R. Huang || rachel.huang@huawei.com +# RFC7868 || D. Savage, J. Ng, S. Moore, D. Slice, P. Paluch, R. White || dsavage@cisco.com, jamng@cisco.com, smoore@cisco.com, dslice@cumulusnetworks.com, peter.paluch@fri.uniza.sk, russ@riw.us +# RFC7869 || D. Warden, I. Iordanov || david_warden@dell.com, iiordanov@gmail.com +# RFC7870 || Y. Fu, S. Jiang, J. Dong, Y. Chen || fuyu@cnnic.cn, jiangsheng@huawei.com, knight.dongjiang@gmail.com, flashfoxmx@gmail.com +# RFC7871 || C. Contavalli, W. van der Gaast, D. Lawrence, W. Kumari || ccontavalli@google.com, wilmer@google.com, tale@akamai.com, warren@kumari.net +# RFC7872 || F. Gont, J. Linkova, T. Chown, W. Liu || fgont@si6networks.com, furry@google.com, tim.chown@jisc.ac.uk, liushucheng@huawei.com +# RFC7873 || D. Eastlake 3rd, M. Andrews || d3e3e3@gmail.com, marka@isc.org +# RFC7874 || JM. Valin, C. Bran || jmvalin@jmvalin.ca, cary.bran@plantronics.com +# RFC7875 || S. Proust, Ed. || stephane.proust@orange.com +# RFC7876 || S. Bryant, S. Sivabalan, S. Soni || stewart.bryant@gmail.com, msiva@cisco.com, sagsoni@cisco.com +# RFC7877 || K. Cartwright, V. Bhatia, S. Ali, D. Schwartz || kcartwright@tnsi.com, vbhatia@tnsi.com, syed.ali@neustar.biz, dschwartz@xconnect.net +# RFC7878 || K. Cartwright, V. Bhatia, J-F. Mule, A. Mayrhofer || kcartwright@tnsi.com, vbhatia@tnsi.com, jfmule@apple.com, alexander.mayrhofer@nic.at +# RFC7879 || R. Ravindranath, T. Reddy, G. Salgueiro, V. Pascual, P. Ravindran || rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, victor.pascual.avila@oracle.com, partha@parthasarathi.co.in +# RFC7880 || C. Pignataro, D. Ward, N. Akiya, M. Bhatia, S. Pallagatti || cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com, manav@ionosnetworks.com, santosh.pallagatti@gmail.com +# RFC7881 || C. Pignataro, D. Ward, N. Akiya || cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com +# RFC7882 || S. Aldrin, C. Pignataro, G. Mirsky, N. Kumar || aldrin.ietf@gmail.com, cpignata@cisco.com, gregory.mirsky@ericsson.com, naikumar@cisco.com +# RFC7883 || L. Ginsberg, N. Akiya, M. Chen || ginsberg@cisco.com, nobo.akiya.dev@gmail.com, mach.chen@huawei.com +# RFC7884 || C. Pignataro, M. Bhatia, S. Aldrin, T. Ranganath || cpignata@cisco.com, manav@ionosnetworks.com, aldrin.ietf@gmail.com, trilok.ranganatha@nokia.com +# RFC7885 || V. Govindan, C. Pignataro || venggovi@cisco.com, cpignata@cisco.com +# RFC7886 || V. Govindan, C. Pignataro || venggovi@cisco.com, cpignata@cisco.com +# RFC7887 || S. Venaas, J. Arango, I. Kouvelas || stig@cisco.com, jearango@cisco.com, kouvelas@arista.com +# RFC7888 || A. Melnikov, Ed. || alexey.melnikov@isode.com +# RFC7889 || J. SrimushnamBoovaraghamoorthy, N. Bisht || jayantheesh.sb@gmail.com, narendrasingh.bisht@gmail.com +# RFC7890 || D. Bryan, P. Matthews, E. Shim, D. Willis, S. Dawkins || dbryan@ethernot.org, philip_matthews@magma.ca, eunsooshim@gmail.com, dean.willis@softarmor.com, spencerdawkins.ietf@gmail.com +# RFC7891 || J. Asghar, IJ. Wijnands, Ed., S. Krishnaswamy, A. Karan, V. Arya || jasghar@cisco.com, ice@cisco.com, sowkrish@cisco.com, apoorva@cisco.com, varya@directv.com +# RFC7892 || Z. Ali, A. Bonfanti, M. Hartley, F. Zhang || zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com +# RFC7893 || Y(J) Stein, D. Black, B. Briscoe || yaakov_s@rad.com, david.black@emc.com, ietf@bobbriscoe.net +# RFC7894 || M. Pritikin, C. Wallace || pritikin@cisco.com, carl@redhoundsoftware.com +# RFC7895 || A. Bierman, M. Bjorklund, K. Watsen || andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net +# RFC7896 || D. Dhody || dhruv.ietf@gmail.com +# RFC7897 || D. Dhody, U. Palle, R. Casellas || dhruv.ietf@gmail.com, udayasree.palle@huawei.com, ramon.casellas@cttc.es +# RFC7898 || D. Dhody, U. Palle, V. Kondreddy, R. Casellas || dhruv.ietf@gmail.com, udayasree.palle@huawei.com, venugopalreddyk@huawei.com, ramon.casellas@cttc.es +# RFC7899 || T. Morin, Ed., S. Litkowski, K. Patel, Z. Zhang, R. Kebler, J. Haas || thomas.morin@orange.com, stephane.litkowski@orange.com, keyupate@cisco.com, zzhang@juniper.net, rkebler@juniper.net, jhaas@juniper.net +# RFC7900 || Y. Rekhter, Ed., E. Rosen, Ed., R. Aggarwal, Y. Cai, T. Morin || none, erosen@juniper.net, raggarwa_1@yahoo.com, yiqun.cai@alibaba-inc.com, thomas.morin@orange.com +# RFC7901 || P. Wouters || pwouters@redhat.com +# RFC7902 || E. Rosen, T. Morin || erosen@juniper.net, thomas.morin@orange.com +# RFC7903 || S. Leonard || dev+ietf@seantek.com +# RFC7904 || C. Jennings, B. Lowekamp, E. Rescorla, S. Baset, H. Schulzrinne, T. Schmidt, Ed. || fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, sabaset@us.ibm.com, hgs@cs.columbia.edu, t.schmidt@haw-hamburg.de +# RFC7905 || A. Langley, W. Chang, N. Mavrogiannopoulos, J. Strombergson, S. Josefsson || agl@google.com, wtc@google.com, nmav@redhat.com, joachim@secworks.se, simon@josefsson.org +# RFC7906 || P. Timmel, R. Housley, S. Turner || pstimme@nsa.gov, housley@vigilsec.com, turners@ieca.com +# RFC7908 || K. Sriram, D. Montgomery, D. McPherson, E. Osterweil, B. Dickson || ksriram@nist.gov, dougm@nist.gov, dmcpherson@verisign.com, eosterweil@verisign.com, brian.peter.dickson@gmail.com +# RFC7909 || R. Kisteleki, B. Haberman || robert@ripe.net, brian@innovationslab.net +# RFC7910 || W. Zhou || zhouweiisu@gmail.com +# RFC7911 || D. Walton, A. Retana, E. Chen, J. Scudder || dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net +# RFC7912 || A. Melnikov || alexey.melnikov@isode.com +# RFC7913 || C. Holmberg || christer.holmberg@ericsson.com +# RFC7914 || C. Percival, S. Josefsson || cperciva@tarsnap.com, simon@josefsson.org +# RFC7915 || C. Bao, X. Li, F. Baker, T. Anderson, F. Gont || congxiao@cernet.edu.cn, xing@cernet.edu.cn, fred@cisco.com, tore@redpill-linpro.com, fgont@si6networks.com +# RFC7916 || S. Litkowski, Ed., B. Decraene, C. Filsfils, K. Raza, M. Horneffer, P. Sarkar || stephane.litkowski@orange.com, bruno.decraene@orange.com, cfilsfil@cisco.com, skraza@cisco.com, Martin.Horneffer@telekom.de, pushpasis.ietf@gmail.com +# RFC7917 || P. Sarkar, Ed., H. Gredler, S. Hegde, S. Litkowski, B. Decraene || pushpasis.ietf@gmail.com, hannes@rtbrick.com, shraddha@juniper.net, stephane.litkowski@orange.com, bruno.decraene@orange.com +# RFC7918 || A. Langley, N. Modadugu, B. Moeller || agl@google.com, nagendra@cs.stanford.edu, bmoeller@acm.org +# RFC7919 || D. Gillmor || dkg@fifthhorseman.net +# RFC7920 || A. Atlas, Ed., T. Nadeau, Ed., D. Ward || akatlas@juniper.net, tnadeau@lucidvision.com, wardd@cisco.com +# RFC7921 || A. Atlas, J. Halpern, S. Hares, D. Ward, T. Nadeau || akatlas@juniper.net, joel.halpern@ericsson.com, shares@ndzh.com, wardd@cisco.com, tnadeau@lucidvision.com +# RFC7922 || J. Clarke, G. Salgueiro, C. Pignataro || jclarke@cisco.com, gsalguei@cisco.com, cpignata@cisco.com +# RFC7923 || E. Voit, A. Clemm, A. Gonzalez Prieto || evoit@cisco.com, alex@cisco.com, albertgo@cisco.com +# RFC7924 || S. Santesson, H. Tschofenig || sts@aaa-sec.com, Hannes.Tschofenig@gmx.net +# RFC7925 || H. Tschofenig, Ed., T. Fossati || Hannes.Tschofenig@gmx.net, thomas.fossati@nokia.com +# RFC7926 || A. Farrel, Ed., J. Drake, N. Bitar, G. Swallow, D. Ceccarelli, X. Zhang || adrian@olddog.co.uk, jdrake@juniper.net, nbitar40@gmail.com, swallow@cisco.com, daniele.ceccarelli@ericsson.com, zhang.xian@huawei.com +# RFC7927 || D. Kutscher, Ed., S. Eum, K. Pentikousis, I. Psaras, D. Corujo, D. Saucez, T. Schmidt, M. Waehlisch || kutscher@neclab.eu, suyong@ist.osaka-u.ac.jp, k.pentikousis@travelping.com, i.psaras@ucl.ac.uk, dcorujo@av.it.pt, damien.saucez@inria.fr, t.schmidt@haw-hamburg.de, waehlisch@ieee.org +# RFC7928 || N. Kuhn, Ed., P. Natarajan, Ed., N. Khademi, Ed., D. Ros || nicolas.kuhn@cnes.fr, prenatar@cisco.com, naeemk@ifi.uio.no, dros@simula.no +# RFC7929 || P. Wouters || pwouters@redhat.com +# RFC7930 || S. Hartman || hartmans-ietf@mit.edu +# RFC7931 || D. Noveck, Ed., P. Shivam, C. Lever, B. Baker || davenoveck@gmail.com, piyush.shivam@oracle.com, chuck.lever@oracle.com, bill.baker@oracle.com +# RFC7932 || J. Alakuijala, Z. Szabadka || jyrki@google.com, szabadka@google.com +# RFC7933 || C. Westphal, Ed., S. Lederer, D. Posch, C. Timmerer, A. Azgin, W. Liu, C. Mueller, A. Detti, D. Corujo, J. Wang, M. Montpetit, N. Murray || Cedric.Westphal@huawei.com, stefan.lederer@itec.aau.at, daniel.posch@itec.aau.at, christian.timmerer@itec.aau.at, aytac.azgin@huawei.com, liushucheng@huawei.com, christopher.mueller@bitmovin.net, andrea.detti@uniroma2.it, dcorujo@av.it.pt, jianwang@cityu.edu.hk, marie@mjmontpetit.com, nmurray@research.ait.ie +# RFC7934 || L. Colitti, V. Cerf, S. Cheshire, D. Schinazi || lorenzo@google.com, vint@google.com, cheshire@apple.com, dschinazi@apple.com +# RFC7935 || G. Huston, G. Michaelson, Ed. || gih@apnic.net, ggm@apnic.net +# RFC7936 || T. Hardie || ted.ietf@gmail.com +# RFC7937 || F. Le Faucheur, Ed., G. Bertrand, Ed., I. Oprescu, Ed., R. Peterkofsky || flefauch@gmail.com, gilbertrand@gmail.com, iuniana.oprescu@gmail.com, peterkofsky@google.com +# RFC7938 || P. Lapukhov, A. Premji, J. Mitchell, Ed. || petr@fb.com, ariff@arista.com, jrmitche@puck.nether.net +# RFC7939 || U. Herberg, R. Cole, I. Chakeres, T. Clausen || ulrich@herberg.name, rgcole01@comcast.net, ian.chakeres@gmail.com, T.Clausen@computer.org +# RFC7940 || K. Davies, A. Freytag || kim.davies@icann.org, asmus@unicode.org +# RFC7941 || M. Westerlund, B. Burman, R. Even, M. Zanaty || magnus.westerlund@ericsson.com, bo.burman@ericsson.com, roni.even@mail01.huawei.com, mzanaty@cisco.com +# RFC7942 || Y. Sheffer, A. Farrel || yaronf.ietf@gmail.com, adrian@olddog.co.uk +# RFC7943 || F. Gont, W. Liu || fgont@si6networks.com, liushucheng@huawei.com +# RFC7944 || S. Donovan || srdonovan@usdonovans.com +# RFC7945 || K. Pentikousis, Ed., B. Ohlman, E. Davies, S. Spirou, G. Boggia || k.pentikousis@travelping.com, Borje.Ohlman@ericsson.com, davieseb@scss.tcd.ie, spis@intracom-telecom.com, g.boggia@poliba.it +# RFC7946 || H. Butler, M. Daly, A. Doyle, S. Gillies, S. Hagen, T. Schaub || howard@hobu.co, martin.daly@cadcorp.com, adoyle@intl-interfaces.com, sean.gillies@gmail.com, stefan@hagen.link, tim.schaub@gmail.com +# RFC7947 || E. Jasinska, N. Hilliard, R. Raszuk, N. Bakker || elisa@bigwaveit.org, nick@inex.ie, robert@raszuk.net, nbakker@akamai.com +# RFC7948 || N. Hilliard, E. Jasinska, R. Raszuk, N. Bakker || nick@inex.ie, elisa@bigwaveit.org, robert@raszuk.net, nbakker@akamai.com +# RFC7949 || I. Chen, A. Lindem, R. Atkinson || ichen@kuatrotech.com, acee@cisco.com, rja.lists@gmail.com +# RFC7950 || M. Bjorklund, Ed. || mbj@tail-f.com +# RFC7951 || L. Lhotka || lhotka@nic.cz +# RFC7952 || L. Lhotka || lhotka@nic.cz +# RFC7953 || C. Daboo, M. Douglass || cyrus@daboo.name, mdouglass@sphericalcowgroup.com +# RFC7954 || L. Iannone, D. Lewis, D. Meyer, V. Fuller || ggx@gigix.net, darlewis@cisco.com, dmm@1-4-5.net, vaf@vaf.net +# RFC7955 || L. Iannone, R. Jorgensen, D. Conrad, G. Huston || ggx@gigix.net, rogerj@gmail.com, drc@virtualized.org, gih@apnic.net +# RFC7956 || W. Hao, Y. Li, A. Qu, M. Durrani, P. Sivamurugan || haoweiguo@huawei.com, liyizhou@huawei.com, laodulaodu@gmail.com, mdurrani@equinix.com, ponkarthick.sivamurugan@ipinfusion.com +# RFC7957 || B. Campbell, Ed., A. Cooper, B. Leiba || ben@nostrum.com, alcoop@cisco.com, barryleiba@computer.org +# RFC7958 || J. Abley, J. Schlyter, G. Bailey, P. Hoffman || jabley@dyn.com, jakob@kirei.se, guillaumebailey@outlook.com, paul.hoffman@icann.org +# RFC7959 || C. Bormann, Z. Shelby, Ed. || cabo@tzi.org, zach.shelby@arm.com +# RFC7960 || F. Martin, Ed., E. Lear, Ed., T. Draegen. Ed., E. Zwicky, Ed., K. Andersen, Ed. || fmartin@linkedin.com, lear@cisco.com, tim@dmarcian.com, zwicky@yahoo-inc.com, kandersen@linkedin.com +# RFC7961 || D. Eastlake 3rd, L. Yizhou || d3e3e3@gmail.com, liyizhou@huawei.com +# RFC7962 || J. Saldana, Ed., A. Arcia-Moret, B. Braem, E. Pietrosemoli, A. Sathiaseelan, M. Zennaro || jsaldana@unizar.es, andres.arcia@cl.cam.ac.uk, bart.braem@iminds.be, ermanno@ictp.it, arjuna.sathiaseelan@cl.cam.ac.uk, mzennaro@ictp.it +# RFC7963 || Z. Ali, A. Bonfanti, M. Hartley, F. Zhang || zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com +# RFC7964 || D. Walton, A. Retana, E. Chen, J. Scudder || dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net +# RFC7965 || M. Chen, W. Cao, A. Takacs, P. Pan || mach.chen@huawei.com, wayne.caowei@huawei.com, attila.takacs@ericsson.com, none +# RFC7966 || H. Tschofenig, J. Korhonen, Ed., G. Zorn, K. Pillay || Hannes.tschofenig@gmx.net, jouni.nospam@gmail.com, glenzorn@gmail.com, kervin.pillay@gmail.com +# RFC7967 || A. Bhattacharyya, S. Bandyopadhyay, A. Pal, T. Bose || abhijan.bhattacharyya@tcs.com, soma.bandyopadhyay@tcs.com, arpan.pal@tcs.com, tulika.bose@tcs.com +# RFC7968 || Y. Li, D. Eastlake 3rd, W. Hao, H. Chen, S. Chatterjee || liyizhou@huawei.com, d3e3e3@gmail.com, haoweiguo@huawei.com, philips.chenhao@huawei.com, somnath.chatterjee01@gmail.com +# RFC7969 || T. Lemon, T. Mrugalski || ted.lemon@nominum.com, tomasz.mrugalski@gmail.com +# RFC7970 || R. Danyliw || rdd@cert.org +# RFC7971 || M. Stiemerling, S. Kiesel, M. Scharf, H. Seidel, S. Previdi || mls.ietf@gmail.com, ietf-alto@skiesel.de, michael.scharf@nokia.com, hseidel@benocs.com, sprevidi@cisco.com +# RFC7972 || P. Lemieux || pal@sandflow.com +# RFC7973 || R. Droms, P. Duffy || rdroms.ietf@gmail.com, paduffy@cisco.com +# RFC7974 || B. Williams, M. Boucadair, D. Wing || brandon.williams@akamai.com, mohamed.boucadair@orange.com, dwing-ietf@fuggles.com +# RFC7975 || B. Niven-Jenkins, Ed., R. van Brandenburg, Ed. || ben.niven-jenkins@nokia.com, ray.vanbrandenburg@tno.nl +# RFC7976 || C. Holmberg, N. Biondic, G. Salgueiro || christer.holmberg@ericsson.com, nevenka.biondic@ericsson.com, gsalguei@cisco.com +# RFC7977 || P. Dunkley, G. Llewellyn, V. Pascual, G. Salgueiro, R. Ravindranath || peter.dunkley@xura.com, gavin.llewellyn@xura.com, victor.pascual.avila@oracle.com, gsalguei@cisco.com, rmohanr@cisco.com +# RFC7978 || D. Eastlake 3rd, M. Umair, Y. Li || d3e3e3@gmail.com, mohammed.umair2@gmail.com, liyizhou@huawei.com +# RFC7979 || E. Lear, Ed., R. Housley, Ed. || lear@cisco.com, housley@vigilsec.com +# RFC7980 || M. Behringer, A. Retana, R. White, G. Huston || mbehring@cisco.com, aretana@cisco.com, russw@riw.us, gih@apnic.net +# RFC7981 || L. Ginsberg, S. Previdi, M. Chen || ginsberg@cisco.com, sprevidi@cisco.com, mach.chen@huawei.com +# RFC7982 || P. Martinsen, T. Reddy, D. Wing, V. Singh || palmarti@cisco.com, tireddy@cisco.com, dwing-ietf@fuggles.com, varun@callstats.io +# RFC7983 || M. Petit-Huguenin, G. Salgueiro || marc@petit-huguenin.org, gsalguei@cisco.com +# RFC7984 || O. Johansson, G. Salgueiro, V. Gurbani, D. Worley, Ed. || oej@edvina.net, gsalguei@cisco.com, vkg@bell-labs.com, worley@ariadne.com +# RFC7985 || J. Yi, T. Clausen, U. Herberg || jiazi@jiaziyi.com, T.Clausen@computer.org, ulrich@herberg.name +# RFC7986 || C. Daboo || cyrus@daboo.name +# RFC7987 || L. Ginsberg, P. Wells, B. Decraene, T. Przygienda, H. Gredler || ginsberg@cisco.com, pauwells@cisco.com, bruno.decraene@orange.com, prz@juniper.net, hannes@rtbrick.com +# RFC7988 || E. Rosen, Ed., K. Subramanian, Z. Zhang || erosen@juniper.net, karthik@sproute.com, zzhang@juniper.net +# RFC7989 || P. Jones, G. Salgueiro, C. Pearce, P. Giralt || paulej@packetizer.com, gsalguei@cisco.com, chrep@cisco.com, pgiralt@cisco.com +# RFC7990 || H. Flanagan || rse@rfc-editor.org +# RFC7991 || P. Hoffman || paul.hoffman@icann.org +# RFC7992 || J. Hildebrand, Ed., P. Hoffman || joe-ietf@cursive.net, paul.hoffman@icann.org +# RFC7993 || H. Flanagan || rse@rfc-editor.org +# RFC7994 || H. Flanagan || rse@rfc-editor.org +# RFC7995 || T. Hansen, Ed., L. Masinter, M. Hardy || tony@att.com, masinter@adobe.com, mahardy@adobe.com +# RFC7996 || N. Brownlee || n.brownlee@auckland.ac.nz +# RFC7997 || H. Flanagan, Ed. || rse@rfc-editor.org +# RFC7998 || P. Hoffman, J. Hildebrand || paul.hoffman@icann.org, joe-ietf@cursive.net +# RFC7999 || T. King, C. Dietzel, J. Snijders, G. Doering, G. Hankins || thomas.king@de-cix.net, christoph.dietzel@de-cix.net, job@ntt.net, gert@space.net, greg.hankins@nokia.com +# RFC8000 || A. Adamson, N. Williams || andros@netapp.com, nico@cryptonector.com +# RFC8001 || F. Zhang, Ed., O. Gonzalez de Dios, Ed., C. Margaria, M. Hartley, Z. Ali || zhangfatai@huawei.com, oscar.gonzalezdedios@telefonica.com, cmargaria@juniper.net, mhartley@cisco.com, zali@cisco.com +# RFC8002 || T. Heer, S. Varjonen || heer@hs-albsig.de, samu.varjonen@helsinki.fi +# RFC8003 || J. Laganier, L. Eggert || julien.ietf@gmail.com, lars@netapp.com +# RFC8004 || J. Laganier, L. Eggert || julien.ietf@gmail.com, lars@netapp.com +# RFC8005 || J. Laganier || julien.ietf@gmail.com +# RFC8006 || B. Niven-Jenkins, R. Murray, M. Caulfield, K. Ma || ben.niven-jenkins@nokia.com, rob.murray@nokia.com, mcaulfie@cisco.com, kevin.j.ma@ericsson.com +# RFC8007 || R. Murray, B. Niven-Jenkins || rob.murray@nokia.com, ben.niven-jenkins@nokia.com +# RFC8008 || J. Seedorf, J. Peterson, S. Previdi, R. van Brandenburg, K. Ma || jan.seedorf@hft-stuttgart.de, jon.peterson@neustar.biz, sprevidi@cisco.com, ray.vanbrandenburg@tno.nl, kevin.j.ma@ericsson.com +# RFC8009 || M. Jenkins, M. Peck, K. Burgin || mjjenki@tycho.ncsc.mil, mpeck@mitre.org, kelley.burgin@gmail.com +# RFC8010 || M. Sweet, I. McDonald || msweet@apple.com, blueroofmusic@gmail.com +# RFC8011 || M. Sweet, I. McDonald || msweet@apple.com, blueroofmusic@gmail.com +# RFC8012 || N. Akiya, G. Swallow, C. Pignataro, A. Malis, S. Aldrin || nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, agmalis@gmail.com, aldrin.ietf@gmail.com +# RFC8013 || D. Joachimpillai, J. Hadi Salim || damascene.joachimpillai@verizon.com, hadi@mojatatu.com +# RFC8014 || D. Black, J. Hudson, L. Kreeger, M. Lasserre, T. Narten || david.black@dell.com, jon.hudson@gmail.com, lkreeger@gmail.com, mmlasserre@gmail.com, narten@us.ibm.com +# RFC8015 || V. Singh, C. Perkins, A. Clark, R. Huang || varun@callstats.io, csp@csperkins.org, alan.d.clark@telchemy.com, Rachel@huawei.com +# RFC8016 || T. Reddy, D. Wing, P. Patil, P. Martinsen || tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, palmarti@cisco.com +# RFC8017 || K. Moriarty, Ed., B. Kaliski, J. Jonsson, A. Rusch || Kathleen.Moriarty@emc.com, bkaliski@verisign.com, jakob.jonsson@subset.se, andreas.rusch@rsa.com +# RFC8018 || K. Moriarty, Ed., B. Kaliski, A. Rusch || Kathleen.Moriarty@Dell.com, bkaliski@verisign.com, andreas.rusch@rsa.com +# RFC8019 || Y. Nir, V. Smyslov || ynir.ietf@gmail.com, svan@elvis.ru +# RFC8020 || S. Bortzmeyer, S. Huque || bortzmeyer+ietf@nic.fr, shuque@verisign.com +# RFC8021 || F. Gont, W. Liu, T. Anderson || fgont@si6networks.com, liushucheng@huawei.com, tore@redpill-linpro.com +# RFC8022 || L. Lhotka, A. Lindem || lhotka@nic.cz, acee@cisco.com +# RFC8023 || M. Thomas, A. Mankin, L. Zhang || mthomas@verisign.com, allison.mankin@gmail.com, lixia@cs.ucla.edu +# RFC8024 || Y. Jiang, Ed., Y. Luo, E. Mallette, Ed., Y. Shen, W. Cheng || jiangyuanlong@huawei.com, dennis.luoyong@huawei.com, edwin.mallette@gmail.com, yshen@juniper.net, chengweiqiang@chinamobile.com +# RFC8025 || P. Thubert, Ed., R. Cragie || pthubert@cisco.com, robert.cragie@gridmerge.com +# RFC8026 || M. Boucadair, I. Farrer || mohamed.boucadair@orange.com, ian.farrer@telekom.de +# RFC8027 || W. Hardaker, O. Gudmundsson, S. Krishnaswamy || ietf@hardakers.net, olafur+ietf@cloudflare.com, suresh@tislabs.com +# RFC8028 || F. Baker, B. Carpenter || fredbaker.ietf@gmail.com, brian.e.carpenter@gmail.com +# RFC8029 || K. Kompella, G. Swallow, C. Pignataro, Ed., N. Kumar, S. Aldrin, M. Chen || kireeti.kompella@gmail.com, swallow.ietf@gmail.com, cpignata@cisco.com, naikumar@cisco.com, aldrin.ietf@gmail.com, mach.chen@huawei.com +# RFC8030 || M. Thomson, E. Damaggio, B. Raymor, Ed. || martin.thomson@gmail.com, elioda@microsoft.com, brian.raymor@microsoft.com +# RFC8031 || Y. Nir, S. Josefsson || ynir.ietf@gmail.com, simon@josefsson.org +# RFC8032 || S. Josefsson, I. Liusvaara || simon@josefsson.org, ilariliusvaara@welho.com +# RFC8033 || R. Pan, P. Natarajan, F. Baker, G. White || ropan@cisco.com, prenatar@cisco.com, fredbaker.ietf@gmail.com, g.white@cablelabs.com +# RFC8034 || G. White, R. Pan || g.white@cablelabs.com, ropan@cisco.com +# RFC8035 || C. Holmberg || christer.holmberg@ericsson.com +# RFC8036 || N. Cam-Winget, Ed., J. Hui, D. Popa || ncamwing@cisco.com, jonhui@nestlabs.com, daniel.popa@itron.com +# RFC8037 || I. Liusvaara || ilariliusvaara@welho.com +# RFC8039 || A. Shpiner, R. Tse, C. Schelp, T. Mizrahi || alexshp@mellanox.com, Richard.Tse@microsemi.com, craig.schelp@oracle.com, talmi@marvell.com +# RFC8040 || A. Bierman, M. Bjorklund, K. Watsen || andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net +# RFC8041 || O. Bonaventure, C. Paasch, G. Detal || Olivier.Bonaventure@uclouvain.be, cpaasch@apple.com, gregory.detal@tessares.net +# RFC8042 || Z. Zhang, L. Wang, A. Lindem || zzhang@juniper.net, liliw@juniper.net, acee@cisco.com +# RFC8043 || B. Sarikaya, M. Boucadair || sarikaya@ieee.org, mohamed.boucadair@orange.com +# RFC8044 || A. DeKok || aland@freeradius.org +# RFC8045 || D. Cheng, J. Korhonen, M. Boucadair, S. Sivakumar || dean.cheng@huawei.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com, ssenthil@cisco.com +# RFC8046 || T. Henderson, Ed., C. Vogt, J. Arkko || tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net +# RFC8047 || T. Henderson, Ed., C. Vogt, J. Arkko || tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net +# RFC8048 || P. Saint-Andre || peter@filament.com +# RFC8049 || S. Litkowski, L. Tomotaki, K. Ogaki || stephane.litkowski@orange.com, luis.tomotaki@verizon.com, ke-oogaki@kddi.com +# RFC8051 || X. Zhang, Ed., I. Minei, Ed. || zhang.xian@huawei.com, inaminei@google.com +# RFC8053 || Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku || y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, maeda@lepidum.co.jp, hayashi@lepidum.co.jp, mutual-work@ioku.org +# RFC8054 || K. Murchison, J. Elie || murch@andrew.cmu.edu, julien@trigofacile.com +# RFC8055 || C. Holmberg, Y. Jiang || christer.holmberg@ericsson.com, jiangyi@chinamobile.com +# RFC8056 || J. Gould || jgould@verisign.com +# RFC8057 || B. Stark, D. Sinicrope, W. Lupton || barbara.stark@att.com, david.sinicrope@ericsson.com, wlupton@broadband-forum.org +# RFC8058 || J. Levine, T. Herkula || standards@taugh.com, t.herkula@optivo.com +# RFC8059 || J. Arango, S. Venaas, I. Kouvelas, D. Farinacci || jearango@cisco.com, stig@cisco.com, kouvelas@arista.com, farinacci@gmail.com +# RFC8060 || D. Farinacci, D. Meyer, J. Snijders || farinacci@gmail.com, dmm@1-4-5.net, job@ntt.net +# RFC8061 || D. Farinacci, B. Weis || farinacci@gmail.com, bew@cisco.com +# RFC8062 || L. Zhu, P. Leach, S. Hartman, S. Emery, Ed. || larry.zhu@microsoft.com, pauljleach@msn.com, hartmans-ietf@mit.edu, shawn.emery@gmail.com +# RFC8063 || H.W. Ribbers, M.W. Groeneweg, R. Gieben, A.L.J. Verschuren || rik.ribbers@sidn.nl, marc.groeneweg@sidn.nl, miek@miek.nl, ietf@antoin.nl +# RFC8064 || F. Gont, A. Cooper, D. Thaler, W. Liu || fgont@si6networks.com, alcoop@cisco.com, dthaler@microsoft.com, liushucheng@huawei.com +# RFC8065 || D. Thaler || dthaler@microsoft.com +# RFC8066 || S. Chakrabarti, G. Montenegro, R. Droms, J. Woodyatt || samitac.ietf@gmail.com, Gabriel.Montenegro@microsoft.com, rdroms.ietf@gmail.com, jhw@google.com +# RFC8067 || B. Leiba || barryleiba@computer.org +# RFC8068 || R. Ravindranath, P. Ravindran, P. Kyzivat || rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu +# RFC8069 || A. Thomas || a.n.thomas@ieee.org +# RFC8070 || M. Short, Ed., S. Moore, P. Miller || michikos@microsoft.com, sethmo@microsoft.com, paumil@microsoft.com +# RFC8071 || K. Watsen || kwatsen@juniper.net +# RFC8072 || A. Bierman, M. Bjorklund, K. Watsen || andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net +# RFC8073 || K. Moriarty, M. Ford || Kathleen.Moriarty@dell.com, ford@isoc.org +# RFC8074 || J. Bi, G. Yao, J. Halpern, E. Levy-Abegnoli, Ed. || junbi@tsinghua.edu.cn, yaoguang.china@gmail.com, joel.halpern@ericsson.com, elevyabe@cisco.com +# RFC8075 || A. Castellani, S. Loreto, A. Rahman, T. Fossati, E. Dijk || angelo@castellani.net, Salvatore.Loreto@ericsson.com, Akbar.Rahman@InterDigital.com, thomas.fossati@nokia.com, esko.dijk@philips.com +# RFC8076 || A. Knauf, T. Schmidt, Ed., G. Hege, M. Waehlisch || alexanderknauf@gmail.com, t.schmidt@haw-hamburg.de, hege@daviko.com, mw@link-lab.net +# RFC8077 || L. Martini, Ed., G. Heron, Ed. || lmartini@monoski.com, giheron@cisco.com +# RFC8078 || O. Gudmundsson, P. Wouters || olafur+ietf@cloudflare.com, pwouters@redhat.com +# RFC8079 || L. Miniero, S. Garcia Murillo, V. Pascual || lorenzo@meetecho.com, sergio.garcia.murillo@gmail.com, victor.pascual.avila@oracle.com +# RFC8080 || O. Sury, R. Edmonds || ondrej.sury@nic.cz, edmonds@mycre.ws +# RFC8081 || C. Lilley || chris@w3.org +# RFC8082 || S. Wenger, J. Lennox, B. Burman, M. Westerlund || stewe@stewe.org, jonathan@vidyo.com, bo.burman@ericsson.com, magnus.westerlund@ericsson.com +# RFC8083 || C. Perkins, V. Singh || csp@csperkins.org, varun@callstats.io +# RFC8084 || G. Fairhurst || gorry@erg.abdn.ac.uk +# RFC8085 || L. Eggert, G. Fairhurst, G. Shepherd || lars@netapp.com, gorry@erg.abdn.ac.uk, gjshep@gmail.com +# RFC8086 || L. Yong, Ed., E. Crabbe, X. Xu, T. Herbert || lucy.yong@huawei.com, edward.crabbe@gmail.com, xuxiaohu@huawei.com, tom@herbertland.com +# RFC8087 || G. Fairhurst, M. Welzl || gorry@erg.abdn.ac.uk, michawe@ifi.uio.no +# RFC8089 || M. Kerwin || matthew.kerwin@qut.edu.au +# RFC8090 || R. Housley || housley@vigilsec.com +# RFC8091 || E. Wilde || erik.wilde@dret.net +# RFC8092 || J. Heitz, Ed., J. Snijders, Ed., K. Patel, I. Bagdonas, N. Hilliard || jheitz@cisco.com, job@ntt.net, keyur@arrcus.com, ibagdona.ietf@gmail.com, nick@inex.ie +# RFC8093 || J. Snijders || job@ntt.net +# RFC8094 || T. Reddy, D. Wing, P. Patil || tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com +# RFC8095 || G. Fairhurst, Ed., B. Trammell, Ed., M. Kuehlewind, Ed. || gorry@erg.abdn.ac.uk, ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch +# RFC8096 || B. Fenner || fenner@fenron.com +# RFC8097 || P. Mohapatra, K. Patel, J. Scudder, D. Ward, R. Bush || mpradosh@yahoo.com, keyur@arrcus.com, jgs@juniper.net, dward@cisco.com, randy@psg.com +# RFC8098 || T. Hansen, Ed., A. Melnikov, Ed. || tony@att.com, alexey.melnikov@isode.com +# RFC8099 || H. Chen, R. Li, A. Retana, Y. Yang, Z. Liu || huaimo.chen@huawei.com, renwei.li@huawei.com, aretana@cisco.com, yyang1998@gmail.com, liu.cmri@gmail.com +# RFC8100 || R. Geib, Ed., D. Black || Ruediger.Geib@telekom.de, david.black@dell.com +# RFC8101 || C. Holmberg, J. Axell || christer.holmberg@ericsson.com, jorgen.axell@ericsson.com +# RFC8102 || P. Sarkar, Ed., S. Hegde, C. Bowers, H. Gredler, S. Litkowski || pushpasis.ietf@gmail.com, shraddha@juniper.net, cbowers@juniper.net, hannes@rtbrick.com, stephane.litkowski@orange.com +# RFC8103 || R. Housley || housley@vigilsec.com +# RFC8104 || Y. Shen, R. Aggarwal, W. Henderickx, Y. Jiang || yshen@juniper.net, raggarwa_1@yahoo.com, wim.henderickx@nokia.com, jiangyuanlong@huawei.com +# RFC8106 || J. Jeong, S. Park, L. Beloeil, S. Madanapalli || pauljeong@skku.edu, soohong.park@samsung.com, luc.beloeil@orange.com, smadanapalli@gmail.com +# RFC8107 || J. Wold || jwold@ad-id.org +# RFC8108 || J. Lennox, M. Westerlund, Q. Wu, C. Perkins || jonathan@vidyo.com, magnus.westerlund@ericsson.com, bill.wu@huawei.com, csp@csperkins.org +# RFC8109 || P. Koch, M. Larson, P. Hoffman || pk@DENIC.DE, matt.larson@icann.org, paul.hoffman@icann.org +# RFC8110 || D. Harkins, Ed., W. Kumari, Ed. || dharkins@arubanetworks.com, warren@kumari.net +# RFC8113 || M. Boucadair, C. Jacquenet || mohamed.boucadair@orange.com, christian.jacquenet@orange.com +# RFC8114 || M. Boucadair, C. Qin, C. Jacquenet, Y. Lee, Q. Wang || mohamed.boucadair@orange.com, jacni@jacni.com, christian.jacquenet@orange.com, yiu_lee@cable.comcast.com, 13301168516@189.cn +# RFC8115 || M. Boucadair, J. Qin, T. Tsou, X. Deng || mohamed.boucadair@orange.com, jacni@jacni.com, tina.tsou@philips.com, dxhbupt@gmail.com +# RFC8117 || C. Huitema, D. Thaler, R. Winter || huitema@huitema.net, dthaler@microsoft.com, rolf.winter@hs-augsburg.de +# RFC8118 || M. Hardy, L. Masinter, D. Markovic, D. Johnson, M. Bailey || mahardy@adobe.com, masinter@adobe.com, dmarkovi@adobe.com, duff.johnson@pdfa.org, martin.bailey@globalgraphics.com +# RFC8119 || M. Mohali, M. Barnes || marianne.mohali@orange.com, mary.ietf.barnes@gmail.com +# RFC8120 || Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku || y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org +# RFC8121 || Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku || y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org +# RFC8122 || J. Lennox, C. Holmberg || jonathan@vidyo.com, christer.holmberg@ericsson.com +# RFC8123 || P. Dawes, C. Arunachalam || peter.dawes@vodafone.com, carunach@cisco.com +# RFC8124 || R. Ravindranath, G. Salgueiro || rmohanr@cisco.com, gsalguei@cisco.com +# RFC8128 || C. Morgan || cmorgan@amsl.com +# RFC8129 || A. Jain, N. Kinder, N. McCallum || ajain323@gatech.edu, nkinder@redhat.com, npmccallum@redhat.com +# RFC8130 || V. Demjanenko, D. Satterlee || victor.demjanenko@vocal.com, david.satterlee@vocal.com +# RFC8131 || X. Zhang, H. Zheng, Ed., R. Gandhi, Ed., Z. Ali, P. Brzozowski || zhang.xian@huawei.com, zhenghaomian@huawei.com, rgandhi@cisco.com, zali@cisco.com, pbrzozowski@advaoptical.com +# RFC8132 || P. van der Stok, C. Bormann, A. Sehgal || consultancy@vanderstok.org, cabo@tzi.org, anuj.sehgal@navomi.com +# RFC8133 || S. Smyshlyaev. Ed., E. Alekseev, I. Oshkin, V. Popov || svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru +# RFC8135 || M. Danielson, M. Nilsson || magda@netinsight.net, mansaxel@besserwisser.org +# RFC8136 || B. Carpenter, R. Hinden || brian.e.carpenter@gmail.com, bob.hinden@gmail.com +# RFC8138 || P. Thubert, Ed., C. Bormann, L. Toutain, R. Cragie || pthubert@cisco.com, cabo@tzi.org, Laurent.Toutain@IMT-Atlantique.fr, robert.cragie@arm.com +# RFC8140 || A. Farrel || adrian@olddog.co.uk +# RFC8144 || K. Murchison || murch@andrew.cmu.edu +# RFC8145 || D. Wessels, W. Kumari, P. Hoffman || dwessels@verisign.com, warren@kumari.net, paul.hoffman@icann.org""".split('\n') + + +# # Many of these are addresses that the draft parser found incorrectly +# ignore_addresses =[ +# '0004454742@mcimail.com', +# '0006423401@mcimail.com', +# 'cabo@tzi.orgemail', +# 'california@san', +# 'cdl@rincon.com', +# 'hss@lando.hns.com', +# 'ietf-info@cnri.reston.va.us', +# 'illinois@urbana-champaign', +# 'jasdips@rwhois.net', +# 'labs@network', +# 'member@the', +# 'park@mit', +# 'research@icsi', +# 'research@isci', +# 'technopark@chaichee', +# 'texas@arlington', +# 'ura-bunyip@bunyip.com', +# ] + +# def get_rfc_data(): +# author_names = dict() +# author_emails = dict() +# for line in rfced_data: +# (rfc,names,emails) = line.split('||') +# rfc = int(rfc.lower().strip()[3:]) +# author_names[rfc] = [ x for x in map(str.lower,map(str.strip,names.split(','))) if x not in ['Ed.', 'ed.', '' ] ] +# author_emails[rfc] = [ x for x in map(unicode,map(str.lower,map(str.strip,emails.split(',')))) if x not in [ '', ] ] +# return author_names, author_emails + +# def get_all_the_email(): +# all_the_email = Email.objects.all() +# for e in all_the_email: +# e.l_address = e.address.lower() +# return all_the_email + +# def get_matching_emails(all_the_email,addrlist): +# """ Find Email objects with addresses case-insensitively matching things in the supplied list (for lack of __iin) """ +# l_addrlist = map(unicode.lower,addrlist) +# return [ e for e in all_the_email if e.l_address in l_addrlist ] + +# def show_verbose(rfc_num,*args): +# print "rfc%-4d :"%rfc_num,' '.join(map(str,args)) + +# ParsedAuthor = namedtuple('ParsedAuthor',['name','address']) + +# def get_parsed_authors(rfc_num): +# h,n = mkstemp() +# os.close(h) +# f = open(n,"w") +# f.write('%s/rfc%d.txt\n'%(settings.RFC_PATH,rfc_num)) +# f.close() +# lines = subprocess.check_output(['ietf/utils/draft.py','-a',n]) +# os.unlink(n) +# if not 'docauthors ' in lines: +# return [] +# authorline = [l for l in lines.split('\n') if l.startswith('docauthors ')][0] +# authstrings = authorline.split(':')[1].split(',') +# retval = [] +# for a in authstrings: +# if '<' in a: +# retval.append(ParsedAuthor(a[:a.find('<')].strip(),a[a.find('<'):a.find('>')][1:])) +# else: +# retval.append(ParsedAuthor(a.strip(),None)) + +# return retval + +# def calculate_changes(tracker_persons,tracker_emails,names,emails): +# adds = set() +# deletes = set() +# for email in emails: +# if email and email!='none' and email not in ignore_addresses: +# p = Person.objects.filter(email__address=email).first() +# if p: +# if not set(map(unicode.lower,p.email_set.values_list('address',flat=True))).intersection(tracker_emails): +# adds.add(email) +# else: +# #person_name = names[emails.index(email)] +# adds.add(email) +# for person in tracker_persons: +# if not set(map(unicode.lower,person.email_set.values_list('address',flat=True))).intersection(emails): +# match = False +# for index in [i for i,j in enumerate(emails) if j=='none' or not j]: +# if names[index].split()[-1].lower()==person.last_name().lower(): +# match = True +# if not match: +# deletes.add(person) +# return adds, deletes + +# def _main(): + +# parser = argparse.ArgumentParser(description="Recalculate RFC documentauthor_set"+'\n\n'+__doc__, +# formatter_class=argparse.RawDescriptionHelpFormatter,) +# parser.add_argument('-v','--verbose',help="Show the action taken for each RFC",action='store_true') +# parser.add_argument('--rfc',type=int, nargs='*',help="Only recalculate the given rfc numbers",dest='rfcnumberlist') +# args = parser.parse_args() + +# probable_email_match = set() +# probable_duplicates = [] + +# all_the_email = get_all_the_email() +# author_names, author_emails = get_rfc_data() + +# stats = { 'rfc not in tracker' :0, +# 'same addresses' :0, +# 'different addresses belonging to same people' :0, +# 'same names, rfced emails do not match' :0, +# 'rfced data is unusable' :0, +# "data doesn't match but no changes found" :0, +# 'changed authors' :0, } + +# for rfc_num in args.rfcnumberlist or sorted(author_names.keys()): + +# rfc = Document.objects.filter(docalias__name='rfc%s'%rfc_num).first() + +# if not rfc: +# if args.verbose: +# show_verbose(rfc_num,'rfc not in tracker') +# stats['rfc not in tracker'] += 1 +# continue + +# rfced_emails = set(author_emails[rfc_num]) +# tracker_emails = set(map(unicode.lower,rfc.authors.values_list('address',flat=True))) +# tracker_persons = set([x.person for x in rfc.authors.all()]) +# matching_emails = get_matching_emails(all_the_email,rfced_emails) +# rfced_persons = set([x.person for x in matching_emails]) +# known_emails = set([e.l_address for e in matching_emails]) +# unknown_emails = rfced_emails - known_emails +# unknown_persons = tracker_persons-rfced_persons + +# rfced_lastnames = sorted([n.split()[-1].lower() for n in author_names[rfc_num]]) +# tracker_lastnames = sorted([p.last_name().lower() for p in tracker_persons]) + +# if rfced_emails == tracker_emails: +# if args.verbose: +# show_verbose(rfc_num,'tracker and rfc editor have the same addresses') +# stats['same addresses'] += 1 +# continue + +# if len(rfced_emails)==len(tracker_emails) and not 'none' in author_emails[rfc_num]: +# if tracker_persons == rfced_persons: +# if args.verbose: +# show_verbose(rfc_num,'tracker and rfc editor have the different addresses belonging to same people') +# stats['different addresses belonging to same people'] += 1 +# continue +# else: +# if len(unknown_emails)==1 and len(tracker_persons-rfced_persons)==1: +# p = list(tracker_persons-rfced_persons)[0] +# probable_email_match.add(u"%s is probably %s (%s) : %s "%(list(unknown_emails)[0], p, p.pk, rfc_num)) +# elif len(unknown_emails)==len(unknown_persons): +# probable_email_match.add(u"%s are probably %s : %s"%(unknown_emails,[(p.ascii,p.pk) for p in unknown_persons],rfc_num)) +# else: +# probable_duplicates.append((tracker_persons^rfced_persons,rfc_num)) + +# if tracker_lastnames == rfced_lastnames: +# if args.verbose: +# show_verbose(rfc_num,"emails don't match up, but person names appear to be the same") +# stats[ 'same names, rfced emails do not match'] += 1 +# continue + +# use_rfc_data = bool(len(author_emails[rfc_num])==len(author_names[rfc_num])) +# if not use_rfc_data: +# if args.verbose: +# print 'Ignoring rfc database for rfc%d'%rfc_num +# stats[ 'rfced data is unusable'] += 1 + +# if use_rfc_data: +# adds, deletes = calculate_changes(tracker_persons,tracker_emails,author_names[rfc_num],author_emails[rfc_num]) +# parsed_authors=get_parsed_authors(rfc_num) +# parsed_adds, parsed_deletes = calculate_changes(tracker_persons,tracker_emails,[x.name for x in parsed_authors],[x.address for x in parsed_authors]) + +# for e in adds.union(parsed_adds) if use_rfc_data else parsed_adds: +# if not e or e in ignore_addresses: +# continue +# if not Person.objects.filter(email__address=e).exists(): +# if e not in parsed_adds: +# #print rfc_num,"Would add",e,"as",author_names[rfc_num][author_emails[rfc_num].index(e)],"(rfced database)" +# print "(address='%s',name='%s'),"%(e,author_names[rfc_num][author_emails[rfc_num].index(e)]),"# (rfced %d)"%rfc_num +# for p in Person.objects.filter(name__iendswith=author_names[rfc_num][author_emails[rfc_num].index(e)].split(' ')[-1]): +# print "\t", p.pk, p.ascii +# else: +# name = [x.name for x in parsed_authors if x.address==e][0] +# p = Person.objects.filter(name=name).first() +# if p: +# #print e,"is probably",p.pk,p +# print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) + +# else: +# p = Person.objects.filter(ascii=name).first() +# if p: +# print e,"is probably",p.pk,p +# print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) +# else: +# p = Person.objects.filter(ascii_short=name).first() +# if p: +# print e,"is probably",p.pk,p +# print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) +# #print rfc_num,"Would add",e,"as",name,"(parsed)" +# print "(address='%s',name='%s'),"%(e,name),"# (parsed %d)"%rfc_num +# for p in Person.objects.filter(name__iendswith=name.split(' ')[-1]): +# print "\t", p.pk, p.ascii + +# if False: # This was a little useful, but the noise in the rfc_ed file keeps it from being completely useful +# for p in deletes: +# for n in author_names[rfc_num]: +# if p.last_name().lower()==n.split()[-1].lower(): +# email_candidate = author_emails[rfc_num][author_names[rfc_num].index(n)] +# email_found = Email.objects.filter(address=email_candidate).first() +# if email_found: +# probable_duplicates.append((set([p,email_found.person]),rfc_num)) +# else: +# probable_email_match.add(u"%s is probably %s (%s) : %s"%(email_candidate, p, p.pk, rfc_num)) + +# if args.verbose: +# if use_rfc_data: +# working_adds = parsed_adds +# seen_people = set(Email.objects.get(address=e).person for e in parsed_adds) +# for addr in adds: +# person = Email.objects.get(address=addr).person +# if person not in seen_people: +# working_adds.add(addr) +# seen_people.add(person) +# working_deletes = deletes.union(parsed_deletes) +# else: +# working_adds = parsed_adds +# working_deletes = parsed_deletes +# # unique_adds = set() # TODO don't add different addresses for the same person from the two sources +# if working_adds or working_deletes: +# show_verbose(rfc_num,"Changing original list",tracker_persons,"by adding",working_adds," and deleting",working_deletes) +# print "(",rfc_num,",",[e for e in working_adds],",",[p.pk for p in working_deletes],"), #",[p.ascii for p in working_deletes] +# else: +# stats["data doesn't match but no changes found"] += 1 +# show_verbose(rfc_num,"Couldn't figure out what to change") + +# if False: +# #if tracker_persons: +# #if any(['iab@' in e for e in adds]) or any(['iesg@' in e for e in adds]) or any(['IESG'==p.name for p in deletes]) or any(['IAB'==p.name for p in deletes]): +# print rfc_num +# print "tracker_persons",tracker_persons +# print "author_names",author_names[rfc_num] +# print "author_emails",author_emails[rfc_num] +# print "Adds:", adds +# print "Deletes:", deletes + +# stats['changed authors'] += 1 + +# if False: +# debug.show('rfc_num') +# debug.show('rfced_emails') +# debug.show('tracker_emails') +# debug.show('known_emails') +# debug.show('unknown_emails') +# debug.show('tracker_persons') +# debug.show('rfced_persons') +# debug.show('tracker_persons==rfced_persons') +# debug.show('[p.id for p in tracker_persons]') +# debug.show('[p.id for p in rfced_persons]') +# exit() + +# if True: +# for p in sorted(list(probable_email_match)): +# print p +# if True: +# print "Probable duplicate persons" +# for d,r in sorted(probable_duplicates): +# print [(p,p.pk) for p in d], r +# else: +# print len(probable_duplicates)," probable duplicate persons" + +# print stats + +# if __name__ == "__main__": +# _main() + diff --git a/dev/mq/Dockerfile b/dev/mq/Dockerfile index e8871c30a9b..1738c4b3d20 100644 --- a/dev/mq/Dockerfile +++ b/dev/mq/Dockerfile @@ -1,6 +1,8 @@ # Dockerfile for RabbitMQ worker # -FROM rabbitmq:3-alpine +ARG RABBITMQ_VERSION=3.11-alpine + +FROM rabbitmq:${RABBITMQ_VERSION} LABEL maintainer="IETF Tools Team " # Copy the startup file diff --git a/dev/tests/debug.sh b/dev/tests/debug.sh index 405daae3774..d87c504bb91 100644 --- a/dev/tests/debug.sh +++ b/dev/tests/debug.sh @@ -3,7 +3,7 @@ # This script recreate the same environment used during tests on GitHub Actions # and drops you into a terminal at the point where the actual tests would be run. # -# Refer to https://github.com/ietf-tools/datatracker/blob/main/.github/workflows/build.yml#L141-L155 +# Refer to https://github.com/ietf-tools/datatracker/blob/main/.github/workflows/tests.yml#L47-L66 # for the commands to run next. # # Simply type "exit" + ENTER to exit and shutdown this test environment. @@ -12,7 +12,7 @@ echo "Fetching latest images..." docker pull ghcr.io/ietf-tools/datatracker-app-base:latest docker pull ghcr.io/ietf-tools/datatracker-db:latest echo "Starting containers..." -docker compose -f docker-compose.debug.yml -p dtdebug up -d +docker compose -f docker-compose.debug.yml -p dtdebug --compatibility up -d echo "Copying working directory into container..." docker compose -p dtdebug cp ../../. app:/__w/datatracker/datatracker/ echo "Run prepare script..." diff --git a/dev/tests/docker-compose.debug.yml b/dev/tests/docker-compose.debug.yml index 74491a5b2e8..8117b923751 100644 --- a/dev/tests/docker-compose.debug.yml +++ b/dev/tests/docker-compose.debug.yml @@ -1,26 +1,35 @@ -# This docker-compose replicates the test workflow happening on GitHub during a PR / build check. -# To be used from the debug.sh script. - -version: '3.8' - -services: - app: - image: ghcr.io/ietf-tools/datatracker-app-base:latest - command: -f /dev/null - working_dir: /__w/datatracker/datatracker - entrypoint: tail - hostname: app - volumes: - - /var/run/docker.sock:/var/run/docker.sock - environment: - CI: 'true' - GITHUB_ACTIONS: 'true' - HOME: /github/home - db: - image: ghcr.io/ietf-tools/datatracker-db:latest - restart: unless-stopped - volumes: - - postgresdb-data:/var/lib/postgresql/data - -volumes: - postgresdb-data: +# This docker-compose replicates the test workflow happening on GitHub during a PR / build check. +# To be used from the debug.sh script. + +version: '3.8' + +services: + app: + image: ghcr.io/ietf-tools/datatracker-app-base:latest + command: -f /dev/null + working_dir: /__w/datatracker/datatracker + entrypoint: tail + hostname: app + volumes: + - /var/run/docker.sock:/var/run/docker.sock + environment: + CI: 'true' + GITHUB_ACTIONS: 'true' + HOME: /github/home + deploy: + resources: + limits: + cpus: '2' + memory: '7GB' + + db: + image: ghcr.io/ietf-tools/datatracker-db:latest + restart: unless-stopped + volumes: + - postgresdb-data:/var/lib/postgresql/data + + blobstore: + image: ghcr.io/ietf-tools/datatracker-devblobstore:latest + +volumes: + postgresdb-data: diff --git a/dev/tests/settings_local.py b/dev/tests/settings_local.py index fdc60a84970..e1ffd60edb8 100644 --- a/dev/tests/settings_local.py +++ b/dev/tests/settings_local.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2007-2019, All Rights Reserved # -*- coding: utf-8 -*- -from ietf.settings import * # pyflakes:ignore +from ietf.settings import * # pyflakes:ignore ALLOWED_HOSTS = ['*'] @@ -10,15 +10,15 @@ 'HOST': 'db', 'PORT': 5432, 'NAME': 'datatracker', - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'USER': 'django', 'PASSWORD': 'RkTkDPFnKpko', }, } IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits" -IDSUBMIT_REPOSITORY_PATH = "test/id/" -IDSUBMIT_STAGING_PATH = "test/staging/" +IDSUBMIT_REPOSITORY_PATH = "/assets/ietfdata/doc/draft/repository" +IDSUBMIT_STAGING_PATH = "/assets/www6s/staging/" AGENDA_PATH = '/assets/www6s/proceedings/' MEETINGHOST_LOGO_PATH = AGENDA_PATH @@ -36,7 +36,6 @@ SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/' SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/' -SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/' SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/' SUBMIT_YANG_RFC_MODEL_DIR = '/assets/ietf-ftp/yang/rfcmod/' @@ -56,9 +55,11 @@ BOFREQ_PATH = '/assets/ietf-ftp/bofreq/' CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/' -INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' +INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive' INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/' BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml' +FTP_DIR = '/assets/ftp' +NFS_METRICS_TMP_DIR = '/assets/tmp' NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/' SLIDE_STAGING_PATH = 'test/staging/' diff --git a/docker-compose.yml b/docker-compose.yml index e9108526692..2440faf1214 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: app: build: @@ -17,6 +15,7 @@ services: depends_on: - db - mq + - blobstore ipc: host @@ -26,7 +25,7 @@ services: # UID: 1001 # GID: 1001 # DATADIR: data - # DJANGO_SETTINGS_MODULE: settings_postgrestest + # DJANGO_SETTINGS_MODULE: settings_test # Uncomment the next line to use a non-root user for all processes. # user: dev @@ -37,7 +36,7 @@ services: db: image: ghcr.io/ietf-tools/datatracker-db:latest # build: - # context: .. + # context: . # dockerfile: docker/db.Dockerfile restart: unless-stopped volumes: @@ -53,23 +52,30 @@ services: - PGADMIN_DEFAULT_EMAIL=dev@ietf.org - PGADMIN_DEFAULT_PASSWORD=dev - PGADMIN_CONFIG_LOGIN_BANNER="Login with dev@ietf.org / dev" - - PGADMIN_LISTEN_PORT=5433 - PGADMIN_DISABLE_POSTFIX=True - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False + - SCRIPT_NAME=/pgadmin volumes: - ./docker/configs/pgadmin-servers.json:/pgadmin4/servers.json + static: + image: ghcr.io/ietf-tools/static:latest + restart: unless-stopped + mq: image: rabbitmq:3-alpine restart: unless-stopped celery: - image: ghcr.io/ietf-tools/datatracker-celery:latest + build: + context: . + dockerfile: docker/celery.Dockerfile init: true environment: CELERY_APP: ietf CELERY_ROLE: worker UPDATE_REQUIREMENTS_FROM: requirements.txt + DEV_MODE: "yes" command: - '--loglevel=INFO' depends_on: @@ -80,6 +86,45 @@ services: - .:/workspace - app-assets:/assets + replicator: + build: + context: . + dockerfile: docker/celery.Dockerfile + init: true + environment: + CELERY_APP: ietf + CELERY_ROLE: worker + UPDATE_REQUIREMENTS_FROM: requirements.txt + DEV_MODE: "yes" + command: + - '--loglevel=INFO' + - '--queues=blobdb' + - '--concurrency=1' + + depends_on: + - db + restart: unless-stopped + stop_grace_period: 1m + volumes: + - .:/workspace + - app-assets:/assets + + blobstore: + image: ghcr.io/ietf-tools/datatracker-devblobstore:latest + restart: unless-stopped + volumes: + - "minio-data:/data" + + blobdb: + image: postgres:17 + restart: unless-stopped + environment: + POSTGRES_DB: blob + POSTGRES_USER: dt + POSTGRES_PASSWORD: abcd1234 + volumes: + - blobdb-data:/var/lib/postgresql/data + # Celery Beat is a periodic task runner. It is not normally needed for development, # but can be enabled by uncommenting the following. # @@ -98,7 +143,10 @@ services: # stop_grace_period: 1m # volumes: # - .:/workspace +# - app-assets:/assets volumes: postgresdb-data: app-assets: + minio-data: + blobdb-data: diff --git a/docker/README.md b/docker/README.md index b16687618f3..0ca79a6e899 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,14 +1,28 @@ # Datatracker Development in Docker +- [Getting started](#getting-started) +- [Using Visual Studio Code](#using-visual-studio-code) + - [Initial Setup](#initial-setup) + - [Subsequent Launch](#subsequent-launch) + - [Usage](#usage) +- [Using Other Editors / Generic](#using-other-editors--generic) + - [Exit Environment](#exit-environment) + - [Accessing PostgreSQL Port](#accessing-postgresql-port) +- [Clean and Rebuild DB from latest image](#clean-and-rebuild-db-from-latest-image) +- [Clean all](#clean-all) +- [Updating an older environment](#updating-an-older-environment) +- [Notes / Troubleshooting](#notes--troubleshooting) + ## Getting started 1. [Set up Docker](https://docs.docker.com/get-started/) on your preferred platform. On Windows, it is highly recommended to use the [WSL 2 *(Windows Subsystem for Linux)*](https://docs.docker.com/desktop/windows/wsl/) backend. +> [!IMPORTANT] > See the [IETF Tools Windows Dev guide](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md) on how to get started when using Windows. -2. On Linux, you must also install [Docker Compose](https://docs.docker.com/compose/install/). Docker Desktop for Mac and Windows already include Docker Compose. +2. On Linux, you must [install Docker Compose manually](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually) and not install Docker Desktop. On Mac and Windows install Docker Desktop which already includes Docker Compose. -2. If you have a copy of the datatracker code checked out already, simply `cd` to the top-level directory. +3. If you have a copy of the datatracker code checked out already, simply `cd` to the top-level directory. If not, check out a datatracker branch as usual. We'll check out `main` below, but you can use any branch: @@ -18,7 +32,7 @@ git checkout main ``` -3. Follow the instructions for your preferred editor: +4. Follow the instructions for your preferred editor: - [Visual Studio Code](#using-visual-studio-code) - [Other Editors / Generic](#using-other-editors--generic) @@ -29,9 +43,9 @@ This project includes a devcontainer configuration which automates the setup of ### Initial Setup 1. Launch [VS Code](https://code.visualstudio.com/) -2. Under the **Extensions** tab, ensure you have the **Remote - Containers** ([ms-vscode-remote.remote-containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)) extension installed. +2. Under the **Extensions** tab, ensure you have the **Dev Containers** ([ms-vscode-remote.remote-containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)) extension installed. * On Linux, note that the Snap installation of VS Code is [incompatible with this plugin](https://code.visualstudio.com/docs/devcontainers/containers#_system-requirements:~:text=snap%20package%20is%20not%20supported). - * On Windows, you also need the **Remote - WSL** ([ms-vscode-remote.remote-wsl](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)) extension to take advantage of the WSL 2 *(Windows Subsystem for Linux)* native integration. + * On Windows, you also need the **WSL** ([ms-vscode-remote.remote-wsl](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)) extension to take advantage of the WSL 2 *(Windows Subsystem for Linux)* native integration. 2. Open the top-level directory of the datatracker code you fetched above. 3. A prompt inviting you to reopen the project in containers will appear in the bottom-right corner. Click the **Reopen in Container** button. If you missed the prompt, you can press `F1`, start typing `reopen in container` task and launch it. 4. VS Code will relaunch in the dev environment and create the containers automatically. @@ -45,7 +59,7 @@ You can also open the datatracker project folder and click the **Reopen in conta ### Usage -- Under the **Run and Debug** tab, you can run the server with the debugger attached using **Run Server** (F5). Once the server is ready to accept connections, you'll be prompted to open in a browser. You can also open [http://localhost:8000](http://localhost:8000) in a browser. +- Under the **Run and Debug** tab, you can run the server with the debugger attached using **Run Server** (F5). Once the server is ready to accept connections, you'll be prompted to open in a browser. Navigate to [http://localhost:8000](http://localhost:8000) in your preferred browser. > An alternate profile **Run Server with Debug Toolbar** is also available from the dropdown menu, which displays various tools on top of the webpage. However, note that this configuration has a significant performance impact. @@ -64,11 +78,7 @@ You can also open the datatracker project folder and click the **Reopen in conta ![](assets/vscode-terminal-new.png) -- Under the **SQL Tools** tab, a connection **Local Dev** is preconfigured to connect to the DB container. Using this tool, you can list tables, view records and execute SQL queries directly from VS Code. - - > The port `3306` is also exposed to the host automatically, should you prefer to use your own SQL tool. - - ![](assets/vscode-sqltools.png) +- The pgAdmin web interface, a PostgreSQL DB browser / management UI, is available at [http://localhost:8000/pgadmin/](http://localhost:8000/pgadmin/). - Under the **Task Explorer** tab, a list of available preconfigured tasks is displayed. *(You may need to expand the tree to `src > vscode` to see it.)* These are common scritps you can run *(e.g. run tests, fetch assets, etc.)*. @@ -87,11 +97,10 @@ You can also open the datatracker project folder and click the **Reopen in conta On Linux / macOS: ```sh - cd docker - ./run + ./docker/run # or whatever path you need ``` - > Note that you can pass the `-r` flag to `./run` to force a rebuild of the containers. This is useful if you switched branches and that the existing containers still contain configurations from the old branch. You should also use this if you don't regularly keep up with main and your containers reflect a much older version of the branch. + > Note that you can pass the `-r` flag to `run` to force a rebuild of the containers. This is useful if you switched branches and that the existing containers still contain configurations from the old branch. You should also use this if you don't regularly keep up with main and your containers reflect a much older version of the branch. On Windows *(using Powershell)*: ```sh @@ -104,7 +113,7 @@ You can also open the datatracker project folder and click the **Reopen in conta 2. Wait for the containers to initialize. Upon completion, you will be dropped into a shell from which you can start the datatracker and execute related commands as usual, for example ``` - ietf/manage.py runserver 0.0.0.0:8000 + ietf/manage.py runserver 8001 ``` to start the datatracker. @@ -127,7 +136,14 @@ docker compose down to terminate the containers. -### Clean and Rebuild DB from latest image +### Accessing PostgreSQL Port + +The port is exposed but not automatically mapped to `5432` to avoid potential conflicts with the host. To get the mapped port, run the command *(from the project `/docker` directory)*: +```sh +docker compose port db 5432 +``` + +## Clean and Rebuild DB from latest image To delete the active DB container, its volume and get the latest image / DB dump, simply run the following command: @@ -145,7 +161,7 @@ docker compose pull db docker compose build --no-cache db ``` -### Clean all +## Clean all To delete all containers for this project, its associated images and purge any remaining dangling images, simply run the following command: @@ -162,11 +178,19 @@ docker compose down -v --rmi all docker image prune ``` -### Accessing MariaDB Port +## Updating an older environment + +If you already have a clone, such as from a previous codesprint, and are updating that clone, before starting the datatracker from the updated image: +1. `rm ietf/settings_local.py` *(The startup script will put a new one, appropriate to the current release, in place)* +1. Execute the [Clean all](#clean-all) sequence above. + +If the dev environment fails to start, even after running the [Clean all](#clean-all) sequence above, you can fully purge all docker cache, containers, images and volumes by running the command below. + +> [!CAUTION] +> Note that this will delete everything docker-related, including non-datatracker docker resources you might have. -The port is exposed but not mapped to `3306` to avoid potential conflicts with the host. To get the mapped port, run the command *(from the project `/docker` directory)*: ```sh -docker compose port db 3306 +docker system prune -a --volumes ``` ## Notes / Troubleshooting @@ -188,3 +212,17 @@ The content of the source files will be copied into the target `.ics` files. Mak ### Missing assets in the data folder Because including all assets in the image would significantly increase the file size, they are not included by default. You can however fetch them by running the **Fetch assets via rsync** task in VS Code or run manually the script `docker/scripts/app-rsync-extras.sh` + +### Linux file permissions leaking to the host system + +If on the host filesystem you have permissions that look like this, + +```bash +$ ls -la +total 4624 +drwxrwxr-x 2 100999 100999 4096 May 25 07:56 bin +drwxrwxr-x 5 100999 100999 4096 May 25 07:56 client +(etc...) +``` + +Try uninstalling Docker Desktop and installing Docker Compose manually. The Docker Compose bundled with Docker Desktop is incompatible with our software. See also [Rootless Docker: file ownership changes #3343](https://github.com/lando/lando/issues/3343), [Docker context desktop-linux has container permission issues #75](https://github.com/docker/desktop-linux/issues/75). diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile index af475a4e6be..dd4cf72ffd9 100644 --- a/docker/app.Dockerfile +++ b/docker/app.Dockerfile @@ -10,12 +10,7 @@ ARG USER_GID=$USER_UID COPY docker/scripts/app-setup-debian.sh /tmp/library-scripts/docker-setup-debian.sh RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-debian.sh && chmod +x /tmp/library-scripts/docker-setup-debian.sh -# Add Postgresql Apt Repository to get 14 -RUN echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list -RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y --no-install-recommends postgresql-client-14 pgloader \ # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131 && apt-get purge -y imagemagick imagemagick-6-common \ # Install common packages, non-root user @@ -30,12 +25,21 @@ COPY docker/scripts/app-setup-python.sh /tmp/library-scripts/docker-setup-python RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-python.sh && chmod +x /tmp/library-scripts/docker-setup-python.sh RUN bash /tmp/library-scripts/docker-setup-python.sh "none" "/usr/local" "${PIPX_HOME}" "${USERNAME}" +# Setup nginx +COPY docker/scripts/app-setup-nginx.sh /tmp/library-scripts/docker-setup-nginx.sh +RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-nginx.sh && chmod +x /tmp/library-scripts/docker-setup-nginx.sh +RUN bash /tmp/library-scripts/docker-setup-nginx.sh +COPY docker/configs/nginx-proxy.conf /etc/nginx/sites-available/default +COPY docker/configs/nginx-502.html /var/www/html/502.html + # Remove library scripts for final image RUN rm -rf /tmp/library-scripts # Copy the startup file COPY docker/scripts/app-init.sh /docker-init.sh -RUN sed -i 's/\r$//' /docker-init.sh && chmod +x /docker-init.sh +COPY docker/scripts/app-start.sh /docker-start.sh +RUN sed -i 's/\r$//' /docker-init.sh && chmod +rx /docker-init.sh +RUN sed -i 's/\r$//' /docker-start.sh && chmod +rx /docker-start.sh # Fix user UID / GID to match host RUN groupmod --gid $USER_GID $USERNAME \ diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 499040e4335..25016360494 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -1,138 +1,159 @@ -FROM python:3.9-bullseye -LABEL maintainer="IETF Tools Team " - -ENV DEBIAN_FRONTEND=noninteractive - -# Update system packages -RUN apt-get update \ - && apt-get -qy upgrade \ - && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 - -# Add Node.js Source -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - - -# Add Docker Source -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg -RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null - -# Add PostgreSQL Source -RUN echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list -RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - -# Install the packages we need -RUN apt-get update --fix-missing && apt-get install -qy \ - apache2-utils \ - apt-file \ - bash \ - build-essential \ - curl \ - default-jdk \ - docker-ce-cli \ - enscript \ - gawk \ - g++ \ - gcc \ - ghostscript \ - git \ - gnupg \ - jq \ - less \ - libcairo2-dev \ - libgtk2.0-0 \ - libgtk-3-0 \ - libnotify-dev \ - libgconf-2-4 \ - libgbm-dev \ - libnss3 \ - libxss1 \ - libasound2 \ - libxtst6 \ - libmagic-dev \ - libmariadb-dev \ - libmemcached-tools \ - locales \ - make \ - mariadb-client \ - memcached \ - nano \ - netcat \ - nodejs \ - pgloader \ - pigz \ - postgresql-client-14 \ - pv \ - python3-ipython \ - ripgrep \ - rsync \ - rsyslog \ - ruby \ - ruby-rubygems \ - unzip \ - wget \ - xauth \ - xvfb \ - yang-tools \ - zsh - -# Install kramdown-rfc2629 (ruby) -RUN gem install kramdown-rfc2629 - -# Install chromedriver -COPY docker/scripts/app-install-chromedriver.sh /tmp/app-install-chromedriver.sh -RUN sed -i 's/\r$//' /tmp/app-install-chromedriver.sh && \ - chmod +x /tmp/app-install-chromedriver.sh -RUN /tmp/app-install-chromedriver.sh - -# Fix /dev/shm permissions for chromedriver -RUN chmod 1777 /dev/shm - -# Activate Yarn -RUN corepack enable - -# Get rid of installation files we don't need in the image, to reduce size -RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* - -# "fake" dbus address to prevent errors -# https://github.com/SeleniumHQ/docker-selenium/issues/87 -ENV DBUS_SESSION_BUS_ADDRESS=/dev/null - -# avoid million NPM install messages -ENV npm_config_loglevel warn -# allow installing when the main user is root -ENV npm_config_unsafe_perm true -# disable NPM funding messages -ENV npm_config_fund false - -# Set locale to en_US.UTF-8 -RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \ - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ - echo "LANG=en_US.UTF-8" > /etc/locale.conf && \ - dpkg-reconfigure locales && \ - locale-gen en_US.UTF-8 && \ - update-locale LC_ALL en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 - -# Install idnits -ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/ -RUN chmod +rx /usr/local/bin/idnits - -# Turn off rsyslog kernel logging (doesn't work in Docker) -RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf - -# Colorize the bash shell -RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc - -# Turn off rsyslog kernel logging (doesn't work in Docker) -RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf - -# Fetch wait-for utility -ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/ -RUN chmod +rx /usr/local/bin/wait-for - -# Create assets directory -RUN mkdir -p /assets - -# Create workspace -RUN mkdir -p /workspace -WORKDIR /workspace +FROM python:3.12-bookworm +LABEL maintainer="IETF Tools Team " + +ENV DEBIAN_FRONTEND=noninteractive +ENV NODE_MAJOR=16 + +# Update system packages +RUN apt-get update \ + && apt-get -qy upgrade \ + && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 + +# Add Node.js Source +RUN apt-get install -y --no-install-recommends ca-certificates curl gnupg \ + && mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN echo "Package: nodejs" >> /etc/apt/preferences.d/preferences \ + && echo "Pin: origin deb.nodesource.com" >> /etc/apt/preferences.d/preferences \ + && echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/preferences + +# Add Docker Source +RUN mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list + +# Add PostgreSQL Source +RUN mkdir -p /etc/apt/keyrings \ + && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/apt.postgresql.org.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/apt.postgresql.org.gpg] https://apt.postgresql.org/pub/repos/apt $(. /etc/os-release && echo "$VERSION_CODENAME")-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list + +# Install the packages we need +RUN apt-get update --fix-missing && apt-get install -qy --no-install-recommends \ + apache2-utils \ + apt-file \ + bash \ + build-essential \ + curl \ + default-jdk \ + docker-ce-cli \ + enscript \ + firefox-esr \ + gawk \ + g++ \ + gcc \ + ghostscript \ + git \ + gnupg \ + jq \ + less \ + libcairo2-dev \ + libgtk2.0-0 \ + libgtk-3-0 \ + libnotify-dev \ + libgconf-2-4 \ + libgbm-dev \ + libnss3 \ + libxss1 \ + libasound2 \ + libxtst6 \ + libmagic-dev \ + libmariadb-dev \ + libmemcached-tools \ + libyang2-tools \ + locales \ + make \ + mariadb-client \ + memcached \ + nano \ + netcat-traditional \ + nodejs \ + pgloader \ + pigz \ + postgresql-client-17 \ + pv \ + python3-ipython \ + ripgrep \ + rsync \ + rsyslog \ + ruby \ + ruby-rubygems \ + unzip \ + wget \ + xauth \ + xvfb \ + zsh + +# Install kramdown-rfc2629 (ruby) +RUN gem install kramdown-rfc2629 + +# GeckoDriver +ARG GECKODRIVER_VERSION=latest +RUN GK_VERSION=$(if [ ${GECKODRIVER_VERSION:-latest} = "latest" ]; then echo "0.34.0"; else echo $GECKODRIVER_VERSION; fi) \ + && echo "Using GeckoDriver version: "$GK_VERSION \ + && wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GK_VERSION/geckodriver-v$GK_VERSION-linux64.tar.gz \ + && rm -rf /opt/geckodriver \ + && tar -C /opt -zxf /tmp/geckodriver.tar.gz \ + && rm /tmp/geckodriver.tar.gz \ + && mv /opt/geckodriver /opt/geckodriver-$GK_VERSION \ + && chmod 755 /opt/geckodriver-$GK_VERSION \ + && ln -fs /opt/geckodriver-$GK_VERSION /usr/bin/geckodriver + +# Activate Yarn +RUN corepack enable + +# Get rid of installation files we don't need in the image, to reduce size +RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# "fake" dbus address to prevent errors +# https://github.com/SeleniumHQ/docker-selenium/issues/87 +ENV DBUS_SESSION_BUS_ADDRESS=/dev/null + +# avoid million NPM install messages +ENV npm_config_loglevel=warn +# allow installing when the main user is root +ENV npm_config_unsafe_perm=true +# disable NPM funding messages +ENV npm_config_fund=false + +# Set locale to en_US.UTF-8 +RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ + echo "LANG=en_US.UTF-8" > /etc/locale.conf && \ + dpkg-reconfigure locales && \ + locale-gen en_US.UTF-8 && \ + update-locale LC_ALL en_US.UTF-8 +ENV LC_ALL=en_US.UTF-8 + +# Install idnits +ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/ +RUN chmod +rx /usr/local/bin/idnits + +# Install required fonts +RUN mkdir -p /tmp/fonts && \ + wget -q -O /tmp/fonts.tar.gz https://github.com/ietf-tools/xml2rfc-fonts/archive/refs/tags/3.22.0.tar.gz && \ + tar zxf /tmp/fonts.tar.gz -C /tmp/fonts && \ + mv /tmp/fonts/*/noto/* /usr/local/share/fonts/ && \ + mv /tmp/fonts/*/roboto_mono/* /usr/local/share/fonts/ && \ + rm -rf /tmp/fonts.tar.gz /tmp/fonts/ && \ + fc-cache -f + +# Turn off rsyslog kernel logging (doesn't work in Docker) +RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf + +# Colorize the bash shell +RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc + +# Turn off rsyslog kernel logging (doesn't work in Docker) +RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf + +# Fetch wait-for utility +ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/ +RUN chmod +rx /usr/local/bin/wait-for + +# Create assets directory +RUN mkdir -p /assets + +# Create workspace +RUN mkdir -p /workspace +WORKDIR /workspace diff --git a/docker/celery.Dockerfile b/docker/celery.Dockerfile new file mode 100644 index 00000000000..e93ca3cf77c --- /dev/null +++ b/docker/celery.Dockerfile @@ -0,0 +1,55 @@ +FROM ghcr.io/ietf-tools/datatracker-app-base:latest +LABEL maintainer="IETF Tools Team " + +ENV DEBIAN_FRONTEND=noninteractive + +# Install needed packages and setup non-root user. +ARG USERNAME=dev +ARG USER_UID=1000 +ARG USER_GID=$USER_UID +COPY docker/scripts/app-setup-debian.sh /tmp/library-scripts/docker-setup-debian.sh +RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-debian.sh && chmod +x /tmp/library-scripts/docker-setup-debian.sh + +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131 + && apt-get purge -y imagemagick imagemagick-6-common \ + # Install common packages, non-root user + # Syntax: ./docker-setup-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages] + && bash /tmp/library-scripts/docker-setup-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "false" "true" "true" + +# Setup default python tools in a venv via pipx to avoid conflicts +ENV PIPX_HOME=/usr/local/py-utils \ + PIPX_BIN_DIR=/usr/local/py-utils/bin +ENV PATH=${PATH}:${PIPX_BIN_DIR} +COPY docker/scripts/app-setup-python.sh /tmp/library-scripts/docker-setup-python.sh +RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-python.sh && chmod +x /tmp/library-scripts/docker-setup-python.sh +RUN bash /tmp/library-scripts/docker-setup-python.sh "none" "/usr/local" "${PIPX_HOME}" "${USERNAME}" + +# Remove library scripts for final image +RUN rm -rf /tmp/library-scripts + +# Copy the startup file +COPY docker/scripts/app-init-celery.sh /docker-init.sh +RUN sed -i 's/\r$//' /docker-init.sh && \ + chmod +x /docker-init.sh + +ENTRYPOINT [ "/docker-init.sh" ] + +# Fix user UID / GID to match host +RUN groupmod --gid $USER_GID $USERNAME \ + && usermod --uid $USER_UID --gid $USER_GID $USERNAME \ + && chown -R $USER_UID:$USER_GID /home/$USERNAME \ + || exit 0 + +# Switch to local dev user +USER dev:dev + +# Install current datatracker python dependencies +COPY requirements.txt /tmp/pip-tmp/ +RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location -r /tmp/pip-tmp/requirements.txt +RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location watchdog[watchmedo] + +RUN sudo rm -rf /tmp/pip-tmp + +VOLUME [ "/assets" ] + diff --git a/docker/cleanall b/docker/cleanall index 91eac1764bf..c6104aaef99 100755 --- a/docker/cleanall +++ b/docker/cleanall @@ -1,5 +1,11 @@ #!/bin/bash +if test $(basename $PWD ) != "docker" +then + echo "Run this from the docker directory" 1>&2 + exit 1 +fi + read -p "Stop and remove all containers, volumes and images for this project? [y/N] " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]] @@ -7,6 +13,5 @@ then cd .. echo "Shutting down any instance still running and purge images..." docker compose down -v --rmi all - cd docker echo "Done!" fi diff --git a/docker/cleandb b/docker/cleandb index 322e4639a25..c881503eae7 100755 --- a/docker/cleandb +++ b/docker/cleandb @@ -1,5 +1,11 @@ #!/bin/bash +if test $(basename $PWD ) != "docker" +then + echo "Run this from the docker directory" 1>&2 + exit 1 +fi + cd .. echo "Shutting down any instance still running..." docker compose down @@ -9,5 +15,5 @@ docker volume rm -f "${PROJNAME}_postgresdb-data" echo "Rebuilding the DB image..." docker compose pull db docker compose build --no-cache db -cd docker + echo "Done!" diff --git a/docker/configs/nginx-502.html b/docker/configs/nginx-502.html new file mode 100644 index 00000000000..b5577d3e179 --- /dev/null +++ b/docker/configs/nginx-502.html @@ -0,0 +1,61 @@ + + + + + + Datatracker DEV + + + + IETF +

Datatracker

+

Could not connect to dev server.

+
+

Is the datatracker server running?

+

Using VS Code, open the Run and Debug tab on the left and click the ‣ symbol (Run Server) to start the server.

+

Otherwise, run the command ietf/manage.py runserver 8001 from the terminal.

+
+
+

You can manage the database at /pgadmin.

+
+

For more information, check out the Datatracker Development in Docker guide.

+ + diff --git a/docker/configs/nginx-proxy.conf b/docker/configs/nginx-proxy.conf new file mode 100644 index 00000000000..3068cc71d73 --- /dev/null +++ b/docker/configs/nginx-proxy.conf @@ -0,0 +1,34 @@ +server { + listen 8000 default_server; + listen [::]:8000 default_server; + + proxy_read_timeout 1d; + proxy_send_timeout 1d; + + root /var/www/html; + index index.html index.htm index.nginx-debian.html; + + server_name _; + + location /_static/ { + proxy_pass http://static/; + } + + location /pgadmin/ { + proxy_set_header X-Script-Name /pgadmin; + proxy_set_header Host $host; + proxy_pass http://pgadmin; + proxy_redirect off; + } + + location / { + error_page 502 /502.html; + proxy_pass http://localhost:8001/; + proxy_set_header Host localhost:8000; + } + + location /502.html { + root /var/www/html; + internal; + } +} diff --git a/docker/configs/pgadmin-servers.json b/docker/configs/pgadmin-servers.json index 8b1c181d13b..b4458af9235 100644 --- a/docker/configs/pgadmin-servers.json +++ b/docker/configs/pgadmin-servers.json @@ -1,22 +1,22 @@ -{ - "Servers": { - "1": { - "Name": "Local Dev", - "Group": "Servers", - "Host": "db", - "Port": 5432, - "MaintenanceDB": "postgres", - "Username": "django", - "UseSSHTunnel": 0, - "TunnelPort": "22", - "TunnelAuthentication": 0, - "KerberosAuthentication": false, - "ConnectionParameters": { - "sslmode": "prefer", - "connect_timeout": 10, - "sslcert": "/.postgresql/postgresql.crt", - "sslkey": "/.postgresql/postgresql.key" - } - } - } -} +{ + "Servers": { + "1": { + "Name": "Local Dev", + "Group": "Servers", + "Host": "db", + "Port": 5432, + "MaintenanceDB": "postgres", + "Username": "django", + "UseSSHTunnel": 0, + "TunnelPort": "22", + "TunnelAuthentication": 0, + "KerberosAuthentication": false, + "ConnectionParameters": { + "sslmode": "prefer", + "connect_timeout": 10, + "sslcert": "/.postgresql/postgresql.crt", + "sslkey": "/.postgresql/postgresql.key" + } + } + } +} diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py index a405206c95c..3ee7a4295d2 100644 --- a/docker/configs/settings_local.py +++ b/docker/configs/settings_local.py @@ -1,15 +1,30 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2007-2025, All Rights Reserved # -*- coding: utf-8 -*- -from ietf.settings import * # pyflakes:ignore +from ietf.settings import * # pyflakes:ignore +from ietf.settings import ( + ARTIFACT_STORAGE_NAMES, + STORAGES, + BLOBSTORAGE_MAX_ATTEMPTS, + BLOBSTORAGE_READ_TIMEOUT, + BLOBSTORAGE_CONNECT_TIMEOUT, +) ALLOWED_HOSTS = ['*'] -from ietf.settings_postgresqldb import DATABASES # pyflakes:ignore +from ietf.settings_postgresqldb import DATABASES # pyflakes:ignore +DATABASE_ROUTERS = ["ietf.blobdb.routers.BlobdbStorageRouter"] +BLOBDB_DATABASE = "blobdb" +BLOBDB_REPLICATION = { + "ENABLED": True, + "DEST_STORAGE_PATTERN": "r2-{bucket}", + "INCLUDE_BUCKETS": ARTIFACT_STORAGE_NAMES, + "EXCLUDE_BUCKETS": ["staging"], + "VERBOSE_LOGGING": True, +} IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits" -IDSUBMIT_REPOSITORY_PATH = "test/id/" -IDSUBMIT_STAGING_PATH = "test/staging/" +IDSUBMIT_STAGING_PATH = "/assets/www6s/staging/" AGENDA_PATH = '/assets/www6s/proceedings/' MEETINGHOST_LOGO_PATH = AGENDA_PATH @@ -27,7 +42,6 @@ SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/' SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/' -SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/' SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/' SUBMIT_YANG_RFC_MODEL_DIR = '/assets/ietf-ftp/yang/rfcmod/' @@ -40,18 +54,49 @@ # 'ietf.context_processors.sql_debug', # ] -DOCUMENT_PATH_PATTERN = '/assets/ietf-ftp/{doc.type_id}/' +DOCUMENT_PATH_PATTERN = '/assets/ietfdata/doc/{doc.type_id}/' INTERNET_DRAFT_PATH = '/assets/ietf-ftp/internet-drafts/' RFC_PATH = '/assets/ietf-ftp/rfc/' CHARTER_PATH = '/assets/ietf-ftp/charter/' BOFREQ_PATH = '/assets/ietf-ftp/bofreq/' CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/' -INTERNET_DRAFT_ARCHIVE_DIR = '/assets/archive/id' +INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive' INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id' BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml' +IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH +FTP_DIR = '/assets/ftp' +NFS_METRICS_TMP_DIR = '/assets/tmp' NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/' -SLIDE_STAGING_PATH = 'test/staging/' +SLIDE_STAGING_PATH = '/assets/www6s/staging/' DE_GFM_BINARY = '/usr/local/bin/de-gfm' + +STATIC_IETF_ORG = "/_static" +STATIC_IETF_ORG_INTERNAL = "http://static" + + +# Blob replication storage for dev +import botocore.config +for storagename in ARTIFACT_STORAGE_NAMES: + replica_storagename = f"r2-{storagename}" + STORAGES[replica_storagename] = { + "BACKEND": "ietf.doc.storage.MetadataS3Storage", + "OPTIONS": dict( + endpoint_url="http://blobstore:9000", + access_key="minio_root", + secret_key="minio_pass", + security_token=None, + client_config=botocore.config.Config( + request_checksum_calculation="when_required", + response_checksum_validation="when_required", + signature_version="s3v4", + connect_timeout=BLOBSTORAGE_CONNECT_TIMEOUT, + read_timeout=BLOBSTORAGE_READ_TIMEOUT, + retries={"total_max_attempts": BLOBSTORAGE_MAX_ATTEMPTS}, + ), + verify=False, + bucket_name=f"{storagename}", + ), + } diff --git a/docker/configs/settings_local_vite.py b/docker/configs/settings_local_vite.py index 7fb12a003d1..9116905b124 100644 --- a/docker/configs/settings_local_vite.py +++ b/docker/configs/settings_local_vite.py @@ -2,5 +2,9 @@ # -*- coding: utf-8 -*- from ietf.settings_local import * # pyflakes:ignore +from ietf.settings_local import DJANGO_VITE -DJANGO_VITE_DEV_MODE = True +DJANGO_VITE["default"] |= { + "dev_mode": True, + "dev_server_port": 3000, +} diff --git a/docker/configs/settings_postgresqldb.py b/docker/configs/settings_postgresqldb.py index fe0c827ffa8..9b98586658e 100644 --- a/docker/configs/settings_postgresqldb.py +++ b/docker/configs/settings_postgresqldb.py @@ -3,8 +3,16 @@ 'HOST': 'db', 'PORT': 5432, 'NAME': 'datatracker', - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'USER': 'django', 'PASSWORD': 'RkTkDPFnKpko', }, + 'blobdb': { + 'HOST': 'blobdb', + 'PORT': 5432, + 'NAME': 'blob', + 'ENGINE': 'django.db.backends.postgresql', + 'USER': 'dt', + 'PASSWORD': 'abcd1234', + }, } diff --git a/docker/db.Dockerfile b/docker/db.Dockerfile index 58d7f2728c8..48ab2987807 100644 --- a/docker/db.Dockerfile +++ b/docker/db.Dockerfile @@ -1,7 +1,7 @@ # ===================== # --- Builder Stage --- # ===================== -FROM postgres:14.6 AS builder +FROM postgres:17 AS builder ENV POSTGRES_PASSWORD=hk2j22sfiv ENV POSTGRES_USER=django @@ -19,7 +19,7 @@ RUN ["/usr/local/bin/docker-entrypoint.sh", "postgres"] # =================== # --- Final Image --- # =================== -FROM postgres:14.6 +FROM postgres:17 LABEL maintainer="IETF Tools Team " COPY --from=builder /data $PGDATA @@ -28,3 +28,10 @@ ENV POSTGRES_PASSWORD=hk2j22sfiv ENV POSTGRES_USER=django ENV POSTGRES_DB=datatracker ENV POSTGRES_HOST_AUTH_METHOD=trust + +# build-args for db dump tagging - exposed in the environment and +# in image metadata +ARG datatracker_dumpinfo_date="" +ENV DATATRACKER_DUMPINFO_DATE=$datatracker_dumpinfo_date +ARG datatracker_snapshot="" +ENV DATATRACKER_SNAPSHOT=$datatracker_snapshot diff --git a/docker/devblobstore.Dockerfile b/docker/devblobstore.Dockerfile new file mode 100644 index 00000000000..40bfbd0e961 --- /dev/null +++ b/docker/devblobstore.Dockerfile @@ -0,0 +1,9 @@ +ARG MINIO_VERSION=latest +FROM quay.io/minio/minio:${MINIO_VERSION} +LABEL maintainer="IETF Tools Team " + +ENV MINIO_ROOT_USER=minio_root +ENV MINIO_ROOT_PASSWORD=minio_pass +ENV MINIO_DEFAULT_BUCKETS=defaultbucket + +CMD ["server", "--console-address", ":9001", "/data"] diff --git a/docker/docker-compose.celery.yml b/docker/docker-compose.celery.yml deleted file mode 100644 index dedae2d0049..00000000000 --- a/docker/docker-compose.celery.yml +++ /dev/null @@ -1,51 +0,0 @@ -version: '2.4' -# Use version 2.4 for mem_limit setting. Version 3+ uses deploy.resources.limits.memory -# instead, but that only works for swarm with docker-compose 1.25.1. - -services: - mq: - image: rabbitmq:3-alpine - user: '${RABBITMQ_UID:-499:499}' - hostname: datatracker-mq -# deploy: -# resources: -# limits: -# memory: 1gb # coordinate with settings in rabbitmq.conf -# reservations: -# memory: 512mb - mem_limit: 1gb # coordinate with settings in rabbitmq.conf - ports: - - '${MQ_PORT:-5672}:5672' - volumes: - - ./lib.rabbitmq:/var/lib/rabbitmq - - ./rabbitmq.conf:/etc/rabbitmq/conf.d/90-ietf.conf - - ./definitions.json:/ietf-conf/definitions.json - restart: unless-stopped - logging: - driver: "syslog" - options: - syslog-address: 'unixgram:///dev/log' - tag: 'docker/{{.Name}}' -# syslog-address: "tcp://ietfa.amsl.com:514" - - celery: - image: ghcr.io/ietf-tools/datatracker-celery:latest - environment: - CELERY_APP: ietf - # UPDATE_REQUIREMENTS: 1 # uncomment to update Python requirements on startup - command: - - '--loglevel=INFO' - user: '${CELERY_UID:-499:499}' - volumes: - - '${DATATRACKER_PATH:-..}:/workspace' - - '${MYSQL_SOCKET_PATH:-/run/mysql}:/run/mysql' - depends_on: - - mq - network_mode: 'service:mq' - restart: unless-stopped - logging: - driver: "syslog" - options: - syslog-address: 'unixgram:///dev/log' - tag: 'docker/{{.Name}}' -# syslog-address: "tcp://ietfa.amsl.com:514" diff --git a/docker/docker-compose.extend.yml b/docker/docker-compose.extend.yml index d055c976f49..a69a453110c 100644 --- a/docker/docker-compose.extend.yml +++ b/docker/docker-compose.extend.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: app: ports: @@ -18,6 +16,10 @@ services: pgadmin: ports: - '5433' + blobstore: + ports: + - '9000' + - '9001' celery: volumes: - .:/workspace diff --git a/docker/run b/docker/run index 68246d891e3..71e794aaa91 100755 --- a/docker/run +++ b/docker/run @@ -37,6 +37,15 @@ while getopts "hp:r" opt; do esac done +# Ensure the run script is in our directory. +dirname=$(dirname $0) +if [ "$dirname" = "." -o "$dirname" = "" ] ; then + : +else + echo "Changing to directory $dirname" + cd $dirname || exit 1 +fi + # Remove mounted temp directories rm -rf .parcel-cache __pycache__ diff --git a/docker/scripts/app-configure-blobstore.py b/docker/scripts/app-configure-blobstore.py new file mode 100755 index 00000000000..3140e393064 --- /dev/null +++ b/docker/scripts/app-configure-blobstore.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# Copyright The IETF Trust 2024, All Rights Reserved + +import boto3 +import botocore.config +import botocore.exceptions +import os +import sys + +from ietf.settings import ARTIFACT_STORAGE_NAMES + + +def init_blobstore(): + blobstore = boto3.resource( + "s3", + endpoint_url=os.environ.get("BLOB_STORE_ENDPOINT_URL", "http://blobstore:9000"), + aws_access_key_id=os.environ.get("BLOB_STORE_ACCESS_KEY", "minio_root"), + aws_secret_access_key=os.environ.get("BLOB_STORE_SECRET_KEY", "minio_pass"), + aws_session_token=None, + config=botocore.config.Config( + request_checksum_calculation="when_required", + response_checksum_validation="when_required", + signature_version="s3v4", + ), + ) + for bucketname in ARTIFACT_STORAGE_NAMES: + try: + blobstore.create_bucket( + Bucket=f"{os.environ.get('BLOB_STORE_BUCKET_PREFIX', '')}{bucketname}".strip() + ) + except botocore.exceptions.ClientError as err: + if err.response["Error"]["Code"] == "BucketAlreadyExists": + print(f"Bucket {bucketname} already exists") + else: + print(f"Error creating {bucketname}: {err.response['Error']['Code']}") + else: + print(f"Bucket {bucketname} created") + +if __name__ == "__main__": + sys.exit(init_blobstore()) diff --git a/docker/scripts/app-create-dirs.sh b/docker/scripts/app-create-dirs.sh index d9296ecffe4..3eb328a2807 100755 --- a/docker/scripts/app-create-dirs.sh +++ b/docker/scripts/app-create-dirs.sh @@ -1,14 +1,9 @@ #!/bin/bash for sub in \ - test/id \ - test/staging \ - test/archive \ - test/rfc \ - test/media \ - test/wiki/ietf \ - data/nomcom_keys/public_keys \ /assets/archive/id \ + /assets/collection \ + /assets/collection/draft-archive \ /assets/ietf-ftp \ /assets/ietf-ftp/bofreq \ /assets/ietf-ftp/charter \ @@ -25,6 +20,7 @@ for sub in \ /assets/ietfdata/derived \ /assets/ietfdata/derived/bibxml \ /assets/ietfdata/derived/bibxml/bibxml-ids \ + /assets/ietfdata/doc/draft/repository \ /assets/www6s \ /assets/www6s/staging \ /assets/www6s/wg-descriptions \ @@ -33,6 +29,11 @@ for sub in \ /assets/www6/iesg \ /assets/www6/iesg/evaluation \ /assets/media/photo \ + /assets/tmp \ + /assets/ftp \ + /assets/ftp/charter \ + /assets/ftp/internet-drafts \ + /assets/ftp/review \ ; do if [ ! -d "$sub" ]; then echo "Creating dir $sub" diff --git a/docker/scripts/app-init-celery.sh b/docker/scripts/app-init-celery.sh new file mode 100755 index 00000000000..17925633d2e --- /dev/null +++ b/docker/scripts/app-init-celery.sh @@ -0,0 +1,119 @@ +#!/bin/bash -e +# +# Environment parameters: +# +# CELERY_APP - name of application to pass to celery (defaults to ietf) +# +# CELERY_ROLE - 'worker' or 'beat' (defaults to 'worker') +# +# CELERY_UID - numeric uid for the celery worker process +# +# CELERY_GID - numeric gid for the celery worker process +# +# UPDATES_REQUIREMENTS_FROM - path, relative to /workspace mount, to a pip requirements +# file that should be installed at container startup. Default is no package install/update. +# +# DEBUG_TERM_TIMING - if non-empty, writes debug messages during shutdown after a TERM signal +# +# DEV_MODE - if non-empty, restart celery worker on Python file change +# +WORKSPACEDIR="/workspace" +CELERY_ROLE="${CELERY_ROLE:-worker}" + +cd "$WORKSPACEDIR" || exit 255 + +if [[ -n "${UPDATE_REQUIREMENTS_FROM}" ]]; then + # Need to run as root in the container for this + reqs_file="${WORKSPACEDIR}/${UPDATE_REQUIREMENTS_FROM}" + echo "Updating requirements from ${reqs_file}..." + pip install --upgrade -r "${reqs_file}" +fi + +CELERY_OPTS=( "${CELERY_ROLE}" ) +if [[ -n "${CELERY_UID}" ]]; then + # ensure that a user with the necessary UID exists in container + if ! id "${CELERY_UID}" ; then + adduser --system --uid "${CELERY_UID}" --no-create-home --disabled-login "celery-user-${CELERY_UID}" + fi + CELERY_OPTS+=("--uid=${CELERY_UID}") + CELERY_USERNAME="$(id -nu ${CELERY_UID})" +fi + +if [[ -n "${CELERY_GID}" ]]; then + # ensure that some group with the necessary GID exists in container + if ! getent group "${CELERY_GID}" ; then + addgroup --gid "${CELERY_GID}" "celery-group-${CELERY_GID}" + fi + CELERY_OPTS+=("--gid=${CELERY_GID}") + CELERY_GROUP="$(getent group ${CELERY_GID} | awk -F: '{print $1}')" +fi + +run_as_celery_uid () { + IAM=$(whoami) + if [ "${IAM}" = "${CELERY_USERNAME:-root}" ]; then + SU_OPTS=() + if [[ -n "${CELERY_GROUP}" ]]; then + SU_OPTS+=("-g" "${CELERY_GROUP}") + fi + su "${SU_OPTS[@]}" "${CELERY_USERNAME:-root}" -s /bin/sh -c "$*" + else + /bin/sh -c "$*" + fi +} + +log_term_timing_msgs () { + # output periodic debug message + while true; do + echo "Waiting for celery worker shutdown ($(date --utc --iso-8601=ns))" + sleep 0.5s + done +} + +cleanup () { + # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit. + if [[ -n "${celery_pid}" ]]; then + echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..." + kill -TERM "${celery_pid}" + if [[ -n "${DEBUG_TERM_TIMING}" ]]; then + log_term_timing_msgs & + fi + wait "${celery_pid}" + fi +} + +echo "Running checks as root to apply patches..." +/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check + +if [[ "${CELERY_ROLE}" == "worker" ]]; then + echo "Running initial checks..." + # Run checks as celery worker if one was specified + run_as_celery_uid /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check +fi + +USER_BIN_PATH="/home/dev/.local/bin" +WATCHMEDO="$USER_BIN_PATH/watchmedo" +# Find a celery that works +if [[ -x "$USER_BIN_PATH/celery" ]]; then + # This branch is used for dev + CELERY="$USER_BIN_PATH/celery" +else + # This branch is used for sandbox instances + CELERY="/usr/local/bin/celery" +fi +trap 'trap "" TERM; cleanup' TERM +# start celery in the background so we can trap the TERM signal +if [[ -n "${DEV_MODE}" && -x "${WATCHMEDO}" ]]; then + $WATCHMEDO auto-restart \ + --patterns '*.py' \ + --directory 'ietf' \ + --recursive \ + --debounce-interval 5 \ + -- \ + $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" $@ & + celery_pid=$! +else + $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" & + celery_pid=$! +fi + +wait "${celery_pid}" diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh index 61d7ef851d9..1d895cdf53e 100755 --- a/docker/scripts/app-init.sh +++ b/docker/scripts/app-init.sh @@ -2,6 +2,12 @@ WORKSPACEDIR="/workspace" +# Handle Linux host mounting the workspace dir as root +if [ ! -O "${WORKSPACEDIR}/ietf" ]; then + sudo chown -R dev:dev $WORKSPACEDIR +fi + +# Start rsyslog service sudo service rsyslog start &>/dev/null # Add /workspace as a safe git directory @@ -18,13 +24,17 @@ sudo chown -R dev:dev "$WORKSPACEDIR/.vite" sudo chown -R dev:dev "$WORKSPACEDIR/.yarn/unplugged" sudo chown dev:dev "/assets" -echo "Fix chromedriver /dev/shm permissions..." -sudo chmod 1777 /dev/shm +# Run nginx +echo "Starting nginx..." +sudo nginx # Build node packages that requrie native compilation echo "Compiling native node packages..." yarn rebuild +# Silence Browserlist warnings +export BROWSERSLIST_IGNORE_OLD_DATA=1 + # Generate static assets echo "Building static assets... (this could take a minute or two)" yarn build @@ -35,37 +45,27 @@ cp $WORKSPACEDIR/docker/configs/settings_postgresqldb.py $WORKSPACEDIR/ietf/sett if [ ! -f "$WORKSPACEDIR/ietf/settings_local.py" ]; then echo "Setting up a default settings_local.py ..." - cp $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py - else - echo "Using existing ietf/settings_local.py file" - if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py; then - echo "NOTE: Differences detected compared to docker/configs/settings_local.py!" - echo "We'll assume you made these deliberately." - fi + echo "Renaming existing ietf/settings_local.py to ietf/settings_local.py.bak" + mv -f $WORKSPACEDIR/ietf/settings_local.py $WORKSPACEDIR/ietf/settings_local.py.bak fi +cp $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py if [ ! -f "$WORKSPACEDIR/ietf/settings_local_debug.py" ]; then echo "Setting up a default settings_local_debug.py ..." - cp $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py else - echo "Using existing ietf/settings_local_debug.py file" - if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py; then - echo "NOTE: Differences detected compared to docker/configs/settings_local_debug.py!" - echo "We'll assume you made these deliberately." - fi + echo "Renaming existing ietf/settings_local_debug.py to ietf/settings_local_debug.py.bak" + mv -f $WORKSPACEDIR/ietf/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py.bak fi +cp $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py if [ ! -f "$WORKSPACEDIR/ietf/settings_local_vite.py" ]; then echo "Setting up a default settings_local_vite.py ..." - cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py else - echo "Using existing ietf/settings_local_vite.py file" - if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py; then - echo "NOTE: Differences detected compared to docker/configs/settings_local_vite.py!" - echo "We'll assume you made these deliberately." - fi + echo "Renaming existing ietf/settings_local_vite.py to ietf/settings_local_vite.py.bak" + mv -f $WORKSPACEDIR/ietf/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py.bak fi +cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py # Create data directories @@ -73,6 +73,11 @@ echo "Creating data directories..." chmod +x ./docker/scripts/app-create-dirs.sh ./docker/scripts/app-create-dirs.sh +# Configure the development blobstore + +echo "Configuring blobstore..." +PYTHONPATH=/workspace python ./docker/scripts/app-configure-blobstore.py + # Download latest coverage results file echo "Downloading latest coverage results file..." @@ -96,25 +101,26 @@ echo "Running initial checks..." /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check --settings=settings_local # Migrate, adjusting to what the current state of the underlying database might be: - /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --fake-initial --settings=settings_local -echo "-----------------------------------------------------------------" -echo "Done!" -echo "-----------------------------------------------------------------" +# Apply migrations to the blobdb database as well (most are skipped) +/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local --database=blobdb if [ -z "$EDITOR_VSCODE" ]; then CODE=0 - python -m smtpd -n -c DebuggingServer localhost:2025 & + python -m aiosmtpd -n -c ietf.utils.aiosmtpd.DevDebuggingHandler -l localhost:2025 & if [ -z "$*" ]; then + echo "-----------------------------------------------------------------" + echo "Ready!" + echo "-----------------------------------------------------------------" echo echo "You can execute arbitrary commands now, e.g.," echo - echo " ietf/manage.py runserver 0.0.0.0:8000" + echo " ietf/manage.py runserver 8001" echo echo "to start a development instance of the Datatracker." echo - echo " ietf/manage.py test --settings=settings_postgrestest" + echo " ietf/manage.py test --settings=settings_test" echo echo "to run all the python tests." echo diff --git a/docker/scripts/app-install-chromedriver.sh b/docker/scripts/app-install-chromedriver.sh deleted file mode 100755 index 43532a1cf68..00000000000 --- a/docker/scripts/app-install-chromedriver.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -HOSTARCH=$(arch) -if [ $HOSTARCH == "x86_64" ]; then - echo "Installing chrome driver..." - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list - apt-get update -y - apt-get install -y google-chrome-stable - CHROMEVER=$(google-chrome --product-version | grep -o "[^\.]*\.[^\.]*\.[^\.]*") - DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER") - wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip" - unzip /chromedriver/chromedriver* -d /chromedriver - ln -s /chromedriver/chromedriver /usr/local/bin/chromedriver - ln -s /chromedriver/chromedriver /usr/bin/chromedriver -else - echo "This architecture doesn't support chromedriver. Skipping installation..." -fi \ No newline at end of file diff --git a/docker/scripts/app-setup-debian.sh b/docker/scripts/app-setup-debian.sh index ddfc351995d..ea9cc3fb879 100644 --- a/docker/scripts/app-setup-debian.sh +++ b/docker/scripts/app-setup-debian.sh @@ -10,7 +10,6 @@ # Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages] set -e - INSTALL_ZSH=${1:-"true"} USERNAME=${2:-"automatic"} USER_UID=${3:-"automatic"} @@ -116,18 +115,9 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then # Bring in variables from /etc/os-release like VERSION_CODENAME - . /etc/os-release - sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list - sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list - sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list - sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list - # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html - sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list + . /etc/os-release + sed -i -E "s/Components: main/Components: main contrib non-free/" /etc/apt/sources.list.d/debian.sources + echo "Running apt-get update..." apt-get update package_list="${package_list} manpages-posix manpages-posix-dev" diff --git a/docker/scripts/app-setup-nginx.sh b/docker/scripts/app-setup-nginx.sh new file mode 100644 index 00000000000..cdeb2ea4cb3 --- /dev/null +++ b/docker/scripts/app-setup-nginx.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +apt-get update -y +apt-get install -y nginx diff --git a/docker/scripts/app-start.sh b/docker/scripts/app-start.sh new file mode 100644 index 00000000000..c3369bab93c --- /dev/null +++ b/docker/scripts/app-start.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +sudo service rsyslog start &>/dev/null + +# Run nginx + +echo "Starting nginx..." +pidof nginx >/dev/null && echo "nginx is already running [ OK ]" || sudo nginx + +# Run memcached + +echo "Starting memcached..." +pidof memcached >/dev/null && echo "memcached is already running [ OK ]" || /usr/bin/memcached -u dev -d + +echo "-----------------------------------------------------------------" +echo "Ready!" +echo "-----------------------------------------------------------------" diff --git a/docker/scripts/db-load-default-extensions.sh b/docker/scripts/db-load-default-extensions.sh index 23329267c78..efb64b75d00 100644 --- a/docker/scripts/db-load-default-extensions.sh +++ b/docker/scripts/db-load-default-extensions.sh @@ -2,7 +2,7 @@ set -e # Adding the extension to the default template is needed to allow the test-suite -# to be run on postgres (see ietf.settings_postgrestest). The test runner always +# to be run on postgres (see ietf.settings_test). The test runner always # makes a fresh test database instance, and since we are bypassing the migration # framework and using a fixture to set the database structure, there's no reaonable # way to install the extension as part of the test run. diff --git a/ietf/.gitignore b/ietf/.gitignore index 2483dbda775..af738db98cb 100644 --- a/ietf/.gitignore +++ b/ietf/.gitignore @@ -1,8 +1,8 @@ /*.pyc /settings_local.py -/settings_local.py.bak /settings_local_debug.py /settings_local_vite.py /settings_mysqldb.py /settings_postgresqldb.py +/settings_*.py.bak /ietfdb.sql.gz diff --git a/ietf/__init__.py b/ietf/__init__.py index b0dad6c657c..26124c3c67a 100644 --- a/ietf/__init__.py +++ b/ietf/__init__.py @@ -6,7 +6,7 @@ # Version must stay in single quotes for automatic CI replace # Don't add patch number here: -__version__ = '10.0.0-dev' +__version__ = '1.0.0-dev' # Release hash must stay in single quotes for automatic CI replace __release_hash__ = '' @@ -17,6 +17,24 @@ # set this to ".p1", ".p2", etc. after patching __patch__ = "" +if __version__ == '1.0.0-dev' and __release_hash__ == '' and __release_branch__ == '': + import subprocess + branch = subprocess.run( + ["/usr/bin/git", "branch", "--show-current"], + capture_output=True, + ).stdout.decode().strip() + git_hash = subprocess.run( + ["/usr/bin/git", "rev-parse", "head"], + capture_output=True, + ).stdout.decode().strip() + rev = subprocess.run( + ["/usr/bin/git", "describe", "--tags", git_hash], + capture_output=True, + ).stdout.decode().strip().split('-', 1)[0] + __version__ = f"{rev}-dev" + __release_branch__ = branch + __release_hash__ = git_hash + # This will make sure the app is always imported when # Django starts so that shared_task will use this app. diff --git a/ietf/ietfauth/management/__init__.py b/ietf/admin/__init__.py similarity index 100% rename from ietf/ietfauth/management/__init__.py rename to ietf/admin/__init__.py diff --git a/ietf/admin/apps.py b/ietf/admin/apps.py new file mode 100644 index 00000000000..20b762cfec9 --- /dev/null +++ b/ietf/admin/apps.py @@ -0,0 +1,6 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +from django.contrib.admin import apps as admin_apps + + +class AdminConfig(admin_apps.AdminConfig): + default_site = "ietf.admin.sites.AdminSite" diff --git a/ietf/admin/sites.py b/ietf/admin/sites.py new file mode 100644 index 00000000000..69cb62ae200 --- /dev/null +++ b/ietf/admin/sites.py @@ -0,0 +1,15 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +from django.contrib.admin import AdminSite as _AdminSite +from django.conf import settings +from django.utils.safestring import mark_safe + + +class AdminSite(_AdminSite): + site_title = "Datatracker admin" + + @staticmethod + def site_header(): + if settings.SERVER_MODE == "production": + return "Datatracker administration" + else: + return mark_safe('Datatracker administration δ') diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py index b4c6203d985..d4562f97ddf 100644 --- a/ietf/api/__init__.py +++ b/ietf/api/__init__.py @@ -4,56 +4,50 @@ import datetime import re +import sys from urllib.parse import urlencode -from django.conf import settings +from django.apps import apps as django_apps from django.core.exceptions import ObjectDoesNotExist +from django.utils.module_loading import autodiscover_modules + import debug # pyflakes:ignore -import tastypie import tastypie.resources +import tastypie.serializers from tastypie.api import Api from tastypie.bundle import Bundle from tastypie.exceptions import ApiFieldError -from tastypie.serializers import Serializer # pyflakes:ignore (we're re-exporting this) from tastypie.fields import ApiField _api_list = [] -for _app in settings.INSTALLED_APPS: +OMITTED_APPS_APIS = ["ietf.status"] + +# Pre-py3.11, fromisoformat() does not handle Z or +HH tz offsets +HAVE_BROKEN_FROMISOFORMAT = sys.version_info < (3, 11, 0, "", 0) + +def populate_api_list(): _module_dict = globals() - if '.' in _app: - _root, _name = _app.split('.', 1) - if _root == 'ietf': - if not '.' in _name: - _api = Api(api_name=_name) - _module_dict[_name] = _api - _api_list.append((_name, _api)) + for app_config in django_apps.get_app_configs(): + if '.' in app_config.name and app_config.name not in OMITTED_APPS_APIS: + _root, _name = app_config.name.split('.', 1) + if _root == 'ietf': + if not '.' in _name: + _api = Api(api_name=_name) + _module_dict[_name] = _api + _api_list.append((_name, _api)) def autodiscover(): """ Auto-discover INSTALLED_APPS resources.py modules and fail silently when - not present. This forces an import on them to register any admin bits they + not present. This forces an import on them to register any resources they may want. """ + autodiscover_modules("resources") - from importlib import import_module - from django.conf import settings - from django.utils.module_loading import module_has_submodule - - for app in settings.INSTALLED_APPS: - mod = import_module(app) - # Attempt to import the app's admin module. - try: - import_module('%s.resources' % (app, )) - except: - # Decide whether to bubble up this error. If the app just - # doesn't have an admin module, we can ignore the error - # attempting to import it, otherwise we want it to bubble up. - if module_has_submodule(mod, "resources"): - raise class ModelResource(tastypie.resources.ModelResource): def generate_cache_key(self, *args, **kwargs): @@ -68,6 +62,35 @@ def generate_cache_key(self, *args, **kwargs): # Use a list plus a ``.join()`` because it's faster than concatenation. return "%s:%s:%s:%s" % (self._meta.api_name, self._meta.resource_name, ':'.join(args), smooshed) + def _z_aware_fromisoformat(self, value: str) -> datetime.datetime: + """datetime.datetime.fromisoformat replacement that works with python < 3.11""" + if HAVE_BROKEN_FROMISOFORMAT: + if value.upper().endswith("Z"): + value = value[:-1] + "+00:00" # Z -> UTC + elif re.match(r"[+-][0-9][0-9]$", value[-3:]): + value = value + ":00" # -04 -> -04:00 + return datetime.datetime.fromisoformat(value) + + def filter_value_to_python( + self, value, field_name, filters, filter_expr, filter_type + ): + py_value = super().filter_value_to_python( + value, field_name, filters, filter_expr, filter_type + ) + if isinstance( + self.fields[field_name], tastypie.fields.DateTimeField + ) and isinstance(py_value, str): + # Ensure datetime values are TZ-aware, using UTC by default + try: + dt = self._z_aware_fromisoformat(py_value) + except ValueError: + pass # let tastypie deal with the original value + else: + if dt.tzinfo is None: + dt = dt.replace(tzinfo=datetime.timezone.utc) + py_value = dt.isoformat() + return py_value + TIMEDELTA_REGEX = re.compile(r'^(?P\d+d)?\s?(?P\d+h)?\s?(?P\d+m)?\s?(?P\d+s?)$') @@ -152,3 +175,29 @@ def dehydrate(self, bundle, for_list=True): dehydrated = self.dehydrate_related(fk_bundle, fk_resource, for_list=for_list) fk_resource._meta.cache.set(cache_key, dehydrated) return dehydrated + + +class Serializer(tastypie.serializers.Serializer): + OPTION_ESCAPE_NULLS = "datatracker-escape-nulls" + + def format_datetime(self, data): + return data.astimezone(datetime.UTC).replace(tzinfo=None).isoformat(timespec="seconds") + "Z" + + def to_simple(self, data, options): + options = options or {} + simple_data = super().to_simple(data, options) + if ( + options.get(self.OPTION_ESCAPE_NULLS, False) + and isinstance(simple_data, str) + ): + # replace nulls with unicode "symbol for null character", \u2400 + simple_data = simple_data.replace("\x00", "\u2400") + return simple_data + + def to_etree(self, data, options=None, name=None, depth=0): + # lxml does not escape nulls on its own, so ask to_simple() to do it. + # This is mostly (only?) an issue when generating errors responses for + # fuzzers. + options = options or {} + options[self.OPTION_ESCAPE_NULLS] = True + return super().to_etree(data, options, name, depth) diff --git a/ietf/api/__init__.pyi b/ietf/api/__init__.pyi index 63d9bc513ba..ededea90a7d 100644 --- a/ietf/api/__init__.pyi +++ b/ietf/api/__init__.pyi @@ -30,4 +30,5 @@ class Serializer(): ... class ToOneField(tastypie.fields.ToOneField): ... class TimedeltaField(tastypie.fields.ApiField): ... +def populate_api_list() -> None: ... def autodiscover() -> None: ... diff --git a/ietf/api/apps.py b/ietf/api/apps.py new file mode 100644 index 00000000000..4549e0d7f20 --- /dev/null +++ b/ietf/api/apps.py @@ -0,0 +1,19 @@ +from django.apps import AppConfig +from . import populate_api_list + + +class ApiConfig(AppConfig): + name = "ietf.api" + + def ready(self): + """Hook to do init after the app registry is fully populated + + Importing models or accessing the app registry is ok here, but do not + interact with the database. See + https://docs.djangoproject.com/en/4.2/ref/applications/#django.apps.AppConfig.ready + """ + # Populate our API list now that the app registry is set up + populate_api_list() + + # Import drf-spectacular extensions + import ietf.api.schema # pyflakes: ignore diff --git a/ietf/api/authentication.py b/ietf/api/authentication.py new file mode 100644 index 00000000000..dfab0d72b8b --- /dev/null +++ b/ietf/api/authentication.py @@ -0,0 +1,19 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# +from rest_framework import authentication +from django.contrib.auth.models import AnonymousUser + + +class ApiKeyAuthentication(authentication.BaseAuthentication): + """API-Key header authentication""" + + def authenticate(self, request): + """Extract the authentication token, if present + + This does not validate the token, it just arranges for it to be available in request.auth. + It's up to a Permissions class to validate it for the appropriate endpoint. + """ + token = request.META.get("HTTP_X_API_KEY", None) + if token is None: + return None + return AnonymousUser(), token # available as request.user and request.auth diff --git a/ietf/api/ietf_utils.py b/ietf/api/ietf_utils.py index 06b9d76aff8..50767a5afd5 100644 --- a/ietf/api/ietf_utils.py +++ b/ietf/api/ietf_utils.py @@ -2,14 +2,75 @@ # This is not utils.py because Tastypie implicitly consumes ietf.api.utils. # See ietf.api.__init__.py for details. +from functools import wraps +from typing import Callable, Optional, Union from django.conf import settings +from django.http import HttpResponseForbidden + def is_valid_token(endpoint, token): # This is where we would consider integration with vault # Settings implementation for now. if hasattr(settings, "APP_API_TOKENS"): token_store = settings.APP_API_TOKENS - if endpoint in token_store and token in token_store[endpoint]: - return True + if endpoint in token_store: + endpoint_tokens = token_store[endpoint] + # Be sure endpoints is a list or tuple so we don't accidentally use substring matching! + if not isinstance(endpoint_tokens, (list, tuple)): + endpoint_tokens = [endpoint_tokens] + if token in endpoint_tokens: + return True return False + + +def requires_api_token(func_or_endpoint: Optional[Union[Callable, str]] = None): + """Validate API token before executing the wrapped method + + Usage: + * Basic: endpoint defaults to the qualified name of the wrapped method. E.g., in ietf.api.views, + + @requires_api_token + def my_view(request): + ... + + will require a token for "ietf.api.views.my_view" + + * Custom endpoint: specify the endpoint explicitly + + @requires_api_token("ietf.api.views.some_other_thing") + def my_view(request): + ... + + will require a token for "ietf.api.views.some_other_thing" + """ + + def decorate(f): + if _endpoint is None: + fname = getattr(f, "__qualname__", None) + if fname is None: + raise TypeError( + "Cannot automatically decorate function that does not support __qualname__. " + "Explicitly set the endpoint." + ) + endpoint = "{}.{}".format(f.__module__, fname) + else: + endpoint = _endpoint + + @wraps(f) + def wrapped(request, *args, **kwargs): + authtoken = request.META.get("HTTP_X_API_KEY", None) + if authtoken is None or not is_valid_token(endpoint, authtoken): + return HttpResponseForbidden() + return f(request, *args, **kwargs) + + return wrapped + + # Magic to allow decorator to be used with or without parentheses + if callable(func_or_endpoint): + func = func_or_endpoint + _endpoint = None + return decorate(func) + else: + _endpoint = func_or_endpoint + return decorate diff --git a/ietf/api/permissions.py b/ietf/api/permissions.py new file mode 100644 index 00000000000..8f7fdd026fd --- /dev/null +++ b/ietf/api/permissions.py @@ -0,0 +1,39 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# +from rest_framework import permissions +from ietf.api.ietf_utils import is_valid_token + + +class HasApiKey(permissions.BasePermission): + """Permissions class that validates a token using is_valid_token + + The view class must indicate the relevant endpoint by setting `api_key_endpoint`. + Must be used with an Authentication class that puts a token in request.auth. + """ + def has_permission(self, request, view): + endpoint = getattr(view, "api_key_endpoint", None) + auth_token = getattr(request, "auth", None) + if endpoint is not None and auth_token is not None: + return is_valid_token(endpoint, auth_token) + return False + + +class IsOwnPerson(permissions.BasePermission): + """Permission to access own Person object""" + def has_object_permission(self, request, view, obj): + if not (request.user.is_authenticated and hasattr(request.user, "person")): + return False + return obj == request.user.person + + +class BelongsToOwnPerson(permissions.BasePermission): + """Permission to access objects associated with own Person + + Requires that the object have a "person" field that indicates ownership. + """ + def has_object_permission(self, request, view, obj): + if not (request.user.is_authenticated and hasattr(request.user, "person")): + return False + return ( + hasattr(obj, "person") and obj.person == request.user.person + ) diff --git a/ietf/api/routers.py b/ietf/api/routers.py new file mode 100644 index 00000000000..745ddaa811a --- /dev/null +++ b/ietf/api/routers.py @@ -0,0 +1,16 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +"""Custom django-rest-framework routers""" +from django.core.exceptions import ImproperlyConfigured +from rest_framework import routers + +class PrefixedSimpleRouter(routers.SimpleRouter): + """SimpleRouter that adds a dot-separated prefix to its basename""" + def __init__(self, name_prefix="", *args, **kwargs): + self.name_prefix = name_prefix + if len(self.name_prefix) == 0 or self.name_prefix[-1] == ".": + raise ImproperlyConfigured("Cannot use a name_prefix that is empty or ends with '.'") + super().__init__(*args, **kwargs) + + def get_default_basename(self, viewset): + basename = super().get_default_basename(viewset) + return f"{self.name_prefix}.{basename}" diff --git a/ietf/api/schema.py b/ietf/api/schema.py new file mode 100644 index 00000000000..7340149685b --- /dev/null +++ b/ietf/api/schema.py @@ -0,0 +1,20 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# +from drf_spectacular.extensions import OpenApiAuthenticationExtension + + +class ApiKeyAuthenticationScheme(OpenApiAuthenticationExtension): + """Authentication scheme extension for the ApiKeyAuthentication + + Used by drf-spectacular when rendering the OpenAPI schema + """ + target_class = "ietf.api.authentication.ApiKeyAuthentication" + name = "apiKeyAuth" + + def get_security_definition(self, auto_schema): + return { + "type": "apiKey", + "description": "Shared secret in the X-Api-Key header", + "name": "X-Api-Key", + "in": "header", + } diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py index 9d6cf1ebb86..d5bca430e00 100644 --- a/ietf/api/serializer.py +++ b/ietf/api/serializer.py @@ -1,6 +1,9 @@ -# Copyright The IETF Trust 2018-2020, All Rights Reserved +# Copyright The IETF Trust 2018-2024, All Rights Reserved # -*- coding: utf-8 -*- +"""Serialization utilities +This is _not_ for django-rest-framework! +""" import hashlib import json @@ -9,11 +12,12 @@ from django.core.exceptions import ObjectDoesNotExist, FieldError from django.core.serializers.json import Serializer from django.http import HttpResponse -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str from django.db.models import Field -from django.db.models.query import QuerySet from django.db.models.signals import post_save, post_delete, m2m_changed +from django_stubs_ext import QuerySetAny + import debug # pyflakes:ignore @@ -121,7 +125,7 @@ def end_object(self, obj): for name in expansions: try: field = getattr(obj, name) - #self._current["_"+name] = smart_text(field) + #self._current["_"+name] = smart_str(field) if not isinstance(field, Field): options = self.options.copy() options["expand"] = [ v[len(name)+2:] for v in options["expand"] if v.startswith(name+"__") ] @@ -145,7 +149,7 @@ def end_object(self, obj): field_value = None else: field_value = field - if isinstance(field_value, QuerySet) or isinstance(field_value, list): + if isinstance(field_value, QuerySetAny) or isinstance(field_value, list): self._current[name] = dict([ (rel.pk, self.expand_related(rel, name)) for rel in field_value ]) else: if hasattr(field_value, "_meta"): @@ -188,10 +192,10 @@ def handle_fk_field(self, obj, field): related = related.natural_key() elif field.remote_field.field_name == related._meta.pk.name: # Related to remote object via primary key - related = smart_text(related._get_pk_val(), strings_only=True) + related = smart_str(related._get_pk_val(), strings_only=True) else: # Related to remote object via other field - related = smart_text(getattr(related, field.remote_field.field_name), strings_only=True) + related = smart_str(getattr(related, field.remote_field.field_name), strings_only=True) self._current[field.name] = related def handle_m2m_field(self, obj, field): @@ -201,7 +205,7 @@ def handle_m2m_field(self, obj, field): elif self.use_natural_keys and hasattr(field.remote_field.to, 'natural_key'): m2m_value = lambda value: value.natural_key() else: - m2m_value = lambda value: smart_text(value._get_pk_val(), strings_only=True) + m2m_value = lambda value: smart_str(value._get_pk_val(), strings_only=True) self._current[field.name] = [m2m_value(related) for related in getattr(obj, field.name).iterator()] @@ -221,7 +225,7 @@ class JsonExportMixin(object): # obj = None # # if obj is None: -# raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_text(self.model._meta.verbose_name), 'key': escape(object_id)}) +# raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_str(self.model._meta.verbose_name), 'key': escape(object_id)}) # # content_type = 'application/json' # return HttpResponse(serialize([ obj ], sort_keys=True, indent=3)[2:-2], content_type=content_type) @@ -264,6 +268,6 @@ def json_view(self, request, filter=None, expand=None): qd = dict( ( k, json.loads(v)[0] ) for k,v in items ) except (FieldError, ValueError) as e: return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type) - text = json.dumps({smart_text(self.model._meta): qd}, sort_keys=True, indent=3) + text = json.dumps({smart_str(self.model._meta): qd}, sort_keys=True, indent=3) return HttpResponse(text, content_type=content_type) diff --git a/ietf/api/tests.py b/ietf/api/tests.py index c910b6f9048..2a44791a5cf 100644 --- a/ietf/api/tests.py +++ b/ietf/api/tests.py @@ -1,18 +1,22 @@ -# Copyright The IETF Trust 2015-2020, All Rights Reserved +# Copyright The IETF Trust 2015-2024, All Rights Reserved # -*- coding: utf-8 -*- - +import base64 +import copy import datetime import json import html +from unittest import mock import os import sys from importlib import import_module from pathlib import Path +from random import randrange from django.apps import apps from django.conf import settings -from django.test import Client +from django.http import HttpResponseForbidden +from django.test import Client, RequestFactory from django.test.utils import override_settings from django.urls import reverse as urlreverse from django.utils import timezone @@ -22,24 +26,31 @@ import debug # pyflakes:ignore import ietf +from ietf.doc.storage_utils import retrieve_str from ietf.doc.utils import get_unicode_document_content from ietf.doc.models import RelatedDocument, State -from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory +from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory, WgRfcFactory from ietf.group.factories import RoleFactory from ietf.meeting.factories import MeetingFactory, SessionFactory -from ietf.meeting.models import Session -from ietf.person.factories import PersonFactory, random_faker -from ietf.person.models import User -from ietf.person.models import PersonalApiKey -from ietf.stats.models import MeetingRegistration -from ietf.utils.mail import outbox, get_payload_text +from ietf.meeting.models import Session, Registration +from ietf.nomcom.models import Volunteer +from ietf.nomcom.factories import NomComFactory, nomcom_kwargs_for_year +from ietf.person.factories import PersonFactory, random_faker, EmailFactory, PersonalApiKeyFactory +from ietf.person.models import Email, User +from ietf.utils.mail import empty_outbox, outbox, get_payload_text from ietf.utils.models import DumpInfo from ietf.utils.test_utils import TestCase, login_testing_unauthorized, reload_db_objects +from . import Serializer +from .ietf_utils import is_valid_token, requires_api_token +from .views import EmailIngestionError + OMITTED_APPS = ( 'ietf.secr.meetings', 'ietf.secr.proceedings', 'ietf.ipr', + 'ietf.status', + 'ietf.blobdb', ) class CustomApiTests(TestCase): @@ -62,7 +73,7 @@ def test_deprecated_api_set_session_video_url(self): meeting = MeetingFactory(type_id='ietf') session = SessionFactory(group__type_id='wg', meeting=meeting) group = session.group - apikey = PersonalApiKey.objects.create(endpoint=url, person=recman) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) video = 'https://foo.example.com/bar/beer/' # error cases @@ -70,7 +81,7 @@ def test_deprecated_api_set_session_video_url(self): self.assertContains(r, "Missing apikey parameter", status_code=400) badrole = RoleFactory(group__type_id='ietf', name_id='ad') - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) badrole.person.user.last_login = timezone.now() badrole.person.user.save() r = self.client.post(url, {'apikey': badapikey.hash()} ) @@ -142,7 +153,7 @@ def test_api_set_session_video_url(self): recman = recmanrole.person meeting = MeetingFactory(type_id="ietf") session = SessionFactory(group__type_id="wg", meeting=meeting) - apikey = PersonalApiKey.objects.create(endpoint=url, person=recman) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) video = "https://foo.example.com/bar/beer/" # error cases @@ -150,7 +161,7 @@ def test_api_set_session_video_url(self): self.assertContains(r, "Missing apikey parameter", status_code=400) badrole = RoleFactory(group__type_id="ietf", name_id="ad") - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) badrole.person.user.last_login = timezone.now() badrole.person.user.save() r = self.client.post(url, {"apikey": badapikey.hash()}) @@ -213,17 +224,83 @@ def test_api_set_session_video_url(self): event = doc.latest_event() self.assertEqual(event.by, recman) - def test_api_add_session_attendees(self): + def test_api_set_meetecho_recording_name(self): + url = urlreverse("ietf.meeting.views.api_set_meetecho_recording_name") + recmanrole = RoleFactory(group__type_id="ietf", name_id="recman") + recman = recmanrole.person + meeting = MeetingFactory(type_id="ietf") + session = SessionFactory(group__type_id="wg", meeting=meeting) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) + name = "testname" + + # error cases + r = self.client.post(url, {}) + self.assertContains(r, "Missing apikey parameter", status_code=400) + + badrole = RoleFactory(group__type_id="ietf", name_id="ad") + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) + badrole.person.user.last_login = timezone.now() + badrole.person.user.save() + r = self.client.post(url, {"apikey": badapikey.hash()}) + self.assertContains(r, "Restricted to role: Recording Manager", status_code=403) + + r = self.client.post(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Too long since last regular login", status_code=400) + recman.user.last_login = timezone.now() + recman.user.save() + + r = self.client.get(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Method not allowed", status_code=405) + + r = self.client.post(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Missing session_id parameter", status_code=400) + + r = self.client.post(url, {"apikey": apikey.hash(), "session_id": session.pk}) + self.assertContains(r, "Missing name parameter", status_code=400) + + bad_pk = int(Session.objects.order_by("-pk").first().pk) + 1 + r = self.client.post( + url, + { + "apikey": apikey.hash(), + "session_id": bad_pk, + "name": name, + }, + ) + self.assertContains(r, "Session not found", status_code=400) + + r = self.client.post( + url, + { + "apikey": apikey.hash(), + "session_id": "foo", + "name": name, + }, + ) + self.assertContains(r, "Invalid session_id", status_code=400) + + r = self.client.post( + url, {"apikey": apikey.hash(), "session_id": session.pk, "name": name} + ) + self.assertContains(r, "Done", status_code=200) + + session.refresh_from_db() + self.assertEqual(session.meetecho_recording_name, name) + + + def test_api_add_session_attendees_deprecated(self): + # Deprecated test - should be removed when we stop accepting a simple list of user PKs in + # the add_session_attendees() view url = urlreverse('ietf.meeting.views.api_add_session_attendees') otherperson = PersonFactory() recmanrole = RoleFactory(group__type_id='ietf', name_id='recman') recman = recmanrole.person meeting = MeetingFactory(type_id='ietf') session = SessionFactory(group__type_id='wg', meeting=meeting) - apikey = PersonalApiKey.objects.create(endpoint=url, person=recman) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) badrole = RoleFactory(group__type_id='ietf', name_id='ad') - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) badrole.person.user.last_login = timezone.now() badrole.person.user.save() @@ -279,6 +356,120 @@ def test_api_add_session_attendees(self): self.assertTrue(session.attended_set.filter(person=recman).exists()) self.assertTrue(session.attended_set.filter(person=otherperson).exists()) + def test_api_add_session_attendees(self): + url = urlreverse("ietf.meeting.views.api_add_session_attendees") + otherperson = PersonFactory() + recmanrole = RoleFactory(group__type_id="ietf", name_id="recman") + recman = recmanrole.person + meeting = MeetingFactory(type_id="ietf") + session = SessionFactory(group__type_id="wg", meeting=meeting) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) + + badrole = RoleFactory(group__type_id="ietf", name_id="ad") + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) + badrole.person.user.last_login = timezone.now() + badrole.person.user.save() + + # Improper credentials, or method + r = self.client.post(url, {}) + self.assertContains(r, "Missing apikey parameter", status_code=400) + + r = self.client.post(url, {"apikey": badapikey.hash()}) + self.assertContains(r, "Restricted to role: Recording Manager", status_code=403) + + r = self.client.post(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Too long since last regular login", status_code=400) + + recman.user.last_login = timezone.now() - datetime.timedelta(days=365) + recman.user.save() + r = self.client.post(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Too long since last regular login", status_code=400) + + recman.user.last_login = timezone.now() + recman.user.save() + r = self.client.get(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Method not allowed", status_code=405) + + recman.user.last_login = timezone.now() + recman.user.save() + + # Malformed requests + r = self.client.post(url, {"apikey": apikey.hash()}) + self.assertContains(r, "Missing attended parameter", status_code=400) + + for baddict in ( + "{}", + '{"bogons;drop table":"bogons;drop table"}', + '{"session_id":"Not an integer;drop table"}', + f'{{"session_id":{session.pk},"attendees":"not a list;drop table"}}', + f'{{"session_id":{session.pk},"attendees":"not a list;drop table"}}', + f'{{"session_id":{session.pk},"attendees":[1,2,"not an int;drop table",4]}}', + f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk}]}}', # no join_time + f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time;drop table":"2024-01-01T00:00:00Z]}}', + f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time":"not a time;drop table"]}}', + # next has no time zone indicator + f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time":"2024-01-01T00:00:00"]}}', + f'{{"session_id":{session.pk},"attendees":["user_id":"not an int; drop table","join_time":"2024-01-01T00:00:00Z"]}}', + # Uncomment the next one when the _deprecated version of this test is retired + # f'{{"session_id":{session.pk},"attendees":[{recman.user.pk}, {otherperson.user.pk}]}}', + ): + r = self.client.post(url, {"apikey": apikey.hash(), "attended": baddict}) + self.assertContains(r, "Malformed post", status_code=400) + + bad_session_id = Session.objects.order_by("-pk").first().pk + 1 + r = self.client.post( + url, + { + "apikey": apikey.hash(), + "attended": f'{{"session_id":{bad_session_id},"attendees":[]}}', + }, + ) + self.assertContains(r, "Invalid session", status_code=400) + bad_user_id = User.objects.order_by("-pk").first().pk + 1 + r = self.client.post( + url, + { + "apikey": apikey.hash(), + "attended": f'{{"session_id":{session.pk},"attendees":[{{"user_id":{bad_user_id}, "join_time":"2024-01-01T00:00:00Z"}}]}}', + }, + ) + self.assertContains(r, "Invalid attendee", status_code=400) + + # Reasonable request + r = self.client.post( + url, + { + "apikey": apikey.hash(), + "attended": json.dumps( + { + "session_id": session.pk, + "attendees": [ + { + "user_id": recman.user.pk, + "join_time": "2023-09-03T12:34:56Z", + }, + { + "user_id": otherperson.user.pk, + "join_time": "2023-09-03T03:00:19Z", + }, + ], + } + ), + }, + ) + + self.assertEqual(session.attended_set.count(), 2) + self.assertTrue(session.attended_set.filter(person=recman).exists()) + self.assertEqual( + session.attended_set.get(person=recman).time, + datetime.datetime(2023, 9, 3, 12, 34, 56, tzinfo=datetime.UTC), + ) + self.assertTrue(session.attended_set.filter(person=otherperson).exists()) + self.assertEqual( + session.attended_set.get(person=otherperson).time, + datetime.datetime(2023, 9, 3, 3, 0, 19, tzinfo=datetime.UTC), + ) + def test_api_upload_polls_and_chatlog(self): recmanrole = RoleFactory(group__type_id='ietf', name_id='recman') recmanrole.person.user.last_login = timezone.now() @@ -328,8 +519,8 @@ def test_api_upload_polls_and_chatlog(self): ), ): url = urlreverse(f"ietf.meeting.views.api_upload_{type_id}") - apikey = PersonalApiKey.objects.create(endpoint=url, person=recmanrole.person) - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + apikey = PersonalApiKeyFactory(endpoint=url, person=recmanrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) r = self.client.post(url, {}) self.assertContains(r, "Missing apikey parameter", status_code=400) @@ -362,101 +553,13 @@ def test_api_upload_polls_and_chatlog(self): r = self.client.post(url,{'apikey':apikey.hash(),'apidata': f'{{"session_id":{session.pk}, "{type_id}":{content}}}'}) self.assertEqual(r.status_code, 200) - newdoc = session.sessionpresentation_set.get(document__type_id=type_id).document + newdoc = session.presentations.get(document__type_id=type_id).document newdoccontent = get_unicode_document_content(newdoc.name, Path(session.meeting.get_materials_path()) / type_id / newdoc.uploaded_filename) self.assertEqual(json.loads(content), json.loads(newdoccontent)) - - def test_deprecated_api_upload_bluesheet(self): - url = urlreverse('ietf.meeting.views.api_upload_bluesheet') - recmanrole = RoleFactory(group__type_id='ietf', name_id='recman') - recman = recmanrole.person - meeting = MeetingFactory(type_id='ietf') - session = SessionFactory(group__type_id='wg', meeting=meeting) - group = session.group - apikey = PersonalApiKey.objects.create(endpoint=url, person=recman) - - people = [ - {"name": "Andrea Andreotti", "affiliation": "Azienda"}, - {"name": "Bosse Bernadotte", "affiliation": "Bolag"}, - {"name": "Charles Charlemagne", "affiliation": "Compagnie"}, - ] - for i in range(3): - faker = random_faker() - people.append(dict(name=faker.name(), affiliation=faker.company())) - bluesheet = json.dumps(people) - - # error cases - r = self.client.post(url, {}) - self.assertContains(r, "Missing apikey parameter", status_code=400) - - badrole = RoleFactory(group__type_id='ietf', name_id='ad') - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) - badrole.person.user.last_login = timezone.now() - badrole.person.user.save() - r = self.client.post(url, {'apikey': badapikey.hash()}) - self.assertContains(r, "Restricted to roles: Recording Manager, Secretariat", status_code=403) - - r = self.client.post(url, {'apikey': apikey.hash()}) - self.assertContains(r, "Too long since last regular login", status_code=400) - recman.user.last_login = timezone.now() - recman.user.save() - - r = self.client.get(url, {'apikey': apikey.hash()}) - self.assertContains(r, "Method not allowed", status_code=405) - - r = self.client.post(url, {'apikey': apikey.hash(), 'group': group.acronym}) - self.assertContains(r, "Missing meeting parameter", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, }) - self.assertContains(r, "Missing group parameter", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym}) - self.assertContains(r, "Missing item parameter", status_code=400) - - r = self.client.post(url, - {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, 'item': '1'}) - self.assertContains(r, "Missing bluesheet parameter", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': '1', 'group': group.acronym, - 'item': '1', 'bluesheet': bluesheet, }) - self.assertContains(r, "No sessions found for meeting", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': 'bogous', - 'item': '1', 'bluesheet': bluesheet, }) - self.assertContains(r, "No sessions found in meeting '%s' for group 'bogous'" % meeting.number, status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, - 'item': '1', 'bluesheet': "foobar", }) - self.assertContains(r, "Invalid json value: 'foobar'", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, - 'item': '5', 'bluesheet': bluesheet, }) - self.assertContains(r, "No item '5' found in list of sessions for group", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, - 'item': 'foo', 'bluesheet': bluesheet, }) - self.assertContains(r, "Expected a numeric value for 'item', found 'foo'", status_code=400) - - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, - 'item': '1', 'bluesheet': bluesheet, }) - self.assertContains(r, "Done", status_code=200) - - # Submit again, with slightly different content, as an updated version - people[1]['affiliation'] = 'Bolaget AB' - bluesheet = json.dumps(people) - r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, - 'item': '1', 'bluesheet': bluesheet, }) - self.assertContains(r, "Done", status_code=200) - - bluesheet = session.sessionpresentation_set.filter(document__type__slug='bluesheets').first().document - # We've submitted an update; check that the rev is right - self.assertEqual(bluesheet.rev, '01') - # Check the content - with open(bluesheet.get_file_name()) as file: - text = file.read() - for p in people: - self.assertIn(p['name'], html.unescape(text)) - self.assertIn(p['affiliation'], html.unescape(text)) + self.assertEqual( + json.loads(retrieve_str(type_id, newdoc.uploaded_filename)), + json.loads(content) + ) def test_api_upload_bluesheet(self): url = urlreverse("ietf.meeting.views.api_upload_bluesheet") @@ -464,8 +567,7 @@ def test_api_upload_bluesheet(self): recman = recmanrole.person meeting = MeetingFactory(type_id="ietf") session = SessionFactory(group__type_id="wg", meeting=meeting) - group = session.group - apikey = PersonalApiKey.objects.create(endpoint=url, person=recman) + apikey = PersonalApiKeyFactory(endpoint=url, person=recman) people = [ {"name": "Andrea Andreotti", "affiliation": "Azienda"}, @@ -482,7 +584,7 @@ def test_api_upload_bluesheet(self): self.assertContains(r, "Missing apikey parameter", status_code=400) badrole = RoleFactory(group__type_id="ietf", name_id="ad") - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) badrole.person.user.last_login = timezone.now() badrole.person.user.save() r = self.client.post(url, {"apikey": badapikey.hash()}) @@ -504,18 +606,6 @@ def test_api_upload_bluesheet(self): r = self.client.post(url, {"apikey": apikey.hash(), "session_id": session.pk}) self.assertContains(r, "Missing bluesheet parameter", status_code=400) - r = self.client.post( - url, - { - "apikey": apikey.hash(), - "meeting": meeting.number, - "group": group.acronym, - "item": "1", - "bluesheet": "foobar", - }, - ) - self.assertContains(r, "Invalid json value: 'foobar'", status_code=400) - bad_session_pk = int(Session.objects.order_by("-pk").first().pk) + 1 r = self.client.post( url, @@ -554,16 +644,14 @@ def test_api_upload_bluesheet(self): url, { "apikey": apikey.hash(), - "meeting": meeting.number, - "group": group.acronym, - "item": "1", + "session_id": session.pk, "bluesheet": bluesheet, }, ) self.assertContains(r, "Done", status_code=200) bluesheet = ( - session.sessionpresentation_set.filter(document__type__slug="bluesheets") + session.presentations.filter(document__type__slug="bluesheets") .first() .document ) @@ -581,6 +669,7 @@ def test_person_export(self): url = urlreverse('ietf.api.views.PersonalInformationExportView') login_testing_unauthorized(self, person.user.username, url) r = self.client.get(url) + self.assertEqual(r.status_code, 200) jsondata = r.json() data = jsondata['person.person'][str(person.id)] self.assertEqual(data['name'], person.name) @@ -591,14 +680,14 @@ def test_api_v2_person_export_view(self): url = urlreverse('ietf.api.views.ApiV2PersonExportView') robot = PersonFactory(user__is_staff=True) RoleFactory(name_id='robot', person=robot, email=robot.email(), group__acronym='secretariat') - apikey = PersonalApiKey.objects.create(endpoint=url, person=robot) + apikey = PersonalApiKeyFactory(endpoint=url, person=robot) # error cases r = self.client.post(url, {}) self.assertContains(r, "Missing apikey parameter", status_code=400) badrole = RoleFactory(group__type_id='ietf', name_id='ad') - badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person) + badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person) badrole.person.user.last_login = timezone.now() badrole.person.user.save() r = self.client.post(url, {'apikey': badapikey.hash()}) @@ -616,86 +705,179 @@ def test_api_v2_person_export_view(self): self.assertEqual(data['ascii'], robot.ascii) self.assertEqual(data['user']['email'], robot.user.email) - def test_api_new_meeting_registration(self): + @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]}) + def test_api_new_meeting_registration_v2(self): meeting = MeetingFactory(type_id='ietf') - reg = { - 'apikey': 'invalid', + person = PersonFactory() + reg_detail = { + 'email': person.email().address, + 'first_name': person.first_name(), + 'last_name': person.last_name(), + 'meeting': meeting.number, 'affiliation': "Alguma Corporação", 'country_code': 'PT', - 'email': 'foo@example.pt', - 'first_name': 'Foo', - 'last_name': 'Bar', - 'meeting': meeting.number, - 'reg_type': 'hackathon', - 'ticket_type': '', - 'checkedin': 'False', + 'checkedin': False, + 'is_nomcom_volunteer': False, + 'cancelled': False, + 'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}], } - url = urlreverse('ietf.api.views.api_new_meeting_registration') - r = self.client.post(url, reg) - self.assertContains(r, 'Invalid apikey', status_code=403) - oidcp = PersonFactory(user__is_staff=True) - # Make sure 'oidcp' has an acceptable role - RoleFactory(name_id='robot', person=oidcp, email=oidcp.email(), group__acronym='secretariat') - key = PersonalApiKey.objects.create(person=oidcp, endpoint=url) - reg['apikey'] = key.hash() + reg_data = {'objects': {reg_detail['email']: reg_detail}} + url = urlreverse('ietf.api.views.api_new_meeting_registration_v2') # - # Test valid POST - # FIXME: sometimes, there seems to be something in the outbox? - old_len = len(outbox) - r = self.client.post(url, reg) - self.assertContains(r, "Accepted, New registration, Email sent", status_code=202) - # - # Check outgoing mail - self.assertEqual(len(outbox), old_len + 1) - body = get_payload_text(outbox[-1]) - self.assertIn(reg['email'], outbox[-1]['To'] ) - self.assertIn(reg['email'], body) - self.assertIn('account creation request', body) + # Test invalid key + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "invalid-token"}) + self.assertEqual(r.status_code, 403) # - # Check record - obj = MeetingRegistration.objects.get(email=reg['email'], meeting__number=reg['meeting']) - for key in ['affiliation', 'country_code', 'first_name', 'last_name', 'person', 'reg_type', 'ticket_type', 'checkedin']: - self.assertEqual(getattr(obj, key), False if key=='checkedin' else reg.get(key) , "Bad data for field '%s'" % key) + # Test invalid data + bad_reg_data = copy.deepcopy(reg_data) + del bad_reg_data['objects'][reg_detail['email']]['email'] + r = self.client.post(url, data=json.dumps(bad_reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 400) # - # Test with existing user - person = PersonFactory() - reg['email'] = person.email().address - reg['first_name'] = person.first_name() - reg['last_name'] = person.last_name() - # - r = self.client.post(url, reg) - self.assertContains(r, "Accepted, New registration", status_code=202) + # Test valid POST + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) # - # There should be no new outgoing mail - self.assertEqual(len(outbox), old_len + 1) + # Check record + objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting']) + self.assertEqual(objects.count(), 1) + obj = objects[0] + for key in ['affiliation', 'country_code', 'first_name', 'last_name', 'checkedin']: + self.assertEqual(getattr(obj, key), False if key == 'checkedin' else reg_detail.get(key), f"Bad data for field {key}") + self.assertEqual(obj.tickets.count(), 1) + ticket = obj.tickets.first() + self.assertEqual(ticket.ticket_type.slug, reg_detail['tickets'][0]['ticket_type']) + self.assertEqual(ticket.attendance_type.slug, reg_detail['tickets'][0]['attendance_type']) + self.assertEqual(obj.person, person) # - # Test multiple reg types - reg['reg_type'] = 'remote' - reg['ticket_type'] = 'full_week_pass' - r = self.client.post(url, reg) - self.assertContains(r, "Accepted, New registration", status_code=202) - objs = MeetingRegistration.objects.filter(email=reg['email'], meeting__number=reg['meeting']) - self.assertEqual(len(objs), 2) - self.assertEqual(objs.filter(reg_type='hackathon').count(), 1) - self.assertEqual(objs.filter(reg_type='remote', ticket_type='full_week_pass').count(), 1) - self.assertEqual(len(outbox), old_len + 1) + # Test update (switch to remote) + reg_detail = { + 'affiliation': "Alguma Corporação", + 'country_code': 'PT', + 'email': person.email().address, + 'first_name': person.first_name(), + 'last_name': person.last_name(), + 'meeting': meeting.number, + 'checkedin': False, + 'is_nomcom_volunteer': False, + 'cancelled': False, + 'tickets': [{'attendance_type': 'remote', 'ticket_type': 'week_pass'}], + } + reg_data = {'objects': {reg_detail['email']: reg_detail}} + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting']) + self.assertEqual(objects.count(), 1) + obj = objects[0] + self.assertEqual(obj.tickets.count(), 1) + ticket = obj.tickets.first() + self.assertEqual(ticket.ticket_type.slug, reg_detail['tickets'][0]['ticket_type']) + self.assertEqual(ticket.attendance_type.slug, reg_detail['tickets'][0]['attendance_type']) # - # Test incomplete POST - drop_fields = ['affiliation', 'first_name', 'reg_type'] - for field in drop_fields: - del reg[field] - r = self.client.post(url, reg) - self.assertContains(r, 'Missing parameters:', status_code=400) - err, fields = r.content.decode().split(':', 1) - missing_fields = [f.strip() for f in fields.split(',')] - self.assertEqual(set(missing_fields), set(drop_fields)) + # Test multiple + reg_detail = { + 'affiliation': "Alguma Corporação", + 'country_code': 'PT', + 'email': person.email().address, + 'first_name': person.first_name(), + 'last_name': person.last_name(), + 'meeting': meeting.number, + 'checkedin': False, + 'is_nomcom_volunteer': False, + 'cancelled': False, + 'tickets': [ + {'attendance_type': 'onsite', 'ticket_type': 'one_day'}, + {'attendance_type': 'remote', 'ticket_type': 'week_pass'}, + ], + } + reg_data = {'objects': {reg_detail['email']: reg_detail}} + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting']) + self.assertEqual(objects.count(), 1) + obj = objects[0] + self.assertEqual(obj.tickets.count(), 2) + self.assertEqual(obj.tickets.filter(attendance_type__slug='onsite').count(), 1) + self.assertEqual(obj.tickets.filter(attendance_type__slug='remote').count(), 1) + + @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]}) + def test_api_new_meeting_registration_v2_cancelled(self): + meeting = MeetingFactory(type_id='ietf') + person = PersonFactory() + reg_detail = { + 'affiliation': "Acme", + 'country_code': 'US', + 'email': person.email().address, + 'first_name': person.first_name(), + 'last_name': person.last_name(), + 'meeting': meeting.number, + 'checkedin': False, + 'is_nomcom_volunteer': False, + 'cancelled': False, + 'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}], + } + reg_data = {'objects': {reg_detail['email']: reg_detail}} + url = urlreverse('ietf.api.views.api_new_meeting_registration_v2') + self.assertEqual(Registration.objects.count(), 0) + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + self.assertEqual(Registration.objects.count(), 1) + reg_detail['cancelled'] = True + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + self.assertEqual(Registration.objects.count(), 0) + + @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]}) + def test_api_new_meeting_registration_v2_nomcom(self): + meeting = MeetingFactory(type_id='ietf') + person = PersonFactory() + reg_detail = { + 'affiliation': "Acme", + 'country_code': 'US', + 'email': person.email().address, + 'first_name': person.first_name(), + 'last_name': person.last_name(), + 'meeting': meeting.number, + 'checkedin': False, + 'is_nomcom_volunteer': False, + 'cancelled': False, + 'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}], + } + reg_data = {'objects': {reg_detail['email']: reg_detail}} + url = urlreverse('ietf.api.views.api_new_meeting_registration_v2') + now = datetime.datetime.now() + if now.month > 10: + year = now.year + 1 + else: + year = now.year + # create appropriate group and nomcom objects + nomcom = NomComFactory.create(is_accepting_volunteers=True, **nomcom_kwargs_for_year(year)) + + # first test is_nomcom_volunteer False + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + # assert no Volunteers exists + self.assertEqual(Volunteer.objects.count(), 0) + + # test is_nomcom_volunteer True + reg_detail['is_nomcom_volunteer'] = True + r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, "Success", status_code=202) + # assert Volunteer exists + self.assertEqual(Volunteer.objects.count(), 1) + volunteer = Volunteer.objects.last() + self.assertEqual(volunteer.person, person) + self.assertEqual(volunteer.nomcom, nomcom) + self.assertEqual(volunteer.origin, 'registration') def test_api_version(self): - DumpInfo.objects.create(date=timezone.datetime(2022,8,31,7,10,1,tzinfo=timezone.utc), host='testapi.example.com',tz='UTC') + DumpInfo.objects.create(date=timezone.datetime(2022,8,31,7,10,1,tzinfo=datetime.UTC), host='testapi.example.com',tz='UTC') url = urlreverse('ietf.api.views.version') r = self.client.get(url) data = r.json() self.assertEqual(data['version'], ietf.__version__+ietf.__patch__) + for lib in settings.ADVERTISE_VERSIONS: + self.assertIn(lib, data['other']) self.assertEqual(data['dumptime'], "2022-08-31 07:10:01 +0000") DumpInfo.objects.update(tz='PST8PDT') r = self.client.get(url) @@ -704,27 +886,519 @@ def test_api_version(self): def test_api_appauth(self): - url = urlreverse('ietf.api.views.app_auth') - person = PersonFactory() - apikey = PersonalApiKey.objects.create(endpoint=url, person=person) + for app in ["authortools", "bibxml"]: + url = urlreverse('ietf.api.views.app_auth', kwargs={"app": app}) + person = PersonFactory() + apikey = PersonalApiKeyFactory(endpoint=url, person=person) + + self.client.login(username=person.user.username,password=f'{person.user.username}+password') + self.client.logout() + + # error cases + # missing apikey + r = self.client.post(url, {}) + self.assertContains(r, 'Missing apikey parameter', status_code=400) + + # invalid apikey + r = self.client.post(url, {'apikey': 'foobar'}) + self.assertContains(r, 'Invalid apikey', status_code=403) + + # working case + r = self.client.post(url, {'apikey': apikey.hash()}) + self.assertEqual(r.status_code, 200) + jsondata = r.json() + self.assertEqual(jsondata['success'], True) + self.client.logout() - self.client.login(username=person.user.username,password=f'{person.user.username}+password') - self.client.logout() + @override_settings(APP_API_TOKENS={"ietf.api.views.nfs_metrics": ["valid-token"]}) + def test_api_nfs_metrics(self): + url = urlreverse("ietf.api.views.nfs_metrics") + r = self.client.get(url) + self.assertEqual(r.status_code, 403) + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertContains(r, 'nfs_latency_seconds{operation="write"}') - # error cases - # missing apikey - r = self.client.post(url, {}) - self.assertContains(r, 'Missing apikey parameter', status_code=400) + def test_api_get_session_matherials_no_agenda_meeting_url(self): + meeting = MeetingFactory(type_id='ietf') + session = SessionFactory(meeting=meeting) + url = urlreverse('ietf.meeting.views.api_get_session_materials', kwargs={'session_id': session.pk}) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + + @override_settings(APP_API_TOKENS={"ietf.api.views.draft_aliases": ["valid-token"]}) + @mock.patch("ietf.api.views.DraftAliasGenerator") + def test_draft_aliases(self, mock): + mock.return_value = (("alias1", ("a1", "a2")), ("alias2", ("a3", "a4"))) + url = urlreverse("ietf.api.views.draft_aliases") + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-type"], "application/json") + self.assertEqual( + json.loads(r.content), + { + "aliases": [ + {"alias": "alias1", "domains": ["ietf"], "addresses": ["a1", "a2"]}, + {"alias": "alias2", "domains": ["ietf"], "addresses": ["a3", "a4"]}, + ]} + ) + # some invalid cases + self.assertEqual( + self.client.get(url, headers={}).status_code, + 403, + ) + self.assertEqual( + self.client.get(url, headers={"X-Api-Key": "something-else"}).status_code, + 403, + ) + self.assertEqual( + self.client.post(url, headers={"X-Api-Key": "something-else"}).status_code, + 403, + ) + self.assertEqual( + self.client.post(url, headers={"X-Api-Key": "valid-token"}).status_code, + 405, + ) - # invalid apikey - r = self.client.post(url, {'apikey': 'foobar'}) - self.assertContains(r, 'Invalid apikey', status_code=403) + @override_settings(APP_API_TOKENS={"ietf.api.views.group_aliases": ["valid-token"]}) + @mock.patch("ietf.api.views.GroupAliasGenerator") + def test_group_aliases(self, mock): + mock.return_value = (("alias1", ("ietf",), ("a1", "a2")), ("alias2", ("ietf", "iab"), ("a3", "a4"))) + url = urlreverse("ietf.api.views.group_aliases") + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-type"], "application/json") + self.assertEqual( + json.loads(r.content), + { + "aliases": [ + {"alias": "alias1", "domains": ["ietf"], "addresses": ["a1", "a2"]}, + {"alias": "alias2", "domains": ["ietf", "iab"], "addresses": ["a3", "a4"]}, + ]} + ) + # some invalid cases + self.assertEqual( + self.client.get(url, headers={}).status_code, + 403, + ) + self.assertEqual( + self.client.get(url, headers={"X-Api-Key": "something-else"}).status_code, + 403, + ) + self.assertEqual( + self.client.post(url, headers={"X-Api-Key": "something-else"}).status_code, + 403, + ) + self.assertEqual( + self.client.post(url, headers={"X-Api-Key": "valid-token"}).status_code, + 405, + ) - # working case - r = self.client.post(url, {'apikey': apikey.hash()}) + @override_settings(APP_API_TOKENS={"ietf.api.views.active_email_list": ["valid-token"]}) + def test_active_email_list(self): + EmailFactory(active=True) # make sure there's at least one active email... + EmailFactory(active=False) # ... and at least one non-active emai + url = urlreverse("ietf.api.views.active_email_list") + r = self.client.post(url, headers={}) + self.assertEqual(r.status_code, 403) + r = self.client.get(url, headers={}) + self.assertEqual(r.status_code, 403) + r = self.client.get(url, headers={"X-Api-Key": "not-the-valid-token"}) + self.assertEqual(r.status_code, 403) + r = self.client.post(url, headers={"X-Api-Key": "not-the-valid-token"}) + self.assertEqual(r.status_code, 403) + r = self.client.post(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 405) + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) self.assertEqual(r.status_code, 200) - jsondata = r.json() - self.assertEqual(jsondata['success'], True) + self.assertEqual(r.headers["Content-Type"], "application/json") + result = json.loads(r.content) + self.assertCountEqual(result.keys(), ["addresses"]) + self.assertCountEqual(result["addresses"], Email.objects.filter(active=True).values_list("address", flat=True)) + + @override_settings(APP_API_TOKENS={"ietf.api.views.related_email_list": ["valid-token"]}) + def test_related_email_list(self): + joe = EmailFactory(address='joe@work.com') + EmailFactory(address='joe@home.com', person=joe.person) + EmailFactory(address='jòe@spain.com', person=joe.person) + url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'joe@home.com'}) + # no api key + r = self.client.get(url, headers={}) + self.assertEqual(r.status_code, 403) + # invalid api key + r = self.client.get(url, headers={"X-Api-Key": "not-the-valid-token"}) + self.assertEqual(r.status_code, 403) + # wrong method + r = self.client.post(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 405) + # valid + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + result = json.loads(r.content) + self.assertCountEqual(result.keys(), ["addresses"]) + self.assertCountEqual(result["addresses"], joe.person.email_set.values_list("address", flat=True)) + # non-ascii + non_ascii_url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'jòe@spain.com'}) + r = self.client.get(non_ascii_url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 200) + result = json.loads(r.content) + self.assertTrue('joe@home.com' in result["addresses"]) + # email not found + not_found_url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'nobody@nowhere.com'}) + r = self.client.get(not_found_url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 404) + + @override_settings(APP_API_TOKENS={"ietf.api.views.role_holder_addresses": ["valid-token"]}) + def test_role_holder_addresses(self): + url = urlreverse("ietf.api.views.role_holder_addresses") + r = self.client.get(url, headers={}) + self.assertEqual(r.status_code, 403, "No api token, no access") + r = self.client.get(url, headers={"X-Api-Key": "not-valid-token"}) + self.assertEqual(r.status_code, 403, "Bad api token, no access") + r = self.client.post(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 405, "Bad method, no access") + + emails = EmailFactory.create_batch(5) + email_queryset = Email.objects.filter(pk__in=[e.pk for e in emails]) + with mock.patch("ietf.api.views.role_holder_emails", return_value=email_queryset): + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 200, "Good api token and method, access") + content_dict = json.loads(r.content) + self.assertCountEqual(content_dict.keys(), ["addresses"]) + self.assertEqual( + content_dict["addresses"], + sorted(e.address for e in emails), + ) + + @override_settings( + APP_API_TOKENS={"ietf.api.views.ingest_email": "valid-token", "ietf.api.views.ingest_email_test": "test-token"} + ) + @mock.patch("ietf.api.views.iana_ingest_review_email") + @mock.patch("ietf.api.views.ipr_ingest_response_email") + @mock.patch("ietf.api.views.nomcom_ingest_feedback_email") + def test_ingest_email( + self, mock_nomcom_ingest, mock_ipr_ingest, mock_iana_ingest + ): + mocks = {mock_nomcom_ingest, mock_ipr_ingest, mock_iana_ingest} + empty_outbox() + url = urlreverse("ietf.api.views.ingest_email") + test_mode_url = urlreverse("ietf.api.views.ingest_email_test") + + # test various bad calls + r = self.client.get(url) + self.assertEqual(r.status_code, 403) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.get(test_mode_url) + self.assertEqual(r.status_code, 403) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.post(url) + self.assertEqual(r.status_code, 403) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post(test_mode_url) + self.assertEqual(r.status_code, 403) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.get(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 405) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.get(test_mode_url, headers={"X-Api-Key": "test-token"}) + self.assertEqual(r.status_code, 405) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.post(url, headers={"X-Api-Key": "valid-token"}) + self.assertEqual(r.status_code, 415) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post(test_mode_url, headers={"X-Api-Key": "test-token"}) + self.assertEqual(r.status_code, 415) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.post( + url, content_type="application/json", headers={"X-Api-Key": "valid-token"} + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post( + test_mode_url, content_type="application/json", headers={"X-Api-Key": "test-token"} + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.post( + url, + "this is not JSON!", + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post( + test_mode_url, + "this is not JSON!", + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + + r = self.client.post( + url, + {"json": "yes", "valid_schema": False}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post( + test_mode_url, + {"json": "yes", "valid_schema": False}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 400) + self.assertFalse(any(m.called for m in mocks)) + + # bad destination + message_b64 = base64.b64encode(b"This is a message").decode() + r = self.client.post( + url, + {"dest": "not-a-destination", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_dest"}) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post( + test_mode_url, + {"dest": "not-a-destination", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_dest"}) + self.assertFalse(any(m.called for m in mocks)) + + # test that valid requests call handlers appropriately + r = self.client.post( + url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertTrue(mock_iana_ingest.called) + self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest}))) + mock_iana_ingest.reset_mock() + + # the test mode endpoint should _not_ call the handler + r = self.client.post( + test_mode_url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertFalse(any(m.called for m in mocks)) + mock_iana_ingest.reset_mock() + + r = self.client.post( + url, + {"dest": "ipr-response", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertTrue(mock_ipr_ingest.called) + self.assertEqual(mock_ipr_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_ipr_ingest}))) + mock_ipr_ingest.reset_mock() + + # the test mode endpoint should _not_ call the handler + r = self.client.post( + test_mode_url, + {"dest": "ipr-response", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertFalse(any(m.called for m in mocks)) + mock_ipr_ingest.reset_mock() + + # bad nomcom-feedback dest + for bad_nomcom_dest in [ + "nomcom-feedback", # no suffix + "nomcom-feedback-", # no year + "nomcom-feedback-squid", # not a year, + "nomcom-feedback-2024-2025", # also not a year + ]: + r = self.client.post( + url, + {"dest": bad_nomcom_dest, "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_dest"}) + self.assertFalse(any(m.called for m in mocks)) + r = self.client.post( + test_mode_url, + {"dest": bad_nomcom_dest, "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_dest"}) + self.assertFalse(any(m.called for m in mocks)) + + # good nomcom-feedback dest + random_year = randrange(100000) + r = self.client.post( + url, + {"dest": f"nomcom-feedback-{random_year}", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertTrue(mock_nomcom_ingest.called) + self.assertEqual(mock_nomcom_ingest.call_args, mock.call(b"This is a message", random_year)) + self.assertFalse(any(m.called for m in (mocks - {mock_nomcom_ingest}))) + mock_nomcom_ingest.reset_mock() + + # the test mode endpoint should _not_ call the handler + r = self.client.post( + test_mode_url, + {"dest": f"nomcom-feedback-{random_year}", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "test-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "ok"}) + self.assertFalse(any(m.called for m in mocks)) + mock_nomcom_ingest.reset_mock() + + # test that exceptions lead to email being sent - assumes that iana-review handling is representative + mock_iana_ingest.side_effect = EmailIngestionError("Error: don't send email") + r = self.client.post( + url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_msg"}) + self.assertTrue(mock_iana_ingest.called) + self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest}))) + self.assertEqual(len(outbox), 0) # implicitly tests that _none_ of the earlier tests sent email + mock_iana_ingest.reset_mock() + + # test default recipients and attached original message + mock_iana_ingest.side_effect = EmailIngestionError( + "Error: do send email", + email_body="This is my email\n", + email_original_message=b"This is the original message" + ) + with override_settings(ADMINS=[("Some Admin", "admin@example.com")]): + r = self.client.post( + url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_msg"}) + self.assertTrue(mock_iana_ingest.called) + self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest}))) + self.assertEqual(len(outbox), 1) + self.assertIn("admin@example.com", outbox[0]["To"]) + self.assertEqual("Error: do send email", outbox[0]["Subject"]) + self.assertEqual("This is my email\n", get_payload_text(outbox[0].get_body())) + attachments = list(a for a in outbox[0].iter_attachments()) + self.assertEqual(len(attachments), 1) + self.assertEqual(attachments[0].get_filename(), "original-message") + self.assertEqual(attachments[0].get_content_type(), "application/octet-stream") + self.assertEqual(attachments[0].get_content(), b"This is the original message") + mock_iana_ingest.reset_mock() + empty_outbox() + + # test overridden recipients and no attached original message + mock_iana_ingest.side_effect = EmailIngestionError( + "Error: do send email", + email_body="This is my email\n", + email_recipients=("thatguy@example.com") + ) + with override_settings(ADMINS=[("Some Admin", "admin@example.com")]): + r = self.client.post( + url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_msg"}) + self.assertTrue(mock_iana_ingest.called) + self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest}))) + self.assertEqual(len(outbox), 1) + self.assertNotIn("admin@example.com", outbox[0]["To"]) + self.assertIn("thatguy@example.com", outbox[0]["To"]) + self.assertEqual("Error: do send email", outbox[0]["Subject"]) + self.assertEqual("This is my email\n", get_payload_text(outbox[0])) + mock_iana_ingest.reset_mock() + empty_outbox() + + # test attached traceback + mock_iana_ingest.side_effect = EmailIngestionError( + "Error: do send email", + email_body="This is my email\n", + email_attach_traceback=True, + ) + with override_settings(ADMINS=[("Some Admin", "admin@example.com")]): + r = self.client.post( + url, + {"dest": "iana-review", "message": message_b64}, + content_type="application/json", + headers={"X-Api-Key": "valid-token"}, + ) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.headers["Content-Type"], "application/json") + self.assertEqual(json.loads(r.content), {"result": "bad_msg"}) + self.assertTrue(mock_iana_ingest.called) + self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message")) + self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest}))) + self.assertEqual(len(outbox), 1) + self.assertIn("admin@example.com", outbox[0]["To"]) + self.assertEqual("Error: do send email", outbox[0]["Subject"]) + self.assertEqual("This is my email\n", get_payload_text(outbox[0].get_body())) + attachments = list(a for a in outbox[0].iter_attachments()) + self.assertEqual(len(attachments), 1) + self.assertEqual(attachments[0].get_filename(), "traceback.txt") + self.assertEqual(attachments[0].get_content_type(), "text/plain") + self.assertIn("ietf.api.views.EmailIngestionError: Error: do send email", attachments[0].get_content()) + mock_iana_ingest.reset_mock() + empty_outbox() + class DirectAuthApiTests(TestCase): @@ -783,7 +1457,7 @@ def test_bad_post(self): data = self.response_data(r) self.assertEqual(data["result"], "failure") self.assertEqual(data["reason"], "invalid post") - + bad = dict(authtoken=self.valid_token, username=self.valid_person.user.username, password=self.valid_password) r = self.client.post(self.url, bad) self.assertEqual(r.status_code, 200) @@ -791,8 +1465,9 @@ def test_bad_post(self): self.assertEqual(data["result"], "failure") self.assertEqual(data["reason"], "invalid post") + @override_settings() def test_notokenstore(self): - self.assertFalse(hasattr(settings, "APP_API_TOKENS")) + del settings.APP_API_TOKENS # only affects overridden copy of settings! r = self.client.post(self.url,self.valid_body_with_good_password) self.assertEqual(r.status_code, 200) data = self.response_data(r) @@ -822,7 +1497,7 @@ def test_good_password(self): data = self.response_data(r) self.assertEqual(data["result"], "success") -class TastypieApiTestCase(ResourceTestCaseMixin, TestCase): +class TastypieApiTests(ResourceTestCaseMixin, TestCase): def __init__(self, *args, **kwargs): self.apps = {} for app_name in settings.INSTALLED_APPS: @@ -832,7 +1507,7 @@ def __init__(self, *args, **kwargs): models_path = os.path.join(os.path.dirname(app.__file__), "models.py") if os.path.exists(models_path): self.apps[name] = app_name - super(TastypieApiTestCase, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def test_api_top_level(self): client = Client(Accept='application/json') @@ -841,7 +1516,7 @@ def test_api_top_level(self): resource_list = r.json() for name in self.apps: - if not name in self.apps: + if not name in resource_list: sys.stderr.write("Expected a REST API resource for %s, but didn't find one\n" % name) for name in self.apps: @@ -867,6 +1542,21 @@ def test_all_model_resources_exist(self): self.assertIn(model._meta.model_name, list(app_resources.keys()), "There doesn't seem to be any API resource for model %s.models.%s"%(app.__name__,model.__name__,)) + def test_serializer_to_etree_handles_nulls(self): + """Serializer to_etree() should handle a null character""" + serializer = Serializer() + try: + serializer.to_etree("string with no nulls in it") + except ValueError: + self.fail("serializer.to_etree raised ValueError on an ordinary string") + try: + serializer.to_etree("string with a \x00 in it") + except ValueError: + self.fail( + "serializer.to_etree raised ValueError on a string " + "containing a null character" + ) + class RfcdiffSupportTests(TestCase): @@ -934,7 +1624,7 @@ def do_draft_test(self, name): self.assertNotIn('previous', received, 'Rev 00 has no previous name when not replacing a draft') replaced = IndividualDraftFactory() - RelatedDocument.objects.create(relationship_id='replaces',source=draft,target=replaced.docalias.first()) + RelatedDocument.objects.create(relationship_id='replaces',source=draft,target=replaced) received = self.getJson(dict(name=draft.name, rev='00')) self.assertEqual(received['previous'], f'{replaced.name}-{replaced.rev}', 'Rev 00 has a previous name when replacing a draft') @@ -964,19 +1654,19 @@ def test_draft_with_broken_history(self): def do_rfc_test(self, draft_name): draft = WgDraftFactory(name=draft_name, create_revisions=range(0,2)) - draft.docalias.create(name=f'rfc{self.next_rfc_number():04}') + rfc = WgRfcFactory(group=draft.group, rfc_number=self.next_rfc_number()) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) draft.set_state(State.objects.get(type_id='draft',slug='rfc')) draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub')) - draft = reload_db_objects(draft) - rfc = draft + draft, rfc = reload_db_objects(draft, rfc) - number = rfc.rfc_number() + number = rfc.rfc_number received = self.getJson(dict(name=number)) self.assertEqual( received, dict( content_url=rfc.get_href(), - name=rfc.canonical_name(), + name=rfc.name, previous=f'{draft.name}-{draft.rev}', previous_url= draft.history_set.get(rev=draft.rev).get_href(), ), @@ -984,7 +1674,7 @@ def do_rfc_test(self, draft_name): ) num_received = received - received = self.getJson(dict(name=rfc.canonical_name())) + received = self.getJson(dict(name=rfc.name)) self.assertEqual(num_received, received, 'RFC by canonical name gives same result as by number') received = self.getJson(dict(name=f'RfC {number}')) @@ -1016,30 +1706,30 @@ def test_rfc(self): def test_rfc_with_tombstone(self): draft = WgDraftFactory(create_revisions=range(0,2)) - draft.docalias.create(name='rfc3261') # See views_doc.HAS_TOMBSTONE + rfc = WgRfcFactory(rfc_number=3261,group=draft.group)# See views_doc.HAS_TOMBSTONE + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) draft.set_state(State.objects.get(type_id='draft',slug='rfc')) draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub')) draft = reload_db_objects(draft) - rfc = draft # Some old rfcs had tombstones that shouldn't be used for comparisons - received = self.getJson(dict(name=rfc.canonical_name())) + received = self.getJson(dict(name=rfc.name)) self.assertTrue(received['previous'].endswith('00')) def do_rfc_with_broken_history_test(self, draft_name): draft = WgDraftFactory(rev='10', name=draft_name) - draft.docalias.create(name=f'rfc{self.next_rfc_number():04}') + rfc = WgRfcFactory(group=draft.group, rfc_number=self.next_rfc_number()) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) draft.set_state(State.objects.get(type_id='draft',slug='rfc')) draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub')) draft = reload_db_objects(draft) - rfc = draft received = self.getJson(dict(name=draft.name)) self.assertEqual( received, dict( content_url=rfc.get_href(), - name=rfc.canonical_name(), + name=rfc.name, previous=f'{draft.name}-10', previous_url= f'{settings.IETF_ID_ARCHIVE_URL}{draft.name}-10.txt', ), @@ -1070,3 +1760,91 @@ def test_rfc_with_broken_history(self): # tricky draft names self.do_rfc_with_broken_history_test(draft_name='draft-gizmo-01') self.do_rfc_with_broken_history_test(draft_name='draft-oh-boy-what-a-draft-02-03') + + def test_no_such_document(self): + for name in ['rfc0000', 'draft-ftei-oof-rab-00']: + url = urlreverse(self.target_view, kwargs={'name': name}) + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + + +class TokenTests(TestCase): + @override_settings(APP_API_TOKENS={"known.endpoint": ["token in a list"], "oops": "token as a str"}) + def test_is_valid_token(self): + # various invalid cases + self.assertFalse(is_valid_token("unknown.endpoint", "token in a list")) + self.assertFalse(is_valid_token("known.endpoint", "token")) + self.assertFalse(is_valid_token("known.endpoint", "token as a str")) + self.assertFalse(is_valid_token("oops", "token")) + self.assertFalse(is_valid_token("oops", "token in a list")) + # the only valid cases + self.assertTrue(is_valid_token("known.endpoint", "token in a list")) + self.assertTrue(is_valid_token("oops", "token as a str")) + + @mock.patch("ietf.api.ietf_utils.is_valid_token") + def test_requires_api_token(self, mock_is_valid_token): + called = False + + @requires_api_token + def fn_to_wrap(request, *args, **kwargs): + nonlocal called + called = True + return request, args, kwargs + + req_factory = RequestFactory() + arg = object() + kwarg = object() + + # No X-Api-Key header + mock_is_valid_token.return_value = False + val = fn_to_wrap( + req_factory.get("/some/url", headers={}), + arg, + kwarg=kwarg, + ) + self.assertTrue(isinstance(val, HttpResponseForbidden)) + self.assertFalse(mock_is_valid_token.called) + self.assertFalse(called) + + # Bad X-Api-Key header (not resetting the mock, it was not used yet) + val = fn_to_wrap( + req_factory.get("/some/url", headers={"X-Api-Key": "some-value"}), + arg, + kwarg=kwarg, + ) + self.assertTrue(isinstance(val, HttpResponseForbidden)) + self.assertTrue(mock_is_valid_token.called) + self.assertEqual( + mock_is_valid_token.call_args[0], + (fn_to_wrap.__module__ + "." + fn_to_wrap.__qualname__, "some-value"), + ) + self.assertFalse(called) + + # Valid header + mock_is_valid_token.reset_mock() + mock_is_valid_token.return_value = True + request = req_factory.get("/some/url", headers={"X-Api-Key": "some-value"}) + # Bad X-Api-Key header (not resetting the mock, it was not used yet) + val = fn_to_wrap( + request, + arg, + kwarg=kwarg, + ) + self.assertEqual(val, (request, (arg,), {"kwarg": kwarg})) + self.assertTrue(mock_is_valid_token.called) + self.assertEqual( + mock_is_valid_token.call_args[0], + (fn_to_wrap.__module__ + "." + fn_to_wrap.__qualname__, "some-value"), + ) + self.assertTrue(called) + + # Test the endpoint setting + @requires_api_token("endpoint") + def another_fn_to_wrap(request): + return "yep" + + val = another_fn_to_wrap(request) + self.assertEqual( + mock_is_valid_token.call_args[0], + ("endpoint", "some-value"), + ) diff --git a/ietf/api/tests_core.py b/ietf/api/tests_core.py new file mode 100644 index 00000000000..7e45deac8a8 --- /dev/null +++ b/ietf/api/tests_core.py @@ -0,0 +1,289 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +"""Core API tests""" +from unittest.mock import patch +# from unittest.mock import patch, call + +from django.urls import reverse as urlreverse, NoReverseMatch +from rest_framework.test import APIClient + +# from ietf.person.factories import PersonFactory, EmailFactory +# from ietf.person.models import Person +from ietf.utils.test_utils import TestCase + + +class CoreApiTestCase(TestCase): + client_class = APIClient + + +class PersonTests(CoreApiTestCase): + # Tests disabled until we activate the DRF URLs in api/urls.py + + def test_person_detail(self): + with self.assertRaises(NoReverseMatch, msg="Re-enable test when this view is enabled"): + urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": 1}) + + # person = PersonFactory() + # other_person = PersonFactory() + # url = urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": person.pk}) + # bad_pk = person.pk + 10000 + # if Person.objects.filter(pk=bad_pk).exists(): + # bad_pk += 10000 # if this doesn't get us clear, something is wrong... + # self.assertFalse( + # Person.objects.filter(pk=bad_pk).exists(), + # "Failed to find a non-existent person pk", + # ) + # bad_url = urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": bad_pk}) + # r = self.client.get(bad_url, format="json") + # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404") + # r = self.client.get(url, format="json") + # self.assertEqual(r.status_code, 403, "Must be logged in") + # self.client.login( + # username=other_person.user.username, + # password=other_person.user.username + "+password", + # ) + # r = self.client.get(bad_url, format="json") + # self.assertEqual(r.status_code, 404) + # r = self.client.get(url, format="json") + # self.assertEqual(r.status_code, 403, "Can only retrieve self") + # self.client.login( + # username=person.user.username, password=person.user.username + "+password" + # ) + # r = self.client.get(url, format="json") + # self.assertEqual(r.status_code, 200) + # self.assertEqual( + # r.data, + # { + # "id": person.pk, + # "name": person.name, + # "emails": [ + # { + # "person": person.pk, + # "address": email.address, + # "primary": email.primary, + # "active": email.active, + # "origin": email.origin, + # } + # for email in person.email_set.all() + # ], + # }, + # ) + + @patch("ietf.person.api.send_new_email_confirmation_request") + def test_add_email(self, send_confirmation_mock): + with self.assertRaises(NoReverseMatch, msg="Re-enable this test when this view is enabled"): + urlreverse("ietf.api.core_api.person-email", kwargs={"pk": 1}) + + # email = EmailFactory(address="old@example.org") + # person = email.person + # other_person = PersonFactory() + # url = urlreverse("ietf.api.core_api.person-email", kwargs={"pk": person.pk}) + # post_data = {"address": "new@example.org"} + # + # r = self.client.post(url, data=post_data, format="json") + # self.assertEqual(r.status_code, 403, "Must be logged in") + # self.assertFalse(send_confirmation_mock.called) + # + # self.client.login( + # username=other_person.user.username, + # password=other_person.user.username + "+password", + # ) + # r = self.client.post(url, data=post_data, format="json") + # self.assertEqual(r.status_code, 403, "Can only retrieve self") + # self.assertFalse(send_confirmation_mock.called) + # + # self.client.login( + # username=person.user.username, password=person.user.username + "+password" + # ) + # r = self.client.post(url, data=post_data, format="json") + # self.assertEqual(r.status_code, 200) + # self.assertEqual(r.data, {"address": "new@example.org"}) + # self.assertTrue(send_confirmation_mock.called) + # self.assertEqual( + # send_confirmation_mock.call_args, call(person, "new@example.org") + # ) + + +class EmailTests(CoreApiTestCase): + def test_email_update(self): + with self.assertRaises(NoReverseMatch, msg="Re-enable this test when the view is enabled"): + urlreverse( + "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"} + ) + + # email = EmailFactory( + # address="original@example.org", primary=False, active=True, origin="factory" + # ) + # person = email.person + # other_person = PersonFactory() + # url = urlreverse( + # "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"} + # ) + # bad_url = urlreverse( + # "ietf.api.core_api.email-detail", + # kwargs={"pk": "not-original@example.org"}, + # ) + # + # r = self.client.put( + # bad_url, data={"primary": True, "active": False}, format="json" + # ) + # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404") + # r = self.client.put(url, data={"primary": True, "active": False}, format="json") + # self.assertEqual(r.status_code, 403, "Must be logged in") + # + # self.client.login( + # username=other_person.user.username, + # password=other_person.user.username + "+password", + # ) + # r = self.client.put( + # bad_url, data={"primary": True, "active": False}, format="json" + # ) + # self.assertEqual(r.status_code, 404, "No such address") + # r = self.client.put(url, data={"primary": True, "active": False}, format="json") + # self.assertEqual(r.status_code, 403, "Can only access own addresses") + # + # self.client.login( + # username=person.user.username, password=person.user.username + "+password" + # ) + # r = self.client.put(url, data={"primary": True, "active": False}, format="json") + # self.assertEqual(r.status_code, 200) + # self.assertEqual( + # r.data, + # { + # "person": person.pk, + # "address": "original@example.org", + # "primary": True, + # "active": False, + # "origin": "factory", + # }, + # ) + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertFalse(email.active) + # self.assertEqual(email.origin, "factory") + # + # # address / origin should be immutable + # r = self.client.put( + # url, + # data={ + # "address": "modified@example.org", + # "primary": True, + # "active": False, + # "origin": "hacker", + # }, + # format="json", + # ) + # self.assertEqual(r.status_code, 200) + # self.assertEqual( + # r.data, + # { + # "person": person.pk, + # "address": "original@example.org", + # "primary": True, + # "active": False, + # "origin": "factory", + # }, + # ) + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertFalse(email.active) + # self.assertEqual(email.origin, "factory") + + def test_email_partial_update(self): + with self.assertRaises(NoReverseMatch, msg="Re-enable this test when the view is enabled"): + urlreverse( + "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"} + ) + + # email = EmailFactory( + # address="original@example.org", primary=False, active=True, origin="factory" + # ) + # person = email.person + # other_person = PersonFactory() + # url = urlreverse( + # "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"} + # ) + # bad_url = urlreverse( + # "ietf.api.core_api.email-detail", + # kwargs={"pk": "not-original@example.org"}, + # ) + # + # r = self.client.patch( + # bad_url, data={"primary": True}, format="json" + # ) + # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404") + # r = self.client.patch(url, data={"primary": True}, format="json") + # self.assertEqual(r.status_code, 403, "Must be logged in") + # + # self.client.login( + # username=other_person.user.username, + # password=other_person.user.username + "+password", + # ) + # r = self.client.patch( + # bad_url, data={"primary": True}, format="json" + # ) + # self.assertEqual(r.status_code, 404, "No such address") + # r = self.client.patch(url, data={"primary": True}, format="json") + # self.assertEqual(r.status_code, 403, "Can only access own addresses") + # + # self.client.login( + # username=person.user.username, password=person.user.username + "+password" + # ) + # r = self.client.patch(url, data={"primary": True}, format="json") + # self.assertEqual(r.status_code, 200) + # self.assertEqual( + # r.data, + # { + # "person": person.pk, + # "address": "original@example.org", + # "primary": True, + # "active": True, + # "origin": "factory", + # }, + # ) + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertTrue(email.active) + # self.assertEqual(email.origin, "factory") + # + # r = self.client.patch(url, data={"active": False}, format="json") + # self.assertEqual(r.status_code, 200) + # self.assertEqual( + # r.data, + # { + # "person": person.pk, + # "address": "original@example.org", + # "primary": True, + # "active": False, + # "origin": "factory", + # }, + # ) + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertFalse(email.active) + # self.assertEqual(email.origin, "factory") + # + # r = self.client.patch(url, data={"address": "modified@example.org"}, format="json") + # self.assertEqual(r.status_code, 200) # extra fields allowed, but ignored + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertFalse(email.active) + # self.assertEqual(email.origin, "factory") + # + # r = self.client.patch(url, data={"origin": "hacker"}, format="json") + # self.assertEqual(r.status_code, 200) # extra fields allowed, but ignored + # email.refresh_from_db() + # self.assertEqual(email.person, person) + # self.assertEqual(email.address, "original@example.org") + # self.assertTrue(email.primary) + # self.assertFalse(email.active) + # self.assertEqual(email.origin, "factory") diff --git a/ietf/api/tests_ietf_utils.py b/ietf/api/tests_ietf_utils.py new file mode 100644 index 00000000000..b8d7fea7b4b --- /dev/null +++ b/ietf/api/tests_ietf_utils.py @@ -0,0 +1,86 @@ +# Copyright The IETF Trust 2025, All Rights Reserved + +from django.test import RequestFactory +from django.test.utils import override_settings + +from ietf.api.ietf_utils import is_valid_token, requires_api_token +from ietf.utils.test_utils import TestCase + + +class IetfUtilsTests(TestCase): + @override_settings( + APP_API_TOKENS={ + "ietf.api.foobar": ["valid-token"], + "ietf.api.misconfigured": "valid-token", # misconfigured + } + ) + def test_is_valid_token(self): + self.assertFalse(is_valid_token("ietf.fake.endpoint", "valid-token")) + self.assertFalse(is_valid_token("ietf.api.foobar", "invalid-token")) + self.assertFalse(is_valid_token("ietf.api.foobar", None)) + self.assertTrue(is_valid_token("ietf.api.foobar", "valid-token")) + + # misconfiguration + self.assertFalse(is_valid_token("ietf.api.misconfigured", "v")) + self.assertFalse(is_valid_token("ietf.api.misconfigured", None)) + self.assertTrue(is_valid_token("ietf.api.misconfigured", "valid-token")) + + @override_settings( + APP_API_TOKENS={ + "ietf.api.foo": ["valid-token"], + "ietf.api.bar": ["another-token"], + "ietf.api.misconfigured": "valid-token", # misconfigured + } + ) + def test_requires_api_token(self): + @requires_api_token("ietf.api.foo") + def protected_function(request): + return f"Access granted: {request.method}" + + # request with a valid token + request = RequestFactory().get( + "/some/url", headers={"X_API_KEY": "valid-token"} + ) + result = protected_function(request) + self.assertEqual(result, "Access granted: GET") + + # request with an invalid token + request = RequestFactory().get( + "/some/url", headers={"X_API_KEY": "invalid-token"} + ) + result = protected_function(request) + self.assertEqual(result.status_code, 403) + + # request without a token + request = RequestFactory().get("/some/url", headers={"X_API_KEY": ""}) + result = protected_function(request) + self.assertEqual(result.status_code, 403) + + # request without a X_API_KEY token + request = RequestFactory().get("/some/url") + result = protected_function(request) + self.assertEqual(result.status_code, 403) + + # request with a valid token for another API endpoint + request = RequestFactory().get( + "/some/url", headers={"X_API_KEY": "another-token"} + ) + result = protected_function(request) + self.assertEqual(result.status_code, 403) + + # requests for a misconfigured endpoint + @requires_api_token("ietf.api.misconfigured") + def another_protected_function(request): + return f"Access granted: {request.method}" + + # request with valid token + request = RequestFactory().get( + "/some/url", headers={"X_API_KEY": "valid-token"} + ) + result = another_protected_function(request) + self.assertEqual(result, "Access granted: GET") + + # request with invalid token with the correct initial character + request = RequestFactory().get("/some/url", headers={"X_API_KEY": "v"}) + result = another_protected_function(request) + self.assertEqual(result.status_code, 403) diff --git a/ietf/api/urls.py b/ietf/api/urls.py index 5185b9f8885..04575b34cb9 100644 --- a/ietf/api/urls.py +++ b/ietf/api/urls.py @@ -1,16 +1,26 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2017-2024, All Rights Reserved from django.conf import settings -from django.conf.urls import include +from django.urls import include from django.views.generic import TemplateView from ietf import api -from ietf.api import views as api_views from ietf.doc import views_ballot from ietf.meeting import views as meeting_views from ietf.submit import views as submit_views from ietf.utils.urls import url +from . import views as api_views + +# DRF API routing - disabled until we plan to use it +# from drf_spectacular.views import SpectacularAPIView +# from django.urls import path +# from ietf.person import api as person_api +# from .routers import PrefixedSimpleRouter +# core_router = PrefixedSimpleRouter(name_prefix="ietf.api.core_api") # core api router +# core_router.register("email", person_api.EmailViewSet) +# core_router.register("person", person_api.PersonViewSet) + api.autodiscover() urlpatterns = [ @@ -20,14 +30,32 @@ url(r'^v1/?$', api_views.top_level), # For mailarchive use, requires secretariat role url(r'^v2/person/person', api_views.ApiV2PersonExportView.as_view()), + # --- DRF API --- + # path("core/", include(core_router.urls)), + # path("schema/", SpectacularAPIView.as_view()), # # --- Custom API endpoints, sorted alphabetically --- - # GPRD: export of personal information for the logged-in person + # Email alias information for drafts + url(r'^doc/draft-aliases/$', api_views.draft_aliases), + # email ingestor + url(r'email/$', api_views.ingest_email), + # email ingestor + url(r'email/test/$', api_views.ingest_email_test), + # GDPR: export of personal information for the logged-in person url(r'^export/personal-information/$', api_views.PersonalInformationExportView.as_view()), + # Email alias information for groups + url(r'^group/group-aliases/$', api_views.group_aliases), + # Email addresses belonging to role holders + url(r'^group/role-holder-addresses/$', api_views.role_holder_addresses), # Let IESG members set positions programmatically url(r'^iesg/position', views_ballot.api_set_position), + # Find the blob to store for a given materials document path + url(r'^meeting/(?:(?P(?:interim-)?[a-z0-9-]+)/)?materials/%(document)s(?P\.[A-Za-z0-9]+)?/resolve-cached/$' % settings.URL_REGEXPS, meeting_views.api_resolve_materials_name_cached), + url(r'^meeting/blob/(?P[a-z0-9-]+)/(?P[a-z][a-z0-9.-]+)$', meeting_views.api_retrieve_materials_blob), # Let Meetecho set session video URLs url(r'^meeting/session/video/url$', meeting_views.api_set_session_video_url), + # Let Meetecho tell us the name of its recordings + url(r'^meeting/session/recording-name$', meeting_views.api_set_meetecho_recording_name), # Meeting agenda + floorplan data url(r'^meeting/(?P[A-Za-z0-9._+-]+)/agenda-data$', meeting_views.api_get_agenda_data), # Meeting session materials @@ -41,12 +69,16 @@ # Let MeetEcho upload session polls url(r'^notify/session/polls/?$', meeting_views.api_upload_polls), # Let the registration system notify us about registrations - url(r'^notify/meeting/registration/?', api_views.api_new_meeting_registration), + url(r'^notify/meeting/registration/v2/?', api_views.api_new_meeting_registration_v2), # OpenID authentication provider url(r'^openid/$', TemplateView.as_view(template_name='api/openid-issuer.html'), name='ietf.api.urls.oidc_issuer'), url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')), + # Email alias listing + url(r'^person/email/$', api_views.active_email_list), + # Related Email listing + url(r'^person/email/(?P[^/\x00]+)/related/$', api_views.related_email_list), # Draft submission API - url(r'^submit/?$', submit_views.api_submit), + url(r'^submit/?$', submit_views.api_submit_tombstone), # Draft upload API url(r'^submission/?$', submit_views.api_submission), # Draft submission state API @@ -54,7 +86,9 @@ # Datatracker version url(r'^version/?$', api_views.version), # Application authentication API key - url(r'^appauth/[authortools|bibxml]', api_views.app_auth), + url(r'^appauth/(?Pauthortools|bibxml)$', api_views.app_auth), + # NFS metrics endpoint + url(r'^metrics/nfs/?$', api_views.nfs_metrics), # latest versions url(r'^rfcdiff-latest-json/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, api_views.rfcdiff_latest_json), url(r'^rfcdiff-latest-json/(?P[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', api_views.rfcdiff_latest_json), diff --git a/ietf/api/views.py b/ietf/api/views.py index b56544c436a..22523b2f172 100644 --- a/ietf/api/views.py +++ b/ietf/api/views.py @@ -1,46 +1,55 @@ # Copyright The IETF Trust 2017-2020, All Rights Reserved # -*- coding: utf-8 -*- - +import base64 +import binascii +import datetime import json +from pathlib import Path +from tempfile import NamedTemporaryFile +import jsonschema import pytz import re -from jwcrypto.jwk import JWK - +from contextlib import suppress from django.conf import settings from django.contrib.auth import authenticate from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User -from django.core.exceptions import ValidationError -from django.core.validators import validate_email -from django.http import HttpResponse, Http404 +from django.http import HttpResponse, Http404, JsonResponse, HttpResponseBadRequest from django.shortcuts import render, get_object_or_404 from django.urls import reverse from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django.views.decorators.gzip import gzip_page from django.views.generic.detail import DetailView - +from email.message import EmailMessage +from importlib.metadata import version as metadata_version +from jwcrypto.jwk import JWK from tastypie.exceptions import BadRequest -from tastypie.utils.mime import determine_format, build_content_type -from tastypie.utils import is_valid_jsonp_callback_value from tastypie.serializers import Serializer - -import debug # pyflakes:ignore +from tastypie.utils import is_valid_jsonp_callback_value +from tastypie.utils.mime import determine_format, build_content_type +from textwrap import dedent +from traceback import format_exception, extract_tb +from typing import Iterable, Optional, Literal import ietf -from ietf.person.models import Person, Email from ietf.api import _api_list +from ietf.api.ietf_utils import is_valid_token, requires_api_token from ietf.api.serializer import JsonExportMixin -from ietf.api.ietf_utils import is_valid_token -from ietf.doc.utils import fuzzy_find_documents -from ietf.ietfauth.views import send_account_creation_email +from ietf.doc.utils import DraftAliasGenerator, fuzzy_find_documents +from ietf.group.utils import GroupAliasGenerator, role_holder_emails from ietf.ietfauth.utils import role_required +from ietf.ipr.utils import ingest_response_email as ipr_ingest_response_email from ietf.meeting.models import Meeting -from ietf.stats.models import MeetingRegistration +from ietf.meeting.utils import import_registration_json_validator, process_single_registration +from ietf.nomcom.utils import ingest_feedback_email as nomcom_ingest_feedback_email +from ietf.person.models import Person, Email +from ietf.sync.iana import ingest_review_email as iana_ingest_review_email from ietf.utils import log from ietf.utils.decorators import require_api_key +from ietf.utils.mail import send_smtp from ietf.utils.models import DumpInfo @@ -55,7 +64,10 @@ def top_level(request): } serializer = Serializer() - desired_format = determine_format(request, serializer) + try: + desired_format = determine_format(request, serializer) + except BadRequest as err: + return HttpResponseBadRequest(str(err)) options = {} @@ -63,10 +75,12 @@ def top_level(request): callback = request.GET.get('callback', 'callback') if not is_valid_jsonp_callback_value(callback): - raise BadRequest('JSONP callback name is invalid.') + return HttpResponseBadRequest("JSONP callback name is invalid") options['callback'] = callback + # This might raise UnsupportedFormat, but that indicates a real server misconfiguration + # so let it bubble up unhandled and trigger a 500 / email to admins. serialized = serializer.serialize(available_resources, desired_format, options) return HttpResponse(content=serialized, content_type=build_content_type(desired_format)) @@ -89,7 +103,7 @@ def get(self, request): 'sendqueue', 'nominee', 'topicfeedbacklastseen', 'alias', 'email', 'apikeys', 'personevent', 'reviewersettings', 'reviewsecretarysettings', 'unavailableperiod', 'reviewwish', 'nextreviewerinteam', 'reviewrequest', 'meetingregistration', 'submissionevent', 'preapproval', - 'user', 'user__communitylist', 'personextresource_set', ] + 'user', 'communitylist', 'personextresource_set', ] return self.json_view(request, filter={'id':person.id}, expand=expand) @@ -100,7 +114,11 @@ class ApiV2PersonExportView(DetailView, JsonExportMixin): model = Person def err(self, code, text): - return HttpResponse(text, status=code, content_type='text/plain') + return HttpResponse( + text, + status=code, + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) def post(self, request): querydict = request.POST.copy() @@ -132,79 +150,61 @@ def post(self, request): # else: # return HttpResponse(status=405) -@require_api_key -@role_required('Robot') + +@requires_api_token @csrf_exempt -def api_new_meeting_registration(request): +def api_new_meeting_registration_v2(request): '''REST API to notify the datatracker about a new meeting registration''' - def err(code, text): - return HttpResponse(text, status=code, content_type='text/plain') - required_fields = [ 'meeting', 'first_name', 'last_name', 'affiliation', 'country_code', - 'email', 'reg_type', 'ticket_type', 'checkedin'] - fields = required_fields + [] - if request.method == 'POST': - # parameters: - # apikey: - # meeting - # name - # email - # reg_type (In Person, Remote, Hackathon Only) - # ticket_type (full_week, one_day, student) - # - data = {'attended': False, } - missing_fields = [] - for item in fields: - value = request.POST.get(item, None) - if value is None and item in required_fields: - missing_fields.append(item) - data[item] = value - if missing_fields: - return err(400, "Missing parameters: %s" % ', '.join(missing_fields)) - number = data['meeting'] - try: - meeting = Meeting.objects.get(number=number) - except Meeting.DoesNotExist: - return err(400, "Invalid meeting value: '%s'" % (number, )) - reg_type = data['reg_type'] - email = data['email'] - try: - validate_email(email) - except ValidationError: - return err(400, "Invalid email value: '%s'" % (email, )) - if request.POST.get('cancelled', 'false') == 'true': - MeetingRegistration.objects.filter( - meeting_id=meeting.pk, - email=email, - reg_type=reg_type).delete() - return HttpResponse('OK', status=200, content_type='text/plain') - else: - object, created = MeetingRegistration.objects.get_or_create( - meeting_id=meeting.pk, - email=email, - reg_type=reg_type) - try: - # Update attributes - for key in set(data.keys())-set(['attended', 'apikey', 'meeting', 'email']): - if key == 'checkedin': - new = bool(data.get(key).lower() == 'true') - else: - new = data.get(key) - setattr(object, key, new) - person = Person.objects.filter(email__address=email) - if person.exists(): - object.person = person.first() - object.save() - except ValueError as e: - return err(400, "Unexpected POST data: %s" % e) - response = "Accepted, New registration" if created else "Accepted, Updated registration" - if User.objects.filter(username__iexact=email).exists() or Email.objects.filter(address=email).exists(): - pass - else: - send_account_creation_email(request, email) - response += ", Email sent" - return HttpResponse(response, status=202, content_type='text/plain') - else: - return HttpResponse(status=405) + def _http_err(code, text): + return HttpResponse( + text, + status=code, + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) + + def _api_response(result): + return JsonResponse(data={"result": result}) + + if request.method != "POST": + return _http_err(405, "Method not allowed") + + if request.content_type != "application/json": + return _http_err(415, "Content-Type must be application/json") + + # Validate + try: + payload = json.loads(request.body) + import_registration_json_validator.validate(payload) + except json.decoder.JSONDecodeError as err: + return _http_err(400, f"JSON parse error at line {err.lineno} col {err.colno}: {err.msg}") + except jsonschema.exceptions.ValidationError as err: + return _http_err(400, f"JSON schema error at {err.json_path}: {err.message}") + except Exception: + return _http_err(400, "Invalid request format") + + # Get the meeting ID from the first registration, the API only deals with one meeting at a time + first_email = next(iter(payload['objects'])) + meeting_number = payload['objects'][first_email]['meeting'] + try: + meeting = Meeting.objects.get(number=meeting_number) + except Meeting.DoesNotExist: + return _http_err(400, f"Invalid meeting value: {meeting_number}") + + # confirm email exists + try: + Email.objects.get(address=first_email) + except Email.DoesNotExist: + return _http_err(400, f"Unknown email: {first_email}") + + reg_data = payload['objects'][first_email] + + process_single_registration(reg_data, meeting) + + return HttpResponse( + 'Success', + status=202, + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) def version(request): @@ -215,9 +215,16 @@ def version(request): if dumpinfo.tz != "UTC": dumpdate = pytz.timezone(dumpinfo.tz).localize(dumpinfo.date.replace(tzinfo=None)) dumptime = dumpdate.strftime('%Y-%m-%d %H:%M:%S %z') if dumpinfo else None + + # important libraries + __version_extra__ = {} + for lib in settings.ADVERTISE_VERSIONS: + __version_extra__[lib] = metadata_version(lib) + return HttpResponse( json.dumps({ 'version': ietf.__version__+ietf.__patch__, + 'other': __version_extra__, 'dumptime': dumptime, }), content_type='application/json', @@ -226,12 +233,27 @@ def version(request): @require_api_key @csrf_exempt -def app_auth(request): +def app_auth(request, app: Literal["authortools", "bibxml"]): return HttpResponse( json.dumps({'success': True}), content_type='application/json') - +@requires_api_token +@csrf_exempt +def nfs_metrics(request): + with NamedTemporaryFile(dir=settings.NFS_METRICS_TMP_DIR,delete=False) as fp: + fp.close() + mark = datetime.datetime.now() + with open(fp.name, mode="w") as f: + f.write("whyioughta"*1024) + write_latency = (datetime.datetime.now() - mark).total_seconds() + mark = datetime.datetime.now() + with open(fp.name, "r") as f: + _=f.read() + read_latency = (datetime.datetime.now() - mark).total_seconds() + Path(f.name).unlink() + response=f'nfs_latency_seconds{{operation="write"}} {write_latency}\nnfs_latency_seconds{{operation="read"}} {read_latency}\n' + return HttpResponse(response) def find_doc_for_rfcdiff(name, rev): """rfcdiff lookup heuristics @@ -317,12 +339,9 @@ def get_previous_url(name, rev=None): previous_url = '' if condition in ('historic version', 'current version'): doc = history if history else document - if found_rev: - doc.is_rfc = lambda: False previous_url = doc.get_href() elif condition == 'version dochistory not found': document.rev = found_rev - document.is_rfc = lambda: False previous_url = document.get_href() return previous_url @@ -330,32 +349,38 @@ def get_previous_url(name, rev=None): def rfcdiff_latest_json(request, name, rev=None): response = dict() condition, document, history, found_rev = find_doc_for_rfcdiff(name, rev) - + if document and document.type_id == "rfc": + draft = document.came_from_draft() if condition == 'no such document': raise Http404 elif condition in ('historic version', 'current version'): doc = history if history else document - if not found_rev and doc.is_rfc(): - response['content_url'] = doc.get_href() - response['name']=doc.canonical_name() - if doc.name != doc.canonical_name(): + if doc.type_id == "rfc": + response['content_url'] = doc.get_href() + response['name']=doc.name + if draft: + prev_rev = draft.rev + if doc.rfc_number in HAS_TOMBSTONE and prev_rev != '00': + prev_rev = f'{(int(draft.rev)-1):02d}' + response['previous'] = f'{draft.name}-{prev_rev}' + response['previous_url'] = get_previous_url(draft.name, prev_rev) + elif doc.type_id == "draft" and not found_rev and doc.relateddocument_set.filter(relationship_id="became_rfc").exists(): + rfc = doc.related_that_doc("became_rfc")[0] + response['content_url'] = rfc.get_href() + response['name']=rfc.name prev_rev = doc.rev - # not sure what to do if non-numeric values come back, so at least log it - log.assertion('doc.rfc_number().isdigit()') # .rfc_number() is expensive... - log.assertion('doc.rev.isdigit()') - if int(doc.rfc_number()) in HAS_TOMBSTONE and prev_rev != '00': + if rfc.rfc_number in HAS_TOMBSTONE and prev_rev != '00': prev_rev = f'{(int(doc.rev)-1):02d}' response['previous'] = f'{doc.name}-{prev_rev}' response['previous_url'] = get_previous_url(doc.name, prev_rev) else: - doc.is_rfc = lambda: False response['content_url'] = doc.get_href() response['rev'] = doc.rev response['name'] = doc.name if doc.rev == '00': replaces_docs = (history.doc if condition=='historic version' else doc).related_that_doc('replaces') if replaces_docs: - replaces = replaces_docs[0].document + replaces = replaces_docs[0] response['previous'] = f'{replaces.name}-{replaces.rev}' response['previous_url'] = get_previous_url(replaces.name, replaces.rev) else: @@ -374,7 +399,6 @@ def rfcdiff_latest_json(request, name, rev=None): response['name'] = document.name response['rev'] = found_rev document.rev = found_rev - document.is_rfc = lambda: False response['content_url'] = document.get_href() # not sure what to do if non-numeric values come back, so at least log it log.assertion('found_rev.isdigit()') @@ -402,6 +426,7 @@ def directauth(request): data = None if raw_data is None or data is None: + log.log("Request body is either missing or invalid") return HttpResponse(json.dumps(dict(result="failure",reason="invalid post")), content_type='application/json') authtoken = data.get('authtoken', None) @@ -409,9 +434,11 @@ def directauth(request): password = data.get('password', None) if any([item is None for item in (authtoken, username, password)]): + log.log("One or more mandatory fields are missing: authtoken, username, password") return HttpResponse(json.dumps(dict(result="failure",reason="invalid post")), content_type='application/json') if not is_valid_token("ietf.api.views.directauth", authtoken): + log.log("Auth token provided is invalid") return HttpResponse(json.dumps(dict(result="failure",reason="invalid authtoken")), content_type='application/json') user_query = User.objects.filter(username__iexact=username) @@ -422,10 +449,288 @@ def directauth(request): # Note well that we are using user.username, not what was passed to the API. - if user_query.count() == 1 and authenticate(username = user_query.first().username, password = password): + user_count = user_query.count() + if user_count == 1 and authenticate(username = user_query.first().username, password = password): + user = user_query.get() + if user_query.filter(person__isnull=True).count() == 1: # Can't inspect user.person direclty here + log.log(f"Direct auth success (personless user): {user.pk}:{user.username}") + else: + log.log(f"Direct auth success: {user.pk}:{user.person.plain_name()}") return HttpResponse(json.dumps(dict(result="success")), content_type='application/json') + log.log(f"Direct auth failure: {username} ({user_count} user(s) found)") return HttpResponse(json.dumps(dict(result="failure", reason="authentication failed")), content_type='application/json') else: + log.log(f"Request must be POST: {request.method} received") return HttpResponse(status=405) + + +@requires_api_token +@csrf_exempt +def draft_aliases(request): + if request.method == "GET": + return JsonResponse( + { + "aliases": [ + { + "alias": alias, + "domains": ["ietf"], + "addresses": address_list, + } + for alias, address_list in DraftAliasGenerator() + ] + } + ) + return HttpResponse(status=405) + + +@requires_api_token +@csrf_exempt +def group_aliases(request): + if request.method == "GET": + return JsonResponse( + { + "aliases": [ + { + "alias": alias, + "domains": domains, + "addresses": address_list, + } + for alias, domains, address_list in GroupAliasGenerator() + ] + } + ) + return HttpResponse(status=405) + + +@requires_api_token +@csrf_exempt +def active_email_list(request): + if request.method == "GET": + return JsonResponse( + { + "addresses": list(Email.objects.filter(active=True).values_list("address", flat=True)), + } + ) + return HttpResponse(status=405) + + +@requires_api_token +@csrf_exempt +def related_email_list(request, email): + """Given an email address, returns all other email addresses known + to Datatracker, via Person object + """ + def _http_err(code, text): + return HttpResponse( + text, + status=code, + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) + + if request.method == "GET": + try: + email_obj = Email.objects.get(address=email) + except Email.DoesNotExist: + return _http_err(404, "Email not found") + person = email_obj.person + if not person: + return JsonResponse({"addresses": []}) + return JsonResponse( + { + "addresses": list(person.email_set.values_list("address", flat=True)), + } + ) + return HttpResponse(status=405) + + +@requires_api_token +def role_holder_addresses(request): + if request.method == "GET": + return JsonResponse( + { + "addresses": list( + role_holder_emails() + .order_by("address") + .values_list("address", flat=True) + ) + } + ) + return HttpResponse(status=405) + + +_response_email_json_validator = jsonschema.Draft202012Validator( + schema={ + "type": "object", + "properties": { + "dest": { + "type": "string", + }, + "message": { + "type": "string", # base64-encoded mail message + }, + }, + "required": ["dest", "message"], + } +) + + +class EmailIngestionError(Exception): + """Exception indicating ingestion failed""" + def __init__( + self, + msg="Message rejected", + *, + email_body: Optional[str] = None, + email_recipients: Optional[Iterable[str]] = None, + email_attach_traceback=False, + email_original_message: Optional[bytes]=None, + ): + self.msg = msg + self.email_body = email_body + self.email_subject = msg + self.email_recipients = email_recipients + self.email_attach_traceback = email_attach_traceback + self.email_original_message = email_original_message + self.email_from = settings.SERVER_EMAIL + + @staticmethod + def _summarize_error(error): + frame = extract_tb(error.__traceback__)[-1] + return dedent(f"""\ + Error details: + Exception type: {type(error).__module__}.{type(error).__name__} + File: {frame.filename} + Line: {frame.lineno}""") + + def as_emailmessage(self) -> Optional[EmailMessage]: + """Generate an EmailMessage to report an error""" + if self.email_body is None: + return None + error = self if self.__cause__ is None else self.__cause__ + format_values = dict( + error=error, + error_summary=self._summarize_error(error), + ) + msg = EmailMessage() + if self.email_recipients is None: + msg["To"] = tuple(adm[1] for adm in settings.ADMINS) + else: + msg["To"] = self.email_recipients + msg["From"] = self.email_from + msg["Subject"] = self.msg + msg.set_content( + self.email_body.format(**format_values) + ) + if self.email_attach_traceback: + msg.add_attachment( + "".join(format_exception(None, error, error.__traceback__)), + filename="traceback.txt", + ) + if self.email_original_message is not None: + # Attach incoming message if it was provided. Send as a generic media + # type because we don't know for sure that it was actually a valid + # message. + msg.add_attachment( + self.email_original_message, + 'application', 'octet-stream', # media type + filename='original-message', + ) + return msg + + +def ingest_email_handler(request, test_mode=False): + """Ingest incoming email - handler + + Returns a 4xx or 5xx status code if the HTTP request was invalid or something went + wrong while processing it. If the request was valid, returns a 200. This may or may + not indicate that the message was accepted. + + If test_mode is true, actual processing of a valid message will be skipped. In this + mode, a valid request with a valid destination will be treated as accepted. The + "bad_dest" error may still be returned. + """ + + def _http_err(code, text): + return HttpResponse( + text, + status=code, + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) + + def _api_response(result): + return JsonResponse(data={"result": result}) + + if request.method != "POST": + return _http_err(405, "Method not allowed") + + if request.content_type != "application/json": + return _http_err(415, "Content-Type must be application/json") + + # Validate + try: + payload = json.loads(request.body) + _response_email_json_validator.validate(payload) + except json.decoder.JSONDecodeError as err: + return _http_err(400, f"JSON parse error at line {err.lineno} col {err.colno}: {err.msg}") + except jsonschema.exceptions.ValidationError as err: + return _http_err(400, f"JSON schema error at {err.json_path}: {err.message}") + except Exception: + return _http_err(400, "Invalid request format") + + try: + message = base64.b64decode(payload["message"], validate=True) + except binascii.Error: + return _http_err(400, "Invalid message: bad base64 encoding") + + dest = payload["dest"] + valid_dest = False + try: + if dest == "iana-review": + valid_dest = True + if not test_mode: + iana_ingest_review_email(message) + elif dest == "ipr-response": + valid_dest = True + if not test_mode: + ipr_ingest_response_email(message) + elif dest.startswith("nomcom-feedback-"): + maybe_year = dest[len("nomcom-feedback-"):] + if maybe_year.isdecimal(): + valid_dest = True + if not test_mode: + nomcom_ingest_feedback_email(message, int(maybe_year)) + except EmailIngestionError as err: + error_email = err.as_emailmessage() + if error_email is not None: + with suppress(Exception): # send_smtp logs its own exceptions, ignore them here + send_smtp(error_email) + return _api_response("bad_msg") + + if not valid_dest: + return _api_response("bad_dest") + + return _api_response("ok") + + +@requires_api_token +@csrf_exempt +def ingest_email(request): + """Ingest incoming email + + Hands off to ingest_email_handler() with test_mode=False. This allows @requires_api_token to + give the test endpoint a distinct token from the real one. + """ + return ingest_email_handler(request, test_mode=False) + + +@requires_api_token +@csrf_exempt +def ingest_email_test(request): + """Ingest incoming email test endpoint + + Hands off to ingest_email_handler() with test_mode=True. This allows @requires_api_token to + give the test endpoint a distinct token from the real one. + """ + return ingest_email_handler(request, test_mode=True) diff --git a/ietf/bin/.gitignore b/ietf/bin/.gitignore deleted file mode 100644 index c7013ced9df..00000000000 --- a/ietf/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.pyc -/settings_local.py diff --git a/ietf/bin/2016-05-25-collect-photos b/ietf/bin/2016-05-25-collect-photos deleted file mode 100755 index dedda767a8e..00000000000 --- a/ietf/bin/2016-05-25-collect-photos +++ /dev/null @@ -1,296 +0,0 @@ -#!/usr/bin/env python - -import os, re, sys, shutil, pathlib -from collections import namedtuple -from PIL import Image - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() - -from django.conf import settings -from django.utils.text import slugify - -import debug - -from ietf.group.models import Role, Person -from ietf.person.name import name_parts - -old_images_dir = '' -new_images_dir = settings.PHOTOS_DIR - -if not os.path.exists(new_images_dir): - print("New images directory does not exist: %s" % new_images_dir) - sys.exit(1) - -old_image_files = [] -for dir in settings.OLD_PHOTO_DIRS: - if not os.path.exists(dir): - print("Old images directory does not exist: %s" % dir) - sys.exit(1) - old_image_files += [ f for f in pathlib.Path(dir).iterdir() if f.is_file() and f.suffix.lower() in ['.jpg', '.jpeg', '.png'] ] - -photo = namedtuple('photo', ['path', 'name', 'ext', 'width', 'height', 'time', 'file']) - -old_images = [] -for f in old_image_files: - path = str(f) - img = Image.open(path) - old_images.append(photo(path, f.stem.decode('utf8'), f.suffix, img.size[0], img.size[1], f.stat().st_mtime, f)) - -# Fix up some names: - -def fix_missing_surnames(images): - replacement = { - "alissa": "alissa-cooper", - "alissa1": "alissa-cooper", - "andrei": "andrei-robachevsky", - "bernard": "bernard-aboba", - "danny": "danny-mcpherson", - "danny1": "danny-mcpherson", - "dthaler": "dave-thaler", - "eliot-mug": "eliot-lear", - "erik.nordmark-300": "erik-nordmark", - "hannes": "hannes-tschofenig", - "hildebrand": "joe-hildebrand", - "housley": "russ-housley", - "jariarkko": "jari-arkko", - "joel": "joel-jaeggli", - "joel1": "joel-jaeggli", - "joel2": "joel-jaeggli", - "jon": "jon-peterson", - "kessens": "david-kessens", - "klensin": "john-klensin", - "lars": "lars-eggert", - "lars1": "lars-eggert", - "marc_blanchet": "marc-blanchet", - "marcelo": "marcelo-bagnulo", - "olaf": "olaf-kolkman", - "olaf1": "olaf-kolkman", - "ross": "ross-callon", - "spencer": "spencer-dawkins", - "spencer1": "spencer-dawkins", - "vijay": "vijay-gurbani", - "xing": "xing-li", - } - - for i in range(len(images)): - img = images[i] - name = re.sub('-[0-9]+x[0-9]+', '', img.name) - if '/iab/' in img.path and name in replacement: - name = replacement[name] - images[i] = photo(img.path, name, img.ext, img.width, img.height, img.time, img.file) - - -fix_missing_surnames(old_images) - -interesting_persons = set(Person.objects.all()) - -name_alias = { - u"andy": [u"andrew", ], - u"ben": [u"benjamin", ], - u"bill": [u"william", ], - u"bob": [u"robert", ], - u"chris": [u"christopher", u"christian"], - u"dan": [u"daniel", ], - u"dave": [u"david", ], - u"dick": [u"richard", ], - u"fred": [u"alfred", ], - u"geoff": [u"geoffrey", ], - u"jake": [u"jacob", ], - u"jerry": [u"gerald", ], - u"jim": [u"james", ], - u"joe": [u"joseph", ], - u"jon": [u"jonathan", ], - u"mike": [u"michael", ], - u"ned": [u"edward", ], - u"pete": [u"peter", ], - u"ron": [u"ronald", ], - u"russ": [u"russel", ], - u"steve": [u"stephen", ], - u"ted": [u"edward", ], - u"terry": [u"terence", ], - u"tom": [u"thomas", ], - u"wes": [u"wesley", ], - u"will": [u"william", ], - - u"beth": [u"elizabeth", ], - u"liz": [u"elizabeth", ], - u"lynn": [u"carolyn", ], - u"pat": [u"patricia", u"patrick", ], - u"sue": [u"susan", ], -} -# Add lookups from long to short, from the initial set -for key,value in name_alias.items(): - for item in value: - if item in name_alias: - name_alias[item] += [ key ]; - else: - name_alias[item] = [ key ]; - -exceptions = { -'Aboba' : 'aboba-bernard', -'Bernardos' : 'cano-carlos', -'Bormann' : 'bormann-carsten', -'Hinden' : 'hinden-bob', -'Hutton' : 'hutton-andy', -'Narten' : 'narten-thomas', # but there's no picture of him -'O\'Donoghue' : 'odonoghue-karen', -'Przygienda' : 'przygienda-antoni', -'Salowey' : 'salowey-joe', -'Gunter Van de Velde' : 'vandevelde-gunter', -'Eric Vyncke' : 'vynke-eric', -'Zuniga' : 'zuniga-carlos-juan', -'Zhen Cao' : 'zhen-cao', -'Jamal Hadi Salim': 'hadi-salim-jamal', -} - -# Manually copied Bo Burman and Thubert Pascal from wg/photos/ -# Manually copied Victor Pascual (main image, not thumb) from wg/ -# Manually copied Eric Vync?ke (main image, not thumb) from wg/photos/ -# Manually copied Danial King (main image, not thumb) from wg/photos/ -# Manually copied the thumb (not labelled as such) for Tianran Zhou as both the main and thumb image from wg/photos/ - -processed_files = [] - -for person in sorted(list(interesting_persons),key=lambda x:x.last_name()+x.ascii): - substr_pattern = None - for exception in exceptions: - if exception in person.ascii: - substr_pattern = exceptions[exception] - break - if not person.ascii.strip(): - print(" Setting person.ascii for %s" % person.name) - person.ascii = person.name.encode('ascii', errors='replace').decode('ascii') - - _, first, _, last, _ = person.ascii_parts() - first = first.lower() - last = last. lower() - if not substr_pattern: - substr_pattern = slugify("%s %s" % (last, first)) - - if first in ['', '<>'] or last in ['', '<>']: - continue - - #debug.show('1, substr_pattern') - - candidates = [x for x in old_images if x.name.lower().startswith(substr_pattern)] - # Also check the reverse the name order (necessary for Deng Hui, for instance) - substr_pattern = slugify("%s %s" % (first, last)) - #debug.show('2, substr_pattern') - prev_len = len(candidates) - candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)] - if prev_len < len(candidates) : - print(" Found match with '%s %s' for '%s %s'" % (last, first, first, last, )) - # If no joy, try a short name - if first in name_alias: - prev_len = len(candidates) - for alias in name_alias[first]: - substr_pattern = slugify("%s %s" % (last, alias)) - #debug.show('3, substr_pattern') - candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)] - if prev_len < len(candidates): - print(" Found match with '%s %s' for '%s %s'" % (alias, last, first, last, )) - - -# # If still no joy, try with Person.plain_name() (necessary for Donald Eastlake) -# if not candidates: -# prefix, first, middle, last, suffix = person.name_parts() -# name_parts = person.plain_name().lower().split() -# -# substr_pattern = u'-'.join(name_parts[-1:]+name_parts[0:1]) -# candidates = [x for x in old_images if x.name.lower().startswith(substr_pattern)] -# # If no joy, try a short name -# if not candidates and first in name_alias: -# prev_len = len(candidates) -# for alias in name_alias[first]: -# substr_pattern = u'-'.join(name_parts[-1:]+[alias]) -# candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)] -# if prev_len < len(candidates) : -# print(" Used '%s %s' instead of '%s %s'" % (alias, last, first, last, )) - -# # Fixup for other exceptional cases -# if person.ascii=="David Oran": -# candidates = ['oran-dave-th.jpg','oran-david.jpg'] -# -# if person.ascii=="Susan Hares": -# candidates = ['hares-sue-th.jpg','hares-susan.JPG'] -# -# if person.ascii=="Mahesh Jethanandani": -# candidates = ['Mahesh-Jethanandani-th.jpg','Jethanandani-Mahesh.jpg'] - - processed_files += [ c.path for c in candidates ] - - # We now have a list of candidate photos. - # * Consider anything less than 200x200 a thumbnail - # * For the full photo, sort by size (width) and time - # * For the thumbnail: - # - first look for a square photo less than 200x200 - # - if none found, then for the first in the sorted list less than 200x200 - # - if none found, then the smallest photo - if candidates: - candidates.sort(key=lambda x: "%04d-%d" % (x.width, x.time)) - iesg_cand = [ c for c in candidates if '/iesg/' in c.path ] - iab_cand = [ c for c in candidates if '/iab/' in c.path ] - if iesg_cand: - full = iesg_cand[-1] - thumb = iesg_cand[-1] - elif iab_cand: - full = iab_cand[-1] - thumb = iab_cand[0] - else: - full = candidates[-1] - thumbs = [ c for c in candidates if c.width==c.height and c.width <= 200 ] - if not thumbs: - thumbs = [ c for c in candidates if c.width==c.height ] - if not thumbs: - thumbs = [ c for c in candidates if c.width <= 200 ] - if not thumbs: - thumbs = candidates[:1] - thumb = thumbs[-1] - candidates = [ thumb, full ] - - # At this point we either have no candidates or two. If two, the first will be the thumb - - def copy(old, new): - if not os.path.exists(new): - print("Copying "+old+" to "+new) - shutil.copy(old, new) - shutil.copystat(old, new) - - assert(len(candidates) in [0,2]) - if len(candidates)==2: - thumb, full = candidates - - new_name = person.photo_name(thumb=False)+full.ext.lower() - new_thumb_name = person.photo_name(thumb=True)+thumb.ext.lower() - - copy( full.path, os.path.join(new_images_dir,new_name) ) - - # - copy( thumb.path, os.path.join(new_images_dir,new_thumb_name) ) - - -print("") -not_processed = 0 -for file in old_image_files: - if ( file.is_file() - and not file.suffix.lower() in ['.txt', '.lck', '.html',] - and not file.name.startswith('index.') - and not file.name.startswith('milestoneupdate') - and not file.name.startswith('nopicture') - and not file.name.startswith('robots.txt') - ): - if not str(file).decode('utf8') in processed_files: - not_processed += 1 - print(u"Not processed: "+str(file).decode('utf8')) -print("") -print("Not processed: %s files" % not_processed) diff --git a/ietf/bin/aliases-from-json.py b/ietf/bin/aliases-from-json.py new file mode 100644 index 00000000000..0da5d1f8b97 --- /dev/null +++ b/ietf/bin/aliases-from-json.py @@ -0,0 +1,104 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# +# Uses only Python standard lib +# + +import argparse +import datetime +import json +import shutil +import stat +import sys + +from pathlib import Path +from tempfile import TemporaryDirectory + +# Default options +POSTCONFIRM_PATH = "/a/postconfirm/wrapper" +VDOMAIN = "virtual.ietf.org" + +# Map from domain label to dns domain +ADOMAINS = { + "ietf": "ietf.org", + "irtf": "irtf.org", + "iab": "iab.org", +} + + +def generate_files(records, adest, vdest, postconfirm, vdomain): + """Generate files from an iterable of records + + If adest or vdest exists as a file, it will be overwritten. If it is a directory, files + with the default names (draft-aliases and draft-virtual) will be created, but existing + files _will not_ be overwritten! + """ + with TemporaryDirectory() as tmpdir: + tmppath = Path(tmpdir) + apath = tmppath / "aliases" + vpath = tmppath / "virtual" + + with apath.open("w") as afile, vpath.open("w") as vfile: + date = datetime.datetime.now(datetime.UTC) + signature = f"# Generated by {Path(__file__).absolute()} at {date}\n" + afile.write(signature) + vfile.write(signature) + vfile.write(f"{vdomain} anything\n") + + for item in records: + alias = item["alias"] + domains = item["domains"] + address_list = item["addresses"] + filtername = f"xfilter-{alias}" + afile.write(f'{filtername + ":":64s} "|{postconfirm} filter expand-{alias} {vdomain}"\n') + for dom in domains: + vfile.write(f"{f'{alias}@{ADOMAINS[dom]}':64s} {filtername}\n") + vfile.write(f"{f'expand-{alias}@{vdomain}':64s} {', '.join(sorted(address_list))}\n") + + perms = stat.S_IWUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH + apath.chmod(perms) + vpath.chmod(perms) + shutil.move(apath, adest) + shutil.move(vpath, vdest) + + +def directory_path(val): + p = Path(val) + if p.is_dir(): + return p + else: + raise argparse.ArgumentTypeError(f"{p} is not a directory") + +if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="Convert a JSON stream of draft alias definitions into alias / virtual alias files." + ) + parser.add_argument( + "--prefix", + required=True, + help="Prefix for output files. Files will be named -aliases and -virtual." + ) + parser.add_argument( + "--output-dir", + default="./", + type=directory_path, + help="Destination for output files.", + ) + parser.add_argument( + "--postconfirm", + default=POSTCONFIRM_PATH, + help=f"Full path to postconfirm executable (defaults to {POSTCONFIRM_PATH}", + ) + parser.add_argument( + "--vdomain", + default=VDOMAIN, + help=f"Virtual domain (defaults to {VDOMAIN}_", + ) + args = parser.parse_args() + data = json.load(sys.stdin) + generate_files( + data["aliases"], + adest=args.output_dir / f"{args.prefix}-aliases", + vdest=args.output_dir / f"{args.prefix}-virtual", + postconfirm=args.postconfirm, + vdomain=args.vdomain, + ) diff --git a/ietf/bin/announce-header-change b/ietf/bin/announce-header-change deleted file mode 100755 index 256324e31a8..00000000000 --- a/ietf/bin/announce-header-change +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python - -import sys, os, sys -import datetime - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() - -from django.core import management -from django.template.loader import render_to_string - -from ietf import settings -from ietf.utils.mail import send_mail_preformatted -from ietf.utils.mail import send_mail - -target_date=datetime.date(year=2014,month=1,day=24) - -send_mail(request = None, - to = "IETF-Announce ", - frm = "The IESG ", - subject = "Upcoming change to announcement email header fields (using old header)", - template = "utils/header_change_content.txt", - context = dict(oldornew='old', target_date=target_date), - extra = {'Reply-To' : 'ietf@ietf.org', - 'Sender' : '', - } - ) - -send_mail(request = None, - to = "IETF-Announce:;", - frm = "The IESG ", - subject = "Upcoming change to announcement email header fields (using new header)", - template = "utils/header_change_content.txt", - context = dict(oldornew='new', target_date=target_date), - extra = {'Reply-To' : 'IETF Discussion List ', - 'Sender' : '', - }, - bcc = '', - ) diff --git a/ietf/bin/create-break-sessions b/ietf/bin/create-break-sessions deleted file mode 100755 index 52ce044d8c8..00000000000 --- a/ietf/bin/create-break-sessions +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -*- Python -*- -# - -import os, sys - -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() - -from ietf.group.models import Group -from ietf.person.models import Person -from ietf.name.models import SessionStatusName -from ietf.meeting.models import Meeting, Session, ScheduledSession as ScheduleTimeslotSSessionAssignment - -secretariat = Group.objects.get(acronym='secretariat') -system = Person.objects.get(id=1, name='(System)') -scheduled = SessionStatusName.objects.get(slug='sched') - -for meeting in Meeting.objects.filter(type="ietf").order_by("date"): - print "Checking %s schedules ..." % meeting - brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', type_id='break',) - reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', type_id='reg',) - - for schedule in meeting.schedule_set.all(): - print " Checking for missing Break and Reg sessions in %s" % schedule - for timeslot in meeting.timeslot_set.all(): - if timeslot.type_id == 'break' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=brk, schedule=schedule.base).exists()): - assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=brk, schedule=schedule) - if created: - print " Added %s break assignment" % timeslot - if timeslot.type_id == 'reg' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=reg, schedule=schedule.base).exists()): - assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=reg, schedule=schedule) - if created: - print " Added %s registration assignment" % timeslot diff --git a/ietf/bin/create-charter-newrevisiondocevents b/ietf/bin/create-charter-newrevisiondocevents deleted file mode 100755 index d91c0b5b730..00000000000 --- a/ietf/bin/create-charter-newrevisiondocevents +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -version = "0.10" -program = os.path.basename(sys.argv[0]) -progdir = os.path.dirname(sys.argv[0]) - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - - -# ---------------------------------------------------------------------- -def note(string): - sys.stdout.write("%s\n" % (string)) - -# ---------------------------------------------------------------------- -def warn(string): - sys.stderr.write(" * %s\n" % (string)) - -# ------------------------------------------------------------------------------ - -import re -import datetime - -import django -django.setup() - -from django.conf import settings - -from ietf.utils.path import path as Path -from ietf.doc.models import Document, NewRevisionDocEvent -from ietf.person.models import Person - -system_entity = Person.objects.get(name="(System)") - -charterdir = Path(settings.CHARTER_PATH) -for file in charterdir.files("charter-ietf-*.txt"): - fname = file.name - ftime = datetime.datetime.fromtimestamp(file.mtime, datetime.timezone.utc) - match = re.search("^(?P[a-z0-9-]+)-(?P\d\d-\d\d)\.txt$", fname) - if match: - name = match.group("name") - rev = match.group("rev") - else: - match = re.search("^(?P[a-z0-9-]+)-(?P\d\d)\.txt$", fname) - if match: - name = match.group("name") - rev = match.group("rev") - else: - warn("Failed extracting revision from filename: '%s'" % fname) - try: - doc = Document.objects.get(type="charter", name=name) - try: - event = NewRevisionDocEvent.objects.get(doc=doc, type='new_revision', rev=rev) - note(".") - except NewRevisionDocEvent.MultipleObjectsReturned, e: - warn("Multiple NewRevisionDocEvent exists for '%s'" % fname) - except NewRevisionDocEvent.DoesNotExist: - event = NewRevisionDocEvent(doc=doc, type='new_revision', rev=rev, by=system_entity, time=ftime, desc="") - event.save() - note("Created new NewRevisionDocEvent for %s-%s" % (name, rev)) - except Document.DoesNotExist: - warn("Document not found: '%s'; no NewRevisionDocEvent created for '%s'" % (name, fname)) - diff --git a/ietf/bin/dump-draft-info b/ietf/bin/dump-draft-info deleted file mode 100755 index 3ac2e4a58a4..00000000000 --- a/ietf/bin/dump-draft-info +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -version = "0.10" -program = os.path.basename(sys.argv[0]) -progdir = os.path.dirname(sys.argv[0]) - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() - -from django.template import Template, Context - -from ietf.doc.models import Document -from ietf.person.models import Person - -drafts = Document.objects.filter(type="draft") - -ads = {} -for p in Person.objects.filter(ad_document_set__type="draft").distinct(): - ads[p.id] = p.role_email("ad") - -for d in drafts: - d.ad_email = ads.get(d.ad_id) - -templ_text = """{% for draft in drafts %}{% if draft.notify or draft.ad_email %}{{ draft.name }}{% if draft.notify %} docnotify='{{ draft.notify|cut:"<"|cut:">" }}'{% endif %}{% if draft.ad_email %} docsponsor='{{ draft.ad_email }}'{% endif %} -{% endif %}{% endfor %}""" -template = Template(templ_text) -context = Context({ 'drafts':drafts }) - -print template.render(context).encode('utf-8') diff --git a/ietf/bin/email-sync-discrepancies b/ietf/bin/email-sync-discrepancies deleted file mode 100755 index 3593fd126f2..00000000000 --- a/ietf/bin/email-sync-discrepancies +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -import sys, os, sys -import syslog - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -from optparse import OptionParser - -parser = OptionParser() -parser.add_option("-t", "--to", dest="to", - help="Email address to send report to", metavar="EMAIL") - -options, args = parser.parse_args() - -syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) - -import django -django.setup() - -from ietf.sync.mails import email_discrepancies - -receivers = ["iesg-secretary@ietf.org"] - -if options.to: - receivers = [options.to] - -email_discrepancies(receivers) - -syslog.syslog("Emailed sync discrepancies to %s" % receivers) diff --git a/ietf/bin/expire-ids b/ietf/bin/expire-ids index 98ee8d75fe5..bb0b94ee61b 100755 --- a/ietf/bin/expire-ids +++ b/ietf/bin/expire-ids @@ -13,10 +13,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django diff --git a/ietf/bin/expire-last-calls b/ietf/bin/expire-last-calls deleted file mode 100755 index 83b565e1924..00000000000 --- a/ietf/bin/expire-last-calls +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# This script requires that the proper virtual python environment has been -# invoked before start - -import os -import sys -import syslog - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) - -import django -django.setup() - -# ---------------------------------------------------------------------- - -from ietf.doc.lastcall import get_expired_last_calls, expire_last_call - -drafts = get_expired_last_calls() -for doc in drafts: - try: - expire_last_call(doc) - syslog.syslog("Expired last call for %s (id=%s)" % (doc.file_tag(), doc.pk)) - except Exception as e: - syslog.syslog(syslog.LOG_ERR, "ERROR: Failed to expire last call for %s (id=%s)" % (doc.file_tag(), doc.pk)) diff --git a/ietf/bin/expire-submissions b/ietf/bin/expire-submissions index 22db38322d8..113a53ddfa0 100755 --- a/ietf/bin/expire-submissions +++ b/ietf/bin/expire-submissions @@ -8,10 +8,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django diff --git a/ietf/bin/find-submission-confirmation-email-in-postfix-log b/ietf/bin/find-submission-confirmation-email-in-postfix-log deleted file mode 100755 index 6bf41574a10..00000000000 --- a/ietf/bin/find-submission-confirmation-email-in-postfix-log +++ /dev/null @@ -1,106 +0,0 @@ -#!/usr/bin/env python - -import io -import os -import sys - -version = "0.10" -program = os.path.basename(sys.argv[0]) -progdir = os.path.dirname(sys.argv[0]) - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -# ---------------------------------------------------------------------- -def note(string): - sys.stdout.write("%s\n" % (string)) - -# ---------------------------------------------------------------------- -def warn(string): - sys.stderr.write(" * %s\n" % (string)) - -# ------------------------------------------------------------------------------ - -import re -from datetime import datetime as Datetime -import time -import warnings -warnings.filterwarnings('ignore', message='the sets module is deprecated', append=True) - -import django -django.setup() - -from django.conf import settings - -from ietf.utils.path import path as Path - -from ietf.submit.models import Submission -from ietf.doc.models import Document - - - -args = sys.argv[1:] -if len(args) < 3: - warn("Expected '$ %s DRAFTNAME USER.LOG POSTFIX.LOG', but found no arguments -- exiting" % program) - sys.exit(1) - -draft = args[0] -if re.search("\.txt$", draft): - draft = draft[:-4] -if re.search("-\d\d$", draft): - draft = draft[:-3] - -if len(args) == 1: - logfiles = [ arg[1] ] -else: - logfiles = args[1:] - -from_email = settings.IDSUBMIT_FROM_EMAIL -if "<" in from_email: - from_email = from_email.split("<")[1].split(">")[0] - -submission = Submission.objects.filter(name=draft).latest('submission_date') -document = Document.objects.get(name=draft) -emails = [ author.email.address for author in document.documentauthor_set.all() if author.email ] - -timestrings = [] -for file in [ Path(settings.INTERNET_DRAFT_PATH) / ("%s-%s.txt"%(draft, submission.rev)), - Path(settings.IDSUBMIT_STAGING_PATH) / ("%s-%s.txt"%(draft, submission.rev)) ]: - if os.path.exists(file): - upload_time = time.localtime(file.mtime) - ts = time.strftime("%b %d %H:%M", upload_time) - timestrings += [ ts ] - timestrings += [ ts[:-1] + chr(((ord(ts[-1])-ord('0')+1)%10)+ord('0')) ] - print "Looking for mail log lines timestamped %s, also checking %s ..." % (timestrings[0], timestrings[1]) - -for log in logfiles: - print "\n Checking %s ...\n" % log - if log.endswith('.gz'): - import gzip - logfile = gzip.open(log) - else: - logfile = io.open(log) - queue_ids = [] - for line in logfile: - if from_email in line and "Confirmation for Auto-Post of I-D "+draft in line: - ts = line[:12] - timestrings += [ ts ] - print "Found a mention of %s, adding timestamp %s: \n %s" % (draft, ts, line) - for ts in timestrings: - if line.startswith(ts): - if from_email in line: - for to_email in emails: - if to_email in line: - sys.stdout.write(line) - if "queued_as:" in line: - queue_ids += [ line.split("queued_as:")[1].split(",")[0] ] - elif queue_ids: - for qi in queue_ids: - if qi in line: - sys.stdout.write(line) diff --git a/ietf/bin/iana-review-email b/ietf/bin/iana-review-email index 5c7a7183b9c..27aee4015ec 100755 --- a/ietf/bin/iana-review-email +++ b/ietf/bin/iana-review-email @@ -8,10 +8,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) import django diff --git a/ietf/bin/interim_minutes_reminder b/ietf/bin/interim_minutes_reminder deleted file mode 100755 index 7f2f84f739e..00000000000 --- a/ietf/bin/interim_minutes_reminder +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -*- Python -*- -# -''' -This script calls ietf.meeting.helpers.check_interim_minutes() which sends -a reminder email for interim meetings that occurred 10 days ago but still -don't have minutes. -''' - -# Set PYTHONPATH and load environment variables for standalone script ----------------- -import os, sys -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() -# ------------------------------------------------------------------------------------- - -from ietf.meeting.helpers import check_interim_minutes - -check_interim_minutes() diff --git a/ietf/bin/list-role-holder-emails b/ietf/bin/list-role-holder-emails deleted file mode 100755 index 6d6c1604640..00000000000 --- a/ietf/bin/list-role-holder-emails +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - - -import os, sys -import syslog - -# boilerplate -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER) - -import django -django.setup() - -from django.utils.encoding import force_str -from ietf.group.models import Role - -addresses = set() -for role in Role.objects.filter( - group__state__slug='active', - group__type__in=['ag','area','dir','iab','ietf','irtf','nomcom','rg','team','wg','rag']): - #sys.stderr.write(str(role)+'\n') - for e in role.person.email_set.all(): - if e.active and not e.address.startswith('unknown-email-'): - addresses.add(e.address) - -addresses = list(addresses) -addresses.sort() -for a in addresses: - print(force_str(a)) diff --git a/ietf/bin/mailman_listinfo.py b/ietf/bin/mailman_listinfo.py deleted file mode 100755 index f7e4cfe4c1b..00000000000 --- a/ietf/bin/mailman_listinfo.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/python2.7 -# Copyright The IETF Trust 2022, All Rights Reserved -# Note the shebang. This specifically targets deployment on IETFA and intends to use its system python2.7. - -# This is an adaptor to pull information out of Mailman2 using its python libraries (which are only available for python2). -# It is NOT django code, and does not have access to django.conf.settings. - -import json -import sys - -from collections import defaultdict - -def main(): - - sys.path.append('/usr/lib/mailman') - - have_mailman = False - try: - from Mailman import Utils - from Mailman import MailList - from Mailman import MemberAdaptor - have_mailman = True - except ImportError: - pass - - - if not have_mailman: - sys.stderr.write("Could not import mailman modules -- skipping import of mailman list info") - sys.exit() - - names = list(Utils.list_names()) - - # need to emit dict of names, each name has an mlist, and each mlist has description, advertised, and members (calculated as below) - result = defaultdict(dict) - for name in names: - mlist = MailList.MailList(name, lock=False) - result[name] = dict() - result[name]['internal_name'] = mlist.internal_name() - result[name]['real_name'] = mlist.real_name - result[name]['description'] = mlist.description # Not attempting to change encoding - result[name]['advertised'] = mlist.advertised - result[name]['members'] = list() - if mlist.advertised: - members = mlist.getRegularMemberKeys() + mlist.getDigestMemberKeys() - members = set([ m for m in members if mlist.getDeliveryStatus(m) == MemberAdaptor.ENABLED ]) - result[name]['members'] = list(members) - json.dump(result, sys.stdout) - -if __name__ == "__main__": - main() diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records deleted file mode 100755 index 155e5755f6b..00000000000 --- a/ietf/bin/merge-person-records +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -*- Python -*- -# -''' -This script merges two Person records into one. It determines which record is the target -based on most current User record (last_login) unless -f (force) option is used to -force SOURCE TARGET as specified on the command line. The order of operations is -important. We must complete all source.save() operations before moving the aliases to -the target, this is to avoid extra "Possible duplicate Person" emails going out, if the -Person is saved without an alias the Person.save() creates another one, which then -conflicts with the moved one. -''' - -# Set PYTHONPATH and load environment variables for standalone script ----------------- -import os, sys -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - -import django -django.setup() -# ------------------------------------------------------------------------------------- - -import argparse -from django.contrib import admin -from ietf.person.models import Person -from ietf.person.utils import (merge_persons, send_merge_notification, handle_users, - determine_merge_order) - - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument("source_id",type=int) - parser.add_argument("target_id",type=int) - parser.add_argument('-f','--force', help='force merge order',action='store_true') - parser.add_argument('-v','--verbose', help='verbose output',action='store_true') - args = parser.parse_args() - - source = Person.objects.get(pk=args.source_id) - target = Person.objects.get(pk=args.target_id) - - # set merge order - if not args.force: - source,target = determine_merge_order(source,target) - - # confirm - print "Merging person {}({}) to {}({})".format(source.ascii,source.pk,target.ascii,target.pk) - print handle_users(source,target,check_only=True) - response = raw_input('Ok to continue y/n? ') - if response.lower() != 'y': - sys.exit() - - # perform merge - success, changes = merge_persons(source, target, verbose=args.verbose) - - # send email notification - send_merge_notification(target,changes) - -if __name__ == "__main__": - main() diff --git a/ietf/bin/notify-expirations b/ietf/bin/notify-expirations index 0270c137659..fc2fd86a31b 100755 --- a/ietf/bin/notify-expirations +++ b/ietf/bin/notify-expirations @@ -7,10 +7,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) sys.path = [ basedir ] + sys.path os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) - import django django.setup() diff --git a/ietf/bin/pretty-xml-dump b/ietf/bin/pretty-xml-dump deleted file mode 100755 index 22abc08a649..00000000000 --- a/ietf/bin/pretty-xml-dump +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -python manage.py dumpdata --format=xml "$@" | sed -e 's/<\/*object/\ - &/g' -e 's/')][1:])) - else: - retval.append(ParsedAuthor(a.strip(),None)) - - return retval - -def calculate_changes(tracker_persons,tracker_emails,names,emails): - adds = set() - deletes = set() - for email in emails: - if email and email!='none' and email not in ignore_addresses: - p = Person.objects.filter(email__address=email).first() - if p: - if not set(map(unicode.lower,p.email_set.values_list('address',flat=True))).intersection(tracker_emails): - adds.add(email) - else: - #person_name = names[emails.index(email)] - adds.add(email) - for person in tracker_persons: - if not set(map(unicode.lower,person.email_set.values_list('address',flat=True))).intersection(emails): - match = False - for index in [i for i,j in enumerate(emails) if j=='none' or not j]: - if names[index].split()[-1].lower()==person.last_name().lower(): - match = True - if not match: - deletes.add(person) - return adds, deletes - -def _main(): - - parser = argparse.ArgumentParser(description="Recalculate RFC documentauthor_set"+'\n\n'+__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter,) - parser.add_argument('-v','--verbose',help="Show the action taken for each RFC",action='store_true') - parser.add_argument('--rfc',type=int, nargs='*',help="Only recalculate the given rfc numbers",dest='rfcnumberlist') - args = parser.parse_args() - - probable_email_match = set() - probable_duplicates = [] - - all_the_email = get_all_the_email() - author_names, author_emails = get_rfc_data() - - stats = { 'rfc not in tracker' :0, - 'same addresses' :0, - 'different addresses belonging to same people' :0, - 'same names, rfced emails do not match' :0, - 'rfced data is unusable' :0, - "data doesn't match but no changes found" :0, - 'changed authors' :0, } - - for rfc_num in args.rfcnumberlist or sorted(author_names.keys()): - - rfc = Document.objects.filter(docalias__name='rfc%s'%rfc_num).first() - - if not rfc: - if args.verbose: - show_verbose(rfc_num,'rfc not in tracker') - stats['rfc not in tracker'] += 1 - continue - - rfced_emails = set(author_emails[rfc_num]) - tracker_emails = set(map(unicode.lower,rfc.authors.values_list('address',flat=True))) - tracker_persons = set([x.person for x in rfc.authors.all()]) - matching_emails = get_matching_emails(all_the_email,rfced_emails) - rfced_persons = set([x.person for x in matching_emails]) - known_emails = set([e.l_address for e in matching_emails]) - unknown_emails = rfced_emails - known_emails - unknown_persons = tracker_persons-rfced_persons - - rfced_lastnames = sorted([n.split()[-1].lower() for n in author_names[rfc_num]]) - tracker_lastnames = sorted([p.last_name().lower() for p in tracker_persons]) - - if rfced_emails == tracker_emails: - if args.verbose: - show_verbose(rfc_num,'tracker and rfc editor have the same addresses') - stats['same addresses'] += 1 - continue - - if len(rfced_emails)==len(tracker_emails) and not 'none' in author_emails[rfc_num]: - if tracker_persons == rfced_persons: - if args.verbose: - show_verbose(rfc_num,'tracker and rfc editor have the different addresses belonging to same people') - stats['different addresses belonging to same people'] += 1 - continue - else: - if len(unknown_emails)==1 and len(tracker_persons-rfced_persons)==1: - p = list(tracker_persons-rfced_persons)[0] - probable_email_match.add(u"%s is probably %s (%s) : %s "%(list(unknown_emails)[0], p, p.pk, rfc_num)) - elif len(unknown_emails)==len(unknown_persons): - probable_email_match.add(u"%s are probably %s : %s"%(unknown_emails,[(p.ascii,p.pk) for p in unknown_persons],rfc_num)) - else: - probable_duplicates.append((tracker_persons^rfced_persons,rfc_num)) - - if tracker_lastnames == rfced_lastnames: - if args.verbose: - show_verbose(rfc_num,"emails don't match up, but person names appear to be the same") - stats[ 'same names, rfced emails do not match'] += 1 - continue - - use_rfc_data = bool(len(author_emails[rfc_num])==len(author_names[rfc_num])) - if not use_rfc_data: - if args.verbose: - print 'Ignoring rfc database for rfc%d'%rfc_num - stats[ 'rfced data is unusable'] += 1 - - if use_rfc_data: - adds, deletes = calculate_changes(tracker_persons,tracker_emails,author_names[rfc_num],author_emails[rfc_num]) - parsed_authors=get_parsed_authors(rfc_num) - parsed_adds, parsed_deletes = calculate_changes(tracker_persons,tracker_emails,[x.name for x in parsed_authors],[x.address for x in parsed_authors]) - - for e in adds.union(parsed_adds) if use_rfc_data else parsed_adds: - if not e or e in ignore_addresses: - continue - if not Person.objects.filter(email__address=e).exists(): - if e not in parsed_adds: - #print rfc_num,"Would add",e,"as",author_names[rfc_num][author_emails[rfc_num].index(e)],"(rfced database)" - print "(address='%s',name='%s'),"%(e,author_names[rfc_num][author_emails[rfc_num].index(e)]),"# (rfced %d)"%rfc_num - for p in Person.objects.filter(name__iendswith=author_names[rfc_num][author_emails[rfc_num].index(e)].split(' ')[-1]): - print "\t", p.pk, p.ascii - else: - name = [x.name for x in parsed_authors if x.address==e][0] - p = Person.objects.filter(name=name).first() - if p: - #print e,"is probably",p.pk,p - print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) - - else: - p = Person.objects.filter(ascii=name).first() - if p: - print e,"is probably",p.pk,p - print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) - else: - p = Person.objects.filter(ascii_short=name).first() - if p: - print e,"is probably",p.pk,p - print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num) - #print rfc_num,"Would add",e,"as",name,"(parsed)" - print "(address='%s',name='%s'),"%(e,name),"# (parsed %d)"%rfc_num - for p in Person.objects.filter(name__iendswith=name.split(' ')[-1]): - print "\t", p.pk, p.ascii - - if False: # This was a little useful, but the noise in the rfc_ed file keeps it from being completely useful - for p in deletes: - for n in author_names[rfc_num]: - if p.last_name().lower()==n.split()[-1].lower(): - email_candidate = author_emails[rfc_num][author_names[rfc_num].index(n)] - email_found = Email.objects.filter(address=email_candidate).first() - if email_found: - probable_duplicates.append((set([p,email_found.person]),rfc_num)) - else: - probable_email_match.add(u"%s is probably %s (%s) : %s"%(email_candidate, p, p.pk, rfc_num)) - - if args.verbose: - if use_rfc_data: - working_adds = parsed_adds - seen_people = set(Email.objects.get(address=e).person for e in parsed_adds) - for addr in adds: - person = Email.objects.get(address=addr).person - if person not in seen_people: - working_adds.add(addr) - seen_people.add(person) - working_deletes = deletes.union(parsed_deletes) - else: - working_adds = parsed_adds - working_deletes = parsed_deletes - # unique_adds = set() # TODO don't add different addresses for the same person from the two sources - if working_adds or working_deletes: - show_verbose(rfc_num,"Changing original list",tracker_persons,"by adding",working_adds," and deleting",working_deletes) - print "(",rfc_num,",",[e for e in working_adds],",",[p.pk for p in working_deletes],"), #",[p.ascii for p in working_deletes] - else: - stats["data doesn't match but no changes found"] += 1 - show_verbose(rfc_num,"Couldn't figure out what to change") - - if False: - #if tracker_persons: - #if any(['iab@' in e for e in adds]) or any(['iesg@' in e for e in adds]) or any(['IESG'==p.name for p in deletes]) or any(['IAB'==p.name for p in deletes]): - print rfc_num - print "tracker_persons",tracker_persons - print "author_names",author_names[rfc_num] - print "author_emails",author_emails[rfc_num] - print "Adds:", adds - print "Deletes:", deletes - - stats['changed authors'] += 1 - - if False: - debug.show('rfc_num') - debug.show('rfced_emails') - debug.show('tracker_emails') - debug.show('known_emails') - debug.show('unknown_emails') - debug.show('tracker_persons') - debug.show('rfced_persons') - debug.show('tracker_persons==rfced_persons') - debug.show('[p.id for p in tracker_persons]') - debug.show('[p.id for p in rfced_persons]') - exit() - - if True: - for p in sorted(list(probable_email_match)): - print p - if True: - print "Probable duplicate persons" - for d,r in sorted(probable_duplicates): - print [(p,p.pk) for p in d], r - else: - print len(probable_duplicates)," probable duplicate persons" - - print stats - -if __name__ == "__main__": - _main() - diff --git a/ietf/bin/redirect-dump b/ietf/bin/redirect-dump deleted file mode 100755 index ef35bbf0de9..00000000000 --- a/ietf/bin/redirect-dump +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Copyright The IETF Trust 2007, All Rights Reserved -# -#python manage.py dumpdata --format=xml redirects | xmllint --format - -python manage.py dumpdata --format=xml redirects | sed -e 's/<\/*object/\ - &/g' -e 's/ {self.bucket}:{self.blob}" diff --git a/ietf/blobdb/replication.py b/ietf/blobdb/replication.py new file mode 100644 index 00000000000..b9d55c94982 --- /dev/null +++ b/ietf/blobdb/replication.py @@ -0,0 +1,178 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +import datetime +from dataclasses import dataclass +from io import BytesIO +from typing import Optional + +from django.conf import settings +from django.core.files import File +from django.core.files.storage import storages, InvalidStorageError +from django.db import connections + +from ietf.utils import log + +DEFAULT_SETTINGS = { + "ENABLED": False, + "DEST_STORAGE_PATTERN": "r2-{bucket}", + "INCLUDE_BUCKETS": (), # empty means include all + "EXCLUDE_BUCKETS": (), # empty means exclude none + "VERBOSE_LOGGING": False, +} + + +class SimpleMetadataFile(File): + def __init__(self, file, name=None): + super().__init__(file, name) + self.custom_metadata = {} + self.content_type = "" + + +def get_replication_settings(): + return DEFAULT_SETTINGS | getattr(settings, "BLOBDB_REPLICATION", {}) + + +def validate_replication_settings(): + replicator_settings = get_replication_settings() + # No extra settings allowed + unknown_settings = set(DEFAULT_SETTINGS.keys()) - set(replicator_settings.keys()) + if len(unknown_settings) > 0: + raise RuntimeError( + f"Unrecognized BLOBDB_REPLICATOR settings: {', '.join(str(unknown_settings))}" + ) + # destination storage pattern must be a string that includes {bucket} + pattern = replicator_settings["DEST_STORAGE_PATTERN"] + if not isinstance(pattern, str): + raise RuntimeError( + f"DEST_STORAGE_PATTERN must be a str, not {type(pattern).__name__}" + ) + if "{bucket}" not in pattern: + raise RuntimeError( + f"DEST_STORAGE_PATTERN must contain the substring '{{bucket}}' (found '{pattern}')" + ) + # include/exclude buckets must be list-like + include_buckets = replicator_settings["INCLUDE_BUCKETS"] + if not isinstance(include_buckets, (list, tuple, set)): + raise RuntimeError("INCLUDE_BUCKETS must be a list, tuple, or set") + exclude_buckets = replicator_settings["EXCLUDE_BUCKETS"] + if not isinstance(exclude_buckets, (list, tuple, set)): + raise RuntimeError("EXCLUDE_BUCKETS must be a list, tuple, or set") + # if we have explicit include_buckets, make sure the necessary storages exist + if len(include_buckets) > 0: + include_storages = {destination_storage_name_for(b) for b in include_buckets} + exclude_storages = {destination_storage_name_for(b) for b in exclude_buckets} + configured_storages = set(settings.STORAGES.keys()) + missing_storages = include_storages - exclude_storages - configured_storages + if len(missing_storages) > 0: + raise RuntimeError( + f"Replication requires unknown storage(s): {', '.join(missing_storages)}" + ) + + +def destination_storage_name_for(bucket: str): + pattern = get_replication_settings()["DEST_STORAGE_PATTERN"] + return pattern.format(bucket=bucket) + + +def destination_storage_for(bucket: str): + storage_name = destination_storage_name_for(bucket) + return storages[storage_name] + + +def replication_enabled(bucket: str): + replication_settings = get_replication_settings() + if not replication_settings["ENABLED"]: + return False + # Default is all buckets are included + included = ( + len(replication_settings["INCLUDE_BUCKETS"]) == 0 + or bucket in replication_settings["INCLUDE_BUCKETS"] + ) + # Default is no buckets are excluded + excluded = ( + len(replication_settings["EXCLUDE_BUCKETS"]) > 0 + and bucket in replication_settings["EXCLUDE_BUCKETS"] + ) + return included and not excluded + + +def verbose_logging_enabled(): + return bool(get_replication_settings()["VERBOSE_LOGGING"]) + + +@dataclass +class SqlBlob: + content: bytes + checksum: str + modified: datetime.datetime + mtime: Optional[datetime.datetime] + content_type: str + + +def fetch_blob_via_sql(bucket: str, name: str) -> Optional[SqlBlob]: + blobdb_connection = connections["blobdb"] + cursor = blobdb_connection.cursor() + cursor.execute( + """ + SELECT content, checksum, modified, mtime, content_type FROM blobdb_blob + WHERE bucket=%s AND name=%s LIMIT 1 + """, + [bucket, name], + ) + row = cursor.fetchone() + col_names = [col[0] for col in cursor.description] + return None if row is None else SqlBlob(**{ + col_name: row_val + for col_name, row_val in zip(col_names, row) + }) + + +def replicate_blob(bucket, name): + """Replicate a Blobdb blob to a Storage""" + if not replication_enabled(bucket): + if verbose_logging_enabled(): + log.log( + f"Not replicating {bucket}:{name} because replication is not enabled for {bucket}" + ) + return + + try: + destination_storage = destination_storage_for(bucket) + except InvalidStorageError as e: + log.log( + f"Failed to replicate {bucket}:{name} because destination storage for {bucket} is not configured" + ) + raise ReplicationError from e + + blob = fetch_blob_via_sql(bucket, name) + if blob is None: + if verbose_logging_enabled(): + log.log("Deleting {bucket}:{name} from replica") + try: + destination_storage.delete(name) + except Exception as e: + log.log("Failed to delete {bucket}:{name} from replica: {e}") + raise ReplicationError from e + else: + # Add metadata expected by the MetadataS3Storage + file_with_metadata = SimpleMetadataFile(file=BytesIO(blob.content)) + file_with_metadata.content_type = blob.content_type + file_with_metadata.custom_metadata = { + "sha384": blob.checksum, + "mtime": (blob.mtime or blob.modified).isoformat(), + } + if verbose_logging_enabled(): + log.log( + f"Saving {bucket}:{name} to replica (" + f"sha384: '{file_with_metadata.custom_metadata['sha384'][:16]}...', " + f"content_type: '{file_with_metadata.content_type}', " + f"mtime: '{file_with_metadata.custom_metadata['mtime']})" + ) + try: + destination_storage.save(name, file_with_metadata) + except Exception as e: + log.log("Failed to save {bucket}:{name} to replica: {e}") + raise ReplicationError from e + + +class ReplicationError(Exception): + pass diff --git a/ietf/blobdb/routers.py b/ietf/blobdb/routers.py new file mode 100644 index 00000000000..319c0fbc71a --- /dev/null +++ b/ietf/blobdb/routers.py @@ -0,0 +1,58 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +from django.apps import apps + +from .apps import BlobdbConfig, get_blobdb + + +class BlobdbStorageRouter: + """Database router for the Blobdb""" + + _app_label = None + + @property + def app_label(self): + if self._app_label is None: + for app in apps.get_app_configs(): + if isinstance(app, BlobdbConfig): + self._app_label = app.label + break + if self._app_label is None: + raise RuntimeError( + f"{BlobdbConfig.name} is not present in the Django app registry" + ) + return self._app_label + + @property + def db(self): + return get_blobdb() + + def db_for_read(self, model, **hints): + """Suggest the database that should be used for read operations for objects of type model + + Returns None if there is no suggestion. + """ + if model._meta.app_label == self.app_label: + return self.db + return None # no suggestion + + def db_for_write(self, model, **hints): + """Suggest the database that should be used for write of objects of type model + + Returns None if there is no suggestion. + """ + if model._meta.app_label == self.app_label: + return self.db + return None # no suggestion + + def allow_migrate(self, db, app_label, model_name=None, **hints): + """Determine if the migration operation is allowed to run on the database with alias db + + Return True if the operation should run, False if it shouldn’t run, or + None if the router has no opinion. + """ + if self.db is None: + return None # no opinion, use the default db + is_our_app = app_label == self.app_label + is_our_db = db == self.db + if is_our_app or is_our_db: + return is_our_app and is_our_db diff --git a/ietf/blobdb/storage.py b/ietf/blobdb/storage.py new file mode 100644 index 00000000000..4213ec801df --- /dev/null +++ b/ietf/blobdb/storage.py @@ -0,0 +1,96 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +from typing import Optional + +from django.core.exceptions import SuspiciousFileOperation +from django.core.files.base import ContentFile +from django.core.files.storage import Storage +from django.db.models.functions import Length +from django.utils.deconstruct import deconstructible +from django.utils import timezone + +from ietf.utils.storage import MetadataFile +from .models import Blob + + +class BlobFile(MetadataFile): + + def __init__(self, content, name=None, mtime=None, content_type=""): + super().__init__( + file=ContentFile(content), + name=name, + mtime=mtime, + content_type=content_type, + ) + + +@deconstructible +class BlobdbStorage(Storage): + + def __init__(self, bucket_name: Optional[str]=None): + if bucket_name is None: + raise ValueError("BlobdbStorage bucket_name must be specified") + self.bucket_name = bucket_name + + def get_queryset(self): + return Blob.objects.filter(bucket=self.bucket_name) + + def delete(self, name): + blob = self.get_queryset().filter(name=name).first() + if blob is not None: + blob.delete() + + def exists(self, name): + return self.get_queryset().filter(name=name).exists() + + def size(self, name): + sizes = ( + self.get_queryset() + .filter(name=name) + .annotate(object_size=Length("content")) + .values_list("object_size", flat=True) + ) + if len(sizes) == 0: + raise FileNotFoundError( + f"No object '{name}' exists in bucket '{self.bucket_name}'" + ) + return sizes[0] # unique constraint guarantees 0 or 1 entry + + def _open(self, name, mode="rb"): + try: + blob = self.get_queryset().get(name=name) + except Blob.DoesNotExist: + raise FileNotFoundError( + f"No object '{name}' exists in bucket '{self.bucket_name}'" + ) + return BlobFile( + content=blob.content, + name=blob.name, + mtime=blob.mtime or blob.modified, # fall back to modified time + content_type=blob.content_type, + ) + + def _save(self, name, content): + """Perform the save operation + + The storage API allows _save() to save to a different name than was requested. This method will + never do that, instead overwriting the existing blob. + """ + Blob.objects.update_or_create( + name=name, + bucket=self.bucket_name, + defaults={ + "content": content.read(), + "modified": timezone.now(), + "mtime": getattr(content, "mtime", None), + "content_type": getattr(content, "content_type", ""), + }, + ) + return name + + def get_available_name(self, name, max_length=None): + if max_length is not None and len(name) > max_length: + raise SuspiciousFileOperation( + f"BlobdbStorage only allows names up to {max_length}, but was" + f"asked to store the name '{name[:5]}...{name[-5:]} of length {len(name)}" + ) + return name # overwrite is permitted diff --git a/ietf/blobdb/tasks.py b/ietf/blobdb/tasks.py new file mode 100644 index 00000000000..538d4158304 --- /dev/null +++ b/ietf/blobdb/tasks.py @@ -0,0 +1,17 @@ +# Copyright The IETF Trust 2025, All Rights Reserved + +import json + +from celery import shared_task + +from .replication import replicate_blob, ReplicationError + + +@shared_task( + autoretry_for=(ReplicationError,), retry_backoff=10, retry_kwargs={"max_retries": 5} +) +def pybob_the_blob_replicator_task(body: str): + request = json.loads(body) + bucket = request["bucket"] + name = request["name"] + replicate_blob(bucket, name) diff --git a/ietf/blobdb/tests.py b/ietf/blobdb/tests.py new file mode 100644 index 00000000000..0eadad0a1f7 --- /dev/null +++ b/ietf/blobdb/tests.py @@ -0,0 +1,80 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +import datetime + +from django.core.files.base import ContentFile + +from ietf.utils.test_utils import TestCase +from .factories import BlobFactory +from .models import Blob +from .storage import BlobFile, BlobdbStorage + + +class StorageTests(TestCase): + def test_save(self): + storage = BlobdbStorage(bucket_name="my-bucket") + timestamp = datetime.datetime( + 2025, + 3, + 17, + 1, + 2, + 3, + tzinfo=datetime.timezone.utc, + ) + # Create file to save + my_file = BlobFile( + content=b"These are my bytes.", + mtime=timestamp, + content_type="application/x-my-content-type", + ) + # save the file + saved_name = storage.save("myfile.txt", my_file) + # validate the outcome + self.assertEqual(saved_name, "myfile.txt") + blob = Blob.objects.filter(bucket="my-bucket", name="myfile.txt").first() + self.assertIsNotNone(blob) # validates bucket and name + self.assertEqual(bytes(blob.content), b"These are my bytes.") + self.assertEqual(blob.mtime, timestamp) + self.assertEqual(blob.content_type, "application/x-my-content-type") + + def test_save_naive_file(self): + storage = BlobdbStorage(bucket_name="my-bucket") + my_naive_file = ContentFile(content=b"These are my naive bytes.") + # save the file + saved_name = storage.save("myfile.txt", my_naive_file) + # validate the outcome + self.assertEqual(saved_name, "myfile.txt") + blob = Blob.objects.filter(bucket="my-bucket", name="myfile.txt").first() + self.assertIsNotNone(blob) # validates bucket and name + self.assertEqual(bytes(blob.content), b"These are my naive bytes.") + self.assertIsNone(blob.mtime) + self.assertEqual(blob.content_type, "") + + def test_open(self): + """BlobdbStorage open yields a BlobFile with specific mtime and content_type""" + mtime = datetime.datetime(2021, 1, 2, 3, 45, tzinfo=datetime.timezone.utc) + blob = BlobFactory(mtime=mtime, content_type="application/x-oh-no-you-didnt") + storage = BlobdbStorage(bucket_name=blob.bucket) + with storage.open(blob.name, "rb") as f: + self.assertTrue(isinstance(f, BlobFile)) + assert isinstance(f, BlobFile) # redundant, narrows type for linter + self.assertEqual(f.read(), bytes(blob.content)) + self.assertEqual(f.mtime, mtime) + self.assertEqual(f.content_type, "application/x-oh-no-you-didnt") + + def test_open_null_mtime(self): + """BlobdbStorage open yields a BlobFile with default mtime and content_type""" + blob = BlobFactory(content_type="application/x-oh-no-you-didnt") # does not set mtime + storage = BlobdbStorage(bucket_name=blob.bucket) + with storage.open(blob.name, "rb") as f: + self.assertTrue(isinstance(f, BlobFile)) + assert isinstance(f, BlobFile) # redundant, narrows type for linter + self.assertEqual(f.read(), bytes(blob.content)) + self.assertIsNotNone(f.mtime) + self.assertEqual(f.mtime, blob.modified) + self.assertEqual(f.content_type, "application/x-oh-no-you-didnt") + + def test_open_file_not_found(self): + storage = BlobdbStorage(bucket_name="not-a-bucket") + with self.assertRaises(FileNotFoundError): + storage.open("definitely/not-a-file.txt") diff --git a/ietf/celeryapp.py b/ietf/celeryapp.py index cefde3a8d36..fda89c30bec 100644 --- a/ietf/celeryapp.py +++ b/ietf/celeryapp.py @@ -1,11 +1,20 @@ import os +import scout_apm.celery + +import celery +from scout_apm.api import Config + + +# Disable celery's internal logging configuration, we set it up via Django +@celery.signals.setup_logging.connect +def on_setup_logging(**kwargs): + pass -from celery import Celery # Set the default Django settings module for the 'celery' program os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ietf.settings') -app = Celery('ietf') +app = celery.Celery('ietf') # Using a string here means the worker doesn't have to serialize # the configuration object to child processes. @@ -13,6 +22,28 @@ # should have a `CELERY_` prefix. app.config_from_object('django.conf:settings', namespace='CELERY') +# Turn on Scout APM celery instrumentation if configured in the environment +scout_key = os.environ.get("DATATRACKER_SCOUT_KEY", None) +if scout_key is not None: + scout_name = os.environ.get("DATATRACKER_SCOUT_NAME", "Datatracker") + scout_core_agent_socket_path = "tcp://{host}:{port}".format( + host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"), + port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"), + ) + Config.set( + key=scout_key, + name=scout_name, + monitor=True, + core_agent_download=False, + core_agent_launch=False, + core_agent_path=scout_core_agent_socket_path, + ) + # Note: Passing the Celery app to install() method as recommended in the + # Scout documentation causes failure at startup, likely because Scout + # ingests the config greedily before Django is ready. Have not found a + # workaround for this other than explicitly configuring Scout. + scout_apm.celery.install() + # Load task modules from all registered Django apps. app.autodiscover_tasks() diff --git a/ietf/checks.py b/ietf/checks.py index c823abf1186..f911d081f0b 100644 --- a/ietf/checks.py +++ b/ietf/checks.py @@ -28,81 +28,6 @@ def already_ran(): checks_run.append(name) return False -@checks.register('directories') -def check_cdn_directory_exists(app_configs, **kwargs): - """This checks that the path from which the CDN will serve static files for - this version of the datatracker actually exists. In development and test - mode STATIC_ROOT will normally be just static/, but in production it will be - set to a different part of the file system which is served via CDN, and the - path will contain the datatracker release version. - """ - if already_ran(): - return [] - # - errors = [] - if settings.SERVER_MODE == 'production' and not os.path.exists(settings.STATIC_ROOT): - errors.append(checks.Error( - "The static files directory has not been set up.", - hint="Please run 'ietf/manage.py collectstatic'.", - obj=None, - id='datatracker.E001', - )) - return errors - -@checks.register('files') -def check_group_email_aliases_exists(app_configs, **kwargs): - from ietf.group.views import check_group_email_aliases - # - if already_ran(): - return [] - # - errors = [] - try: - ok = check_group_email_aliases() - if not ok: - errors.append(checks.Error( - "Found no aliases in the group email aliases file\n'%s'."%settings.GROUP_ALIASES_PATH, - hint="Please run the generate_group_aliases management command to generate them.", - obj=None, - id="datatracker.E0002", - )) - except IOError as e: - errors.append(checks.Error( - "Could not read group email aliases:\n %s" % e, - hint="Please run the generate_group_aliases management command to generate them.", - obj=None, - id="datatracker.E0003", - )) - - return errors - -@checks.register('files') -def check_doc_email_aliases_exists(app_configs, **kwargs): - from ietf.doc.views_doc import check_doc_email_aliases - # - if already_ran(): - return [] - # - errors = [] - try: - ok = check_doc_email_aliases() - if not ok: - errors.append(checks.Error( - "Found no aliases in the document email aliases file\n'%s'."%settings.DRAFT_VIRTUAL_PATH, - hint="Please run the generate_draft_aliases management command to generate them.", - obj=None, - id="datatracker.E0004", - )) - except IOError as e: - errors.append(checks.Error( - "Could not read document email aliases:\n %s" % e, - hint="Please run the generate_draft_aliases management command to generate them.", - obj=None, - id="datatracker.E0005", - )) - - return errors - @checks.register('directories') def check_id_submission_directories(app_configs, **kwargs): # diff --git a/ietf/community/admin.py b/ietf/community/admin.py index 890819d9d98..4c947ad3f78 100644 --- a/ietf/community/admin.py +++ b/ietf/community/admin.py @@ -7,8 +7,8 @@ from ietf.community.models import CommunityList, SearchRule, EmailSubscription class CommunityListAdmin(admin.ModelAdmin): - list_display = ['id', 'user', 'group'] - raw_id_fields = ['user', 'group', 'added_docs'] + list_display = ['id', 'person', 'group'] + raw_id_fields = ['person', 'group', 'added_docs'] admin.site.register(CommunityList, CommunityListAdmin) class SearchRuleAdmin(admin.ModelAdmin): diff --git a/ietf/community/apps.py b/ietf/community/apps.py new file mode 100644 index 00000000000..ab0a6d6054b --- /dev/null +++ b/ietf/community/apps.py @@ -0,0 +1,12 @@ +# Copyright The IETF Trust 2024, All Rights Reserved + +from django.apps import AppConfig + + +class CommunityConfig(AppConfig): + name = "ietf.community" + + def ready(self): + """Initialize the app after the registry is populated""" + # implicitly connects @receiver-decorated signals + from . import signals # pyflakes: ignore diff --git a/ietf/community/forms.py b/ietf/community/forms.py index 8d72ce0d702..d3fa01dd19d 100644 --- a/ietf/community/forms.py +++ b/ietf/community/forms.py @@ -30,6 +30,8 @@ def __init__(self, clist, rule_type, *args, **kwargs): super(SearchRuleForm, self).__init__(*args, **kwargs) def restrict_state(state_type, slug=None): + if "state" not in self.fields: + raise RuntimeError(f"Rule type {rule_type} cannot include state filtering") f = self.fields['state'] f.queryset = f.queryset.filter(used=True).filter(type=state_type) if slug: @@ -38,11 +40,15 @@ def restrict_state(state_type, slug=None): f.initial = f.queryset[0].pk f.widget = forms.HiddenInput() + if rule_type.endswith("_rfc"): + del self.fields["state"] # rfc rules must not look at document states + if rule_type in ["group", "group_rfc", "area", "area_rfc", "group_exp"]: if rule_type == "group_exp": restrict_state("draft", "expired") else: - restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active") + if not rule_type.endswith("_rfc"): + restrict_state("draft", "active") if rule_type.startswith("area"): self.fields["group"].label = "Area" @@ -70,7 +76,8 @@ def restrict_state(state_type, slug=None): del self.fields["text"] elif rule_type in ["author", "author_rfc", "shepherd", "ad"]: - restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active") + if not rule_type.endswith("_rfc"): + restrict_state("draft", "active") if rule_type.startswith("author"): self.fields["person"].label = "Author" @@ -84,7 +91,8 @@ def restrict_state(state_type, slug=None): del self.fields["text"] elif rule_type == "name_contains": - restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active") + if not rule_type.endswith("_rfc"): + restrict_state("draft", "active") del self.fields["person"] del self.fields["group"] @@ -106,14 +114,13 @@ def clean_text(self): class SubscriptionForm(forms.ModelForm): - def __init__(self, user, clist, *args, **kwargs): + def __init__(self, person, clist, *args, **kwargs): self.clist = clist - self.user = user super(SubscriptionForm, self).__init__(*args, **kwargs) self.fields["notify_on"].widget = forms.RadioSelect(choices=self.fields["notify_on"].choices) - self.fields["email"].queryset = self.fields["email"].queryset.filter(person__user=user, active=True).order_by("-primary") + self.fields["email"].queryset = self.fields["email"].queryset.filter(person=person, active=True).order_by("-primary") self.fields["email"].widget = forms.RadioSelect(choices=[t for t in self.fields["email"].choices if t[0]]) if self.fields["email"].queryset: diff --git a/ietf/community/migrations/0003_track_rfcs.py b/ietf/community/migrations/0003_track_rfcs.py new file mode 100644 index 00000000000..3c2d04097da --- /dev/null +++ b/ietf/community/migrations/0003_track_rfcs.py @@ -0,0 +1,50 @@ +# Generated by Django 4.2.3 on 2023-07-07 18:33 + +from django.db import migrations + + +def forward(apps, schema_editor): + """Track any RFCs that were created from tracked drafts""" + CommunityList = apps.get_model("community", "CommunityList") + RelatedDocument = apps.get_model("doc", "RelatedDocument") + + # Handle individually tracked documents + for cl in CommunityList.objects.all(): + for rfc in set( + RelatedDocument.objects.filter( + source__in=cl.added_docs.all(), + relationship__slug="became_rfc", + ).values_list("target__docs", flat=True) + ): + cl.added_docs.add(rfc) + + # Handle rules - rules ending with _rfc should no longer filter by state. + # There are 9 CommunityLists with invalid author_rfc rules that are filtering + # by (draft, active) instead of (draft, rfc) state before migration. All but one + # also includes an author rule for (draft, active), so these will start following + # RFCs as well. The one exception will start tracking RFCs instead of I-Ds, which + # is probably what was intended, but will be a change in their user experience. + SearchRule = apps.get_model("community", "SearchRule") + rfc_rules = SearchRule.objects.filter(rule_type__endswith="_rfc") + rfc_rules.update(state=None) + +def reverse(apps, schema_editor): + Document = apps.get_model("doc", "Document") + for rfc in Document.objects.filter(type__slug="rfc"): + rfc.communitylist_set.clear() + + # See the comment above regarding author_rfc + SearchRule = apps.get_model("community", "SearchRule") + State = apps.get_model("doc", "State") + SearchRule.objects.filter(rule_type__endswith="_rfc").update( + state=State.objects.get(type_id="draft", slug="rfc") + ) + + +class Migration(migrations.Migration): + dependencies = [ + ("community", "0002_auto_20230320_1222"), + ("doc", "0014_move_rfc_docaliases"), + ] + + operations = [migrations.RunPython(forward, reverse)] diff --git a/ietf/community/migrations/0004_delete_useless_community_lists.py b/ietf/community/migrations/0004_delete_useless_community_lists.py new file mode 100644 index 00000000000..9f657a3c349 --- /dev/null +++ b/ietf/community/migrations/0004_delete_useless_community_lists.py @@ -0,0 +1,26 @@ +# Generated by Django 4.2.9 on 2024-01-05 21:28 + +from django.db import migrations + + +def forward(apps, schema_editor): + CommunityList = apps.get_model("community", "CommunityList") + # As of 2024-01-05, there are 570 personal CommunityLists with a user + # who has no associated Person. None of these has an EmailSubscription, + # so the lists are doing nothing and can be safely deleted. + personal_lists_no_person = CommunityList.objects.exclude( + user__isnull=True + ).filter( + user__person__isnull=True + ) + # Confirm the assumption that none of the lists to be deleted has an EmailSubscription + assert not personal_lists_no_person.filter(emailsubscription__isnull=False).exists() + personal_lists_no_person.delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("community", "0003_track_rfcs"), + ] + + operations = [migrations.RunPython(forward)] diff --git a/ietf/community/migrations/0005_user_to_person.py b/ietf/community/migrations/0005_user_to_person.py new file mode 100644 index 00000000000..01d8950edb7 --- /dev/null +++ b/ietf/community/migrations/0005_user_to_person.py @@ -0,0 +1,54 @@ +# Generated by Django 4.2.2 on 2023-06-12 19:35 + +from django.conf import settings +from django.db import migrations +import django.db.models.deletion +import ietf.utils.models + + +def forward(apps, schema_editor): + CommunityList = apps.get_model('community', 'CommunityList') + for clist in CommunityList.objects.all(): + try: + clist.person = clist.user.person + except: + clist.person = None + clist.save() + +def reverse(apps, schema_editor): + CommunityList = apps.get_model('community', 'CommunityList') + for clist in CommunityList.objects.all(): + try: + clist.user = clist.person.user + except: + clist.user = None + clist.save() + +class Migration(migrations.Migration): + dependencies = [ + ("community", "0004_delete_useless_community_lists"), + ("person", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="communitylist", + name="person", + field=ietf.utils.models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="person.Person", + ), + ), + migrations.RunPython(forward, reverse), + migrations.RemoveField( + model_name="communitylist", + name="user", + field=ietf.utils.models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/ietf/community/models.py b/ietf/community/models.py index 9b2383f2114..6945918f9a4 100644 --- a/ietf/community/models.py +++ b/ietf/community/models.py @@ -1,25 +1,23 @@ # Copyright The IETF Trust 2012-2020, All Rights Reserved # -*- coding: utf-8 -*- - -from django.contrib.auth.models import User from django.db import models -from django.db.models import signals from django.urls import reverse as urlreverse -from ietf.doc.models import Document, DocEvent, State +from ietf.doc.models import Document, State from ietf.group.models import Group from ietf.person.models import Person, Email from ietf.utils.models import ForeignKey + class CommunityList(models.Model): - user = ForeignKey(User, blank=True, null=True) + person = ForeignKey(Person, blank=True, null=True) group = ForeignKey(Group, blank=True, null=True) added_docs = models.ManyToManyField(Document) def long_name(self): - if self.user: - return 'Personal I-D list of %s' % self.user.username + if self.person: + return 'Personal I-D list of %s' % self.person.plain_name() elif self.group: return 'I-D list for %s' % self.group.name else: @@ -30,8 +28,8 @@ def __str__(self): def get_absolute_url(self): import ietf.community.views - if self.user: - return urlreverse(ietf.community.views.view_list, kwargs={ 'username': self.user.username }) + if self.person: + return urlreverse(ietf.community.views.view_list, kwargs={ 'email_or_name': self.person.email() }) elif self.group: return urlreverse("ietf.group.views.group_documents", kwargs={ 'acronym': self.group.acronym }) return "" @@ -95,20 +93,3 @@ class EmailSubscription(models.Model): def __str__(self): return "%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on) - - -def notify_events(sender, instance, **kwargs): - if not isinstance(instance, DocEvent): - return - - if instance.doc.type_id != 'draft': - return - - if getattr(instance, "skip_community_list_notification", False): - return - - from ietf.community.utils import notify_event_to_subscribers - notify_event_to_subscribers(instance) - - -signals.post_save.connect(notify_events) diff --git a/ietf/community/signals.py b/ietf/community/signals.py new file mode 100644 index 00000000000..20ee761129f --- /dev/null +++ b/ietf/community/signals.py @@ -0,0 +1,44 @@ +# Copyright The IETF Trust 2024, All Rights Reserved + +from django.conf import settings +from django.db import transaction +from django.db.models.signals import post_save +from django.dispatch import receiver + +from ietf.doc.models import DocEvent +from .tasks import notify_event_to_subscribers_task + + +def notify_of_event(event: DocEvent): + """Send subscriber notification emails for a 'draft'-related DocEvent + + If the event is attached to a draft of type 'doc', queues a task to send notification emails to + community list subscribers. No emails will be sent when SERVER_MODE is 'test'. + """ + if event.doc.type_id != "draft": + return + + if getattr(event, "skip_community_list_notification", False): + return + + # kludge alert: queuing a celery task in response to a signal can cause unexpected attempts to + # start a Celery task during tests. To prevent this, don't queue a celery task if we're running + # tests. + if settings.SERVER_MODE != "test": + # Wrap in on_commit in case a transaction is open + transaction.on_commit( + lambda: notify_event_to_subscribers_task.delay(event_id=event.pk) + ) + + +# dispatch_uid ensures only a single signal receiver binding is made +@receiver(post_save, dispatch_uid="notify_of_events_receiver_uid") +def notify_of_events_receiver(sender, instance, **kwargs): + """Call notify_of_event after saving a new DocEvent""" + if not isinstance(instance, DocEvent): + return + + if not kwargs.get("created", False): + return # only notify on creation + + notify_of_event(instance) diff --git a/ietf/community/tasks.py b/ietf/community/tasks.py new file mode 100644 index 00000000000..763a5964953 --- /dev/null +++ b/ietf/community/tasks.py @@ -0,0 +1,15 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +from celery import shared_task + +from ietf.doc.models import DocEvent +from ietf.utils.log import log + + +@shared_task +def notify_event_to_subscribers_task(event_id): + from .utils import notify_event_to_subscribers + event = DocEvent.objects.filter(pk=event_id).first() + if event is None: + log(f"Unable to send subscriber notifications because DocEvent {event_id} was not found") + else: + notify_event_to_subscribers(event) diff --git a/ietf/community/tests.py b/ietf/community/tests.py index 3dd86f70e36..04f1433d61a 100644 --- a/ietf/community/tests.py +++ b/ietf/community/tests.py @@ -1,60 +1,112 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved +# Copyright The IETF Trust 2016-2023, All Rights Reserved # -*- coding: utf-8 -*- - +from unittest import mock from pyquery import PyQuery +from django.test.utils import override_settings from django.urls import reverse as urlreverse -from django.contrib.auth.models import User - -from django_webtest import WebTest +from lxml import etree -import debug # pyflakes:ignore +import debug # pyflakes:ignore from ietf.community.models import CommunityList, SearchRule, EmailSubscription -from ietf.community.utils import docs_matching_community_list_rule, community_list_rules_matching_doc -from ietf.community.utils import reset_name_contains_index_for_rule +from ietf.community.signals import notify_of_event +from ietf.community.utils import ( + docs_matching_community_list_rule, + community_list_rules_matching_doc, +) +from ietf.community.utils import ( + reset_name_contains_index_for_rule, + notify_event_to_subscribers, +) +from ietf.community.tasks import notify_event_to_subscribers_task import ietf.community.views from ietf.group.models import Group from ietf.group.utils import setup_default_community_list_for_group +from ietf.doc.factories import DocumentFactory from ietf.doc.models import State from ietf.doc.utils import add_state_change_event -from ietf.person.models import Person, Email -from ietf.utils.test_utils import login_testing_unauthorized -from ietf.utils.mail import outbox -from ietf.doc.factories import WgDraftFactory +from ietf.person.models import Person, Email, Alias +from ietf.utils.test_utils import TestCase, login_testing_unauthorized +from ietf.doc.factories import DocEventFactory, WgDraftFactory from ietf.group.factories import GroupFactory, RoleFactory -from ietf.person.factories import PersonFactory +from ietf.person.factories import PersonFactory, EmailFactory, AliasFactory + -class CommunityListTests(WebTest): +class CommunityListTests(TestCase): def test_rule_matching(self): - plain = PersonFactory(user__username='plain') - ad = Person.objects.get(user__username='ad') + plain = PersonFactory(user__username="plain") + ad = Person.objects.get(user__username="ad") draft = WgDraftFactory( - group__parent=Group.objects.get(acronym='farfut' ), + group__parent=Group.objects.get(acronym="farfut"), authors=[ad], ad=ad, shepherd=plain.email(), - states=[('draft-iesg','lc'),('draft','active')], + states=[("draft-iesg", "lc"), ("draft", "active")], ) - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) + clist = CommunityList.objects.create(person=plain) - rule_group = SearchRule.objects.create(rule_type="group", group=draft.group, state=State.objects.get(type="draft", slug="active"), community_list=clist) - rule_group_rfc = SearchRule.objects.create(rule_type="group_rfc", group=draft.group, state=State.objects.get(type="draft", slug="rfc"), community_list=clist) - rule_area = SearchRule.objects.create(rule_type="area", group=draft.group.parent, state=State.objects.get(type="draft", slug="active"), community_list=clist) + rule_group = SearchRule.objects.create( + rule_type="group", + group=draft.group, + state=State.objects.get(type="draft", slug="active"), + community_list=clist, + ) + rule_group_rfc = SearchRule.objects.create( + rule_type="group_rfc", + group=draft.group, + state=State.objects.get(type="rfc", slug="published"), + community_list=clist, + ) + rule_area = SearchRule.objects.create( + rule_type="area", + group=draft.group.parent, + state=State.objects.get(type="draft", slug="active"), + community_list=clist, + ) - rule_state_iesg = SearchRule.objects.create(rule_type="state_iesg", state=State.objects.get(type="draft-iesg", slug="lc"), community_list=clist) + rule_state_iesg = SearchRule.objects.create( + rule_type="state_iesg", + state=State.objects.get(type="draft-iesg", slug="lc"), + community_list=clist, + ) - rule_author = SearchRule.objects.create(rule_type="author", state=State.objects.get(type="draft", slug="active"), person=Person.objects.filter(documentauthor__document=draft).first(), community_list=clist) + rule_author = SearchRule.objects.create( + rule_type="author", + state=State.objects.get(type="draft", slug="active"), + person=Person.objects.filter(documentauthor__document=draft).first(), + community_list=clist, + ) - rule_ad = SearchRule.objects.create(rule_type="ad", state=State.objects.get(type="draft", slug="active"), person=draft.ad, community_list=clist) + rule_ad = SearchRule.objects.create( + rule_type="ad", + state=State.objects.get(type="draft", slug="active"), + person=draft.ad, + community_list=clist, + ) - rule_shepherd = SearchRule.objects.create(rule_type="shepherd", state=State.objects.get(type="draft", slug="active"), person=draft.shepherd.person, community_list=clist) + rule_shepherd = SearchRule.objects.create( + rule_type="shepherd", + state=State.objects.get(type="draft", slug="active"), + person=draft.shepherd.person, + community_list=clist, + ) - rule_group_exp = SearchRule.objects.create(rule_type="group_exp", group=draft.group, state=State.objects.get(type="draft", slug="expired"), community_list=clist) + rule_group_exp = SearchRule.objects.create( + rule_type="group_exp", + group=draft.group, + state=State.objects.get(type="draft", slug="expired"), + community_list=clist, + ) - rule_name_contains = SearchRule.objects.create(rule_type="name_contains", state=State.objects.get(type="draft", slug="active"), text="draft-.*" + "-".join(draft.name.split("-")[2:]), community_list=clist) + rule_name_contains = SearchRule.objects.create( + rule_type="name_contains", + state=State.objects.get(type="draft", slug="active"), + text="draft-.*" + "-".join(draft.name.split("-")[2:]), + community_list=clist, + ) reset_name_contains_index_for_rule(rule_name_contains) # doc -> rules @@ -71,37 +123,71 @@ def test_rule_matching(self): # rule -> docs self.assertTrue(draft in list(docs_matching_community_list_rule(rule_group))) - self.assertTrue(draft not in list(docs_matching_community_list_rule(rule_group_rfc))) + self.assertTrue( + draft not in list(docs_matching_community_list_rule(rule_group_rfc)) + ) self.assertTrue(draft in list(docs_matching_community_list_rule(rule_area))) - self.assertTrue(draft in list(docs_matching_community_list_rule(rule_state_iesg))) + self.assertTrue( + draft in list(docs_matching_community_list_rule(rule_state_iesg)) + ) self.assertTrue(draft in list(docs_matching_community_list_rule(rule_author))) self.assertTrue(draft in list(docs_matching_community_list_rule(rule_ad))) self.assertTrue(draft in list(docs_matching_community_list_rule(rule_shepherd))) - self.assertTrue(draft in list(docs_matching_community_list_rule(rule_name_contains))) - self.assertTrue(draft not in list(docs_matching_community_list_rule(rule_group_exp))) + self.assertTrue( + draft in list(docs_matching_community_list_rule(rule_name_contains)) + ) + self.assertTrue( + draft not in list(docs_matching_community_list_rule(rule_group_exp)) + ) - draft.set_state(State.objects.get(type='draft', slug='expired')) + draft.set_state(State.objects.get(type="draft", slug="expired")) # doc -> rules matching_rules = list(community_list_rules_matching_doc(draft)) self.assertTrue(rule_group_exp in matching_rules) # rule -> docs - self.assertTrue(draft in list(docs_matching_community_list_rule(rule_group_exp))) + self.assertTrue( + draft in list(docs_matching_community_list_rule(rule_group_exp)) + ) - def test_view_list(self): - PersonFactory(user__username='plain') - draft = WgDraftFactory() + def test_view_list_duplicates(self): + person = PersonFactory( + name="John Q. Public", user__username="bazquux@example.com" + ) + PersonFactory(name="John Q. Public", user__username="foobar@example.com") - url = urlreverse(ietf.community.views.view_list, kwargs={ "username": "plain" }) + url = urlreverse( + ietf.community.views.view_list, + kwargs={"email_or_name": person.plain_name()}, + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + def complex_person(self, *args, **kwargs): + person = PersonFactory(*args, **kwargs) + EmailFactory(person=person) + AliasFactory(person=person) + return person + + def email_or_name_set(self, person): + return [e for e in Email.objects.filter(person=person)] + [ + a for a in Alias.objects.filter(person=person) + ] + + def do_view_list_test(self, person): + draft = WgDraftFactory() # without list - r = self.client.get(url) - self.assertEqual(r.status_code, 200) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.view_list, kwargs={"email_or_name": id} + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") # with list - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) - if not draft in clist.added_docs.all(): + clist = CommunityList.objects.create(person=person) + if draft not in clist.added_docs.all(): clist.added_docs.add(draft) SearchRule.objects.create( community_list=clist, @@ -109,86 +195,135 @@ def test_view_list(self): state=State.objects.get(type="draft", slug="active"), text="test", ) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - self.assertContains(r, draft.name) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.view_list, kwargs={"email_or_name": id} + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + self.assertContains(r, draft.name) - def test_manage_personal_list(self): + def test_view_list(self): + person = self.complex_person(user__username="plain") + self.do_view_list_test(person) + + def test_view_list_without_active_email(self): + person = self.complex_person(user__username="plain") + person.email_set.update(active=False) + self.do_view_list_test(person) - PersonFactory(user__username='plain') - ad = Person.objects.get(user__username='ad') + def test_manage_personal_list(self): + person = self.complex_person(user__username="plain") + ad = Person.objects.get(user__username="ad") draft = WgDraftFactory(authors=[ad]) - url = urlreverse(ietf.community.views.manage_list, kwargs={ "username": "plain" }) + url = urlreverse( + ietf.community.views.manage_list, kwargs={"email_or_name": person.email()} + ) login_testing_unauthorized(self, "plain", url) - page = self.app.get(url, user='plain') - self.assertEqual(page.status_int, 200) - - # add document - self.assertIn('add_document', page.forms) - form = page.forms['add_document'] - form['documents'].options=[(draft.pk, True, draft.name)] - page = form.submit('action',value='add_documents') - self.assertEqual(page.status_int, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertTrue(clist.added_docs.filter(pk=draft.pk)) - page = page.follow() - - self.assertContains(page, draft.name) - - # remove document - self.assertIn('remove_document_%s' % draft.pk, page.forms) - form = page.forms['remove_document_%s' % draft.pk] - page = form.submit('action',value='remove_document') - self.assertEqual(page.status_int, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertTrue(not clist.added_docs.filter(pk=draft.pk)) - page = page.follow() - - # add rule - r = self.client.post(url, { - "action": "add_rule", - "rule_type": "author_rfc", - "author_rfc-person": Person.objects.filter(documentauthor__document=draft).first().pk, - "author_rfc-state": State.objects.get(type="draft", slug="rfc").pk, - }) - self.assertEqual(r.status_code, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertTrue(clist.searchrule_set.filter(rule_type="author_rfc")) - - # add name_contains rule - r = self.client.post(url, { - "action": "add_rule", - "rule_type": "name_contains", - "name_contains-text": "draft.*mars", - "name_contains-state": State.objects.get(type="draft", slug="active").pk, - }) - self.assertEqual(r.status_code, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertTrue(clist.searchrule_set.filter(rule_type="name_contains")) - - # rule shows up on GET - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - rule = clist.searchrule_set.filter(rule_type="author_rfc").first() - q = PyQuery(r.content) - self.assertEqual(len(q('#r%s' % rule.pk)), 1) - - # remove rule - r = self.client.post(url, { - "action": "remove_rule", - "rule": rule.pk, - }) - - clist = CommunityList.objects.get(user__username="plain") - self.assertTrue(not clist.searchrule_set.filter(rule_type="author_rfc")) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.manage_list, kwargs={"email_or_name": id} + ) + r = self.client.get(url, user="plain") + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + + # We can't call post() with follow=True because that 404's if + # the url contains unicode, because the django test client + # apparently re-encodes the already-encoded url. + def follow(r): + redirect_url = r.url or url + return self.client.get(redirect_url, user="plain") + + # add document + self.assertContains(r, "add_document") + r = self.client.post( + url, {"action": "add_documents", "documents": draft.pk} + ) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertTrue(clist.added_docs.filter(pk=draft.pk)) + r = follow(r) + self.assertContains(r, draft.name, status_code=200) + + # remove document + self.assertContains(r, "remove_document_%s" % draft.pk) + r = self.client.post( + url, {"action": "remove_document", "document": draft.pk} + ) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertTrue(not clist.added_docs.filter(pk=draft.pk)) + r = follow(r) + self.assertNotContains(r, draft.name, status_code=200) + + # add rule + r = self.client.post( + url, + { + "action": "add_rule", + "rule_type": "author_rfc", + "author_rfc-person": Person.objects.filter( + documentauthor__document=draft + ) + .first() + .pk, + "author_rfc-state": State.objects.get( + type="rfc", slug="published" + ).pk, + }, + ) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertTrue(clist.searchrule_set.filter(rule_type="author_rfc")) + + # add name_contains rule + r = self.client.post( + url, + { + "action": "add_rule", + "rule_type": "name_contains", + "name_contains-text": "draft.*mars", + "name_contains-state": State.objects.get( + type="draft", slug="active" + ).pk, + }, + ) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertTrue(clist.searchrule_set.filter(rule_type="name_contains")) + + # rule shows up on GET + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + rule = clist.searchrule_set.filter(rule_type="author_rfc").first() + q = PyQuery(r.content) + self.assertEqual(len(q("#r%s" % rule.pk)), 1) + + # remove rule + r = self.client.post( + url, + { + "action": "remove_rule", + "rule": rule.pk, + }, + ) + + clist = CommunityList.objects.get(person__user__username="plain") + self.assertTrue(not clist.searchrule_set.filter(rule_type="author_rfc")) def test_manage_group_list(self): - draft = WgDraftFactory(group__acronym='mars') - RoleFactory(group__acronym='mars',name_id='chair',person=PersonFactory(user__username='marschairman')) + draft = WgDraftFactory(group__acronym="mars") + RoleFactory( + group__acronym="mars", + name_id="chair", + person=PersonFactory(user__username="marschairman"), + ) - url = urlreverse(ietf.community.views.manage_list, kwargs={ "acronym": draft.group.acronym }) + url = urlreverse( + ietf.community.views.manage_list, kwargs={"acronym": draft.group.acronym} + ) setup_default_community_list_for_group(draft.group) login_testing_unauthorized(self, "marschairman", url) @@ -197,95 +332,132 @@ def test_manage_group_list(self): self.assertEqual(r.status_code, 200) # Verify GET also works with non-WG and RG groups - for gtype in ['area','program']: + for gtype in ["area", "program"]: g = GroupFactory.create(type_id=gtype) # make sure the group's features have been initialized to improve coverage - _ = g.features # pyflakes:ignore + _ = g.features # pyflakes:ignore p = PersonFactory() - g.role_set.create(name_id={'area':'ad','program':'lead'}[gtype],person=p, email=p.email()) - url = urlreverse(ietf.community.views.manage_list, kwargs={ "acronym": g.acronym }) + g.role_set.create( + name_id={"area": "ad", "program": "lead"}[gtype], + person=p, + email=p.email(), + ) + url = urlreverse( + ietf.community.views.manage_list, kwargs={"acronym": g.acronym} + ) setup_default_community_list_for_group(g) - self.client.login(username=p.user.username,password=p.user.username+"+password") + self.client.login( + username=p.user.username, password=p.user.username + "+password" + ) r = self.client.get(url) self.assertEqual(r.status_code, 200) def test_track_untrack_document(self): - PersonFactory(user__username='plain') + person = self.complex_person(user__username="plain") draft = WgDraftFactory() - url = urlreverse(ietf.community.views.track_document, kwargs={ "username": "plain", "name": draft.name }) + url = urlreverse( + ietf.community.views.track_document, + kwargs={"email_or_name": person.email(), "name": draft.name}, + ) login_testing_unauthorized(self, "plain", url) - # track - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - r = self.client.post(url) - self.assertEqual(r.status_code, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertEqual(list(clist.added_docs.all()), [draft]) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.track_document, + kwargs={"email_or_name": id, "name": draft.name}, + ) - # untrack - url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name }) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) + # track + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + + r = self.client.post(url) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertEqual(list(clist.added_docs.all()), [draft]) + + # untrack + url = urlreverse( + ietf.community.views.untrack_document, + kwargs={"email_or_name": id, "name": draft.name}, + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") - r = self.client.post(url) - self.assertEqual(r.status_code, 302) - clist = CommunityList.objects.get(user__username="plain") - self.assertEqual(list(clist.added_docs.all()), []) + r = self.client.post(url) + self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'") + clist = CommunityList.objects.get(person__user__username="plain") + self.assertEqual(list(clist.added_docs.all()), []) def test_track_untrack_document_through_ajax(self): - PersonFactory(user__username='plain') + person = self.complex_person(user__username="plain") draft = WgDraftFactory() - url = urlreverse(ietf.community.views.track_document, kwargs={ "username": "plain", "name": draft.name }) + url = urlreverse( + ietf.community.views.track_document, + kwargs={"email_or_name": person.email(), "name": draft.name}, + ) login_testing_unauthorized(self, "plain", url) - # track - r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest') - self.assertEqual(r.status_code, 200) - self.assertEqual(r.json()["success"], True) - clist = CommunityList.objects.get(user__username="plain") - self.assertEqual(list(clist.added_docs.all()), [draft]) - - # untrack - url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name }) - r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest') - self.assertEqual(r.status_code, 200) - self.assertEqual(r.json()["success"], True) - clist = CommunityList.objects.get(user__username="plain") - self.assertEqual(list(clist.added_docs.all()), []) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.track_document, + kwargs={"email_or_name": id, "name": draft.name}, + ) + + # track + r = self.client.post(url, HTTP_X_REQUESTED_WITH="XMLHttpRequest") + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + self.assertEqual(r.json()["success"], True) + clist = CommunityList.objects.get(person__user__username="plain") + self.assertEqual(list(clist.added_docs.all()), [draft]) + + # untrack + url = urlreverse( + ietf.community.views.untrack_document, + kwargs={"email_or_name": id, "name": draft.name}, + ) + r = self.client.post(url, HTTP_X_REQUESTED_WITH="XMLHttpRequest") + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + self.assertEqual(r.json()["success"], True) + clist = CommunityList.objects.get(person__user__username="plain") + self.assertEqual(list(clist.added_docs.all()), []) def test_csv(self): - PersonFactory(user__username='plain') + person = self.complex_person(user__username="plain") draft = WgDraftFactory() - url = urlreverse(ietf.community.views.export_to_csv, kwargs={ "username": "plain" }) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.export_to_csv, kwargs={"email_or_name": id} + ) - # without list - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - # with list - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) - if not draft in clist.added_docs.all(): - clist.added_docs.add(draft) - SearchRule.objects.create( - community_list=clist, - rule_type="name_contains", - state=State.objects.get(type="draft", slug="active"), - text="test", - ) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - # this is a simple-minded test, we don't actually check the fields - self.assertContains(r, draft.name) + # without list + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + + # with list + clist = CommunityList.objects.create(person=person) + if draft not in clist.added_docs.all(): + clist.added_docs.add(draft) + SearchRule.objects.create( + community_list=clist, + rule_type="name_contains", + state=State.objects.get(type="draft", slug="active"), + text="test", + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + # this is a simple-minded test, we don't actually check the fields + self.assertContains(r, draft.name) def test_csv_for_group(self): draft = WgDraftFactory() - url = urlreverse(ietf.community.views.export_to_csv, kwargs={ "acronym": draft.group.acronym }) + url = urlreverse( + ietf.community.views.export_to_csv, kwargs={"acronym": draft.group.acronym} + ) setup_default_community_list_for_group(draft.group) @@ -294,60 +466,85 @@ def test_csv_for_group(self): self.assertEqual(r.status_code, 200) def test_feed(self): - PersonFactory(user__username='plain') + person = self.complex_person(user__username="plain") draft = WgDraftFactory() - url = urlreverse(ietf.community.views.feed, kwargs={ "username": "plain" }) - - # without list - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - # with list - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) - if not draft in clist.added_docs.all(): - clist.added_docs.add(draft) - SearchRule.objects.create( - community_list=clist, - rule_type="name_contains", - state=State.objects.get(type="draft", slug="active"), - text="test", - ) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - self.assertContains(r, draft.name) + for id in self.email_or_name_set(person): + url = urlreverse(ietf.community.views.feed, kwargs={"email_or_name": id}) - # only significant - r = self.client.get(url + "?significant=1") - self.assertEqual(r.status_code, 200) - self.assertNotContains(r, '') + # without list + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + + # with list + clist = CommunityList.objects.create(person=person) + if draft not in clist.added_docs.all(): + clist.added_docs.add(draft) + SearchRule.objects.create( + community_list=clist, + rule_type="name_contains", + state=State.objects.get(type="draft", slug="active"), + text="test", + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + self.assertContains(r, draft.name) + + # test atom xml + xml = etree.fromstring(r.content) + ns = {"atom": "http://www.w3.org/2005/Atom"} + updated = xml.xpath("/atom:feed/atom:updated", namespaces=ns)[0].text + entries = xml.xpath("/atom:feed/atom:entry", namespaces=ns) + self.assertIn("+00:00", updated) # RFC 3339 compatible UTC TZ + for entry in entries: + updated = entry.xpath("atom:updated", namespaces=ns)[0].text + published = entry.xpath("atom:published", namespaces=ns)[0].text + entry_id = entry.xpath("atom:id", namespaces=ns)[0].text + self.assertIn("+00:00", updated) + self.assertIn("+00:00", published) + self.assertIn( + "urn:datatracker-ietf-org:event:", entry_id + ) # atom:entry:id must be a valid URN + + # only significant + r = self.client.get(url + "?significant=1") + self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'") + self.assertNotContains(r, "") def test_feed_for_group(self): draft = WgDraftFactory() - url = urlreverse(ietf.community.views.feed, kwargs={ "acronym": draft.group.acronym }) + url = urlreverse( + ietf.community.views.feed, kwargs={"acronym": draft.group.acronym} + ) setup_default_community_list_for_group(draft.group) # test GET, rest is tested with personal list r = self.client.get(url) self.assertEqual(r.status_code, 200) - + def test_subscription(self): - PersonFactory(user__username='plain') + person = self.complex_person(user__username="plain") draft = WgDraftFactory() - url = urlreverse(ietf.community.views.subscription, kwargs={ "username": "plain" }) - + url = urlreverse( + ietf.community.views.subscription, kwargs={"email_or_name": person.email()} + ) login_testing_unauthorized(self, "plain", url) - # subscription without list - r = self.client.get(url) - self.assertEqual(r.status_code, 404) + for id in self.email_or_name_set(person): + url = urlreverse( + ietf.community.views.subscription, kwargs={"email_or_name": id} + ) + + # subscription without list + r = self.client.get(url) + self.assertEqual(r.status_code, 404, msg=f"id='{id}', url='{url}'") # subscription with list - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) - if not draft in clist.added_docs.all(): + clist = CommunityList.objects.create(person=person) + if draft not in clist.added_docs.all(): clist.added_docs.add(draft) SearchRule.objects.create( community_list=clist, @@ -355,28 +552,51 @@ def test_subscription(self): state=State.objects.get(type="draft", slug="active"), text="test", ) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - # subscribe - email = Email.objects.filter(person__user__username="plain").first() - r = self.client.post(url, { "email": email.pk, "notify_on": "significant", "action": "subscribe" }) - self.assertEqual(r.status_code, 302) + for email in Email.objects.filter(person=person): + url = urlreverse( + ietf.community.views.subscription, kwargs={"email_or_name": email} + ) - subscription = EmailSubscription.objects.filter(community_list=clist, email=email, notify_on="significant").first() - - self.assertTrue(subscription) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) - # delete subscription - r = self.client.post(url, { "subscription_id": subscription.pk, "action": "unsubscribe" }) - self.assertEqual(r.status_code, 302) - self.assertEqual(EmailSubscription.objects.filter(community_list=clist, email=email, notify_on="significant").count(), 0) + # subscribe + r = self.client.post( + url, + {"email": email.pk, "notify_on": "significant", "action": "subscribe"}, + ) + self.assertEqual(r.status_code, 302) + + subscription = EmailSubscription.objects.filter( + community_list=clist, email=email, notify_on="significant" + ).first() + + self.assertTrue(subscription) + + # delete subscription + r = self.client.post( + url, {"subscription_id": subscription.pk, "action": "unsubscribe"} + ) + self.assertEqual(r.status_code, 302) + self.assertEqual( + EmailSubscription.objects.filter( + community_list=clist, email=email, notify_on="significant" + ).count(), + 0, + ) def test_subscription_for_group(self): - draft = WgDraftFactory(group__acronym='mars') - RoleFactory(group__acronym='mars',name_id='chair',person=PersonFactory(user__username='marschairman')) + draft = WgDraftFactory(group__acronym="mars") + RoleFactory( + group__acronym="mars", + name_id="chair", + person=PersonFactory(user__username="marschairman"), + ) - url = urlreverse(ietf.community.views.subscription, kwargs={ "acronym": draft.group.acronym }) + url = urlreverse( + ietf.community.views.subscription, kwargs={"acronym": draft.group.acronym} + ) setup_default_community_list_for_group(draft.group) @@ -385,27 +605,136 @@ def test_subscription_for_group(self): # test GET, rest is tested with personal list r = self.client.get(url) self.assertEqual(r.status_code, 200) - - def test_notification(self): - PersonFactory(user__username='plain') + + @mock.patch("ietf.community.signals.notify_of_event") + def test_notification_signal_receiver(self, mock_notify_of_event): + """Saving a newly created DocEvent should notify subscribers + + This implicitly tests that notify_of_event_receiver is hooked up to the post_save signal. + """ + # Arbitrary model that's not a DocEvent + person = PersonFactory.build() # builds but does not save... + mock_notify_of_event.reset_mock() # clear any calls that resulted from the factories + person.save() + self.assertFalse(mock_notify_of_event.called) + + # build a DocEvent that is not yet persisted + doc = DocumentFactory() + event = DocEventFactory.build(by=person, doc=doc) # builds but does not save... + mock_notify_of_event.reset_mock() # clear any calls that resulted from the factories + event.save() + self.assertEqual( + mock_notify_of_event.call_count, + 1, + "notify_task should be run on creation of DocEvent", + ) + self.assertEqual(mock_notify_of_event.call_args, mock.call(event)) + + # save the existing DocEvent and see that no notification is sent + mock_notify_of_event.reset_mock() + event.save() + self.assertFalse( + mock_notify_of_event.called, + "notify_task should not be run save of on existing DocEvent", + ) + + # Mock out the on_commit call so we can tell whether the task was actually queued + @mock.patch("ietf.submit.views.transaction.on_commit", side_effect=lambda x: x()) + @mock.patch("ietf.community.signals.notify_event_to_subscribers_task") + def test_notify_of_event(self, mock_notify_task, mock_on_commit): + """The community notification task should be called as intended""" + person = PersonFactory() # builds but does not save... + doc = DocumentFactory() + event = DocEventFactory(by=person, doc=doc) + # be careful overriding SERVER_MODE - we do it here because the method + # under test does not make this call when in "test" mode + with override_settings(SERVER_MODE="not-test"): + notify_of_event(event) + self.assertTrue( + mock_notify_task.delay.called, + "notify_task should run for a DocEvent on a draft", + ) + mock_notify_task.reset_mock() + + event.skip_community_list_notification = True + # be careful overriding SERVER_MODE - we do it here because the method + # under test does not make this call when in "test" mode + with override_settings(SERVER_MODE="not-test"): + notify_of_event(event) + self.assertFalse( + mock_notify_task.delay.called, + "notify_task should not run when skip_community_list_notification is set", + ) + + event = DocEventFactory.build(by=person, doc=DocumentFactory(type_id="rfc")) + # be careful overriding SERVER_MODE - we do it here because the method + # under test does not make this call when in "test" mode + with override_settings(SERVER_MODE="not-test"): + notify_of_event(event) + self.assertFalse( + mock_notify_task.delay.called, + "notify_task should not run on a document with type 'rfc'", + ) + + @mock.patch("ietf.utils.mail.send_mail_text") + def test_notify_event_to_subscribers(self, mock_send_mail_text): + person = PersonFactory(user__username="plain") draft = WgDraftFactory() - clist = CommunityList.objects.create(user=User.objects.get(username="plain")) - if not draft in clist.added_docs.all(): + clist = CommunityList.objects.create(person=person) + if draft not in clist.added_docs.all(): clist.added_docs.add(draft) - EmailSubscription.objects.create(community_list=clist, email=Email.objects.filter(person__user__username="plain").first(), notify_on="significant") + sub_to_significant = EmailSubscription.objects.create( + community_list=clist, + email=Email.objects.filter(person__user__username="plain").first(), + notify_on="significant", + ) + sub_to_all = EmailSubscription.objects.create( + community_list=clist, + email=Email.objects.filter(person__user__username="plain").first(), + notify_on="all", + ) - mailbox_before = len(outbox) active_state = State.objects.get(type="draft", slug="active") system = Person.objects.get(name="(System)") - add_state_change_event(draft, system, None, active_state) - self.assertEqual(len(outbox), mailbox_before) + event = add_state_change_event(draft, system, None, active_state) + notify_event_to_subscribers(event) + self.assertEqual(mock_send_mail_text.call_count, 1) + address = mock_send_mail_text.call_args[0][1] + subject = mock_send_mail_text.call_args[0][3] + content = mock_send_mail_text.call_args[0][4] + self.assertEqual(address, sub_to_all.email.address) + self.assertIn(draft.name, subject) + self.assertIn(clist.long_name(), content) - mailbox_before = len(outbox) rfc_state = State.objects.get(type="draft", slug="rfc") - add_state_change_event(draft, system, active_state, rfc_state) - self.assertEqual(len(outbox), mailbox_before + 1) - self.assertTrue(draft.name in outbox[-1]["Subject"]) - - \ No newline at end of file + event = add_state_change_event(draft, system, active_state, rfc_state) + mock_send_mail_text.reset_mock() + notify_event_to_subscribers(event) + self.assertEqual(mock_send_mail_text.call_count, 2) + addresses = [ + call_args[0][1] for call_args in mock_send_mail_text.call_args_list + ] + subjects = {call_args[0][3] for call_args in mock_send_mail_text.call_args_list} + contents = {call_args[0][4] for call_args in mock_send_mail_text.call_args_list} + self.assertCountEqual( + addresses, + [sub_to_significant.email.address, sub_to_all.email.address], + ) + self.assertEqual(len(subjects), 1) + self.assertIn(draft.name, subjects.pop()) + self.assertEqual(len(contents), 1) + self.assertIn(clist.long_name(), contents.pop()) + + @mock.patch("ietf.community.utils.notify_event_to_subscribers") + def test_notify_event_to_subscribers_task(self, mock_notify): + d = DocEventFactory() + notify_event_to_subscribers_task(event_id=d.pk) + self.assertEqual(mock_notify.call_count, 1) + self.assertEqual(mock_notify.call_args, mock.call(d)) + mock_notify.reset_mock() + + d.delete() + notify_event_to_subscribers_task(event_id=d.pk) + self.assertFalse(mock_notify.called) diff --git a/ietf/community/urls.py b/ietf/community/urls.py index f80547ffad1..3ab132f2dca 100644 --- a/ietf/community/urls.py +++ b/ietf/community/urls.py @@ -4,11 +4,11 @@ from ietf.utils.urls import url urlpatterns = [ - url(r'^personal/(?P[^/]+)/$', views.view_list), - url(r'^personal/(?P[^/]+)/manage/$', views.manage_list), - url(r'^personal/(?P[^/]+)/trackdocument/(?P[^/]+)/$', views.track_document), - url(r'^personal/(?P[^/]+)/untrackdocument/(?P[^/]+)/$', views.untrack_document), - url(r'^personal/(?P[^/]+)/csv/$', views.export_to_csv), - url(r'^personal/(?P[^/]+)/feed/$', views.feed), - url(r'^personal/(?P[^/]+)/subscription/$', views.subscription), + url(r'^personal/(?P[^/]+)/$', views.view_list), + url(r'^personal/(?P[^/]+)/manage/$', views.manage_list), + url(r'^personal/(?P[^/]+)/trackdocument/(?P[^/]+)/$', views.track_document), + url(r'^personal/(?P[^/]+)/untrackdocument/(?P[^/]+)/$', views.untrack_document), + url(r'^personal/(?P[^/]+)/csv/$', views.export_to_csv), + url(r'^personal/(?P[^/]+)/feed/$', views.feed), + url(r'^personal/(?P[^/]+)/subscription/$', views.subscription), ] diff --git a/ietf/community/utils.py b/ietf/community/utils.py index 8130954b924..f23e8d26abd 100644 --- a/ietf/community/utils.py +++ b/ietf/community/utils.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved +# Copyright The IETF Trust 2016-2023, All Rights Reserved # -*- coding: utf-8 -*- @@ -11,11 +11,9 @@ from ietf.community.models import CommunityList, EmailSubscription, SearchRule from ietf.doc.models import Document, State -from ietf.group.models import Role, Group +from ietf.group.models import Role from ietf.person.models import Person from ietf.ietfauth.utils import has_role -from django.contrib.auth.models import User -from django.shortcuts import get_object_or_404 from ietf.utils.mail import send_mail @@ -29,24 +27,12 @@ def states_of_significant_change(): Q(type="draft", slug__in=['rfc', 'dead']) ) -def lookup_community_list(username=None, acronym=None): - assert username or acronym - - if acronym: - group = get_object_or_404(Group, acronym=acronym) - clist = CommunityList.objects.filter(group=group).first() or CommunityList(group=group) - else: - user = get_object_or_404(User, username__iexact=username) - clist = CommunityList.objects.filter(user=user).first() or CommunityList(user=user) - - return clist - def can_manage_community_list(user, clist): if not user or not user.is_authenticated: return False - if clist.user: - return user == clist.user + if clist.person: + return user == clist.person.user elif clist.group: if has_role(user, 'Secretariat'): return True @@ -60,7 +46,7 @@ def reset_name_contains_index_for_rule(rule): if not rule.rule_type == "name_contains": return - rule.name_contains_index.set(Document.objects.filter(docalias__name__regex=rule.text)) + rule.name_contains_index.set(Document.objects.filter(name__regex=rule.text)) def update_name_contains_indexes_with_new_doc(doc): for r in SearchRule.objects.filter(rule_type="name_contains"): @@ -71,71 +57,104 @@ def update_name_contains_indexes_with_new_doc(doc): if re.search(r.text, doc.name) and not doc in r.name_contains_index.all(): r.name_contains_index.add(doc) + def docs_matching_community_list_rule(rule): docs = Document.objects.all() + + if rule.rule_type.endswith("_rfc"): + docs = docs.filter(type_id="rfc") # rule.state is ignored for RFCs + else: + docs = docs.filter(type_id="draft", states=rule.state) + if rule.rule_type in ['group', 'area', 'group_rfc', 'area_rfc']: - return docs.filter(Q(group=rule.group_id) | Q(group__parent=rule.group_id), states=rule.state) + return docs.filter(Q(group=rule.group_id) | Q(group__parent=rule.group_id)) elif rule.rule_type in ['group_exp']: - return docs.filter(group=rule.group_id, states=rule.state) + return docs.filter(group=rule.group_id) elif rule.rule_type.startswith("state_"): - return docs.filter(states=rule.state) + return docs elif rule.rule_type in ["author", "author_rfc"]: - return docs.filter(states=rule.state, documentauthor__person=rule.person) + return docs.filter(documentauthor__person=rule.person) elif rule.rule_type == "ad": - return docs.filter(states=rule.state, ad=rule.person) + return docs.filter(ad=rule.person) elif rule.rule_type == "shepherd": - return docs.filter(states=rule.state, shepherd__person=rule.person) + return docs.filter(shepherd__person=rule.person) elif rule.rule_type == "name_contains": - return docs.filter(states=rule.state, searchrule=rule) + return docs.filter(searchrule=rule) raise NotImplementedError -def community_list_rules_matching_doc(doc): - states = list(doc.states.values_list("pk", flat=True)) +def community_list_rules_matching_doc(doc): rules = SearchRule.objects.none() + if doc.type_id not in ["draft", "rfc"]: + return rules # none + states = list(doc.states.values_list("pk", flat=True)) + # group and area rules if doc.group_id: groups = [doc.group_id] if doc.group.parent_id: groups.append(doc.group.parent_id) + rules_to_add = SearchRule.objects.filter(group__in=groups) + if doc.type_id == "rfc": + rules_to_add = rules_to_add.filter(rule_type__in=["group_rfc", "area_rfc"]) + else: + rules_to_add = rules_to_add.filter( + rule_type__in=["group", "area", "group_exp"], + state__in=states, + ) + rules |= rules_to_add + + # state rules (only relevant for I-Ds) + if doc.type_id == "draft": rules |= SearchRule.objects.filter( - rule_type__in=['group', 'area', 'group_rfc', 'area_rfc', 'group_exp'], + rule_type__in=[ + "state_iab", + "state_iana", + "state_iesg", + "state_irtf", + "state_ise", + "state_rfceditor", + "state_ietf", + ], state__in=states, - group__in=groups ) - rules |= SearchRule.objects.filter( - rule_type__in=['state_iab', 'state_iana', 'state_iesg', 'state_irtf', 'state_ise', 'state_rfceditor', 'state_ietf'], - state__in=states, - ) - - rules |= SearchRule.objects.filter( - rule_type__in=["author", "author_rfc"], - state__in=states, - person__in=list(Person.objects.filter(documentauthor__document=doc)), - ) - - if doc.ad_id: + # author rules + if doc.type_id == "rfc": + rules |= SearchRule.objects.filter( + rule_type="author_rfc", + person__in=list(Person.objects.filter(documentauthor__document=doc)), + ) + else: rules |= SearchRule.objects.filter( - rule_type="ad", + rule_type="author", state__in=states, - person=doc.ad_id, + person__in=list(Person.objects.filter(documentauthor__document=doc)), ) - if doc.shepherd_id: + # Other draft-only rules rules + if doc.type_id == "draft": + if doc.ad_id: + rules |= SearchRule.objects.filter( + rule_type="ad", + state__in=states, + person=doc.ad_id, + ) + + if doc.shepherd_id: + rules |= SearchRule.objects.filter( + rule_type="shepherd", + state__in=states, + person__email=doc.shepherd_id, + ) + rules |= SearchRule.objects.filter( - rule_type="shepherd", + rule_type="name_contains", state__in=states, - person__email=doc.shepherd_id, + name_contains_index=doc, # search our materialized index to avoid full scan ) - rules |= SearchRule.objects.filter( - rule_type="name_contains", - state__in=states, - name_contains_index=doc, # search our materialized index to avoid full scan - ) - return rules @@ -146,7 +165,11 @@ def docs_tracked_by_community_list(clist): # in theory, we could use an OR query, but databases seem to have # trouble with OR queries and complicated joins so do the OR'ing # manually - doc_ids = set(clist.added_docs.values_list("pk", flat=True)) + doc_ids = set() + for doc in clist.added_docs.all(): + doc_ids.add(doc.pk) + doc_ids.update(rfc.pk for rfc in doc.related_that_doc("became_rfc")) + for rule in clist.searchrule_set.all(): doc_ids = doc_ids | set(docs_matching_community_list_rule(rule).values_list("pk", flat=True)) diff --git a/ietf/community/views.py b/ietf/community/views.py index b0646424a3c..08b1c24fe58 100644 --- a/ietf/community/views.py +++ b/ietf/community/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2023, All Rights Reserved # -*- coding: utf-8 -*- @@ -13,60 +13,119 @@ from django.utils import timezone from django.utils.html import strip_tags -import debug # pyflakes:ignore - -from ietf.community.models import SearchRule, EmailSubscription -from ietf.community.forms import SearchRuleTypeForm, SearchRuleForm, AddDocumentsForm, SubscriptionForm -from ietf.community.utils import lookup_community_list, can_manage_community_list -from ietf.community.utils import docs_tracked_by_community_list, docs_matching_community_list_rule -from ietf.community.utils import states_of_significant_change, reset_name_contains_index_for_rule +import debug # pyflakes:ignore + +from ietf.community.models import CommunityList, EmailSubscription, SearchRule +from ietf.community.forms import ( + SearchRuleTypeForm, + SearchRuleForm, + AddDocumentsForm, + SubscriptionForm, +) +from ietf.community.utils import can_manage_community_list +from ietf.community.utils import ( + docs_tracked_by_community_list, + docs_matching_community_list_rule, +) +from ietf.community.utils import ( + states_of_significant_change, + reset_name_contains_index_for_rule, +) +from ietf.group.models import Group from ietf.doc.models import DocEvent, Document from ietf.doc.utils_search import prepare_document_table +from ietf.person.utils import lookup_persons +from ietf.utils.decorators import ignore_view_kwargs +from ietf.utils.http import is_ajax from ietf.utils.response import permission_denied -def view_list(request, username=None): - clist = lookup_community_list(username) +def lookup_community_list(request, email_or_name=None, acronym=None): + """Finds a CommunityList for a person or group + + Instantiates an unsaved CommunityList if one is not found. + + If the person or group cannot be found and uniquely identified, raises an Http404 exception + """ + assert email_or_name or acronym + + if acronym: + group = get_object_or_404(Group, acronym=acronym) + clist = CommunityList.objects.filter(group=group).first() or CommunityList( + group=group + ) + else: + persons = lookup_persons(email_or_name) + if len(persons) > 1: + if hasattr(request.user, "person") and request.user.person in persons: + person = request.user.person + else: + raise Http404( + f"Unable to identify the CommunityList for {email_or_name}" + ) + else: + person = persons[0] + clist = CommunityList.objects.filter(person=person).first() or CommunityList( + person=person + ) + return clist + + +def view_list(request, email_or_name=None): + clist = lookup_community_list(request, email_or_name) # may raise Http404 docs = docs_tracked_by_community_list(clist) docs, meta = prepare_document_table(request, docs, request.GET) - subscribed = request.user.is_authenticated and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user) + subscribed = request.user.is_authenticated and ( + EmailSubscription.objects.none() + if clist.pk is None + else EmailSubscription.objects.filter( + community_list=clist, email__person__user=request.user + ) + ) + + return render( + request, + "community/view_list.html", + { + "clist": clist, + "docs": docs, + "meta": meta, + "can_manage_list": can_manage_community_list(request.user, clist), + "subscribed": subscribed, + "email_or_name": email_or_name, + }, + ) - return render(request, 'community/view_list.html', { - 'clist': clist, - 'docs': docs, - 'meta': meta, - 'can_manage_list': can_manage_community_list(request.user, clist), - 'subscribed': subscribed, - }) @login_required -def manage_list(request, username=None, acronym=None, group_type=None): +@ignore_view_kwargs("group_type") +def manage_list(request, email_or_name=None, acronym=None): # we need to be a bit careful because clist may not exist in the # database so we can't call related stuff on it yet - clist = lookup_community_list(username, acronym) + clist = lookup_community_list(request, email_or_name, acronym) # may raise Http404 if not can_manage_community_list(request.user, clist): permission_denied(request, "You do not have permission to access this view") - action = request.POST.get('action') + action = request.POST.get("action") - if request.method == 'POST' and action == 'add_documents': + if request.method == "POST" and action == "add_documents": add_doc_form = AddDocumentsForm(request.POST) if add_doc_form.is_valid(): if clist.pk is None: clist.save() - for d in add_doc_form.cleaned_data['documents']: - if not d in clist.added_docs.all(): + for d in add_doc_form.cleaned_data["documents"]: + if d not in clist.added_docs.all(): clist.added_docs.add(d) return HttpResponseRedirect("") else: add_doc_form = AddDocumentsForm() - if request.method == 'POST' and action == 'remove_document': - document_id = request.POST.get('document') + if request.method == "POST" and action == "remove_document": + document_id = request.POST.get("document") if clist.pk is not None and document_id: document = get_object_or_404(clist.added_docs, id=document_id) clist.added_docs.remove(document) @@ -74,30 +133,29 @@ def manage_list(request, username=None, acronym=None, group_type=None): return HttpResponseRedirect("") rule_form = None - if request.method == 'POST' and action == 'add_rule': + if request.method == "POST" and action == "add_rule": rule_type_form = SearchRuleTypeForm(request.POST) if rule_type_form.is_valid(): - rule_type = rule_type_form.cleaned_data['rule_type'] - - if rule_type: - rule_form = SearchRuleForm(clist, rule_type, request.POST) - if rule_form.is_valid(): - if clist.pk is None: - clist.save() - - rule = rule_form.save(commit=False) - rule.community_list = clist - rule.rule_type = rule_type - rule.save() - if rule.rule_type == "name_contains": - reset_name_contains_index_for_rule(rule) + rule_type = rule_type_form.cleaned_data["rule_type"] + if rule_type: + rule_form = SearchRuleForm(clist, rule_type, request.POST) + if rule_form.is_valid(): + if clist.pk is None: + clist.save() + + rule = rule_form.save(commit=False) + rule.community_list = clist + rule.rule_type = rule_type + rule.save() + if rule.rule_type == "name_contains": + reset_name_contains_index_for_rule(rule) return HttpResponseRedirect("") else: rule_type_form = SearchRuleTypeForm() - if request.method == 'POST' and action == 'remove_rule': - rule_pk = request.POST.get('rule') + if request.method == "POST" and action == "remove_rule": + rule_pk = request.POST.get("rule") if clist.pk is not None and rule_pk: rule = get_object_or_404(SearchRule, pk=rule_pk, community_list=clist) rule.delete() @@ -108,53 +166,74 @@ def manage_list(request, username=None, acronym=None, group_type=None): for r in rules: r.matching_documents_count = docs_matching_community_list_rule(r).count() - empty_rule_forms = { rule_type: SearchRuleForm(clist, rule_type) for rule_type, _ in SearchRule.RULE_TYPES } + empty_rule_forms = { + rule_type: SearchRuleForm(clist, rule_type) + for rule_type, _ in SearchRule.RULE_TYPES + } total_count = docs_tracked_by_community_list(clist).count() - all_forms = [f for f in [rule_type_form, rule_form, add_doc_form, *empty_rule_forms.values()] - if f is not None] - return render(request, 'community/manage_list.html', { - 'clist': clist, - 'rules': rules, - 'individually_added': clist.added_docs.all() if clist.pk is not None else [], - 'rule_type_form': rule_type_form, - 'rule_form': rule_form, - 'empty_rule_forms': empty_rule_forms, - 'total_count': total_count, - 'add_doc_form': add_doc_form, - 'all_forms': all_forms, - }) + all_forms = [ + f + for f in [rule_type_form, rule_form, add_doc_form, *empty_rule_forms.values()] + if f is not None + ] + return render( + request, + "community/manage_list.html", + { + "clist": clist, + "rules": rules, + "individually_added": ( + clist.added_docs.all() if clist.pk is not None else [] + ), + "rule_type_form": rule_type_form, + "rule_form": rule_form, + "empty_rule_forms": empty_rule_forms, + "total_count": total_count, + "add_doc_form": add_doc_form, + "all_forms": all_forms, + }, + ) @login_required -def track_document(request, name, username=None, acronym=None): - doc = get_object_or_404(Document, docalias__name=name) +def track_document(request, name, email_or_name=None, acronym=None): + doc = get_object_or_404(Document, name=name) if request.method == "POST": - clist = lookup_community_list(username, acronym) + clist = lookup_community_list( + request, email_or_name, acronym + ) # may raise Http404 if not can_manage_community_list(request.user, clist): permission_denied(request, "You do not have permission to access this view") if clist.pk is None: clist.save() - if not doc in clist.added_docs.all(): + if doc not in clist.added_docs.all(): clist.added_docs.add(doc) - if request.is_ajax(): - return HttpResponse(json.dumps({ 'success': True }), content_type='application/json') + if is_ajax(request): + return HttpResponse( + json.dumps({"success": True}), content_type="application/json" + ) else: return HttpResponseRedirect(clist.get_absolute_url()) - return render(request, "community/track_document.html", { - "name": doc.name, - }) + return render( + request, + "community/track_document.html", + { + "name": doc.name, + }, + ) + @login_required -def untrack_document(request, name, username=None, acronym=None): - doc = get_object_or_404(Document, docalias__name=name) - clist = lookup_community_list(username, acronym) +def untrack_document(request, name, email_or_name=None, acronym=None): + doc = get_object_or_404(Document, name=name) + clist = lookup_community_list(request, email_or_name, acronym) # may raise Http404 if not can_manage_community_list(request.user, clist): permission_denied(request, "You do not have permission to access this view") @@ -162,29 +241,35 @@ def untrack_document(request, name, username=None, acronym=None): if clist.pk is not None: clist.added_docs.remove(doc) - if request.is_ajax(): - return HttpResponse(json.dumps({ 'success': True }), content_type='application/json') + if is_ajax(request): + return HttpResponse( + json.dumps({"success": True}), content_type="application/json" + ) else: return HttpResponseRedirect(clist.get_absolute_url()) - return render(request, "community/untrack_document.html", { - "name": doc.name, - }) - + return render( + request, + "community/untrack_document.html", + { + "name": doc.name, + }, + ) -def export_to_csv(request, username=None, acronym=None, group_type=None): - clist = lookup_community_list(username, acronym) - response = HttpResponse(content_type='text/csv') +@ignore_view_kwargs("group_type") +def export_to_csv(request, email_or_name=None, acronym=None): + clist = lookup_community_list(request, email_or_name, acronym) # may raise Http404 + response = HttpResponse(content_type="text/csv") if clist.group: filename = "%s-draft-list.csv" % clist.group.acronym else: filename = "draft-list.csv" - response['Content-Disposition'] = 'attachment; filename=%s' % filename + response["Content-Disposition"] = "attachment; filename=%s" % filename - writer = csv.writer(response, dialect=csv.excel, delimiter=str(',')) + writer = csv.writer(response, dialect=csv.excel, delimiter=str(",")) header = [ "Name", @@ -197,12 +282,12 @@ def export_to_csv(request, username=None, acronym=None, group_type=None): ] writer.writerow(header) - docs = docs_tracked_by_community_list(clist).select_related('type', 'group', 'ad') + docs = docs_tracked_by_community_list(clist).select_related("type", "group", "ad") for doc in docs.prefetch_related("states", "tags"): row = [] row.append(doc.name) row.append(doc.title) - e = doc.latest_event(type='new_revision') + e = doc.latest_event(type="new_revision") row.append(e.time.strftime("%Y-%m-%d") if e else "") row.append(strip_tags(doc.friendly_state())) row.append(doc.group.acronym if doc.group else "") @@ -213,53 +298,73 @@ def export_to_csv(request, username=None, acronym=None, group_type=None): return response -def feed(request, username=None, acronym=None, group_type=None): - clist = lookup_community_list(username, acronym) - significant = request.GET.get('significant', '') == '1' +@ignore_view_kwargs("group_type") +def feed(request, email_or_name=None, acronym=None): + clist = lookup_community_list(request, email_or_name, acronym) # may raise Http404 + significant = request.GET.get("significant", "") == "1" - documents = docs_tracked_by_community_list(clist).values_list('pk', flat=True) - since = timezone.now() - datetime.timedelta(days=14) + documents = docs_tracked_by_community_list(clist).values_list("pk", flat=True) + updated = timezone.now() + since = updated - datetime.timedelta(days=14) - events = DocEvent.objects.filter( - doc__id__in=documents, - time__gte=since, - ).distinct().order_by('-time', '-id').select_related("doc") + events = ( + DocEvent.objects.filter( + doc__id__in=documents, + time__gte=since, + ) + .distinct() + .order_by("-time", "-id") + .select_related("doc") + ) if significant: - events = events.filter(type="changed_state", statedocevent__state__in=list(states_of_significant_change())) + events = events.filter( + type="changed_state", + statedocevent__state__in=list(states_of_significant_change()), + ) host = request.get_host() - feed_url = 'https://%s%s' % (host, request.get_full_path()) + feed_url = "https://%s%s" % (host, request.get_full_path()) feed_id = uuid.uuid5(uuid.NAMESPACE_URL, str(feed_url)) - title = '%s RSS Feed' % clist.long_name() + title = "%s RSS Feed" % clist.long_name() if significant: - subtitle = 'Significant document changes' + subtitle = "Significant document changes" else: - subtitle = 'Document changes' - - return render(request, 'community/atom.xml', { - 'clist': clist, - 'entries': events[:50], - 'title': title, - 'subtitle': subtitle, - 'id': feed_id.urn, - 'updated': timezone.now(), - }, content_type='text/xml') + subtitle = "Document changes" + + return render( + request, + "community/atom.xml", + { + "clist": clist, + "entries": events[:50], + "title": title, + "subtitle": subtitle, + "id": feed_id.urn, + "updated": updated, + }, + content_type="text/xml", + ) @login_required -def subscription(request, username=None, acronym=None, group_type=None): - clist = lookup_community_list(username, acronym) +@ignore_view_kwargs("group_type") +def subscription(request, email_or_name=None, acronym=None): + clist = lookup_community_list(request, email_or_name, acronym) # may raise Http404 if clist.pk is None: raise Http404 - existing_subscriptions = EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user) + person = request.user.person + + existing_subscriptions = EmailSubscription.objects.filter( + community_list=clist, email__person=person + ) - if request.method == 'POST': + if request.method == "POST": action = request.POST.get("action") if action == "subscribe": - form = SubscriptionForm(request.user, clist, request.POST) + form = SubscriptionForm(person, clist, request.POST) if form.is_valid(): subscription = form.save(commit=False) subscription.community_list = clist @@ -268,14 +373,20 @@ def subscription(request, username=None, acronym=None, group_type=None): return HttpResponseRedirect("") elif action == "unsubscribe": - existing_subscriptions.filter(pk=request.POST.get("subscription_id")).delete() + existing_subscriptions.filter( + pk=request.POST.get("subscription_id") + ).delete() return HttpResponseRedirect("") else: - form = SubscriptionForm(request.user, clist) - - return render(request, 'community/subscription.html', { - 'clist': clist, - 'form': form, - 'existing_subscriptions': existing_subscriptions, - }) + form = SubscriptionForm(person, clist) + + return render( + request, + "community/subscription.html", + { + "clist": clist, + "form": form, + "existing_subscriptions": existing_subscriptions, + }, + ) diff --git a/ietf/context_processors.py b/ietf/context_processors.py index baa8d7a5d26..5aaa4ab2567 100644 --- a/ietf/context_processors.py +++ b/ietf/context_processors.py @@ -5,6 +5,7 @@ from django.conf import settings from django.utils import timezone from ietf import __version__, __patch__, __release_branch__, __release_hash__ +from opentelemetry.propagate import inject def server_mode(request): return {'server_mode': settings.SERVER_MODE} @@ -51,3 +52,8 @@ def timezone_now(request): return { 'timezone_now': timezone.now(), } + +def traceparent_id(request): + context_extras = {} + inject(context_extras) + return { "otel": context_extras } diff --git a/ietf/cookies/.gitignore b/ietf/cookies/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/cookies/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/database-notes/.gitignore b/ietf/database-notes/.gitignore deleted file mode 100644 index c7013ced9df..00000000000 --- a/ietf/database-notes/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.pyc -/settings_local.py diff --git a/ietf/dbtemplate/fixtures/nomcom_templates.xml b/ietf/dbtemplate/fixtures/nomcom_templates.xml index abf0cb58f69..e7065b84cd3 100644 --- a/ietf/dbtemplate/fixtures/nomcom_templates.xml +++ b/ietf/dbtemplate/fixtures/nomcom_templates.xml @@ -1,190 +1,190 @@ - - - - /nomcom/defaults/home.rst - Home page of group - - rst - Home page -========= - -This is the home page of the nomcom group. - - - - /nomcom/defaults/email/inexistent_person.txt - Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist - $email: Newly created email -$fullname: Fullname of the new person -$person_id: Id of the new Person object -$group: Name of the group - plain - Hello, - -A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'. - -Please, check if there is some more action nedeed. - - - - /nomcom/defaults/email/new_nominee.txt - Email sent to nominees when they are nominated - $nominee: Full name of the nominee -$position: Name of the position -$domain: Server domain -$accept_url: Url hash to accept nominations -$decline_url: Url hash to decline nominations - plain - Hi, - -You have been nominated for the position of $position. - -The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. - -You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url - -If you accept, you will need to fill out a questionnaire. You will receive the questionnaire by email. - -Best regards, - - - - - /nomcom/defaults/email/new_nomination.txt - Email sent to nominators and secretariat when the nominators make the nominations - $nominator: Full name of the nominator -$nominator_email: Email of the nominator -$nominee: Full name of the nominee -$nominee_email: Email of the nominee -$position: Nomination position - plain - A new nomination have been received. - -Nominator: $nominator ($nominator_email) -Nominee: $nominee ($nominee_email) -Position: $position - - - - /nomcom/defaults/position/questionnaire.txt - Questionnaire sent to the nomine - $position: Position - plain - Enter here the questionnaire for the position $position: - -Questionnaire - - - - /nomcom/defaults/position/requirements - Position requirements - $position: Position - rst - These are the requirements for the position $position: - -Requirements. - - - - /nomcom/defaults/position/header_questionnaire.txt - Header of the email that contains the questionnaire sent to the nomine - $nominee: Full name of the nomine -$position: Position - plain - Hi $nominee, this is the questionnaire for the position $position: - - - - - - /nomcom/defaults/email/nomination_accept_reminder.txt - Email sent to nominees asking them to accept (or decline) the nominations. - $positions: Nomination positions - plain - Hi, - -You have been nominated for the position of $position. - -The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. - -You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url - -If you accept, you will need to fill out a questionnaire. - -Best regards, - - - - /nomcom/defaults/email/nomination_receipt.txt - Email sent to nominator to get a confirmation mail containing feedback in cleartext - $nominee: Full name of the nominee -$position: Name of the position -$domain: Server domain -$accept_url: Url hash to accept nominations -$decline_url: Url hash to decline nominations - plain - Hi, - -Your nomination of $nominee for the position of -$position has been received and registered. - -The following comments have also been registered: - --------------------------------------------------------------------------- -$comments --------------------------------------------------------------------------- - -Thank you, - - - - /nomcom/defaults/email/feedback_receipt.txt - Email sent to feedback author to get a confirmation mail containing feedback in cleartext - $nominee: Full name of the nominee -$position: Nomination position -$comments: Comments on this candidate - plain - Hi, - -Your input regarding $about has been received and registered. - -The following comments have been registered: - --------------------------------------------------------------------------- -$comments --------------------------------------------------------------------------- - -Thank you, - - - - /nomcom/defaults/email/questionnaire_reminder.txt - Email sent to nominees reminding them to complete a questionnaire - $positions: Nomination positions - plain - -Thank you for accepting your nomination for the position of $position. - -Please remember to complete and return the questionnaire for this position at your earliest opportunity. -The questionnaire is repeated below for your convenience. - --------- - - - - /nomcom/defaults/topic/description - Description of Topic - $topic: Topic' - rst - This is a description of the topic "$topic" - -Describe the topic and add any information/instructions for the responder here. - - - - /nomcom/defaults/iesg_requirements - Generic IESG Requirements - rst - Generic IESG Requirements Yo! - - + + + + /nomcom/defaults/home.rst + Home page of group + + rst + Home page +========= + +This is the home page of the nomcom group. + + + + /nomcom/defaults/email/inexistent_person.txt + Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist + $email: Newly created email +$fullname: Fullname of the new person +$person_id: Id of the new Person object +$group: Name of the group + plain + Hello, + +A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'. + +Please, check if there is some more action nedeed. + + + + /nomcom/defaults/email/new_nominee.txt + Email sent to nominees when they are nominated + $nominee: Full name of the nominee +$position: Name of the position +$domain: Server domain +$accept_url: Url hash to accept nominations +$decline_url: Url hash to decline nominations + plain + Hi, + +You have been nominated for the position of $position. + +The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. + +You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url + +If you accept, you will need to fill out a questionnaire. You will receive the questionnaire by email. + +Best regards, + + + + + /nomcom/defaults/email/new_nomination.txt + Email sent to nominators and secretariat when the nominators make the nominations + $nominator: Full name of the nominator +$nominator_email: Email of the nominator +$nominee: Full name of the nominee +$nominee_email: Email of the nominee +$position: Nomination position + plain + A new nomination have been received. + +Nominator: $nominator ($nominator_email) +Nominee: $nominee ($nominee_email) +Position: $position + + + + /nomcom/defaults/position/questionnaire.txt + Questionnaire sent to the nomine + $position: Position + plain + Enter here the questionnaire for the position $position: + +Questionnaire + + + + /nomcom/defaults/position/requirements + Position requirements + $position: Position + rst + These are the requirements for the position $position: + +Requirements. + + + + /nomcom/defaults/position/header_questionnaire.txt + Header of the email that contains the questionnaire sent to the nomine + $nominee: Full name of the nomine +$position: Position + plain + Hi $nominee, this is the questionnaire for the position $position: + + + + + + /nomcom/defaults/email/nomination_accept_reminder.txt + Email sent to nominees asking them to accept (or decline) the nominations. + $positions: Nomination positions + plain + Hi, + +You have been nominated for the position of $position. + +The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. + +You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url + +If you accept, you will need to fill out a questionnaire. + +Best regards, + + + + /nomcom/defaults/email/nomination_receipt.txt + Email sent to nominator to get a confirmation mail containing feedback in cleartext + $nominee: Full name of the nominee +$position: Name of the position +$domain: Server domain +$accept_url: Url hash to accept nominations +$decline_url: Url hash to decline nominations + plain + Hi, + +Your nomination of $nominee for the position of +$position has been received and registered. + +The following comments have also been registered: + +-------------------------------------------------------------------------- +$comments +-------------------------------------------------------------------------- + +Thank you, + + + + /nomcom/defaults/email/feedback_receipt.txt + Email sent to feedback author to get a confirmation mail containing feedback in cleartext + $nominee: Full name of the nominee +$position: Nomination position +$comments: Comments on this candidate + plain + Hi, + +Your input regarding $about has been received and registered. + +The following comments have been registered: + +-------------------------------------------------------------------------- +$comments +-------------------------------------------------------------------------- + +Thank you, + + + + /nomcom/defaults/email/questionnaire_reminder.txt + Email sent to nominees reminding them to complete a questionnaire + $positions: Nomination positions + plain + +Thank you for accepting your nomination for the position of $position. + +Please remember to complete and return the questionnaire for this position at your earliest opportunity. +The questionnaire is repeated below for your convenience. + +-------- + + + + /nomcom/defaults/topic/description + Description of Topic + $topic: Topic' + rst + This is a description of the topic "$topic" + +Describe the topic and add any information/instructions for the responder here. + + + + /nomcom/defaults/iesg_requirements + Generic IESG Requirements + rst + Generic IESG Requirements Yo! + + diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py index 64b9d9eff8b..745536f9a1e 100644 --- a/ietf/doc/admin.py +++ b/ietf/doc/admin.py @@ -1,18 +1,19 @@ -# Copyright The IETF Trust 2010-2021, All Rights Reserved +# Copyright The IETF Trust 2010-2025, All Rights Reserved # -*- coding: utf-8 -*- from django.contrib import admin from django.db import models from django import forms +from rangefilter.filters import DateRangeQuickSelectListFilterBuilder from .models import (StateType, State, RelatedDocument, DocumentAuthor, Document, RelatedDocHistory, - DocHistoryAuthor, DocHistory, DocAlias, DocReminder, DocEvent, NewRevisionDocEvent, + DocHistoryAuthor, DocHistory, DocReminder, DocEvent, NewRevisionDocEvent, StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent, TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent, AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL, ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder, - BofreqEditorDocEvent, BofreqResponsibleDocEvent ) + BofreqEditorDocEvent, BofreqResponsibleDocEvent, StoredObject ) from ietf.utils.validators import validate_external_resource_value @@ -21,16 +22,12 @@ class StateTypeAdmin(admin.ModelAdmin): admin.site.register(StateType, StateTypeAdmin) class StateAdmin(admin.ModelAdmin): - list_display = ["slug", "type", 'name', 'order', 'desc'] - list_filter = ["type", ] + list_display = ["slug", "type", 'name', 'order', 'desc', "used"] + list_filter = ["type", "used"] search_fields = ["slug", "type__label", "type__slug", "name", "desc"] filter_horizontal = ["next_states"] admin.site.register(State, StateAdmin) -# class DocAliasInline(admin.TabularInline): -# model = DocAlias -# extra = 1 - class DocAuthorInline(admin.TabularInline): model = DocumentAuthor raw_id_fields = ['person', 'email'] @@ -43,8 +40,9 @@ class DocActionHolderInline(admin.TabularInline): class RelatedDocumentInline(admin.TabularInline): model = RelatedDocument + fk_name= 'source' def this(self, instance): - return instance.source.canonical_name() + return instance.source.name readonly_fields = ['this', ] fields = ['this', 'relationship', 'target', ] raw_id_fields = ['target'] @@ -70,7 +68,7 @@ class Meta: class DocumentAuthorAdmin(admin.ModelAdmin): list_display = ['id', 'document', 'person', 'email', 'affiliation', 'country', 'order'] - search_fields = ['document__docalias__name', 'person__name', 'email__address', 'affiliation', 'country'] + search_fields = ['document__name', 'person__name', 'email__address', 'affiliation', 'country'] raw_id_fields = ["document", "person", "email"] admin.site.register(DocumentAuthor, DocumentAuthorAdmin) @@ -108,14 +106,6 @@ def state(self, instance): admin.site.register(DocHistory, DocHistoryAdmin) -class DocAliasAdmin(admin.ModelAdmin): - list_display = ['name', 'targets'] - search_fields = ['name', 'docs__name'] - raw_id_fields = ['docs'] - def targets(self, obj): - return ', '.join([o.name for o in obj.docs.all()]) -admin.site.register(DocAlias, DocAliasAdmin) - class DocReminderAdmin(admin.ModelAdmin): list_display = ['id', 'event', 'type', 'due', 'active'] list_filter = ['type', 'due', 'active'] @@ -125,7 +115,7 @@ class DocReminderAdmin(admin.ModelAdmin): class RelatedDocumentAdmin(admin.ModelAdmin): list_display = ['source', 'target', 'relationship', ] list_filter = ['relationship', ] - search_fields = ['source__name', 'target__name', 'target__docs__name', ] + search_fields = ['source__name', 'target__name', ] raw_id_fields = ['source', 'target', ] admin.site.register(RelatedDocument, RelatedDocumentAdmin) @@ -153,6 +143,13 @@ class DocumentActionHolderAdmin(admin.ModelAdmin): # events +class DeletedEventAdmin(admin.ModelAdmin): + list_display = ['id', 'content_type', 'json', 'by', 'time'] + list_filter = ['time'] + raw_id_fields = ['content_type', 'by'] +admin.site.register(DeletedEvent, DeletedEventAdmin) + + class DocEventAdmin(admin.ModelAdmin): def event_type(self, obj): return str(obj.type) @@ -170,39 +167,42 @@ def short_desc(self, obj): admin.site.register(StateDocEvent, DocEventAdmin) admin.site.register(ConsensusDocEvent, DocEventAdmin) admin.site.register(BallotDocEvent, DocEventAdmin) +admin.site.register(IRSGBallotDocEvent, DocEventAdmin) admin.site.register(WriteupDocEvent, DocEventAdmin) admin.site.register(LastCallDocEvent, DocEventAdmin) admin.site.register(TelechatDocEvent, DocEventAdmin) -admin.site.register(ReviewRequestDocEvent, DocEventAdmin) -admin.site.register(ReviewAssignmentDocEvent, DocEventAdmin) admin.site.register(InitialReviewDocEvent, DocEventAdmin) -admin.site.register(AddedMessageEvent, DocEventAdmin) -admin.site.register(SubmissionDocEvent, DocEventAdmin) admin.site.register(EditedAuthorsDocEvent, DocEventAdmin) admin.site.register(IanaExpertDocEvent, DocEventAdmin) -class DeletedEventAdmin(admin.ModelAdmin): - list_display = ['id', 'content_type', 'json', 'by', 'time'] - list_filter = ['time'] - raw_id_fields = ['content_type', 'by'] -admin.site.register(DeletedEvent, DeletedEventAdmin) - class BallotPositionDocEventAdmin(DocEventAdmin): - raw_id_fields = ["doc", "by", "balloter", "ballot"] + raw_id_fields = DocEventAdmin.raw_id_fields + ["balloter", "ballot"] admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin) - -class IRSGBallotDocEventAdmin(DocEventAdmin): - raw_id_fields = ["doc", "by"] -admin.site.register(IRSGBallotDocEvent, IRSGBallotDocEventAdmin) class BofreqEditorDocEventAdmin(DocEventAdmin): - raw_id_fields = ["doc", "by", "editors" ] + raw_id_fields = DocEventAdmin.raw_id_fields + ["editors"] admin.site.register(BofreqEditorDocEvent, BofreqEditorDocEventAdmin) class BofreqResponsibleDocEventAdmin(DocEventAdmin): - raw_id_fields = ["doc", "by", "responsible" ] + raw_id_fields = DocEventAdmin.raw_id_fields + ["responsible"] admin.site.register(BofreqResponsibleDocEvent, BofreqResponsibleDocEventAdmin) +class ReviewRequestDocEventAdmin(DocEventAdmin): + raw_id_fields = DocEventAdmin.raw_id_fields + ["review_request"] +admin.site.register(ReviewRequestDocEvent, ReviewRequestDocEventAdmin) + +class ReviewAssignmentDocEventAdmin(DocEventAdmin): + raw_id_fields = DocEventAdmin.raw_id_fields + ["review_assignment"] +admin.site.register(ReviewAssignmentDocEvent, ReviewAssignmentDocEventAdmin) + +class AddedMessageEventAdmin(DocEventAdmin): + raw_id_fields = DocEventAdmin.raw_id_fields + ["message"] +admin.site.register(AddedMessageEvent, AddedMessageEventAdmin) + +class SubmissionDocEventAdmin(DocEventAdmin): + raw_id_fields = DocEventAdmin.raw_id_fields + ["submission"] +admin.site.register(SubmissionDocEvent, SubmissionDocEventAdmin) + class DocumentUrlAdmin(admin.ModelAdmin): list_display = ['id', 'doc', 'tag', 'url', 'desc', ] search_fields = ['doc__name', 'url', ] @@ -219,3 +219,20 @@ class DocExtResourceAdmin(admin.ModelAdmin): search_fields = ['doc__name', 'value', 'display_name', 'name__slug',] raw_id_fields = ['doc', ] admin.site.register(DocExtResource, DocExtResourceAdmin) + +class StoredObjectAdmin(admin.ModelAdmin): + list_display = ['store', 'name', 'doc_name', 'modified', 'is_deleted'] + list_filter = [ + 'store', + ('modified', DateRangeQuickSelectListFilterBuilder()), + ('deleted', DateRangeQuickSelectListFilterBuilder()), + ] + search_fields = ['name', 'doc_name', 'doc_rev'] + list_display_links = ['name'] + + @admin.display(boolean=True, description="Deleted?", ordering="deleted") + def is_deleted(self, instance): + return instance.deleted is not None + + +admin.site.register(StoredObject, StoredObjectAdmin) diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py index f6779e04718..bf8523aa98f 100644 --- a/ietf/doc/expire.py +++ b/ietf/doc/expire.py @@ -3,6 +3,8 @@ # expiry of Internet-Drafts +import debug # pyflakes:ignore + from django.conf import settings from django.utils import timezone @@ -11,12 +13,13 @@ from typing import List, Optional # pyflakes:ignore +from ietf.doc.storage_utils import exists_in_storage, remove_from_storage +from ietf.doc.utils import update_action_holders from ietf.utils import log from ietf.utils.mail import send_mail -from ietf.doc.models import Document, DocEvent, State, IESG_SUBSTATE_TAGS +from ietf.doc.models import Document, DocEvent, State from ietf.person.models import Person from ietf.meeting.models import Meeting -from ietf.doc.utils import add_state_change_event, update_action_holders from ietf.mailtrigger.utils import gather_address_lists from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO @@ -34,8 +37,8 @@ def expirable_drafts(queryset=None): # Populate this first time through (but after django has been set up) if nonexpirable_states is None: - # all IESG states except I-D Exists, AD Watching, and Dead block expiry - nonexpirable_states = list(State.objects.filter(used=True, type="draft-iesg").exclude(slug__in=("idexists","watching", "dead"))) + # all IESG states except I-D Exists and Dead block expiry + nonexpirable_states = list(State.objects.filter(used=True, type="draft-iesg").exclude(slug__in=("idexists", "dead"))) # sent to RFC Editor and RFC Published block expiry (the latter # shouldn't be possible for an active draft, though) nonexpirable_states += list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"), slug__in=("rfc-edit", "pub"))) @@ -139,16 +142,32 @@ def move_file(f): if os.path.exists(src): try: + # ghostlinkd would keep this in the combined all archive since it would + # be sourced from a different place. But when ghostlinkd is removed, nothing + # new is needed here - the file will already exist in the combined archive shutil.move(src, dst) except IOError as e: if "No such file or directory" in str(e): pass else: raise - + + def remove_ftp_copy(f): + mark = Path(settings.FTP_DIR) / "internet-drafts" / f + if mark.exists(): + mark.unlink() + + def remove_from_active_draft_storage(file): + # Assumes the glob will never find a file with no suffix + ext = file.suffix[1:] + remove_from_storage("active-draft", f"{ext}/{file.name}", warn_if_missing=False) + + # Note that the object is already in the "draft" storage. src_dir = Path(settings.INTERNET_DRAFT_PATH) for file in src_dir.glob("%s-%s.*" % (doc.name, rev)): move_file(str(file.name)) + remove_ftp_copy(str(file.name)) + remove_from_active_draft_storage(file) def expire_draft(doc): # clean up files @@ -158,24 +177,11 @@ def expire_draft(doc): events = [] - # change the state - if doc.latest_event(type='started_iesg_process'): - new_state = State.objects.get(used=True, type="draft-iesg", slug="dead") - prev_state = doc.get_state(new_state.type_id) - prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS) - if new_state != prev_state: - doc.set_state(new_state) - doc.tags.remove(*prev_tags) - e = add_state_change_event(doc, system, prev_state, new_state, prev_tags=prev_tags, new_tags=[]) - if e: - events.append(e) - e = update_action_holders(doc, prev_state, new_state, prev_tags=prev_tags, new_tags=[]) - if e: - events.append(e) - events.append(DocEvent.objects.create(doc=doc, rev=doc.rev, by=system, type="expired_document", desc="Document has expired")) + prev_draft_state=doc.get_state("draft") doc.set_state(State.objects.get(used=True, type="draft", slug="expired")) + events.append(update_action_holders(doc, prev_draft_state, doc.get_state("draft"),[],[])) doc.save_with_history(events) def clean_up_draft_files(): @@ -213,8 +219,19 @@ def splitext(fn): filename, revision = match.groups() def move_file_to(subdir): + # Similar to move_draft_files_to_archive shutil.move(path, os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, subdir, basename)) + mark = Path(settings.FTP_DIR) / "internet-drafts" / basename + if mark.exists(): + mark.unlink() + if ext: + # Note that we're not moving these strays anywhere - the assumption + # is that the active-draft blobstore will not get strays. + # See, however, the note about "major system failures" at "unknown_ids" + blobname = f"{ext[1:]}/{basename}" + if exists_in_storage("active-draft", blobname): + remove_from_storage("active-draft", blobname) try: doc = Document.objects.get(name=filename, rev=revision) @@ -229,4 +246,6 @@ def move_file_to(subdir): move_file_to("") except Document.DoesNotExist: + # All uses of this past 2014 seem related to major system failures. move_file_to("unknown_ids") + diff --git a/ietf/doc/factories.py b/ietf/doc/factories.py index 95fbedfaaed..19aa9ecc9cc 100644 --- a/ietf/doc/factories.py +++ b/ietf/doc/factories.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved +# Copyright The IETF Trust 2016-2023, All Rights Reserved # -*- coding: utf-8 -*- @@ -7,12 +7,12 @@ import factory.fuzzy import datetime -from typing import Optional # pyflakes:ignore +from typing import Any # pyflakes:ignore from django.conf import settings from django.utils import timezone -from ietf.doc.models import ( Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor, +from ietf.doc.models import ( Document, DocEvent, NewRevisionDocEvent, State, DocumentAuthor, StateDocEvent, BallotPositionDocEvent, BallotDocEvent, BallotType, IRSGBallotDocEvent, TelechatDocEvent, DocumentActionHolder, BofreqEditorDocEvent, BofreqResponsibleDocEvent, DocExtResource ) from ietf.group.models import Group @@ -23,7 +23,6 @@ from ietf.utils.timezone import date_today - def draft_name_generator(type_id,group,n): return '%s-%s-%s-%s%d'%( type_id, @@ -36,14 +35,18 @@ def draft_name_generator(type_id,group,n): class BaseDocumentFactory(factory.django.DjangoModelFactory): class Meta: model = Document + skip_postgeneration_save = True + # n.b., a few attributes are typed as Any so mypy won't complain when we override in subclasses title = factory.Faker('sentence',nb_words=5) - abstract = factory.Faker('paragraph', nb_sentences=5) + abstract: Any = factory.Faker('paragraph', nb_sentences=5) rev = '00' - std_level_id = None # type: Optional[str] + std_level_id: Any = None intended_std_level_id = None time = timezone.now() - expires = factory.LazyAttribute(lambda o: o.time+datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)) + expires: Any = factory.LazyAttribute( + lambda o: o.time+datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE) + ) pages = factory.fuzzy.FuzzyInteger(2,400) @@ -51,16 +54,11 @@ class Meta: def name(self, n): return draft_name_generator(self.type_id,self.group,n) - newrevisiondocevent = factory.RelatedFactory('ietf.doc.factories.NewRevisionDocEventFactory','doc') - @factory.post_generation - def other_aliases(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument - alias = DocAliasFactory(name=obj.name) - alias.docs.add(obj) - if create and extracted: - for name in extracted: - alias = DocAliasFactory(name=name) - alias.docs.add(obj) + def newrevisiondocevent(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument + if create: + if obj.type_id != "rfc": + NewRevisionDocEventFactory(doc=obj) @factory.post_generation def states(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument @@ -83,13 +81,7 @@ def authors(obj, create, extracted, **kwargs): # pylint: disable=no-self-argumen def relations(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument if create and extracted: for (rel_id, doc) in extracted: - if isinstance(doc, Document): - docalias = doc.docalias.first() - elif isinstance(doc, DocAlias): - docalias = doc - else: - continue - obj.relateddocument_set.create(relationship_id=rel_id, target=docalias) + obj.relateddocument_set.create(relationship_id=rel_id, target=doc) @factory.post_generation def create_revisions(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument @@ -119,10 +111,12 @@ class DocumentFactory(BaseDocumentFactory): group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none') -class IndividualDraftFactory(BaseDocumentFactory): - - type_id = 'draft' - group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none') +class RfcFactory(BaseDocumentFactory): + type_id = "rfc" + rev = "" + rfc_number = factory.Sequence(lambda n: n + 1000) + name = factory.LazyAttribute(lambda o: f"rfc{o.rfc_number:d}") + expires = None @factory.post_generation def states(obj, create, extracted, **kwargs): @@ -131,15 +125,14 @@ def states(obj, create, extracted, **kwargs): if extracted: for (state_type_id,state_slug) in extracted: obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug)) - if not obj.get_state('draft-iesg'): - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) else: - obj.set_state(State.objects.get(type_id='draft',slug='active')) - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) + obj.set_state(State.objects.get(type_id='rfc',slug='published')) -class IndividualRfcFactory(IndividualDraftFactory): - alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000))) +class IndividualDraftFactory(BaseDocumentFactory): + + type_id = 'draft' + group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none') @factory.post_generation def states(obj, create, extracted, **kwargs): @@ -148,17 +141,17 @@ def states(obj, create, extracted, **kwargs): if extracted: for (state_type_id,state_slug) in extracted: obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug)) + if not obj.get_state('draft-iesg'): + obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) else: - obj.set_state(State.objects.get(type_id='draft',slug='rfc')) + obj.set_state(State.objects.get(type_id='draft',slug='active')) + obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) - @factory.post_generation - def reset_canonical_name(obj, create, extracted, **kwargs): - if hasattr(obj, '_canonical_name'): - del obj._canonical_name - return None +class IndividualRfcFactory(RfcFactory): + group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none') -class WgDraftFactory(BaseDocumentFactory): +class WgDraftFactory(BaseDocumentFactory): type_id = 'draft' group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='wg') stream_id = 'ietf' @@ -177,30 +170,12 @@ def states(obj, create, extracted, **kwargs): obj.set_state(State.objects.get(type_id='draft-stream-ietf',slug='wg-doc')) obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) -class WgRfcFactory(WgDraftFactory): - - alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000))) +class WgRfcFactory(RfcFactory): + group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='wg') + stream_id = 'ietf' std_level_id = 'ps' - @factory.post_generation - def states(obj, create, extracted, **kwargs): - if not create: - return - if extracted: - for (state_type_id,state_slug) in extracted: - obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug)) - if not obj.get_state('draft-iesg'): - obj.set_state(State.objects.get(type_id='draft-iesg', slug='pub')) - else: - obj.set_state(State.objects.get(type_id='draft',slug='rfc')) - obj.set_state(State.objects.get(type_id='draft-iesg', slug='pub')) - - @factory.post_generation - def reset_canonical_name(obj, create, extracted, **kwargs): - if hasattr(obj, '_canonical_name'): - del obj._canonical_name - return None class RgDraftFactory(BaseDocumentFactory): @@ -223,34 +198,11 @@ def states(obj, create, extracted, **kwargs): obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) -class RgRfcFactory(RgDraftFactory): - - alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000))) - +class RgRfcFactory(RfcFactory): + group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='rg') + stream_id = 'irtf' std_level_id = 'inf' - @factory.post_generation - def states(obj, create, extracted, **kwargs): - if not create: - return - if extracted: - for (state_type_id,state_slug) in extracted: - obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug)) - if not obj.get_state('draft-stream-irtf'): - obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub')) - if not obj.get_state('draft-iesg'): - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) - else: - obj.set_state(State.objects.get(type_id='draft',slug='rfc')) - obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub')) - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) - - @factory.post_generation - def reset_canonical_name(obj, create, extracted, **kwargs): - if hasattr(obj, '_canonical_name'): - del obj._canonical_name - return None - class CharterFactory(BaseDocumentFactory): @@ -279,7 +231,7 @@ def changes_status_of(obj, create, extracted, **kwargs): for (rel, target) in extracted: obj.relateddocument_set.create(relationship_id=rel,target=target) else: - obj.relateddocument_set.create(relationship_id='tobcp', target=WgRfcFactory().docalias.first()) + obj.relateddocument_set.create(relationship_id='tobcp', target=WgRfcFactory()) @factory.post_generation def states(obj, create, extracted, **kwargs): @@ -306,9 +258,9 @@ def review_of(obj, create, extracted, **kwargs): if not create: return if extracted: - obj.relateddocument_set.create(relationship_id='conflrev',target=extracted.docalias.first()) + obj.relateddocument_set.create(relationship_id='conflrev',target=extracted) else: - obj.relateddocument_set.create(relationship_id='conflrev',target=DocumentFactory(name=obj.name.replace('conflict-review-','draft-'),type_id='draft',group=Group.objects.get(type_id='individ')).docalias.first()) + obj.relateddocument_set.create(relationship_id='conflrev',target=DocumentFactory(name=obj.name.replace('conflict-review-','draft-'),type_id='draft',group=Group.objects.get(type_id='individ'))) @factory.post_generation @@ -327,30 +279,13 @@ class ReviewFactory(BaseDocumentFactory): name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,date_today().isoformat())) group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='review') -class DocAliasFactory(factory.django.DjangoModelFactory): - class Meta: - model = DocAlias - - @factory.post_generation - def document(self, create, extracted, **kwargs): - if create and extracted: - self.docs.add(extracted) - - @factory.post_generation - def docs(self, create, extracted, **kwargs): - if create and extracted: - for doc in extracted: - if not doc in self.docs.all(): - self.docs.add(doc) - - class DocEventFactory(factory.django.DjangoModelFactory): class Meta: model = DocEvent type = 'added_comment' by = factory.SubFactory('ietf.person.factories.PersonFactory') - doc = factory.SubFactory(DocumentFactory) + doc: Any = factory.SubFactory(DocumentFactory) # `Any` to appease mypy when a subclass overrides doc desc = factory.Faker('sentence',nb_words=6) @factory.lazy_attribute @@ -379,6 +314,7 @@ def desc(self): class StateDocEventFactory(DocEventFactory): class Meta: model = StateDocEvent + skip_postgeneration_save = True type = 'changed_state' state_type_id = 'draft-iesg' @@ -452,6 +388,7 @@ class WgDocumentAuthorFactory(DocumentAuthorFactory): class BofreqEditorDocEventFactory(DocEventFactory): class Meta: model = BofreqEditorDocEvent + skip_postgeneration_save = True type = "changed_editors" doc = factory.SubFactory('ietf.doc.factories.BofreqFactory') @@ -466,10 +403,12 @@ def editors(obj, create, extracted, **kwargs): else: obj.editors.set(PersonFactory.create_batch(3)) obj.desc = f'Changed editors to {", ".join(obj.editors.values_list("name",flat=True)) or "(None)"}' + obj.save() class BofreqResponsibleDocEventFactory(DocEventFactory): class Meta: model = BofreqResponsibleDocEvent + skip_postgeneration_save = True type = "changed_responsible" doc = factory.SubFactory('ietf.doc.factories.BofreqFactory') @@ -484,7 +423,8 @@ def responsible(obj, create, extracted, **kwargs): else: ad = RoleFactory(group__type_id='area',name_id='ad').person obj.responsible.set([ad]) - obj.desc = f'Changed responsible leadership to {", ".join(obj.responsible.values_list("name",flat=True)) or "(None)"}' + obj.desc = f'Changed responsible leadership to {", ".join(obj.responsible.values_list("name",flat=True)) or "(None)"}' + obj.save() class BofreqFactory(BaseDocumentFactory): type_id = 'bofreq' @@ -551,30 +491,60 @@ def states(obj, create, extracted, **kwargs): obj.set_state(State.objects.get(type_id='draft-stream-editorial',slug='active')) obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) -class EditorialRfcFactory(RgDraftFactory): - - alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000))) - - std_level_id = 'inf' +class EditorialRfcFactory(RgRfcFactory): + pass + +class StatementFactory(BaseDocumentFactory): + type_id = "statement" + title = factory.Faker("sentence") + group = factory.SubFactory("ietf.group.factories.GroupFactory", acronym="iab") + + name = factory.LazyAttribute( + lambda o: "statement-%s-%s" % (xslugify(o.group.acronym), xslugify(o.title)) + ) + uploaded_filename = factory.LazyAttribute(lambda o: f"{o.name}-{o.rev}.md") + + published_statement_event = factory.RelatedFactory( + "ietf.doc.factories.DocEventFactory", + "doc", + type="published_statement", + time=timezone.now() - datetime.timedelta(days=1), + ) @factory.post_generation def states(obj, create, extracted, **kwargs): if not create: return if extracted: - for (state_type_id,state_slug) in extracted: - obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug)) - if not obj.get_state('draft-stream-editorial'): - obj.set_state(State.objects.get(type_id='draft-stream-editorial', slug='pub')) - if not obj.get_state('draft-iesg'): - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) + for state_type_id, state_slug in extracted: + obj.set_state(State.objects.get(type_id=state_type_id, slug=state_slug)) else: - obj.set_state(State.objects.get(type_id='draft',slug='rfc')) - obj.set_state(State.objects.get(type_id='draft-stream-editorial', slug='pub')) - obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists')) + obj.set_state(State.objects.get(type_id="statement", slug="active")) + +class SubseriesFactory(factory.django.DjangoModelFactory): + class Meta: + model = Document + skip_postgeneration_save = True + @factory.lazy_attribute_sequence + def name(self, n): + return f"{self.type_id}{n}" + @factory.post_generation - def reset_canonical_name(obj, create, extracted, **kwargs): - if hasattr(obj, '_canonical_name'): - del obj._canonical_name - return None + def contains(obj, create, extracted, **kwargs): + if not create: + return + if extracted: + for doc in extracted: + obj.relateddocument_set.create(relationship_id="contains",target=doc) + else: + obj.relateddocument_set.create(relationship_id="contains", target=RfcFactory()) + +class BcpFactory(SubseriesFactory): + type_id="bcp" + +class StdFactory(SubseriesFactory): + type_id="std" + +class FyiFactory(SubseriesFactory): + type_id="fyi" diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py index 7885e75e31e..500ed3cb182 100644 --- a/ietf/doc/feeds.py +++ b/ietf/doc/feeds.py @@ -1,6 +1,7 @@ # Copyright The IETF Trust 2007-2020, All Rights Reserved # -*- coding: utf-8 -*- +import debug # pyflakes:ignore import datetime import unicodedata @@ -8,8 +9,12 @@ from django.contrib.syndication.views import Feed, FeedDoesNotExist from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed from django.urls import reverse as urlreverse -from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter -from django.template.defaultfilters import linebreaks # type: ignore +from django.template.defaultfilters import ( + truncatewords, + truncatewords_html, + date as datefilter, +) +from django.template.defaultfilters import linebreaks # type: ignore from django.utils import timezone from django.utils.html import strip_tags @@ -21,17 +26,17 @@ def strip_control_characters(s): """Remove Unicode control / non-printing characters from a string""" - replacement_char = unicodedata.lookup('REPLACEMENT CHARACTER') - return ''.join( - replacement_char if unicodedata.category(c)[0] == 'C' else c - for c in s + replacement_char = unicodedata.lookup("REPLACEMENT CHARACTER") + return "".join( + replacement_char if unicodedata.category(c)[0] == "C" else c for c in s ) + class DocumentChangesFeed(Feed): feed_type = Atom1Feed def get_object(self, request, name): - return Document.objects.get(docalias__name=name) + return Document.objects.get(name=name) def title(self, obj): return "Changes for %s" % obj.display_name() @@ -39,25 +44,37 @@ def title(self, obj): def link(self, obj): if obj is None: raise FeedDoesNotExist - return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name())) + return urlreverse( + "ietf.doc.views_doc.document_history", + kwargs=dict(name=obj.name), + ) def subtitle(self, obj): return "History of change entries for %s." % obj.display_name() def items(self, obj): - events = obj.docevent_set.all().order_by("-time","-id") + events = ( + obj.docevent_set.all() + .order_by("-time", "-id") + .select_related("by", "newrevisiondocevent", "submissiondocevent") + ) augment_events_with_revision(obj, events) return events def item_title(self, item): - return strip_control_characters("[%s] %s [rev. %s]" % ( - item.by, - truncatewords(strip_tags(item.desc), 15), - item.rev, - )) + return strip_control_characters( + "[%s] %s [rev. %s]" + % ( + item.by, + truncatewords(strip_tags(item.desc), 15), + item.rev, + ) + ) def item_description(self, item): - return strip_control_characters(truncatewords_html(format_textarea(item.desc), 20)) + return strip_control_characters( + truncatewords_html(format_textarea(item.desc), 20) + ) def item_pubdate(self, item): return item.time @@ -66,17 +83,28 @@ def item_author_name(self, item): return str(item.by) def item_link(self, item): - return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk + return ( + urlreverse( + "ietf.doc.views_doc.document_history", + kwargs=dict(name=item.doc.name), + ) + + "#history-%s" % item.pk + ) + class InLastCallFeed(Feed): title = "Documents in Last Call" subtitle = "Announcements for documents in last call." feed_type = Atom1Feed - author_name = 'IESG Secretary' + author_name = "IESG Secretary" link = "/doc/iesg/last-call/" def items(self): - docs = list(Document.objects.filter(type="draft", states=State.objects.get(type="draft-iesg", slug="lc"))) + docs = list( + Document.objects.filter( + type="draft", states=State.objects.get(type="draft-iesg", slug="lc") + ) + ) for d in docs: d.lc_event = d.latest_event(LastCallDocEvent, type="sent_last_call") @@ -86,9 +114,11 @@ def items(self): return docs def item_title(self, item): - return "%s (%s - %s)" % (item.name, - datefilter(item.lc_event.time, "F j"), - datefilter(item.lc_event.expires, "F j, Y")) + return "%s (%s - %s)" % ( + item.name, + datefilter(item.lc_event.time, "F j"), + datefilter(item.lc_event.expires, "F j, Y"), + ) def item_description(self, item): return strip_control_characters(linebreaks(item.lc_event.desc)) @@ -96,33 +126,55 @@ def item_description(self, item): def item_pubdate(self, item): return item.lc_event.time + class Rss201WithNamespacesFeed(Rss201rev2Feed): def root_attributes(self): attrs = super(Rss201WithNamespacesFeed, self).root_attributes() - attrs['xmlns:dcterms'] = 'http://purl.org/dc/terms/' - attrs['xmlns:media'] = 'http://search.yahoo.com/mrss/' - attrs['xmlns:xsi'] = 'http://www.w3.org/2001/XMLSchema-instance' + attrs["xmlns:dcterms"] = "http://purl.org/dc/terms/" + attrs["xmlns:media"] = "http://search.yahoo.com/mrss/" + attrs["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance" return attrs def add_item_elements(self, handler, item): super(Rss201WithNamespacesFeed, self).add_item_elements(handler, item) - for element_name in ['abstract','accessRights', 'format', 'publisher',]: - dc_item_name = 'dcterms_%s' % element_name - dc_element_name = 'dcterms:%s' % element_name - attrs= {'xsi:type':'dcterms:local'} if element_name == 'publisher' else {} + for element_name in [ + "abstract", + "accessRights", + "format", + "publisher", + ]: + dc_item_name = "dcterms_%s" % element_name + dc_element_name = "dcterms:%s" % element_name + attrs = {"xsi:type": "dcterms:local"} if element_name == "publisher" else {} if dc_item_name in item and item[dc_item_name] is not None: - handler.addQuickElement(dc_element_name,item[dc_item_name],attrs) + handler.addQuickElement(dc_element_name, item[dc_item_name], attrs) + + if "doi" in item and item["doi"] is not None: + handler.addQuickElement( + "dcterms:identifier", item["doi"], {"xsi:type": "dcterms:doi"} + ) + if "doiuri" in item and item["doiuri"] is not None: + handler.addQuickElement( + "dcterms:identifier", item["doiuri"], {"xsi:type": "dcterms:uri"} + ) + + # TODO: consider using media:group + if "media_contents" in item and item["media_contents"] is not None: + for media_content in item["media_contents"]: + handler.startElement( + "media:content", + { + "url": media_content["url"], + "type": media_content["media_type"], + }, + ) + if "is_format_of" in media_content: + handler.addQuickElement( + "dcterms:isFormatOf", media_content["is_format_of"] + ) + handler.endElement("media:content") - if 'doi' in item and item['doi'] is not None: - handler.addQuickElement('dcterms:identifier',item['doi'],{'xsi:type':'dcterms:doi'}) - if 'doiuri' in item and item['doiuri'] is not None: - handler.addQuickElement('dcterms:identifier',item['doiuri'],{'xsi:type':'dcterms:uri'}) - - if 'media_content' in item and item['media_content'] is not None: - handler.startElement('media:content',{'url':item['media_content']['url'],'type':'text/plain'}) - handler.addQuickElement('dcterms:isFormatOf',item['media_content']['link_url']) - handler.endElement('media:content') class RfcFeed(Feed): feed_type = Rss201WithNamespacesFeed @@ -130,55 +182,96 @@ class RfcFeed(Feed): author_name = "RFC Editor" link = "https://www.rfc-editor.org/rfc-index2.html" - def get_object(self,request,year=None): + def get_object(self, request, year=None): self.year = year - + def items(self): if self.year: # Find published RFCs based on their official publication year start_of_year = datetime.datetime(int(self.year), 1, 1, tzinfo=RPC_TZINFO) - start_of_next_year = datetime.datetime(int(self.year) + 1, 1, 1, tzinfo=RPC_TZINFO) + start_of_next_year = datetime.datetime( + int(self.year) + 1, 1, 1, tzinfo=RPC_TZINFO + ) rfc_events = DocEvent.objects.filter( - type='published_rfc', + type="published_rfc", time__gte=start_of_year, time__lt=start_of_next_year, - ).order_by('-time') + ).order_by("-time") else: cutoff = timezone.now() - datetime.timedelta(days=8) - rfc_events = DocEvent.objects.filter(type='published_rfc',time__gte=cutoff).order_by('-time') + rfc_events = DocEvent.objects.filter( + type="published_rfc", time__gte=cutoff + ).order_by("-time") results = [(e.doc, e.time) for e in rfc_events] - for doc,time in results: + for doc, time in results: doc.publication_time = time - return [doc for doc,time in results] - + return [doc for doc, time in results] + def item_title(self, item): - return "%s : %s" % (item.canonical_name(),item.title) + return "%s : %s" % (item.name, item.title) def item_description(self, item): return item.abstract def item_link(self, item): - return "https://rfc-editor.org/info/%s"%item.canonical_name() + return "https://rfc-editor.org/info/%s" % item.name def item_pubdate(self, item): return item.publication_time def item_extra_kwargs(self, item): extra = super(RfcFeed, self).item_extra_kwargs(item) - extra.update({'dcterms_accessRights': 'gratis'}) - extra.update({'dcterms_format': 'text/html'}) - extra.update({'media_content': {'url': 'https://rfc-editor.org/rfc/%s.txt' % item.canonical_name(), - 'link_url': self.item_link(item) - } - }) - extra.update({'doi':'10.17487/%s' % item.canonical_name().upper()}) - extra.update({'doiuri':'http://dx.doi.org/10.17487/%s' % item.canonical_name().upper()}) - - #TODO + extra.update({"dcterms_accessRights": "gratis"}) + extra.update({"dcterms_format": "text/html"}) + media_contents = [] + if item.rfc_number < 8650: + if item.rfc_number not in [8, 9, 51, 418, 500, 530, 589]: + for fmt, media_type in [("txt", "text/plain"), ("html", "text/html")]: + media_contents.append( + { + "url": f"https://rfc-editor.org/rfc/{item.name}.{fmt}", + "media_type": media_type, + "is_format_of": self.item_link(item), + } + ) + if item.rfc_number not in [571, 587]: + media_contents.append( + { + "url": f"https://www.rfc-editor.org/rfc/pdfrfc/{item.name}.txt.pdf", + "media_type": "application/pdf", + "is_format_of": self.item_link(item), + } + ) + else: + media_contents.append( + { + "url": f"https://www.rfc-editor.org/rfc/{item.name}.xml", + "media_type": "application/rfc+xml", + } + ) + for fmt, media_type in [ + ("txt", "text/plain"), + ("html", "text/html"), + ("pdf", "application/pdf"), + ]: + media_contents.append( + { + "url": f"https://rfc-editor.org/rfc/{item.name}.{fmt}", + "media_type": media_type, + "is_format_of": f"https://www.rfc-editor.org/rfc/{item.name}.xml", + } + ) + extra.update({"media_contents": media_contents}) + + extra.update({"doi": "10.17487/%s" % item.name.upper()}) + extra.update( + {"doiuri": "http://dx.doi.org/10.17487/%s" % item.name.upper()} + ) + # R104 Publisher (Mandatory - but we need a string from them first) - extra.update({'dcterms_publisher':'rfc-editor.org'}) + extra.update({"dcterms_publisher": "rfc-editor.org"}) - #TODO MAYBE (Optional stuff) + # TODO MAYBE (Optional stuff) # R108 License # R115 Creator/Contributor (which would we use?) # F305 Checksum (do they use it?) (or should we put the our digital signature in here somewhere?) @@ -188,4 +281,3 @@ def item_extra_kwargs(self, item): # R118 Keyword return extra - diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py index fde51995094..4a6922bf345 100644 --- a/ietf/doc/fields.py +++ b/ietf/doc/fields.py @@ -13,7 +13,7 @@ import debug # pyflakes:ignore -from ietf.doc.models import Document, DocAlias +from ietf.doc.models import Document from ietf.doc.utils import uppercase_std_abbreviated_name from ietf.utils.fields import SearchableField @@ -69,19 +69,3 @@ def ajax_url(self): class SearchableDocumentField(SearchableDocumentsField): """Specialized to only return one Document""" max_entries = 1 - - -class SearchableDocAliasesField(SearchableDocumentsField): - """Search DocAliases instead of Documents""" - model = DocAlias # type: Type[models.Model] - - def doc_type_filter(self, queryset): - """Filter to include only desired doc type - - For DocAlias, pass through to the docs to check type. - """ - return queryset.filter(docs__type=self.doc_type) - -class SearchableDocAliasField(SearchableDocAliasesField): - """Specialized to only return one DocAlias""" - max_entries = 1 \ No newline at end of file diff --git a/ietf/doc/forms.py b/ietf/doc/forms.py index c0c52571c2f..768d6f96af2 100644 --- a/ietf/doc/forms.py +++ b/ietf/doc/forms.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2013-2020, All Rights Reserved +# Copyright The IETF Trust 2013-2025, All Rights Reserved # -*- coding: utf-8 -*- @@ -8,8 +8,8 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.validators import validate_email -from ietf.doc.fields import SearchableDocAliasesField, SearchableDocAliasField -from ietf.doc.models import RelatedDocument, DocExtResource +from ietf.doc.fields import SearchableDocumentField, SearchableDocumentsField +from ietf.doc.models import RelatedDocument, DocExtResource, State from ietf.iesg.models import TelechatDate from ietf.iesg.utils import telechat_page_count from ietf.person.fields import SearchablePersonField, SearchablePersonsField @@ -61,7 +61,7 @@ class DocAuthorChangeBasisForm(forms.Form): basis = forms.CharField(max_length=255, label='Reason for change', help_text='What is the source or reasoning for the changes to the author list?') - + class AdForm(forms.Form): ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type='area').order_by('name'), label="Shepherding AD", empty_label="(None)", required=True) @@ -134,11 +134,12 @@ class ActionHoldersForm(forms.Form): IESG_APPROVED_STATE_LIST = ("ann", "rfcqueue", "pub") class AddDownrefForm(forms.Form): - rfc = SearchableDocAliasField( + rfc = SearchableDocumentField( label="Referenced RFC", help_text="The RFC that is approved for downref", - required=True) - drafts = SearchableDocAliasesField( + required=True, + doc_type="rfc") + drafts = SearchableDocumentsField( label="Internet-Drafts that makes the reference", help_text="The Internet-Drafts that approve the downref in their Last Call", required=True) @@ -148,7 +149,7 @@ def clean_rfc(self): raise forms.ValidationError("Please provide a referenced RFC and a referencing Internet-Draft") rfc = self.cleaned_data['rfc'] - if not rfc.document.is_rfc(): + if rfc.type_id != "rfc": raise forms.ValidationError("Cannot find the RFC: " + rfc.name) return rfc @@ -158,10 +159,10 @@ def clean_drafts(self): v_err_names = [] drafts = self.cleaned_data['drafts'] - for da in drafts: - state = da.document.get_state("draft-iesg") + for d in drafts: + state = d.get_state("draft-iesg") if not state or state.slug not in IESG_APPROVED_STATE_LIST: - v_err_names.append(da.name) + v_err_names.append(d.name) if v_err_names: raise forms.ValidationError("Internet-Draft is not yet approved: " + ", ".join(v_err_names)) return drafts @@ -173,23 +174,23 @@ def clean(self): v_err_pairs = [] rfc = self.cleaned_data['rfc'] drafts = self.cleaned_data['drafts'] - for da in drafts: - if RelatedDocument.objects.filter(source=da.document, target=rfc, relationship_id='downref-approval'): - v_err_pairs.append(da.name + " --> RFC " + rfc.document.rfc_number()) + for d in drafts: + if RelatedDocument.objects.filter(source=d, target=rfc, relationship_id='downref-approval'): + v_err_pairs.append(f"{d.name} --> RFC {rfc.rfc_number}") if v_err_pairs: raise forms.ValidationError("Downref is already in the registry: " + ", ".join(v_err_pairs)) if 'save_downref_anyway' not in self.data: # this check is skipped if the save_downref_anyway button is used v_err_refnorm = "" - for da in drafts: - if not RelatedDocument.objects.filter(source=da.document, target=rfc, relationship_id='refnorm'): + for d in drafts: + if not RelatedDocument.objects.filter(source=d, target=rfc, relationship_id='refnorm'): if v_err_refnorm: - v_err_refnorm = v_err_refnorm + " or " + da.name + v_err_refnorm = v_err_refnorm + " or " + d.name else: - v_err_refnorm = da.name + v_err_refnorm = d.name if v_err_refnorm: - v_err_refnorm_prefix = "There does not seem to be a normative reference to RFC " + rfc.document.rfc_number() + " by " + v_err_refnorm_prefix = f"There does not seem to be a normative reference to RFC {rfc.rfc_number} by " raise forms.ValidationError(v_err_refnorm_prefix + v_err_refnorm) @@ -265,3 +266,32 @@ def clean(self): @staticmethod def valid_resource_tags(): return ExtResourceName.objects.all().order_by('slug').values_list('slug', flat=True) + +class InvestigateForm(forms.Form): + name_fragment = forms.CharField( + label="File name or fragment to investigate", + required=True, + help_text=( + "Enter a filename such as draft-ietf-some-draft-00.txt or a fragment like draft-ietf-some-draft using at least 8 characters. The search will also work for files that are not necessarily drafts." + ), + min_length=8, + ) + task_id = forms.CharField(required=False, widget=forms.HiddenInput) + + def clean_name_fragment(self): + disallowed_characters = ["%", "/", "\\", "*"] + name_fragment = self.cleaned_data["name_fragment"] + # Manual inspection of the directories at the time of this writing shows + # looking for files with less than 8 characters in the name is not useful + # Requiring this will help protect against the secretariat unintentionally + # matching every draft. + if any(c in name_fragment for c in disallowed_characters): + raise ValidationError(f"The following characters are disallowed: {', '.join(disallowed_characters)}") + return name_fragment + + +class ChangeStatementStateForm(forms.Form): + state = forms.ModelChoiceField( + State.objects.filter(used=True, type="statement"), + empty_label=None, + ) diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index ddb2843cca8..f20d398c3cb 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -11,7 +11,7 @@ from django.conf import settings from django.urls import reverse as urlreverse from django.utils import timezone -from django.utils.encoding import force_text +from django.utils.encoding import force_str import debug # pyflakes:ignore from ietf.doc.templatetags.mail_filters import std_level_prompt @@ -19,7 +19,7 @@ from ietf.utils import log from ietf.utils.mail import send_mail, send_mail_text from ietf.ipr.utils import iprs_from_docs, related_docs -from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent +from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, ConsensusDocEvent from ietf.doc.utils import needed_ballot_positions from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible from ietf.group.models import Role @@ -54,7 +54,7 @@ def email_ad_approved_doc(request, doc, text): def email_ad_approved_conflict_review(request, review, ok_to_publish): """Email notification when AD approves a conflict review""" - conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document + conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target (to, cc) = gather_address_lists("ad_approved_conflict_review") frm = request.user.person.formatted_email() send_mail(request, @@ -103,6 +103,61 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""): dict(text=text, url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()), cc=cc) + +def email_wg_call_for_adoption_issued(request, doc, cfa_duration_weeks=None): + if cfa_duration_weeks is None: + cfa_duration_weeks=2 + (to, cc) = gather_address_lists("doc_wg_call_for_adoption_issued", doc=doc) + frm = request.user.person.formatted_email() + + end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=7 * cfa_duration_weeks) + + subject = f"Call for adoption: {doc.name}-{doc.rev} (Ends {end_date})" + + send_mail( + request, + to, + frm, + subject, + "doc/mail/wg_call_for_adoption_issued.txt", + dict( + doc=doc, + subject=subject, + url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(), + end_date=end_date, + cfa_duration_weeks=cfa_duration_weeks, + wg_list=doc.group.list_email, + ), + cc=cc, + ) + + +def email_wg_last_call_issued(request, doc, wglc_duration_weeks=None): + if wglc_duration_weeks is None: + wglc_duration_weeks = 2 + (to, cc) = gather_address_lists("doc_wg_last_call_issued", doc=doc) + frm = request.user.person.formatted_email() + + + end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=7 * wglc_duration_weeks) + subject = f"WG Last Call: {doc.name}-{doc.rev} (Ends {end_date})" + + send_mail( + request, + to, + frm, + subject, + "doc/mail/wg_last_call_issued.txt", + dict( + doc=doc, + subject=subject, + url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(), + end_date=end_date, + wglc_duration_weeks=wglc_duration_weeks, + wg_list=doc.group.list_email, + ), + cc=cc, + ) def email_pulled_from_rfc_queue(request, doc, comment, prev_state, next_state): extra=extra_automation_headers(doc) @@ -175,7 +230,7 @@ def generate_ballot_writeup(request, doc): e.doc = doc e.rev = doc.rev e.desc = "Ballot writeup was generated" - e.text = force_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana, 'doc': doc })) + e.text = force_str(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana, 'doc': doc })) # caller is responsible for saving, if necessary return e @@ -187,7 +242,7 @@ def generate_ballot_rfceditornote(request, doc): e.doc = doc e.rev = doc.rev e.desc = "RFC Editor Note for ballot was generated" - e.text = force_text(render_to_string("doc/mail/ballot_rfceditornote.txt")) + e.text = force_str(render_to_string("doc/mail/ballot_rfceditornote.txt")) e.save() return e @@ -202,7 +257,7 @@ def generate_last_call_announcement(request, doc): doc.filled_title = textwrap.fill(doc.title, width=70, subsequent_indent=" " * 3) - iprs = iprs_from_docs(related_docs(DocAlias.objects.get(name=doc.canonical_name()))) + iprs = iprs_from_docs(related_docs(Document.objects.get(name=doc.name))) if iprs: ipr_links = [ urlreverse("ietf.ipr.views.show", kwargs=dict(id=i.id)) for i in iprs] ipr_links = [ settings.IDTRACKER_BASE_URL+url if not url.startswith("http") else url for url in ipr_links ] @@ -232,7 +287,7 @@ def generate_last_call_announcement(request, doc): e.doc = doc e.rev = doc.rev e.desc = "Last call announcement was generated" - e.text = force_text(mail) + e.text = force_str(mail) # caller is responsible for saving, if necessary return e @@ -252,7 +307,7 @@ def generate_approval_mail(request, doc): e.doc = doc e.rev = doc.rev e.desc = "Ballot approval text was generated" - e.text = force_text(mail) + e.text = force_str(mail) # caller is responsible for saving, if necessary return e @@ -568,7 +623,7 @@ def email_last_call_expired(doc): send_mail(None, addrs.to, "DraftTracker Mail System ", - "Last Call Expired: %s" % doc.file_tag(), + "IETF Last Call Expired: %s" % doc.file_tag(), "doc/mail/change_notice.txt", dict(text=text, doc=doc, @@ -670,7 +725,7 @@ def send_review_possibly_replaces_request(request, doc, submitter_info): to = set(addrs.to) cc = set(addrs.cc) - possibly_replaces = Document.objects.filter(name__in=[alias.name for alias in doc.related_that_doc("possibly-replaces")]) + possibly_replaces = Document.objects.filter(name__in=[related.name for related in doc.related_that_doc("possibly-replaces")]) for other_doc in possibly_replaces: (other_to, other_cc) = gather_address_lists('doc_replacement_suggested',doc=other_doc) to.update(other_to) diff --git a/ietf/doc/management/commands/find_github_backup_info.py b/ietf/doc/management/commands/find_github_backup_info.py deleted file mode 100644 index f1f71452df2..00000000000 --- a/ietf/doc/management/commands/find_github_backup_info.py +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright The IETF Trust 2020, All Rights Reserved - - -import github3 - -from collections import Counter -from urllib.parse import urlparse - -from django.conf import settings -from django.core.management.base import BaseCommand, CommandError - -from ietf.doc.models import DocExtResource -from ietf.group.models import GroupExtResource -from ietf.person.models import PersonExtResource - -# TODO: Think more about submodules. This currently will only take top level repos, with the assumption that the clone will include arguments to grab all the submodules. -# As a consequence, we might end up pulling more than we need (or that the org or user expected) -# Make sure this is what we want. - -class Command(BaseCommand): - help = ('Locate information about github repositories to backup') - - def add_arguments(self, parser): - parser.add_argument('--verbose', dest='verbose', action='store_true', help='Show counts of types of repositories') - - def handle(self, *args, **options): - - if not (hasattr(settings,'GITHUB_BACKUP_API_KEY') and settings.GITHUB_BACKUP_API_KEY): - raise CommandError("ERROR: can't find GITHUB_BACKUP_API_KEY") # TODO: at >= py3.1, use returncode - - github = github3.login(token = settings.GITHUB_BACKUP_API_KEY) - owners = dict() - repos = set() - - for cls in (DocExtResource, GroupExtResource, PersonExtResource): - for res in cls.objects.filter(name_id__in=('github_repo','github_org')): - path_parts = urlparse(res.value).path.strip('/').split('/') - if not path_parts or not path_parts[0]: - continue - - owner = path_parts[0] - - if owner not in owners: - try: - gh_owner = github.user(username=owner) - owners[owner] = gh_owner - except github3.exceptions.NotFoundError: - continue - - if gh_owner.type in ('User', 'Organization'): - if len(path_parts) > 1: - repo = path_parts[1] - if (owner, repo) not in repos: - try: - github.repository(owner,repo) - repos.add( (owner, repo) ) - except github3.exceptions.NotFoundError: - continue - else: - for repo in github.repositories_by(owner): - repos.add( (owner, repo.name) ) - - owner_types = Counter([owners[owner].type for owner in owners]) - if options['verbose']: - self.stdout.write("Owners:") - for key in owner_types: - self.stdout.write(" %s: %s"%(key,owner_types[key])) - self.stdout.write("Repositories: %d" % len(repos)) - for repo in sorted(repos): - self.stdout.write(" https://github.com/%s/%s" % repo ) - else: - for repo in sorted(repos): - self.stdout.write("%s/%s" % repo ) - diff --git a/ietf/doc/management/commands/fix_105_slides.py b/ietf/doc/management/commands/fix_105_slides.py deleted file mode 100644 index 377298ea3c7..00000000000 --- a/ietf/doc/management/commands/fix_105_slides.py +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright The IETF Trust 2019-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import os - -from collections import Counter - -from django.core.management.base import BaseCommand - -from ietf.doc.models import DocEvent -from ietf.meeting.models import Meeting, SessionPresentation -from ietf.person.models import Person - -from ietf.meeting.utils import is_powerpoint, post_process - -class Command(BaseCommand): - help = ('Fix uploaded_filename and generate pdf from pptx') - - def add_arguments(self, parser): - parser.add_argument('--dry-run', action='store_true', dest='dry-run', default=False, help='Report on changes that would be made without making them') - - def handle(self, *args, **options): - ietf105 = Meeting.objects.get(number=105) - slides_path = os.path.join(ietf105.get_materials_path(),'slides') - system_person = Person.objects.get(name="(System)") - counts = Counter() - - for sp in SessionPresentation.objects.filter(session__meeting__number=105,document__type='slides'): #.filter(document__name='slides-105-manet-dlep-multicast-support-discussion'): - slides = sp.document - if not os.path.exists(os.path.join(slides_path,slides.uploaded_filename)): - name, ext = os.path.splitext(slides.uploaded_filename) - target_filename = '%s-%s%s' % (name[:name.rfind('-ss')], slides.rev,ext) - if os.path.exists(os.path.join(slides_path,target_filename)): - slides.uploaded_filename = target_filename - if not options['dry-run']: - e = DocEvent.objects.create(doc=slides, rev=slides.rev, by=system_person, type='changed_document', desc='Corrected uploaded_filename') - slides.save_with_history([e]) - counts['uploaded_filename repair succeeded'] += 1 - - else: - self.stderr.write("Unable to repair %s" % slides) - counts['uploaded_filename repair failed'] += 1 - continue - else: - counts['uploaded_filename already ok'] += 1 - - if is_powerpoint(slides): - base, _ = os.path.splitext(slides.uploaded_filename) - if os.path.exists(os.path.join(slides_path,base+'.pdf')): - self.stderr.write("PDF already exists for %s " % slides) - counts['PDF already exists for a repaired file'] += 1 - else: - if not options['dry-run']: - post_process(slides) - counts['PDF conversions'] += 1 - - if options['dry-run']: - self.stdout.write("This is a dry-run. Nothing has actually changed. In a normal run, the output would say the following:") - - for label,count in counts.iteritems(): - self.stdout.write("%s : %d" % (label,count) ) - - diff --git a/ietf/doc/management/commands/generate_draft_aliases.py b/ietf/doc/management/commands/generate_draft_aliases.py deleted file mode 100755 index 88f4aa98cb6..00000000000 --- a/ietf/doc/management/commands/generate_draft_aliases.py +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright The IETF Trust 2012-2021, All Rights Reserved -# -*- coding: utf-8 -*- - -# This was written as a script by Markus Stenberg . -# It was turned into a management command by Russ Housley . - -import datetime -import io -import os -import re -import shutil -import stat -import time - -from tempfile import mkstemp - -from django.conf import settings -from django.core.management.base import BaseCommand -from django.utils import timezone - -import debug # pyflakes:ignore - -from ietf.doc.models import Document -from ietf.group.utils import get_group_role_emails, get_group_ad_emails -from ietf.utils.aliases import dump_sublist -from utils.mail import parseaddr - -DEFAULT_YEARS = 2 - - -def get_draft_ad_emails(doc): - """Get AD email addresses for the given draft, if any.""" - ad_emails = set() - # If working group document, return current WG ADs - if doc.group and doc.group.acronym != 'none': - ad_emails.update(get_group_ad_emails(doc.group)) - # Document may have an explicit AD set - if doc.ad: - ad_emails.add(doc.ad.email_address()) - return ad_emails - - -def get_draft_chair_emails(doc): - """Get chair email addresses for the given draft, if any.""" - chair_emails = set() - if doc.group: - chair_emails.update(get_group_role_emails(doc.group, ['chair', 'secr'])) - return chair_emails - - -def get_draft_shepherd_email(doc): - """Get shepherd email addresses for the given draft, if any.""" - shepherd_email = set() - if doc.shepherd: - shepherd_email.add(doc.shepherd.email_address()) - return shepherd_email - - -def get_draft_authors_emails(doc): - """Get list of authors for the given draft.""" - author_emails = set() - for author in doc.documentauthor_set.all(): - if author.email and author.email.email_address(): - author_emails.add(author.email.email_address()) - return author_emails - - -def get_draft_notify_emails(doc): - """Get list of email addresses to notify for the given draft.""" - ad_email_alias_regex = r"^%s.ad@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER) - all_email_alias_regex = r"^%s.all@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER) - author_email_alias_regex = r"^%s@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER) - notify_email_alias_regex = r"^%s.notify@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER) - shepherd_email_alias_regex = r"^%s.shepherd@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER) - notify_emails = set() - if doc.notify: - for e in doc.notify.split(','): - e = e.strip() - if re.search(ad_email_alias_regex, e): - notify_emails.update(get_draft_ad_emails(doc)) - elif re.search(author_email_alias_regex, e): - notify_emails.update(get_draft_authors_emails(doc)) - elif re.search(shepherd_email_alias_regex, e): - notify_emails.update(get_draft_shepherd_email(doc)) - elif re.search(all_email_alias_regex, e): - notify_emails.update(get_draft_ad_emails(doc)) - notify_emails.update(get_draft_authors_emails(doc)) - notify_emails.update(get_draft_shepherd_email(doc)) - elif re.search(notify_email_alias_regex, e): - pass - else: - (name, email) = parseaddr(e) - notify_emails.add(email) - return notify_emails - - -class Command(BaseCommand): - help = ('Generate the draft-aliases and draft-virtual files for Internet-Draft ' - 'mail aliases, placing them in the files configured in ' - 'settings.DRAFT_ALIASES_PATH and settings.DRAFT_VIRTUAL_PATH, ' - 'respectively. The generation includes aliases for Internet-Drafts ' - 'that have seen activity in the last %s years.' % (DEFAULT_YEARS)) - - def handle(self, *args, **options): - show_since = timezone.now() - datetime.timedelta(DEFAULT_YEARS*365) - - date = time.strftime("%Y-%m-%d_%H:%M:%S") - signature = '# Generated by %s at %s\n' % (os.path.abspath(__file__), date) - - ahandle, aname = mkstemp() - os.close(ahandle) - afile = io.open(aname,"w") - - vhandle, vname = mkstemp() - os.close(vhandle) - vfile = io.open(vname,"w") - - afile.write(signature) - vfile.write(signature) - vfile.write("%s anything\n" % settings.DRAFT_VIRTUAL_DOMAIN) - - # Internet-Drafts with active status or expired within DEFAULT_YEARS - drafts = Document.objects.filter(name__startswith='draft-') - active_drafts = drafts.filter(states__slug='active') - inactive_recent_drafts = drafts.exclude(states__slug='active').filter(expires__gte=show_since) - interesting_drafts = active_drafts | inactive_recent_drafts - - alias_domains = ['ietf.org', ] - for draft in interesting_drafts.distinct().iterator(): - # Omit RFCs, unless they were published in the last DEFAULT_YEARS - if draft.docalias.filter(name__startswith='rfc'): - if draft.latest_event(type='published_rfc').time < show_since: - continue - - alias = draft.name - all = set() - - # no suffix and .authors are the same list - emails = get_draft_authors_emails(draft) - all.update(emails) - dump_sublist(afile, vfile, alias, alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - dump_sublist(afile, vfile, alias+'.authors', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - - # .chairs = group chairs - emails = get_draft_chair_emails(draft) - if emails: - all.update(emails) - dump_sublist(afile, vfile, alias+'.chairs', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - - # .ad = sponsoring AD / WG AD (WG document) - emails = get_draft_ad_emails(draft) - if emails: - all.update(emails) - dump_sublist(afile, vfile, alias+'.ad', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - - # .notify = notify email list from the Document - emails = get_draft_notify_emails(draft) - if emails: - all.update(emails) - dump_sublist(afile, vfile, alias+'.notify', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - - # .shepherd = shepherd email from the Document - emails = get_draft_shepherd_email(draft) - if emails: - all.update(emails) - dump_sublist(afile, vfile, alias+'.shepherd', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails) - - # .all = everything from above - dump_sublist(afile, vfile, alias+'.all', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, all) - - afile.close() - vfile.close() - - os.chmod(aname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) - os.chmod(vname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) - - shutil.move(aname, settings.DRAFT_ALIASES_PATH) - shutil.move(vname, settings.DRAFT_VIRTUAL_PATH) - - \ No newline at end of file diff --git a/ietf/doc/management/commands/generate_draft_bibxml_files.py b/ietf/doc/management/commands/generate_draft_bibxml_files.py deleted file mode 100644 index eda67c401bb..00000000000 --- a/ietf/doc/management/commands/generate_draft_bibxml_files.py +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import datetime -import io -import os -import re -import sys - -from django.conf import settings -from django.core.management.base import BaseCommand -from django.utils import timezone - -import debug # pyflakes:ignore - -from ietf.doc.models import NewRevisionDocEvent -from ietf.doc.utils import bibxml_for_draft - -DEFAULT_DAYS = 7 - -class Command(BaseCommand): - help = ('Generate draft bibxml files for xml2rfc references, placing them in the ' - 'directory configured in settings.BIBXML_BASE_PATH: %s. ' - 'By default, generate files as needed for new Internet-Draft revisions from the ' - 'last %s days.' % (settings.BIBXML_BASE_PATH, DEFAULT_DAYS)) - - def add_arguments(self, parser): - parser.add_argument('--all', action='store_true', default=False, help="Process all documents, not only recent submissions") - parser.add_argument('--days', type=int, default=DEFAULT_DAYS, help="Look submissions from the last DAYS days, instead of %s" % DEFAULT_DAYS) - - def say(self, msg): - if self.verbosity > 0: - sys.stdout.write(msg) - sys.stdout.write('\n') - - def note(self, msg): - if self.verbosity > 1: - sys.stdout.write(msg) - sys.stdout.write('\n') - - def mutter(self, msg): - if self.verbosity > 2: - sys.stdout.write(msg) - sys.stdout.write('\n') - - def write(self, fn, new): - # normalize new - new = re.sub(r'\r\n?', r'\n', new) - try: - with io.open(fn, encoding='utf-8') as f: - old = f.read() - except IOError: - old = "" - if old.strip() != new.strip(): - self.note('Writing %s' % os.path.basename(fn)) - with io.open(fn, "w", encoding='utf-8') as f: - f.write(new) - - def handle(self, *args, **options): - self.verbosity = options.get("verbosity", 1) - process_all = options.get("all") - days = options.get("days") - # - bibxmldir = os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids') - if not os.path.exists(bibxmldir): - os.makedirs(bibxmldir) - # - if process_all: - doc_events = NewRevisionDocEvent.objects.filter(type='new_revision', doc__type_id='draft') - else: - start = timezone.now() - datetime.timedelta(days=days) - doc_events = NewRevisionDocEvent.objects.filter(type='new_revision', doc__type_id='draft', time__gte=start) - doc_events = doc_events.order_by('time') - - for e in doc_events: - self.mutter('%s %s' % (e.time, e.doc.name)) - try: - doc = e.doc - bibxml = bibxml_for_draft(doc, e.rev) - ref_rev_file_name = os.path.join(bibxmldir, 'reference.I-D.%s-%s.xml' % (doc.name, e.rev)) - self.write(ref_rev_file_name, bibxml) - except Exception as ee: - sys.stderr.write('\n%s-%s: %s\n' % (doc.name, doc.rev, ee)) diff --git a/ietf/doc/management/commands/generate_idnits2_rfc_status.py b/ietf/doc/management/commands/generate_idnits2_rfc_status.py deleted file mode 100644 index 45be1880181..00000000000 --- a/ietf/doc/management/commands/generate_idnits2_rfc_status.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright The IETF Trust 2021 All Rights Reserved - -import os - -from django.conf import settings -from django.core.management.base import BaseCommand - -from ietf.doc.utils import generate_idnits2_rfc_status -from ietf.utils.log import log - -class Command(BaseCommand): - help = ('Generate the rfc_status blob used by idnits2') - - def handle(self, *args, **options): - filename=os.path.join(settings.DERIVED_DIR,'idnits2-rfc-status') - blob = generate_idnits2_rfc_status() - try: - bytes = blob.encode('utf-8') - with open(filename,'wb') as f: - f.write(bytes) - except Exception as e: - log('failed to write idnits2-rfc-status: '+str(e)) - raise e diff --git a/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py b/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py deleted file mode 100644 index 8bd122e87ef..00000000000 --- a/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright The IETF Trust 2021 All Rights Reserved - -import os - -from django.conf import settings -from django.core.management.base import BaseCommand - -from ietf.doc.utils import generate_idnits2_rfcs_obsoleted -from ietf.utils.log import log - -class Command(BaseCommand): - help = ('Generate the rfcs-obsoleted file used by idnits2') - - def handle(self, *args, **options): - filename=os.path.join(settings.DERIVED_DIR,'idnits2-rfcs-obsoleted') - blob = generate_idnits2_rfcs_obsoleted() - try: - bytes = blob.encode('utf-8') - with open(filename,'wb') as f: - f.write(bytes) - except Exception as e: - log('failed to write idnits2-rfcs-obsoleted: '+str(e)) - raise e diff --git a/ietf/doc/management/commands/reset_rfc_authors.py b/ietf/doc/management/commands/reset_rfc_authors.py new file mode 100644 index 00000000000..e2ab5f12081 --- /dev/null +++ b/ietf/doc/management/commands/reset_rfc_authors.py @@ -0,0 +1,69 @@ +# Copyright The IETF Trust 2024, All Rights Reserved + +# Reset an RFC's authors to those of the draft it came from +from django.core.management.base import BaseCommand, CommandError + +from ietf.doc.models import Document, DocEvent +from ietf.person.models import Person + + +class Command(BaseCommand): + def add_arguments(self, parser): + parser.add_argument("rfcnum", type=int, help="RFC number to modify") + parser.add_argument( + "--force", + action="store_true", + help="reset even if RFC already has authors", + ) + + def handle(self, *args, **options): + try: + rfc = Document.objects.get(type="rfc", rfc_number=options["rfcnum"]) + except Document.DoesNotExist: + raise CommandError( + f"rfc{options['rfcnum']} does not exist in the Datatracker." + ) + + draft = rfc.came_from_draft() + if draft is None: + raise CommandError(f"{rfc.name} did not come from a draft. Can't reset.") + + orig_authors = rfc.documentauthor_set.all() + if orig_authors.exists(): + # Potentially dangerous, so refuse unless "--force" is specified + if not options["force"]: + raise CommandError( + f"{rfc.name} already has authors. Not resetting. Use '--force' to reset anyway." + ) + removed_auth_names = list(orig_authors.values_list("person__name", flat=True)) + rfc.documentauthor_set.all().delete() + DocEvent.objects.create( + doc=rfc, + by=Person.objects.get(name="(System)"), + type="edited_authors", + desc=f"Removed all authors: {', '.join(removed_auth_names)}", + ) + self.stdout.write( + self.style.SUCCESS( + f"Removed author(s): {', '.join(removed_auth_names)}" + ) + ) + + for author in draft.documentauthor_set.all(): + # Copy the author but point at the new doc. + # See https://docs.djangoproject.com/en/4.2/topics/db/queries/#copying-model-instances + author.pk = None + author.id = None + author._state.adding = True + author.document = rfc + author.save() + self.stdout.write( + self.style.SUCCESS(f"Added author {author.person.name} <{author.email}>") + ) + auth_names = draft.documentauthor_set.values_list("person__name", flat=True) + DocEvent.objects.create( + doc=rfc, + by=Person.objects.get(name="(System)"), + type="edited_authors", + desc=f"Set authors from rev {draft.rev} of {draft.name}: {', '.join(auth_names)}", + ) diff --git a/ietf/doc/management/commands/tests.py b/ietf/doc/management/commands/tests.py new file mode 100644 index 00000000000..8244d872663 --- /dev/null +++ b/ietf/doc/management/commands/tests.py @@ -0,0 +1,72 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from io import StringIO + +from django.core.management import call_command, CommandError + +from ietf.doc.factories import DocumentAuthorFactory, WgDraftFactory, WgRfcFactory +from ietf.doc.models import Document, DocumentAuthor +from ietf.utils.test_utils import TestCase + + +class CommandTests(TestCase): + @staticmethod + def _call_command(command_name, *args, **options): + """Call command, capturing (and suppressing) output""" + out = StringIO() + err = StringIO() + options["stdout"] = out + options["stderr"] = err + call_command(command_name, *args, **options) + return out.getvalue(), err.getvalue() + + def test_reset_rfc_authors(self): + command_name = "reset_rfc_authors" + + draft = WgDraftFactory() + DocumentAuthorFactory.create_batch(3, document=draft) + rfc = WgRfcFactory() # rfc does not yet have a draft + DocumentAuthorFactory.create_batch(3, document=rfc) + bad_rfc_num = ( + 1 + + Document.objects.filter(rfc_number__isnull=False) + .order_by("-rfc_number") + .first() + .rfc_number + ) + docauthor_fields = [ + field.name + for field in DocumentAuthor._meta.get_fields() + if field.name not in ["document", "id"] + ] + + with self.assertRaises(CommandError, msg="Cannot reset a bad RFC number"): + self._call_command(command_name, bad_rfc_num) + + with self.assertRaises(CommandError, msg="Cannot reset an RFC with no draft"): + self._call_command(command_name, rfc.rfc_number) + + with self.assertRaises(CommandError, msg="Cannot force-reset an RFC with no draft"): + self._call_command(command_name, rfc.rfc_number, "--force") + + # Link the draft to the rfc + rfc.targets_related.create(relationship_id="became_rfc", source=draft) + + with self.assertRaises(CommandError, msg="Cannot reset an RFC with authors"): + self._call_command(command_name, rfc.rfc_number) + + # Calling with force should work + self._call_command(command_name, rfc.rfc_number, "--force") + self.assertCountEqual( + draft.documentauthor_set.values(*docauthor_fields), + rfc.documentauthor_set.values(*docauthor_fields), + ) + + # Calling on an RFC with no authors should also work + rfc.documentauthor_set.all().delete() + self._call_command(command_name, rfc.rfc_number) + self.assertCountEqual( + draft.documentauthor_set.values(*docauthor_fields), + rfc.documentauthor_set.values(*docauthor_fields), + ) diff --git a/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py b/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py new file mode 100644 index 00000000000..adc0e696272 --- /dev/null +++ b/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py @@ -0,0 +1,36 @@ +# Generated by Django 4.0.10 on 2023-05-16 20:36 + +from django.db import migrations +import django.db.models.deletion +import ietf.utils.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('person', '0001_initial'), + ('doc', '0003_remove_document_info_order'), + ] + + operations = [ + migrations.AlterField( + model_name='dochistory', + name='ad', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_%(class)s_set', to='person.person', verbose_name='area director'), + ), + migrations.AlterField( + model_name='dochistory', + name='shepherd', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_%(class)s_set', to='person.email'), + ), + migrations.AlterField( + model_name='document', + name='ad', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_%(class)s_set', to='person.person', verbose_name='area director'), + ), + migrations.AlterField( + model_name='document', + name='shepherd', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_%(class)s_set', to='person.email'), + ), + ] diff --git a/ietf/doc/migrations/0005_alter_docevent_type.py b/ietf/doc/migrations/0005_alter_docevent_type.py new file mode 100644 index 00000000000..f8a3cfc7959 --- /dev/null +++ b/ietf/doc/migrations/0005_alter_docevent_type.py @@ -0,0 +1,86 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="docevent", + name="type", + field=models.CharField( + choices=[ + ("new_revision", "Added new revision"), + ("new_submission", "Uploaded new revision"), + ("changed_document", "Changed document metadata"), + ("added_comment", "Added comment"), + ("added_message", "Added message"), + ("edited_authors", "Edited the documents author list"), + ("deleted", "Deleted document"), + ("changed_state", "Changed state"), + ("changed_stream", "Changed document stream"), + ("expired_document", "Expired document"), + ("extended_expiry", "Extended expiry of document"), + ("requested_resurrect", "Requested resurrect"), + ("completed_resurrect", "Completed resurrect"), + ("changed_consensus", "Changed consensus"), + ("published_rfc", "Published RFC"), + ( + "added_suggested_replaces", + "Added suggested replacement relationships", + ), + ( + "reviewed_suggested_replaces", + "Reviewed suggested replacement relationships", + ), + ("changed_action_holders", "Changed action holders for document"), + ("changed_group", "Changed group"), + ("changed_protocol_writeup", "Changed protocol writeup"), + ("changed_charter_milestone", "Changed charter milestone"), + ("initial_review", "Set initial review time"), + ("changed_review_announcement", "Changed WG Review text"), + ("changed_action_announcement", "Changed WG Action text"), + ("started_iesg_process", "Started IESG process on document"), + ("created_ballot", "Created ballot"), + ("closed_ballot", "Closed ballot"), + ("sent_ballot_announcement", "Sent ballot announcement"), + ("changed_ballot_position", "Changed ballot position"), + ("changed_ballot_approval_text", "Changed ballot approval text"), + ("changed_ballot_writeup_text", "Changed ballot writeup text"), + ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"), + ("changed_last_call_text", "Changed last call text"), + ("requested_last_call", "Requested last call"), + ("sent_last_call", "Sent last call"), + ("scheduled_for_telechat", "Scheduled for telechat"), + ("iesg_approved", "IESG approved document (no problem)"), + ("iesg_disapproved", "IESG disapproved document (do not publish)"), + ("approved_in_minute", "Approved in minute"), + ("iana_review", "IANA review comment"), + ("rfc_in_iana_registry", "RFC is in IANA registry"), + ( + "rfc_editor_received_announcement", + "Announcement was received by RFC Editor", + ), + ("requested_publication", "Publication at RFC Editor requested"), + ( + "sync_from_rfc_editor", + "Received updated information from RFC Editor", + ), + ("requested_review", "Requested review"), + ("assigned_review_request", "Assigned review request"), + ("closed_review_request", "Closed review request"), + ("closed_review_assignment", "Closed review assignment"), + ("downref_approved", "Downref approved"), + ("posted_related_ipr", "Posted related IPR"), + ("removed_related_ipr", "Removed related IPR"), + ("changed_editors", "Changed BOF Request editors"), + ("published_statement", "Published statement"), + ], + max_length=50, + ), + ), + ] diff --git a/ietf/doc/migrations/0006_statements.py b/ietf/doc/migrations/0006_statements.py new file mode 100644 index 00000000000..9a074292e5c --- /dev/null +++ b/ietf/doc/migrations/0006_statements.py @@ -0,0 +1,43 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + +from django.db import migrations + + +def forward(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + State = apps.get_model("doc", "State") + + StateType.objects.create(slug="statement", label="Statement State") + State.objects.create( + slug="active", + type_id="statement", + name="Active", + order=0, + desc="The statement is active", + ) + State.objects.create( + slug="replaced", + type_id="statement", + name="Replaced", + order=0, + desc="The statement has been replaced", + ) + + +def reverse(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + State = apps.get_model("doc", "State") + + State.objects.filter(type_id="statement").delete() + StateType.objects.filter(slug="statement").delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0005_alter_docevent_type"), + ("name", "0004_statements"), + ] + + operations = [ + migrations.RunPython(forward, reverse), + ] diff --git a/ietf/doc/migrations/0007_alter_docevent_type.py b/ietf/doc/migrations/0007_alter_docevent_type.py new file mode 100644 index 00000000000..c98144d70fe --- /dev/null +++ b/ietf/doc/migrations/0007_alter_docevent_type.py @@ -0,0 +1,90 @@ +# Generated by Django 4.2.4 on 2023-08-23 21:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0006_statements"), + ] + + operations = [ + migrations.AlterField( + model_name="docevent", + name="type", + field=models.CharField( + choices=[ + ("new_revision", "Added new revision"), + ("new_submission", "Uploaded new revision"), + ("changed_document", "Changed document metadata"), + ("added_comment", "Added comment"), + ("added_message", "Added message"), + ("edited_authors", "Edited the documents author list"), + ("deleted", "Deleted document"), + ("changed_state", "Changed state"), + ("changed_stream", "Changed document stream"), + ("expired_document", "Expired document"), + ("extended_expiry", "Extended expiry of document"), + ("requested_resurrect", "Requested resurrect"), + ("completed_resurrect", "Completed resurrect"), + ("changed_consensus", "Changed consensus"), + ("published_rfc", "Published RFC"), + ( + "added_suggested_replaces", + "Added suggested replacement relationships", + ), + ( + "reviewed_suggested_replaces", + "Reviewed suggested replacement relationships", + ), + ("changed_action_holders", "Changed action holders for document"), + ("changed_group", "Changed group"), + ("changed_protocol_writeup", "Changed protocol writeup"), + ("changed_charter_milestone", "Changed charter milestone"), + ("initial_review", "Set initial review time"), + ("changed_review_announcement", "Changed WG Review text"), + ("changed_action_announcement", "Changed WG Action text"), + ("started_iesg_process", "Started IESG process on document"), + ("created_ballot", "Created ballot"), + ("closed_ballot", "Closed ballot"), + ("sent_ballot_announcement", "Sent ballot announcement"), + ("changed_ballot_position", "Changed ballot position"), + ("changed_ballot_approval_text", "Changed ballot approval text"), + ("changed_ballot_writeup_text", "Changed ballot writeup text"), + ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"), + ("changed_last_call_text", "Changed last call text"), + ("requested_last_call", "Requested last call"), + ("sent_last_call", "Sent last call"), + ("scheduled_for_telechat", "Scheduled for telechat"), + ("iesg_approved", "IESG approved document (no problem)"), + ("iesg_disapproved", "IESG disapproved document (do not publish)"), + ("approved_in_minute", "Approved in minute"), + ("iana_review", "IANA review comment"), + ("rfc_in_iana_registry", "RFC is in IANA registry"), + ( + "rfc_editor_received_announcement", + "Announcement was received by RFC Editor", + ), + ("requested_publication", "Publication at RFC Editor requested"), + ( + "sync_from_rfc_editor", + "Received updated information from RFC Editor", + ), + ("requested_review", "Requested review"), + ("assigned_review_request", "Assigned review request"), + ("closed_review_request", "Closed review request"), + ("closed_review_assignment", "Closed review assignment"), + ("downref_approved", "Downref approved"), + ("posted_related_ipr", "Posted related IPR"), + ("removed_related_ipr", "Removed related IPR"), + ( + "removed_objfalse_related_ipr", + "Removed Objectively False related IPR", + ), + ("changed_editors", "Changed BOF Request editors"), + ("published_statement", "Published statement"), + ], + max_length=50, + ), + ), + ] diff --git a/ietf/doc/migrations/0008_alter_docevent_type.py b/ietf/doc/migrations/0008_alter_docevent_type.py new file mode 100644 index 00000000000..52a75f074b3 --- /dev/null +++ b/ietf/doc/migrations/0008_alter_docevent_type.py @@ -0,0 +1,91 @@ +# Generated by Django 4.2.7 on 2023-11-04 13:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0007_alter_docevent_type"), + ] + + operations = [ + migrations.AlterField( + model_name="docevent", + name="type", + field=models.CharField( + choices=[ + ("new_revision", "Added new revision"), + ("new_submission", "Uploaded new revision"), + ("changed_document", "Changed document metadata"), + ("added_comment", "Added comment"), + ("added_message", "Added message"), + ("edited_authors", "Edited the documents author list"), + ("deleted", "Deleted document"), + ("changed_state", "Changed state"), + ("changed_stream", "Changed document stream"), + ("expired_document", "Expired document"), + ("extended_expiry", "Extended expiry of document"), + ("requested_resurrect", "Requested resurrect"), + ("completed_resurrect", "Completed resurrect"), + ("changed_consensus", "Changed consensus"), + ("published_rfc", "Published RFC"), + ( + "added_suggested_replaces", + "Added suggested replacement relationships", + ), + ( + "reviewed_suggested_replaces", + "Reviewed suggested replacement relationships", + ), + ("changed_action_holders", "Changed action holders for document"), + ("changed_group", "Changed group"), + ("changed_protocol_writeup", "Changed protocol writeup"), + ("changed_charter_milestone", "Changed charter milestone"), + ("initial_review", "Set initial review time"), + ("changed_review_announcement", "Changed WG Review text"), + ("changed_action_announcement", "Changed WG Action text"), + ("started_iesg_process", "Started IESG process on document"), + ("created_ballot", "Created ballot"), + ("closed_ballot", "Closed ballot"), + ("sent_ballot_announcement", "Sent ballot announcement"), + ("changed_ballot_position", "Changed ballot position"), + ("changed_ballot_approval_text", "Changed ballot approval text"), + ("changed_ballot_writeup_text", "Changed ballot writeup text"), + ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"), + ("changed_last_call_text", "Changed last call text"), + ("requested_last_call", "Requested last call"), + ("sent_last_call", "Sent last call"), + ("scheduled_for_telechat", "Scheduled for telechat"), + ("iesg_approved", "IESG approved document (no problem)"), + ("iesg_disapproved", "IESG disapproved document (do not publish)"), + ("approved_in_minute", "Approved in minute"), + ("iana_review", "IANA review comment"), + ("rfc_in_iana_registry", "RFC is in IANA registry"), + ( + "rfc_editor_received_announcement", + "Announcement was received by RFC Editor", + ), + ("requested_publication", "Publication at RFC Editor requested"), + ( + "sync_from_rfc_editor", + "Received updated information from RFC Editor", + ), + ("requested_review", "Requested review"), + ("assigned_review_request", "Assigned review request"), + ("closed_review_request", "Closed review request"), + ("closed_review_assignment", "Closed review assignment"), + ("downref_approved", "Downref approved"), + ("posted_related_ipr", "Posted related IPR"), + ("removed_related_ipr", "Removed related IPR"), + ( + "removed_objfalse_related_ipr", + "Removed Objectively False related IPR", + ), + ("changed_editors", "Changed BOF Request editors"), + ("published_statement", "Published statement"), + ("approved_slides", "Slides approved"), + ], + max_length=50, + ), + ), + ] diff --git a/ietf/doc/migrations/0009_add_rfc_states.py b/ietf/doc/migrations/0009_add_rfc_states.py new file mode 100644 index 00000000000..07a6ac0205f --- /dev/null +++ b/ietf/doc/migrations/0009_add_rfc_states.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.2 on 2023-06-14 20:57 + +from django.db import migrations + + +def forward(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + rfc_statetype, _ = StateType.objects.get_or_create(slug="rfc", label="State") + + State = apps.get_model("doc", "State") + State.objects.get_or_create( + type=rfc_statetype, slug="published", name="Published", used=True, order=1 + ) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0008_alter_docevent_type"), + ] + + operations = [ + migrations.RunPython(forward), + ] diff --git a/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py b/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py new file mode 100644 index 00000000000..26b2a85c622 --- /dev/null +++ b/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.2 on 2023-06-14 22:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0009_add_rfc_states"), + ] + + operations = [ + migrations.AddField( + model_name="dochistory", + name="rfc_number", + field=models.PositiveIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name="document", + name="rfc_number", + field=models.PositiveIntegerField(blank=True, null=True), + ), + ] diff --git a/ietf/doc/migrations/0011_create_rfc_documents.py b/ietf/doc/migrations/0011_create_rfc_documents.py new file mode 100644 index 00000000000..466ff81bb0f --- /dev/null +++ b/ietf/doc/migrations/0011_create_rfc_documents.py @@ -0,0 +1,76 @@ +# Generated by Django 4.2.2 on 2023-06-15 15:27 + +from django.db import migrations + + +def forward(apps, schema_editor): + Document = apps.get_model("doc", "Document") + DocAlias = apps.get_model("doc", "DocAlias") + DocumentAuthor = apps.get_model("doc", "DocumentAuthor") + + State = apps.get_model("doc", "State") + draft_rfc_state = State.objects.get(type_id="draft", slug="rfc") + rfc_published_state = State.objects.get(type_id="rfc", slug="published") + + # Find draft Documents in the "rfc" state + found_by_state = Document.objects.filter(states=draft_rfc_state).distinct() + + # Find Documents with an "rfc..." alias and confirm they're the same set + rfc_docaliases = DocAlias.objects.filter(name__startswith="rfc") + found_by_name = Document.objects.filter(docalias__in=rfc_docaliases).distinct() + assert set(found_by_name) == set(found_by_state), "mismatch between rfcs identified by state and docalias" + + # As of 2023-06-15, there is one Document with two rfc aliases: rfc6312 and rfc6342 are the same Document. This + # was due to a publication error. Because we go alias-by-alias, no special handling is needed in this migration. + + for rfc_alias in rfc_docaliases.order_by("name"): + assert rfc_alias.docs.count() == 1, f"DocAlias {rfc_alias} is linked to more than 1 Document" + draft = rfc_alias.docs.first() + if draft.name.startswith("rfc"): + rfc = draft + rfc.type_id = "rfc" + rfc.rfc_number = int(draft.name[3:]) + rfc.save() + rfc.states.set([rfc_published_state]) + else: + rfc = Document.objects.create( + type_id="rfc", + name=rfc_alias.name, + rfc_number=int(rfc_alias.name[3:]), + time=draft.time, + title=draft.title, + stream=draft.stream, + group=draft.group, + abstract=draft.abstract, + pages=draft.pages, + words=draft.words, + std_level=draft.std_level, + ad=draft.ad, + external_url=draft.external_url, + uploaded_filename=draft.uploaded_filename, + note=draft.note, + ) + rfc.states.set([rfc_published_state]) + rfc.formal_languages.set(draft.formal_languages.all()) + + # Copy Authors + for da in draft.documentauthor_set.all(): + DocumentAuthor.objects.create( + document=rfc, + person=da.person, + email=da.email, + affiliation=da.affiliation, + country=da.country, + order=da.order, + ) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0010_dochistory_rfc_number_document_rfc_number"), + ("name", "0010_rfc_doctype_names"), + ] + + operations = [ + migrations.RunPython(forward), + ] diff --git a/ietf/doc/migrations/0012_move_rfc_docevents.py b/ietf/doc/migrations/0012_move_rfc_docevents.py new file mode 100644 index 00000000000..9969a8f0add --- /dev/null +++ b/ietf/doc/migrations/0012_move_rfc_docevents.py @@ -0,0 +1,88 @@ +# Generated by Django 4.2.2 on 2023-06-20 18:36 + +from django.db import migrations +from django.db.models import Q + + +def forward(apps, schema_editor): + """Move RFC events from the draft to the rfc Document""" + DocAlias = apps.get_model("doc", "DocAlias") + DocEvent = apps.get_model("doc", "DocEvent") + Document = apps.get_model("doc", "Document") + + # queryset with events migrated regardless of whether before or after the "published_rfc" event + events_always_migrated = DocEvent.objects.filter( + Q( + type__in=[ + "published_rfc", # do not remove this one! + ] + ) + ) + + # queryset with events migrated only after the "published_rfc" event + events_migrated_after_pub = DocEvent.objects.exclude( + type__in=[ + "created_ballot", + "closed_ballot", + "sent_ballot_announcement", + "changed_ballot_position", + "changed_ballot_approval_text", + "changed_ballot_writeup_text", + ] + ).exclude( + type="added_comment", + desc__contains="ballot set", # excludes 311 comments that all apply to drafts + ) + + # special case for rfc 6312/6342 draft, which has two published_rfc events + ignore = ["rfc6312", "rfc6342"] # do not reprocess these later + rfc6312 = Document.objects.get(name="rfc6312") + rfc6342 = Document.objects.get(name="rfc6342") + draft = DocAlias.objects.get(name="rfc6312").docs.first() + assert draft == DocAlias.objects.get(name="rfc6342").docs.first() + published_events = list( + DocEvent.objects.filter(doc=draft, type="published_rfc").order_by("time") + ) + assert len(published_events) == 2 + ( + pub_event_6312, + pub_event_6342, + ) = published_events # order matches pub dates at rfc-editor.org + + pub_event_6312.doc = rfc6312 + pub_event_6312.save() + events_migrated_after_pub.filter( + doc=draft, + time__gte=pub_event_6312.time, + time__lt=pub_event_6342.time, + ).update(doc=rfc6312) + + pub_event_6342.doc = rfc6342 + pub_event_6342.save() + events_migrated_after_pub.filter( + doc=draft, + time__gte=pub_event_6342.time, + ).update(doc=rfc6342) + + # Now handle all the rest + for rfc in Document.objects.filter(type_id="rfc").exclude(name__in=ignore): + draft = DocAlias.objects.get(name=rfc.name).docs.first() + assert draft is not None + published_event = DocEvent.objects.get(doc=draft, type="published_rfc") + events_always_migrated.filter( + doc=draft, + ).update(doc=rfc) + events_migrated_after_pub.filter( + doc=draft, + time__gte=published_event.time, + ).update(doc=rfc) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0011_create_rfc_documents"), + ] + + operations = [ + migrations.RunPython(forward), + ] diff --git a/ietf/doc/migrations/0013_rfc_relateddocuments.py b/ietf/doc/migrations/0013_rfc_relateddocuments.py new file mode 100644 index 00000000000..9baddaebdb5 --- /dev/null +++ b/ietf/doc/migrations/0013_rfc_relateddocuments.py @@ -0,0 +1,45 @@ +# Generated by Django 4.2.3 on 2023-07-05 22:40 + +from django.db import migrations + + +def forward(apps, schema_editor): + DocAlias = apps.get_model("doc", "DocAlias") + Document = apps.get_model("doc", "Document") + RelatedDocument = apps.get_model("doc", "RelatedDocument") + for rfc_alias in DocAlias.objects.filter(name__startswith="rfc").exclude( + docs__type_id="rfc" + ): + # Move these over to the RFC + RelatedDocument.objects.filter( + relationship__slug__in=( + "tobcp", + "toexp", + "tohist", + "toinf", + "tois", + "tops", + "obs", + "updates", + ), + source__docalias=rfc_alias, + ).update(source=Document.objects.get(name=rfc_alias.name)) + # Duplicate references on the RFC but keep the ones on the draft as well + originals = list( + RelatedDocument.objects.filter( + relationship__slug__in=("refinfo", "refnorm", "refold", "refunk"), + source__docalias=rfc_alias, + ) + ) + for o in originals: + o.pk = None + o.source = Document.objects.get(name=rfc_alias.name) + RelatedDocument.objects.bulk_create(originals) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0012_move_rfc_docevents"), + ] + + operations = [migrations.RunPython(forward)] diff --git a/ietf/doc/migrations/0014_move_rfc_docaliases.py b/ietf/doc/migrations/0014_move_rfc_docaliases.py new file mode 100644 index 00000000000..c82a98e0526 --- /dev/null +++ b/ietf/doc/migrations/0014_move_rfc_docaliases.py @@ -0,0 +1,38 @@ +# Generated by Django 4.2.2 on 2023-06-20 18:36 + +from django.db import migrations + + +def forward(apps, schema_editor): + """Point "rfc..." DocAliases at the rfc-type Document + + Creates a became_rfc RelatedDocument to preserve the connection between the draft and the rfc. + """ + DocAlias = apps.get_model("doc", "DocAlias") + Document = apps.get_model("doc", "Document") + RelatedDocument = apps.get_model("doc", "RelatedDocument") + + for rfc_alias in DocAlias.objects.filter(name__startswith="rfc"): + rfc = Document.objects.get(name=rfc_alias.name) + aliased_doc = rfc_alias.docs.get() # implicitly confirms only one value in rfc_alias.docs + if aliased_doc != rfc: + # If the DocAlias was not already pointing at the rfc, it was pointing at the draft + # it came from. Create the relationship between draft and rfc Documents. + assert aliased_doc.type_id == "draft", f"Alias for {rfc.name} should be pointing at a draft" + RelatedDocument.objects.create( + source=aliased_doc, + target=rfc_alias, + relationship_id="became_rfc", + ) + # Now move the alias from the draft to the rfc + rfc_alias.docs.set([rfc]) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0013_rfc_relateddocuments"), + ] + + operations = [ + migrations.RunPython(forward), + ] diff --git a/ietf/doc/migrations/0015_relate_no_aliases.py b/ietf/doc/migrations/0015_relate_no_aliases.py new file mode 100644 index 00000000000..4ba3dd96070 --- /dev/null +++ b/ietf/doc/migrations/0015_relate_no_aliases.py @@ -0,0 +1,84 @@ +# Generated by Django 4.2.2 on 2023-06-16 13:40 + +from django.db import migrations +import django.db.models.deletion +from django.db.models import F, Subquery, OuterRef, CharField +import ietf.utils.models + +def forward(apps, schema_editor): + RelatedDocument = apps.get_model("doc", "RelatedDocument") + DocAlias = apps.get_model("doc", "DocAlias") + target_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("docs")[:1]) + name_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("name")[:1]) + RelatedDocument.objects.annotate(firstdoc=target_subquery).annotate(aliasname=name_subquery).update(target=F("firstdoc"),originaltargetaliasname=F("aliasname")) + +def reverse(apps, schema_editor): + pass + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0014_move_rfc_docaliases"), + ] + + operations = [ + migrations.AlterField( + model_name='relateddocument', + name='target', + field=ietf.utils.models.ForeignKey( + db_index=False, + on_delete=django.db.models.deletion.CASCADE, + to='doc.docalias', + ), + ), + migrations.RenameField( + model_name="relateddocument", + old_name="target", + new_name="deprecated_target" + ), + migrations.AlterField( + model_name='relateddocument', + name='deprecated_target', + field=ietf.utils.models.ForeignKey( + db_index=True, + on_delete=django.db.models.deletion.CASCADE, + to='doc.docalias', + ), + ), + migrations.AddField( + model_name="relateddocument", + name="target", + field=ietf.utils.models.ForeignKey( + default=1, # A lie, but a convenient one - no relations point here. + on_delete=django.db.models.deletion.CASCADE, + related_name="targets_related", + to="doc.document", + db_index=False, + ), + preserve_default=False, + ), + migrations.AddField( + model_name="relateddocument", + name="originaltargetaliasname", + field=CharField(max_length=255,null=True,blank=True), + preserve_default=True, + ), + migrations.RunPython(forward, reverse), + migrations.AlterField( + model_name="relateddocument", + name="target", + field=ietf.utils.models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="targets_related", + to="doc.document", + db_index=True, + ), + ), + migrations.RemoveField( + model_name="relateddocument", + name="deprecated_target", + field=ietf.utils.models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to='doc.DocAlias', + ), + ), + ] diff --git a/ietf/doc/migrations/0016_relate_hist_no_aliases.py b/ietf/doc/migrations/0016_relate_hist_no_aliases.py new file mode 100644 index 00000000000..df5fb3c3259 --- /dev/null +++ b/ietf/doc/migrations/0016_relate_hist_no_aliases.py @@ -0,0 +1,87 @@ +# Generated by Django 4.2.2 on 2023-06-16 13:40 + +from django.db import migrations +import django.db.models.deletion +from django.db.models import F, Subquery, OuterRef, CharField +import ietf.utils.models + +def forward(apps, schema_editor): + RelatedDocHistory = apps.get_model("doc", "RelatedDocHistory") + DocAlias = apps.get_model("doc", "DocAlias") + target_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("docs")[:1]) + name_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("name")[:1]) + RelatedDocHistory.objects.annotate(firstdoc=target_subquery).annotate(aliasname=name_subquery).update(target=F("firstdoc"),originaltargetaliasname=F("aliasname")) + +def reverse(apps, schema_editor): + pass + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0015_relate_no_aliases"), + ] + + operations = [ + migrations.AlterField( + model_name='relateddochistory', + name='target', + field=ietf.utils.models.ForeignKey( + db_index=False, + on_delete=django.db.models.deletion.CASCADE, + to='doc.docalias', + related_name='reversely_related_document_history_set', + ), + ), + migrations.RenameField( + model_name="relateddochistory", + old_name="target", + new_name="deprecated_target" + ), + migrations.AlterField( + model_name='relateddochistory', + name='deprecated_target', + field=ietf.utils.models.ForeignKey( + db_index=True, + on_delete=django.db.models.deletion.CASCADE, + to='doc.docalias', + related_name='deprecated_reversely_related_document_history_set', + ), + ), + migrations.AddField( + model_name="relateddochistory", + name="target", + field=ietf.utils.models.ForeignKey( + default=1, # A lie, but a convenient one - no relations point here. + on_delete=django.db.models.deletion.CASCADE, + to="doc.document", + db_index=False, + related_name='reversely_related_document_history_set', + ), + preserve_default=False, + ), + migrations.AddField( + model_name="relateddochistory", + name="originaltargetaliasname", + field=CharField(max_length=255,null=True,blank=True), + preserve_default=True, + ), + migrations.RunPython(forward, reverse), + migrations.AlterField( + model_name="relateddochistory", + name="target", + field=ietf.utils.models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="doc.document", + db_index=True, + related_name='reversely_related_document_history_set', + ), + ), + migrations.RemoveField( + model_name="relateddochistory", + name="deprecated_target", + field=ietf.utils.models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to='doc.DocAlias', + related_name='deprecated_reversely_related_document_history_set', + ), + ), + ] diff --git a/ietf/doc/migrations/0017_delete_docalias.py b/ietf/doc/migrations/0017_delete_docalias.py new file mode 100644 index 00000000000..207ca81e155 --- /dev/null +++ b/ietf/doc/migrations/0017_delete_docalias.py @@ -0,0 +1,16 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("ipr", "0002_iprdocrel_no_aliases"), + ("doc", "0016_relate_hist_no_aliases"), + ] + + operations = [ + migrations.DeleteModel( + name="DocAlias", + ), + ] diff --git a/ietf/doc/migrations/0018_move_dochistory.py b/ietf/doc/migrations/0018_move_dochistory.py new file mode 100644 index 00000000000..0bc29b0bc45 --- /dev/null +++ b/ietf/doc/migrations/0018_move_dochistory.py @@ -0,0 +1,45 @@ +# Generated by Django 4.2.5 on 2023-09-11 17:52 + +from django.db import migrations + +from django.db.models import Subquery, OuterRef, F + + +def forward(apps, schema_editor): + DocHistory = apps.get_model("doc", "DocHistory") + RelatedDocument = apps.get_model("doc", "RelatedDocument") + Document = apps.get_model("doc", "Document") + DocHistory.objects.filter(type_id="draft", doc__type_id="rfc").update(type_id="rfc") + DocHistory.objects.filter( + type_id="draft", doc__type_id="draft", name__startswith="rfc" + ).annotate( + rfc_id=Subquery( + RelatedDocument.objects.filter( + source_id=OuterRef("doc_id"), relationship_id="became_rfc" + ).values_list("target_id", flat=True)[:1] + ) + ).update( + doc_id=F("rfc_id"), type_id="rfc" + ) + DocHistory.objects.filter(type_id="rfc").annotate( + rfcno=Subquery( + Document.objects.filter(pk=OuterRef("doc_id")).values_list( + "rfc_number", flat=True + )[:1] + ) + ).update(rfc_number=F("rfcno")) + assert not DocHistory.objects.filter( + name__startswith="rfc", type_id="draft" + ).exists() + assert not DocHistory.objects.filter( + type_id="rfc", rfc_number__isnull=True + ).exists() + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0017_delete_docalias"), + ] + + # There is no going back + operations = [migrations.RunPython(forward)] diff --git a/ietf/doc/migrations/0019_subseries.py b/ietf/doc/migrations/0019_subseries.py new file mode 100644 index 00000000000..be2c612ac0e --- /dev/null +++ b/ietf/doc/migrations/0019_subseries.py @@ -0,0 +1,21 @@ +# Copyright The IETF Trust 2023, All Rights Reserved +from django.db import migrations + + +def forward(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + for slug in ["bcp", "std", "fyi"]: + StateType.objects.create(slug=slug, label=f"{slug} state") + + +def reverse(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + StateType.objects.filter(slug__in=["bcp", "std", "fyi"]).delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0018_move_dochistory"), + ] + + operations = [migrations.RunPython(forward, reverse)] diff --git a/ietf/doc/migrations/0020_move_errata_tags.py b/ietf/doc/migrations/0020_move_errata_tags.py new file mode 100644 index 00000000000..897b88f4678 --- /dev/null +++ b/ietf/doc/migrations/0020_move_errata_tags.py @@ -0,0 +1,29 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + +from django.db import migrations + +from django.db.models import Subquery, OuterRef, F + + +def forward(apps, schema_editor): + Document = apps.get_model("doc", "Document") + RelatedDocument = apps.get_model("doc", "RelatedDocument") + Document.tags.through.objects.filter( + doctagname_id__in=["errata", "verified-errata"], document__type_id="draft" + ).annotate( + rfcdoc=Subquery( + RelatedDocument.objects.filter( + relationship_id="became_rfc", source_id=OuterRef("document__pk") + ).values_list("target__pk", flat=True)[:1] + ) + ).update( + document_id=F("rfcdoc") + ) + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0019_subseries"), + ] + + operations = [migrations.RunPython(forward)] diff --git a/ietf/doc/migrations/0021_narrativeminutes.py b/ietf/doc/migrations/0021_narrativeminutes.py new file mode 100644 index 00000000000..0f330bd0530 --- /dev/null +++ b/ietf/doc/migrations/0021_narrativeminutes.py @@ -0,0 +1,39 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + +from django.db import migrations + + +def forward(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + State = apps.get_model("doc", "State") + + StateType.objects.create( + slug="narrativeminutes", + label="State", + ) + for order, slug in enumerate(["active", "deleted"]): + State.objects.create( + slug=slug, + type_id="narrativeminutes", + name=slug.capitalize(), + order=order, + desc="", + used=True, + ) + + +def reverse(apps, schema_editor): + StateType = apps.get_model("doc", "StateType") + State = apps.get_model("doc", "State") + + State.objects.filter(type_id="narrativeminutes").delete() + StateType.objects.filter(slug="narrativeminutes").delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("doc", "0020_move_errata_tags"), + ("name", "0013_narrativeminutes"), + ] + + operations = [migrations.RunPython(forward, reverse)] diff --git a/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py b/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py new file mode 100644 index 00000000000..ad27793a833 --- /dev/null +++ b/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.15 on 2024-08-16 16:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("doc", "0021_narrativeminutes"), + ] + + operations = [ + migrations.RemoveField( + model_name="dochistory", + name="internal_comments", + ), + migrations.RemoveField( + model_name="document", + name="internal_comments", + ), + ] diff --git a/ietf/doc/migrations/0023_bofreqspamstate.py b/ietf/doc/migrations/0023_bofreqspamstate.py new file mode 100644 index 00000000000..dbbaf996e9b --- /dev/null +++ b/ietf/doc/migrations/0023_bofreqspamstate.py @@ -0,0 +1,30 @@ +# Copyright The IETF Trust 2024, All Rights Reserved + +from django.db import migrations + + +def forward(apps, schema_editor): + State = apps.get_model("doc", "State") + State.objects.get_or_create( + type_id="bofreq", + slug="spam", + defaults={"name": "Spam", "desc": "The BOF request is spam", "order": 5}, + ) + + +def reverse(apps, schema_editor): + State = apps.get_model("doc", "State") + Document = apps.get_model("doc", "Document") + assert not Document.objects.filter( + states__type="bofreq", states__slug="spam" + ).exists() + State.objects.filter(type_id="bofreq", slug="spam").delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ("doc", "0022_remove_dochistory_internal_comments_and_more"), + ] + + operations = [migrations.RunPython(forward, reverse)] diff --git a/ietf/doc/migrations/0024_remove_ad_is_watching_states.py b/ietf/doc/migrations/0024_remove_ad_is_watching_states.py new file mode 100644 index 00000000000..0c0fb0ad25c --- /dev/null +++ b/ietf/doc/migrations/0024_remove_ad_is_watching_states.py @@ -0,0 +1,121 @@ +# Copyright The IETF Trust 2024, All Rights Reserved + +from django.db import migrations + + +def get_helper(DocHistory, RelatedDocument, RelatedDocHistory, DocumentAuthor, DocHistoryAuthor): + """Dependency injection wrapper""" + + def save_document_in_history(doc): + """Save a snapshot of document and related objects in the database. + + Local copy of ietf.doc.utils.save_document_in_history() to avoid depending on the + code base in a migration. + """ + + def get_model_fields_as_dict(obj): + return dict((field.name, getattr(obj, field.name)) + for field in obj._meta.fields + if field is not obj._meta.pk) + + # copy fields + fields = get_model_fields_as_dict(doc) + fields["doc"] = doc + fields["name"] = doc.name + + dochist = DocHistory(**fields) + dochist.save() + + # copy many to many + for field in doc._meta.many_to_many: + if field.remote_field.through and field.remote_field.through._meta.auto_created: + hist_field = getattr(dochist, field.name) + hist_field.clear() + hist_field.set(getattr(doc, field.name).all()) + + # copy remaining tricky many to many + def transfer_fields(obj, HistModel): + mfields = get_model_fields_as_dict(item) + # map doc -> dochist + for k, v in mfields.items(): + if v == doc: + mfields[k] = dochist + HistModel.objects.create(**mfields) + + for item in RelatedDocument.objects.filter(source=doc): + transfer_fields(item, RelatedDocHistory) + + for item in DocumentAuthor.objects.filter(document=doc): + transfer_fields(item, DocHistoryAuthor) + + return dochist + + return save_document_in_history + + +def forward(apps, schema_editor): + """Mark watching draft-iesg state unused after removing it from Documents""" + StateDocEvent = apps.get_model("doc", "StateDocEvent") + Document = apps.get_model("doc", "Document") + State = apps.get_model("doc", "State") + StateType = apps.get_model("doc", "StateType") + Person = apps.get_model("person", "Person") + + save_document_in_history = get_helper( + DocHistory=apps.get_model("doc", "DocHistory"), + RelatedDocument=apps.get_model("doc", "RelatedDocument"), + RelatedDocHistory=apps.get_model("doc", "RelatedDocHistory"), + DocumentAuthor=apps.get_model("doc", "DocumentAuthor"), + DocHistoryAuthor=apps.get_model("doc", "DocHistoryAuthor"), + ) + + draft_iesg_state_type = StateType.objects.get(slug="draft-iesg") + idexists_state = State.objects.get(type=draft_iesg_state_type, slug="idexists") + watching_state = State.objects.get(type=draft_iesg_state_type, slug="watching") + system_person = Person.objects.get(name="(System)") + + # Remove state from documents that currently have it + for doc in Document.objects.filter(states=watching_state): + assert doc.type_id == "draft" + doc.states.remove(watching_state) + doc.states.add(idexists_state) + e = StateDocEvent.objects.create( + type="changed_state", + by=system_person, + doc=doc, + rev=doc.rev, + desc=f"{draft_iesg_state_type.label} changed to {idexists_state.name} from {watching_state.name}", + state_type=draft_iesg_state_type, + state=idexists_state, + ) + doc.time = e.time + doc.save() + save_document_in_history(doc) + assert not Document.objects.filter(states=watching_state).exists() + + # Mark state as unused + watching_state.used = False + watching_state.save() + + +def reverse(apps, schema_editor): + """Mark watching draft-iesg state as used + + Does not try to re-apply the state to Documents modified by the forward migration. This + could be done in theory, but would either require dangerous history rewriting or add a + lot of history junk. + """ + State = apps.get_model("doc", "State") + StateType = apps.get_model("doc", "StateType") + State.objects.filter( + type=StateType.objects.get(slug="draft-iesg"), slug="watching" + ).update(used=True) + + +class Migration(migrations.Migration): + + dependencies = [ + ("doc", "0023_bofreqspamstate"), + ] + + operations = [migrations.RunPython(forward, reverse)] diff --git a/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py b/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py new file mode 100644 index 00000000000..e948ca30113 --- /dev/null +++ b/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py @@ -0,0 +1,66 @@ +# Copyright The IETF Trust 2025, All Rights Reserved + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("doc", "0024_remove_ad_is_watching_states"), + ] + + operations = [ + migrations.CreateModel( + name="StoredObject", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("store", models.CharField(max_length=256)), + ("name", models.CharField(max_length=1024)), + ("sha384", models.CharField(max_length=96)), + ("len", models.PositiveBigIntegerField()), + ( + "store_created", + models.DateTimeField( + help_text="The instant the object ws first placed in the store" + ), + ), + ( + "created", + models.DateTimeField( + help_text="Instant object became known. May not be the same as the storage's created value for the instance. It will hold ctime for objects imported from older disk storage" + ), + ), + ( + "modified", + models.DateTimeField( + help_text="Last instant object was modified. May not be the same as the storage's modified value for the instance. It will hold mtime for objects imported from older disk storage unless they've actually been overwritten more recently" + ), + ), + ("doc_name", models.CharField(blank=True, max_length=255, null=True)), + ("doc_rev", models.CharField(blank=True, max_length=16, null=True)), + ("deleted", models.DateTimeField(null=True)), + ], + options={ + "indexes": [ + models.Index( + fields=["doc_name", "doc_rev"], + name="doc_storedo_doc_nam_d04465_idx", + ) + ], + }, + ), + migrations.AddConstraint( + model_name="storedobject", + constraint=models.UniqueConstraint( + fields=("store", "name"), name="unique_name_per_store" + ), + ), + ] diff --git a/ietf/doc/migrations/0026_change_wg_state_descriptions.py b/ietf/doc/migrations/0026_change_wg_state_descriptions.py new file mode 100644 index 00000000000..b02b12c97e4 --- /dev/null +++ b/ietf/doc/migrations/0026_change_wg_state_descriptions.py @@ -0,0 +1,117 @@ +# Copyright The IETF Trust 2025, All Rights Reserved + +from django.db import migrations + +def forward(apps, schema_editor): + State = apps.get_model("doc","State") + for name, desc in [ + ("WG Document","The document has been adopted by the Working Group (WG) and is under development. A document can only be adopted by one WG at a time. However, a document may be transferred between WGs."), + ("Parked WG Document","The Working Group (WG) document is in a temporary state where it will not be actively developed. The reason for the pause is explained via a datatracker comments section."), + ("Dead WG Document","The Working Group (WG) document has been abandoned by the WG. No further development is planned in this WG. A decision to resume work on this document and move it out of this state is possible."), + ("In WG Last Call","The Working Group (WG) document is currently subject to an active WG Last Call (WGLC) review per Section 7.4 of RFC2418."), + ("Waiting for Implementation","The progression of this Working Group (WG) document towards publication is paused as it awaits implementation. The process governing the approach to implementations is WG-specific."), + ("Held by WG","Held by Working Group (WG) chairs for administrative reasons. See document history for details."), + ("Waiting for WG Chair Go-Ahead","The Working Group (WG) document has completed Working Group Last Call (WGLC), but the WG chair(s) are not yet ready to call consensus on the document. The reasons for this may include comments from the WGLC need to be responded to, or a revision to the document is needed"), + ("WG Consensus: Waiting for Write-Up","The Working Group (WG) document has consensus to proceed to publication. However, the document is waiting for a document shepherd write-up per RFC4858."), + ("Submitted to IESG for Publication","The Working Group (WG) document has left the WG and been submitted to the Internet Engineering Steering Group (IESG) for evaluation and publication. See the “IESG State” or “RFC Editor State” for further details on the state of the document."), + ("Candidate for WG Adoption","The individual submission document has been marked by the Working Group (WG) chairs as a candidate for adoption by the WG, but no adoption call has been started."), + ("Call For Adoption By WG Issued","A call for adoption of the individual submission document has been issued by the Working Group (WG) chairs. This call is still running but the WG has not yet reached consensus for adoption."), + ("Adopted by a WG","The individual submission document has been adopted by the Working Group (WG), but a WG document replacing this document with the typical naming convention of 'draft- ietf-wgname-topic-nn' has not yet been submitted."), + ("Adopted for WG Info Only","The document is adopted by the Working Group (WG) for its internal use. The WG has decided that it will not pursue publication of it as an RFC."), + ]: + State.objects.filter(name=name).update(desc=desc) + +def reverse(apps, schema_editor): + State = apps.get_model("doc","State") + for name, desc in [ + ("WG Document","""4.2.4. WG Document + + The "WG Document" state describes an I-D that has been adopted by an IETF WG and is being actively developed. + + A WG Chair may transition an I-D into the "WG Document" state at any time as long as the I-D is not being considered or developed in any other WG. + + Alternatively, WG Chairs may rely upon new functionality to be added to the Datatracker to automatically move version-00 drafts into the "WG Document" state as described in Section 4.1. + + Under normal conditions, it should not be possible for an I-D to be in the "WG Document" state in more than one WG at a time. This said, I-Ds may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs."""), + ("Parked WG Document","""4.2.5. Parked WG Document + + A "Parked WG Document" is an I-D that has lost its author or editor, is waiting for another document to be written or for a review to be completed, or cannot be progressed by the working group for some other reason. + + Some of the annotation tags described in Section 4.3 may be used in conjunction with this state to indicate why an I-D has been parked, and/or what may need to happen for the I-D to be un-parked. + + Parking a WG draft will not prevent it from expiring; however, this state can be used to indicate why the I-D has stopped progressing in the WG. + + A "Parked WG Document" that is not expired may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs."""), + ("Dead WG Document","""4.2.6. Dead WG Document + + A "Dead WG Document" is an I-D that has been abandoned. Note that 'Dead' is not always a final state for a WG I-D. If consensus is subsequently achieved, a "Dead WG Document" may be resurrected. A "Dead WG Document" that is not resurrected will eventually expire. + + Note that an I-D that is declared to be "Dead" in one WG and that is not expired may be transferred to a non-dead state in another WG with the consent of the WG Chairs and the responsible ADs."""), + ("In WG Last Call","""4.2.7. In WG Last Call + + A document "In WG Last Call" is an I-D for which a WG Last Call (WGLC) has been issued and is in progress. + + Note that conducting a WGLC is an optional part of the IETF WG process, per Section 7.4 of RFC 2418 [RFC2418]. + + If a WG Chair decides to conduct a WGLC on an I-D, the "In WG Last Call" state can be used to track the progress of the WGLC. The Chair may configure the Datatracker to send a WGLC message to one or more mailing lists when the Chair moves the I-D into this state. The WG Chair may also be able to select a different set of mailing lists for a different document undergoing a WGLC; some documents may deserve coordination with other WGs. + + A WG I-D in this state should remain "In WG Last Call" until the WG Chair moves it to another state. The WG Chair may configure the Datatracker to send an e-mail after a specified period of time to remind or 'nudge' the Chair to conclude the WGLC and to determine the next state for the document. + + It is possible for one WGLC to lead into another WGLC for the same document. For example, an I-D that completed a WGLC as an "Informational" document may need another WGLC if a decision is taken to convert the I-D into a Standards Track document."""), + ("Waiting for Implementation","""In some areas, it can be desirable to wait for multiple interoperable implementations before progressing a draft to be an RFC, and in some WGs this is required. This state should be entered after WG Last Call has completed."""), + ("Held by WG","""Held by WG, see document history for details."""), + ("Waiting for WG Chair Go-Ahead","""4.2.8. Waiting for WG Chair Go-Ahead + + A WG Chair may wish to place an I-D that receives a lot of comments during a WGLC into the "Waiting for WG Chair Go-Ahead" state. This state describes an I-D that has undergone a WGLC; however, the Chair is not yet ready to call consensus on the document. + + If comments from the WGLC need to be responded to, or a revision to the I-D is needed, the Chair may place an I-D into this state until all of the WGLC comments are adequately addressed and the (possibly revised) document is in the I-D repository."""), + ("WG Consensus: Waiting for Write-Up","""4.2.9. WG Consensus: Waiting for Writeup + + A document in the "WG Consensus: Waiting for Writeup" state has essentially completed its development within the working group, and is nearly ready to be sent to the IESG for publication. The last thing to be done is the preparation of a protocol writeup by a Document Shepherd. The IESG requires that a document shepherd writeup be completed before publication of the I-D is requested. The IETF document shepherding process and the role of a WG Document Shepherd is described in RFC 4858 [RFC4858] + + A WG Chair may call consensus on an I-D without a formal WGLC and transition an I-D that was in the "WG Document" state directly into this state. + + The name of this state includes the words "Waiting for Writeup" because a good document shepherd writeup takes time to prepare."""), + ("Submitted to IESG for Publication","""4.2.10. Submitted to IESG for Publication + + This state describes a WG document that has been submitted to the IESG for publication and that has not been sent back to the working group for revision. + + An I-D in this state may be under review by the IESG, it may have been approved and be in the RFC Editor's queue, or it may have been published as an RFC. Other possibilities exist too. The document may be "Dead" (in the IESG state machine) or in a "Do Not Publish" state."""), + ("Candidate for WG Adoption","""The document has been marked as a candidate for WG adoption by the WG Chair. This state can be used before a call for adoption is issued (and the document is put in the "Call For Adoption By WG Issued" state), to indicate that the document is in the queue for a call for adoption, even if none has been issued yet."""), + ("Call For Adoption By WG Issued","""4.2.1. Call for Adoption by WG Issued + + The "Call for Adoption by WG Issued" state should be used to indicate when an I-D is being considered for adoption by an IETF WG. An I-D that is in this state is actively being considered for adoption and has not yet achieved consensus, preference, or selection in the WG. + + This state may be used to describe an I-D that someone has asked a WG to consider for adoption, if the WG Chair has agreed with the request. This state may also be used to identify an I-D that a WG Chair asked an author to write specifically for consideration as a candidate WG item [WGDTSPEC], and/or an I-D that is listed as a 'candidate draft' in the WG's charter. + + Under normal conditions, it should not be possible for an I-D to be in the "Call for Adoption by WG Issued" state in more than one working group at the same time. This said, it is not uncommon for authors to "shop" their I-Ds to more than one WG at a time, with the hope of getting their documents adopted somewhere. + + After this state is implemented in the Datatracker, an I-D that is in the "Call for Adoption by WG Issued" state will not be able to be "shopped" to any other WG without the consent of the WG Chairs and the responsible ADs impacted by the shopping. + + Note that Figure 1 includes an arc leading from this state to outside of the WG state machine. This illustrates that some I-Ds that are considered do not get adopted as WG drafts. An I-D that is not adopted as a WG draft will transition out of the WG state machine and revert back to having no stream-specific state; however, the status change history log of the I-D will record that the I-D was previously in the "Call for Adoption by WG Issued" state."""), + ("Adopted by a WG","""4.2.2. Adopted by a WG + + The "Adopted by a WG" state describes an individual submission I-D that an IETF WG has agreed to adopt as one of its WG drafts. + + WG Chairs who use this state will be able to clearly indicate when their WGs adopt individual submission I-Ds. This will facilitate the Datatracker's ability to correctly capture "Replaces" information for WG drafts and correct "Replaced by" information for individual submission I-Ds that have been replaced by WG drafts. + + This state is needed because the Datatracker uses the filename of an I-D as a key to search its database for status information about the I-D, and because the filename of a WG I-D is supposed to be different from the filename of an individual submission I-D. The filename of an individual submission I-D will typically be formatted as 'draft-author-wgname-topic-nn'. + + The filename of a WG document is supposed to be formatted as 'draft- ietf-wgname-topic-nn'. + + An individual I-D that is adopted by a WG may take weeks or months to be resubmitted by the author as a new (version-00) WG draft. If the "Adopted by a WG" state is not used, the Datatracker has no way to determine that an I-D has been adopted until a new version of the I-D is submitted to the WG by the author and until the I-D is approved for posting by a WG Chair."""), + ("Adopted for WG Info Only","""4.2.3. Adopted for WG Info Only + + The "Adopted for WG Info Only" state describes a document that contains useful information for the WG that adopted it, but the document is not intended to be published as an RFC. The WG will not actively develop the contents of the I-D or progress it for publication as an RFC. The only purpose of the I-D is to provide information for internal use by the WG."""), + ]: + State.objects.filter(name=name).update(desc=desc) + +class Migration(migrations.Migration): + + dependencies = [ + ("doc", "0025_storedobject_storedobject_unique_name_per_store"), + ] + + operations = [ + migrations.RunPython(forward, reverse) + ] diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 2e6db02a62e..8bb79b64ed3 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -1,42 +1,48 @@ -# Copyright The IETF Trust 2010-2020, All Rights Reserved +# Copyright The IETF Trust 2010-2025, All Rights Reserved # -*- coding: utf-8 -*- import datetime import logging -import io import os import django.db import rfc2html +from io import BufferedReader from pathlib import Path from lxml import etree -from typing import Optional, TYPE_CHECKING +from typing import Optional, Protocol, TYPE_CHECKING, Union from weasyprint import HTML as wpHTML +from weasyprint.text.fonts import FontConfiguration from django.db import models from django.core import checks +from django.core.files.base import File from django.core.cache import caches from django.core.validators import URLValidator, RegexValidator from django.urls import reverse as urlreverse from django.contrib.contenttypes.models import ContentType from django.conf import settings from django.utils import timezone -from django.utils.encoding import force_text +from django.utils.encoding import force_str from django.utils.html import mark_safe # type:ignore from django.contrib.staticfiles import finders import debug # pyflakes:ignore from ietf.group.models import Group +from ietf.doc.storage_utils import ( + store_str as utils_store_str, + store_bytes as utils_store_bytes, + store_file as utils_store_file +) from ietf.name.models import ( DocTypeName, DocTagName, StreamName, IntendedStdLevelName, StdLevelName, DocRelationshipName, DocReminderTypeName, BallotPositionName, ReviewRequestStateName, ReviewAssignmentStateName, FormalLanguageName, DocUrlTagName, ExtResourceName) from ietf.person.models import Email, Person from ietf.person.utils import get_active_balloters from ietf.utils import log -from ietf.utils.admin import admin_link from ietf.utils.decorators import memoize from ietf.utils.validators import validate_no_control_chars from ietf.utils.mail import formataddr @@ -83,7 +89,7 @@ class State(models.Model): desc = models.TextField(blank=True) order = models.IntegerField(default=0) - next_states = models.ManyToManyField('State', related_name="previous_states", blank=True) + next_states = models.ManyToManyField('doc.State', related_name="previous_states", blank=True) def __str__(self): return self.name @@ -122,7 +128,7 @@ class DocumentInfo(models.Model): external_url = models.URLField(blank=True) uploaded_filename = models.TextField(blank=True) note = models.TextField(blank=True) - internal_comments = models.TextField(blank=True) + rfc_number = models.PositiveIntegerField(blank=True, null=True) # only valid for type="rfc" def file_extension(self): if not hasattr(self, '_cached_extension'): @@ -135,20 +141,20 @@ def file_extension(self): def get_file_path(self): if not hasattr(self, '_cached_file_path'): - if self.type_id == "draft": + if self.type_id == "rfc": + self._cached_file_path = settings.RFC_PATH + elif self.type_id == "draft": if self.is_dochistory(): self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR else: - if self.get_state_slug() == "rfc": - self._cached_file_path = settings.RFC_PATH + # This could be simplified since anything in INTERNET_DRAFT_PATH is also already in INTERNET_ALL_DRAFTS_ARCHIVE_DIR + draft_state = self.get_state('draft') + if draft_state and draft_state.slug == 'active': + self._cached_file_path = settings.INTERNET_DRAFT_PATH else: - draft_state = self.get_state('draft') - if draft_state and draft_state.slug == 'active': - self._cached_file_path = settings.INTERNET_DRAFT_PATH - else: - self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR + self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR elif self.meeting_related() and self.type_id in ( - "agenda", "minutes", "slides", "bluesheets", "procmaterials", "chatlog", "polls" + "agenda", "minutes", "narrativeminutes", "slides", "bluesheets", "procmaterials", "chatlog", "polls" ): meeting = self.get_related_meeting() if meeting is not None: @@ -161,7 +167,7 @@ def get_file_path(self): self._cached_file_path = settings.CONFLICT_REVIEW_PATH elif self.type_id == "statchg": self._cached_file_path = settings.STATUS_CHANGE_PATH - elif self.type_id == "bofreq": + elif self.type_id == "bofreq": # TODO: This is probably unneeded, as is the separate path setting self._cached_file_path = settings.BOFREQ_PATH else: self._cached_file_path = settings.DOCUMENT_PATH_PATTERN.format(doc=self) @@ -171,27 +177,26 @@ def get_base_name(self): if not hasattr(self, '_cached_base_name'): if self.uploaded_filename: self._cached_base_name = self.uploaded_filename + elif self.type_id == 'rfc': + self._cached_base_name = "%s.txt" % self.name elif self.type_id == 'draft': if self.is_dochistory(): self._cached_base_name = "%s-%s.txt" % (self.doc.name, self.rev) else: - if self.get_state_slug() == 'rfc': - self._cached_base_name = "%s.txt" % self.canonical_name() - else: - self._cached_base_name = "%s-%s.txt" % (self.name, self.rev) + self._cached_base_name = "%s-%s.txt" % (self.name, self.rev) elif self.type_id in ["slides", "agenda", "minutes", "bluesheets", "procmaterials", ] and self.meeting_related(): ext = 'pdf' if self.type_id == 'procmaterials' else 'txt' - self._cached_base_name = f'{self.canonical_name()}-{self.rev}.{ext}' + self._cached_base_name = f'{self.name}-{self.rev}.{ext}' elif self.type_id == 'review': # TODO: This will be wrong if a review is updated on the same day it was created (or updated more than once on the same day) self._cached_base_name = "%s.txt" % self.name - elif self.type_id == 'bofreq': + elif self.type_id in ['bofreq', 'statement']: self._cached_base_name = "%s-%s.md" % (self.name, self.rev) else: if self.rev: - self._cached_base_name = "%s-%s.txt" % (self.canonical_name(), self.rev) + self._cached_base_name = "%s-%s.txt" % (self.name, self.rev) else: - self._cached_base_name = "%s.txt" % (self.canonical_name(), ) + self._cached_base_name = "%s.txt" % (self.name, ) return self._cached_base_name def get_file_name(self): @@ -199,17 +204,28 @@ def get_file_name(self): self._cached_file_name = os.path.join(self.get_file_path(), self.get_base_name()) return self._cached_file_name - def revisions(self): + + def revisions_by_dochistory(self): revisions = [] - doc = self.doc if isinstance(self, DocHistory) else self - for e in doc.docevent_set.filter(type='new_revision').distinct(): - if e.rev and not e.rev in revisions: - revisions.append(e.rev) - if not doc.rev in revisions: - revisions.append(doc.rev) - revisions.sort() + if self.type_id != "rfc": + for h in self.history_set.order_by("time", "id"): + if h.rev and not h.rev in revisions: + revisions.append(h.rev) + if not self.rev in revisions: + revisions.append(self.rev) return revisions + def revisions_by_newrevisionevent(self): + revisions = [] + if self.type_id != "rfc": + doc = self.doc if isinstance(self, DocHistory) else self + for e in doc.docevent_set.filter(type='new_revision').distinct(): + if e.rev and not e.rev in revisions: + revisions.append(e.rev) + if not doc.rev in revisions: + revisions.append(doc.rev) + revisions.sort() + return revisions def get_href(self, meeting=None): return self._get_ref(meeting=meeting,meeting_doc_refs=settings.MEETING_DOC_HREFS) @@ -243,7 +259,7 @@ def _get_ref(self, meeting=None, meeting_doc_refs=settings.MEETING_DOC_HREFS): format = settings.DOC_HREFS[self.type_id] elif self.type_id in settings.DOC_HREFS: self.is_meeting_related = False - if self.is_rfc(): + if self.type_id == "rfc": format = settings.DOC_HREFS['rfc'] else: format = settings.DOC_HREFS[self.type_id] @@ -270,6 +286,19 @@ def _get_ref(self, meeting=None, meeting_doc_refs=settings.MEETING_DOC_HREFS): info = dict(doc=self) href = format.format(**info) + + # For slides that are not meeting-related, we need to know the file extension. + # Assume we have access to the same files as settings.DOC_HREFS["slides"] and + # see what extension is available + if self.type_id == "slides" and not self.meeting_related() and not href.endswith("/"): + filepath = Path(self.get_file_path()) / self.get_base_name() # start with this + if not filepath.exists(): + # Look for other extensions - grab the first one, sorted for stability + for existing in sorted(filepath.parent.glob(f"{filepath.stem}.*")): + filepath = filepath.with_suffix(existing.suffix) + break + href += filepath.suffix # tack on the extension + if href.startswith('/'): href = settings.IDTRACKER_BASE_URL + href self._cached_href = href @@ -333,7 +362,9 @@ def friendly_state(self): if not state: return "Unknown state" - if self.type_id == 'draft': + if self.type_id == "rfc": + return f"RFC {self.rfc_number} ({self.std_level})" + elif self.type_id == 'draft': iesg_state = self.get_state("draft-iesg") iesg_state_summary = None if iesg_state: @@ -342,13 +373,15 @@ def friendly_state(self): iesg_state_summary = iesg_state.name if iesg_substate: iesg_state_summary = iesg_state_summary + "::"+"::".join(tag.name for tag in iesg_substate) - - if state.slug == "rfc": - return "RFC %s (%s)" % (self.rfc_number(), self.std_level) + + rfc = self.became_rfc() + if rfc: + return f"Became RFC {rfc.rfc_number} ({rfc.std_level})" + elif state.slug == "repl": rs = self.related_that("replaces") if rs: - return mark_safe("Replaced by " + ", ".join("%s" % (urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=alias.document.name)), alias.document) for alias in rs)) + return mark_safe("Replaced by " + ", ".join("%s" % (urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=related.name)), related) for related in rs)) else: return "Replaced" elif state.slug == "active": @@ -374,27 +407,6 @@ def friendly_state(self): else: return state.name - def is_rfc(self): - if not hasattr(self, '_cached_is_rfc'): - self._cached_is_rfc = self.pk and self.type_id == 'draft' and self.states.filter(type='draft',slug='rfc').exists() - return self._cached_is_rfc - - def rfc_number(self): - if not hasattr(self, '_cached_rfc_number'): - self._cached_rfc_number = None - if self.is_rfc(): - n = self.canonical_name() - if n.startswith("rfc"): - self._cached_rfc_number = n[3:] - else: - if isinstance(self,Document): - logger.error("Document self.is_rfc() is True but self.canonical_name() is %s" % n) - return self._cached_rfc_number - - @property - def rfcnum(self): - return self.rfc_number() - def author_list(self): best_addresses = [] for author in self.documentauthor_set.all(): @@ -432,7 +444,7 @@ def has_rfc_editor_note(self): return e != None and (e.text != "") def meeting_related(self): - if self.type_id in ("agenda","minutes","bluesheets","slides","recording","procmaterials","chatlog","polls"): + if self.type_id in ("agenda","minutes", "narrativeminutes", "bluesheets","slides","recording","procmaterials","chatlog","polls"): return self.type_id != "slides" or self.get_state_slug('reuse_policy')=='single' return False @@ -467,9 +479,9 @@ def relations_that(self, relationship): if not isinstance(relationship, tuple): raise TypeError("Expected a string or tuple, received %s" % type(relationship)) if isinstance(self, Document): - return RelatedDocument.objects.filter(target__docs=self, relationship__in=relationship).select_related('source') + return RelatedDocument.objects.filter(target=self, relationship__in=relationship).select_related('source') elif isinstance(self, DocHistory): - return RelatedDocHistory.objects.filter(target__docs=self.doc, relationship__in=relationship).select_related('source') + return RelatedDocHistory.objects.filter(target=self.doc, relationship__in=relationship).select_related('source') else: raise TypeError("Expected method called on Document or DocHistory") @@ -503,15 +515,14 @@ def all_relations_that_doc(self, relationship, related=None): for r in rels: if not r in related: related += ( r, ) - for doc in r.target.docs.all(): - related = doc.all_relations_that_doc(relationship, related) + related = r.target.all_relations_that_doc(relationship, related) return related def related_that(self, relationship): - return list(set([x.source.docalias.get(name=x.source.name) for x in self.relations_that(relationship)])) + return list(set([x.source for x in self.relations_that(relationship)])) def all_related_that(self, relationship, related=None): - return list(set([x.source.docalias.get(name=x.source.name) for x in self.all_relations_that(relationship)])) + return list(set([x.source for x in self.all_relations_that(relationship)])) def related_that_doc(self, relationship): return list(set([x.target for x in self.relations_that_doc(relationship)])) @@ -520,42 +531,55 @@ def all_related_that_doc(self, relationship, related=None): return list(set([x.target for x in self.all_relations_that_doc(relationship)])) def replaces(self): - return set([ d for r in self.related_that_doc("replaces") for d in r.docs.all() ]) - - def replaces_canonical_name(self): - s = set([ r.document for r in self.related_that_doc("replaces")]) - first = list(s)[0] if s else None - return None if first is None else first.filename_with_rev() + return self.related_that_doc("replaces") def replaced_by(self): return set([ r.document for r in self.related_that("replaces") ]) - def text(self): + def _text_path(self): path = self.get_file_name() root, ext = os.path.splitext(path) txtpath = root+'.txt' if ext != '.txt' and os.path.exists(txtpath): path = txtpath + return path + + def text_exists(self): + path = Path(self._text_path()) + return path.exists() + + def text(self, size = -1): + path = Path(self._text_path()) + if not path.exists(): + return None try: - with io.open(path, 'rb') as file: - raw = file.read() - except IOError: + with path.open('rb') as file: + raw = file.read(size) + except IOError as e: + log.log(f"Error reading text for {path}: {e}") return None + text = None try: text = raw.decode('utf-8') except UnicodeDecodeError: - text = raw.decode('latin-1') - # + for back in range(1,4): + try: + text = raw[:-back].decode('utf-8') + break + except UnicodeDecodeError: + pass + if text is None: + text = raw.decode('latin-1') return text def text_or_error(self): return self.text() or "Error; cannot read '%s'"%self.get_base_name() def html_body(self, classes=""): - if self.get_state_slug() == "rfc": + if self.type_id == "rfc": try: html = Path( - os.path.join(settings.RFC_PATH, self.canonical_name() + ".html") + os.path.join(settings.RFC_PATH, self.name + ".html") ).read_text() except (IOError, UnicodeDecodeError): return None @@ -626,6 +650,7 @@ def pdfized(self): stylesheets.append(finders.find("ietf/css/document_html_txt.css")) else: text = self.htmlized() + stylesheets.append(f'{settings.STATIC_IETF_ORG_INTERNAL}/fonts/noto-sans-mono/import.css') cache = caches["pdfized"] cache_key = name.split(".")[0] @@ -635,15 +660,20 @@ def pdfized(self): pdf = None if not pdf: try: + font_config = FontConfiguration() pdf = wpHTML( string=text, base_url=settings.IDTRACKER_BASE_URL ).write_pdf( stylesheets=stylesheets, + font_config=font_config, presentational_hints=True, - optimize_size=("fonts", "images"), + optimize_images=True, ) except AssertionError: pdf = None + except Exception as e: + log.log('weasyprint failed:'+str(e)) + raise if pdf: cache.set(cache_key, pdf, settings.PDFIZER_CACHE_TIME) return pdf @@ -652,66 +682,165 @@ def references(self): return self.relations_that_doc(('refnorm','refinfo','refunk','refold')) def referenced_by(self): - return self.relations_that(('refnorm','refinfo','refunk','refold')).filter(source__states__type__slug='draft',source__states__slug__in=['rfc','active']) - + return self.relations_that(("refnorm", "refinfo", "refunk", "refold")).filter( + models.Q( + source__type__slug="draft", + source__states__type__slug="draft", + source__states__slug="active", + ) + | models.Q(source__type__slug="rfc") + ).distinct() + def referenced_by_rfcs(self): - return self.relations_that(('refnorm','refinfo','refunk','refold')).filter(source__states__type__slug='draft',source__states__slug='rfc') + """Get refs to this doc from RFCs""" + return self.relations_that(("refnorm", "refinfo", "refunk", "refold")).filter( + source__type__slug="rfc" + ) + def became_rfc(self): + if not hasattr(self, "_cached_became_rfc"): + doc = self if isinstance(self, Document) else self.doc + self._cached_became_rfc = next(iter(doc.related_that_doc("became_rfc")), None) + return self._cached_became_rfc + + def came_from_draft(self): + if not hasattr(self, "_cached_came_from_draft"): + doc = self if isinstance(self, Document) else self.doc + self._cached_came_from_draft = next(iter(doc.related_that("became_rfc")), None) + return self._cached_came_from_draft + + def contains(self): + return self.related_that_doc("contains") + + def part_of(self): + return self.related_that("contains") + + def referenced_by_rfcs_as_rfc_or_draft(self): + """Get refs to this doc, or a draft/rfc it came from, from an RFC""" + refs_to = self.referenced_by_rfcs() + if self.type_id == "rfc" and self.came_from_draft(): + refs_to |= self.came_from_draft().referenced_by_rfcs() + return refs_to + class Meta: abstract = True + +class HasNameRevAndTypeIdProtocol(Protocol): + """Typing Protocol describing a class that has name, rev, and type_id properties""" + @property + def name(self) -> str: ... + @property + def rev(self) -> str: ... + @property + def type_id(self) -> str: ... + + +class StorableMixin: + """Mixin that adds storage helpers to a DocumentInfo subclass""" + def store_str( + self: HasNameRevAndTypeIdProtocol, + name: str, + content: str, + allow_overwrite: bool = False + ) -> None: + return utils_store_str(self.type_id, name, content, allow_overwrite, self.name, self.rev) + + def store_bytes( + self: HasNameRevAndTypeIdProtocol, + name: str, + content: bytes, + allow_overwrite: bool = False, + doc_name: Optional[str] = None, + doc_rev: Optional[str] = None + ) -> None: + return utils_store_bytes(self.type_id, name, content, allow_overwrite, self.name, self.rev) + + def store_file( + self: HasNameRevAndTypeIdProtocol, + name: str, + file: Union[File, BufferedReader], + allow_overwrite: bool = False, + doc_name: Optional[str] = None, + doc_rev: Optional[str] = None + ) -> None: + return utils_store_file(self.type_id, name, file, allow_overwrite, self.name, self.rev) + + STATUSCHANGE_RELATIONS = ('tops','tois','tohist','toinf','tobcp','toexp') class RelatedDocument(models.Model): source = ForeignKey('Document') - target = ForeignKey('DocAlias') + target = ForeignKey('Document', related_name='targets_related') relationship = ForeignKey(DocRelationshipName) + originaltargetaliasname = models.CharField(max_length=255, null=True, blank=True) def action(self): return self.relationship.name def __str__(self): return u"%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name) def is_downref(self): - - if self.source.type.slug!='draft' or self.relationship.slug not in ['refnorm','refold','refunk']: + if self.source.type_id not in ["draft","rfc"] or self.relationship.slug not in [ + "refnorm", + "refold", + "refunk", + ]: return None - state = self.source.get_state() - if state and state.slug == 'rfc': - source_lvl = self.source.std_level.slug if self.source.std_level else None - elif self.source.intended_std_level: - source_lvl = self.source.intended_std_level.slug + if self.source.type_id == "rfc": + source_lvl = self.source.std_level_id + elif self.source.type_id in ["bcp","std"]: + source_lvl = self.source.type_id else: - source_lvl = None + source_lvl = self.source.intended_std_level_id - if source_lvl not in ['bcp','ps','ds','std']: + if source_lvl not in ["bcp", "ps", "ds", "std", "unkn"]: return None - if self.target.document.get_state().slug == 'rfc': - if not self.target.document.std_level: + if self.target.type_id == 'rfc': + if not self.target.std_level: target_lvl = 'unkn' else: - target_lvl = self.target.document.std_level.slug + target_lvl = self.target.std_level_id + elif self.target.type_id in ["bcp", "std"]: + target_lvl = self.target.type_id else: - if not self.target.document.intended_std_level: + if not self.target.intended_std_level: target_lvl = 'unkn' else: - target_lvl = self.target.document.intended_std_level.slug + target_lvl = self.target.intended_std_level_id - rank = { 'ps':1, 'ds':2, 'std':3, 'bcp':3 } + if self.relationship.slug not in ["refnorm", "refunk"]: + return None - if ( target_lvl not in rank ) or ( rank[target_lvl] < rank[source_lvl] ): - if self.relationship.slug == 'refnorm' and target_lvl!='unkn': - return "Downref" - else: - return "Possible Downref" + if source_lvl in ["inf", "exp"]: + return None + + pos_downref = ( + "Downref" if self.relationship_id != "refunk" else "Possible Downref" + ) + + if source_lvl in ["bcp", "ps", "ds", "std"] and target_lvl in ["inf", "exp"]: + return pos_downref + + if source_lvl == "ds" and target_lvl == "ps": + return pos_downref + + if source_lvl == "std" and target_lvl in ["ps", "ds"]: + return pos_downref + + if source_lvl not in ["inf", "exp"] and target_lvl == "unkn": + return "Possible Downref" + + if source_lvl == "unkn" and target_lvl in ["ps", "ds"]: + return "Possible Downref" return None def is_approved_downref(self): - if self.target.document.get_state().slug == 'rfc': - if RelatedDocument.objects.filter(relationship_id='downref-approval', target=self.target): + if self.target.type_id == 'rfc': + if RelatedDocument.objects.filter(relationship_id='downref-approval', target=self.target).exists(): return "Approved Downref" return False @@ -784,13 +913,14 @@ def role_for_doc(self): roles.append('Action Holder') return ', '.join(roles) +# N.B., at least a couple dozen documents exist that do not satisfy this validator validate_docname = RegexValidator( r'^[-a-z0-9]+$', "Provide a valid document name consisting of lowercase letters, numbers and hyphens.", 'invalid' ) -class Document(DocumentInfo): +class Document(StorableMixin, DocumentInfo): name = models.CharField(max_length=255, validators=[validate_docname,], unique=True) # immutable action_holders = models.ManyToManyField(Person, through=DocumentActionHolder, blank=True) @@ -807,7 +937,7 @@ def get_absolute_url(self): name = self.name url = None if self.type_id == "draft" and self.get_state_slug() == "rfc": - name = self.canonical_name() + name = self.name url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ 'name': name }, urlconf="ietf.urls") elif self.type_id in ('slides','bluesheets','recording'): session = self.session_set.first() @@ -845,28 +975,8 @@ def latest_event(self, *args, **filter_args): e = model.objects.filter(doc=self).filter(**filter_args).order_by('-time', '-id').first() return e - def canonical_name(self): - if not hasattr(self, '_canonical_name'): - name = self.name - if self.type_id == "draft" and self.get_state_slug() == "rfc": - a = self.docalias.filter(name__startswith="rfc").order_by('-name').first() - if a: - name = a.name - elif self.type_id == "charter": - from ietf.doc.utils_charter import charter_name_for_group # Imported locally to avoid circular imports - try: - name = charter_name_for_group(self.chartered_group) - except Group.DoesNotExist: - pass - self._canonical_name = name - return self._canonical_name - - - def canonical_docalias(self): - return self.docalias.get(name=self.name) - def display_name(self): - name = self.canonical_name() + name = self.name if name.startswith('rfc'): name = name.upper() return name @@ -959,23 +1069,33 @@ def most_recent_ietflc(self): def displayname_with_link(self): return mark_safe('%s-%s' % (self.get_absolute_url(), self.name , self.rev)) - def ipr(self,states=('posted','removed')): + def ipr(self,states=settings.PUBLISH_IPR_STATES): """Returns the IPR disclosures against this document (as a queryset over IprDocRel).""" - from ietf.ipr.models import IprDocRel - return IprDocRel.objects.filter(document__docs=self, disclosure__state__in=states) + # from ietf.ipr.models import IprDocRel + # return IprDocRel.objects.filter(document__docs=self, disclosure__state__in=states) # TODO - clear these comments away + return self.iprdocrel_set.filter(disclosure__state__in=states) def related_ipr(self): """Returns the IPR disclosures against this document and those documents this document directly or indirectly obsoletes or replaces """ from ietf.ipr.models import IprDocRel - iprs = IprDocRel.objects.filter(document__in=list(self.docalias.all())+self.all_related_that_doc(('obs','replaces'))).filter(disclosure__state__in=('posted','removed')).values_list('disclosure', flat=True).distinct() + iprs = ( + IprDocRel.objects.filter( + document__in=[self] + + self.all_related_that_doc(("obs", "replaces")) + ) + .filter(disclosure__state__in=settings.PUBLISH_IPR_STATES) + .values_list("disclosure", flat=True) + .distinct() + ) return iprs + def future_presentations(self): """ returns related SessionPresentation objects for meetings that have not yet ended. This implementation allows for 2 week meetings """ - candidate_presentations = self.sessionpresentation_set.filter( + candidate_presentations = self.presentations.filter( session__meeting__date__gte=date_today() - datetime.timedelta(days=15) ) return sorted( @@ -988,11 +1108,11 @@ def last_presented(self): """ returns related SessionPresentation objects for the most recent meeting in the past""" # Assumes no two meetings have the same start date - if the assumption is violated, one will be chosen arbitrarily today = date_today() - candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__lte=today) + candidate_presentations = self.presentations.filter(session__meeting__date__lte=today) candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()%s" % (self.name, ','.join([force_text(d.name) for d in self.docs.all() if isinstance(d, Document) ])) - document_link = admin_link("document") - class Meta: - verbose_name = "document alias" - verbose_name_plural = "document aliases" class DocReminder(models.Model): event = ForeignKey('DocEvent') @@ -1284,9 +1374,17 @@ class DocReminder(models.Model): # IPR events ("posted_related_ipr", "Posted related IPR"), ("removed_related_ipr", "Removed related IPR"), + ("removed_objfalse_related_ipr", "Removed Objectively False related IPR"), # Bofreq Editor events - ("changed_editors", "Changed BOF Request editors") + ("changed_editors", "Changed BOF Request editors"), + + # Statement events + ("published_statement", "Published statement"), + + # Slide events + ("approved_slides", "Slides approved"), + ] class DocEvent(models.Model): @@ -1490,3 +1588,42 @@ class BofreqEditorDocEvent(DocEvent): class BofreqResponsibleDocEvent(DocEvent): """ Capture the responsible leadership (IAB and IESG members) for a BOF Request """ responsible = models.ManyToManyField('person.Person', blank=True) + + +class StoredObjectQuerySet(models.QuerySet): + def exclude_deleted(self): + return self.filter(deleted__isnull=True) + + +class StoredObject(models.Model): + """Hold metadata about objects placed in object storage""" + + objects = StoredObjectQuerySet.as_manager() + + store = models.CharField(max_length=256) + name = models.CharField(max_length=1024, null=False, blank=False) # N.B. the 1024 limit on name comes from S3 + sha384 = models.CharField(max_length=96) + len = models.PositiveBigIntegerField() + store_created = models.DateTimeField(help_text="The instant the object ws first placed in the store") + created = models.DateTimeField( + null=False, + help_text="Instant object became known. May not be the same as the storage's created value for the instance. It will hold ctime for objects imported from older disk storage" + ) + modified = models.DateTimeField( + null=False, + help_text="Last instant object was modified. May not be the same as the storage's modified value for the instance. It will hold mtime for objects imported from older disk storage unless they've actually been overwritten more recently" + ) + doc_name = models.CharField(max_length=255, null=True, blank=True) + doc_rev = models.CharField(max_length=16, null=True, blank=True) + deleted = models.DateTimeField(null=True) + + class Meta: + constraints = [ + models.UniqueConstraint(fields=['store', 'name'], name='unique_name_per_store'), + ] + indexes = [ + models.Index(fields=["doc_name", "doc_rev"]), + ] + + def __str__(self): + return f"{self.store}:{self.name}" diff --git a/ietf/doc/resources.py b/ietf/doc/resources.py index 99e26ac33d8..157a3ad5568 100644 --- a/ietf/doc/resources.py +++ b/ietf/doc/resources.py @@ -12,13 +12,13 @@ from ietf import api from ietf.doc.models import (BallotType, DeletedEvent, StateType, State, Document, - DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent, DocAlias, + DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent, TelechatDocEvent, DocReminder, LastCallDocEvent, NewRevisionDocEvent, WriteupDocEvent, InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument, RelatedDocHistory, BallotPositionDocEvent, AddedMessageEvent, SubmissionDocEvent, ReviewRequestDocEvent, ReviewAssignmentDocEvent, EditedAuthorsDocEvent, DocumentURL, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder, - BofreqEditorDocEvent,BofreqResponsibleDocEvent) + BofreqEditorDocEvent, BofreqResponsibleDocEvent, StoredObject) from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource class BallotTypeResource(ModelResource): @@ -130,7 +130,6 @@ class Meta: "external_url": ALL, "uploaded_filename": ALL, "note": ALL, - "internal_comments": ALL, "name": ALL, "type": ALL_WITH_RELATIONS, "stream": ALL_WITH_RELATIONS, @@ -247,7 +246,6 @@ class Meta: "external_url": ALL, "uploaded_filename": ALL, "note": ALL, - "internal_comments": ALL, "name": ALL, "type": ALL_WITH_RELATIONS, "stream": ALL_WITH_RELATIONS, @@ -286,21 +284,6 @@ class Meta: } api.doc.register(ConsensusDocEventResource()) -class DocAliasResource(ModelResource): - document = ToOneField(DocumentResource, 'document') - class Meta: - cache = SimpleCache() - queryset = DocAlias.objects.all() - serializer = api.Serializer() - detail_uri_name = 'name' - #resource_name = 'docalias' - ordering = ['id', ] - filtering = { - "name": ALL, - "document": ALL_WITH_RELATIONS, - } -api.doc.register(DocAliasResource()) - from ietf.person.resources import PersonResource class TelechatDocEventResource(ModelResource): by = ToOneField(PersonResource, 'by') @@ -490,7 +473,7 @@ class Meta: from ietf.name.resources import DocRelationshipNameResource class RelatedDocumentResource(ModelResource): source = ToOneField(DocumentResource, 'source') - target = ToOneField(DocAliasResource, 'target') + target = ToOneField(DocumentResource, 'target') relationship = ToOneField(DocRelationshipNameResource, 'relationship') class Meta: cache = SimpleCache() @@ -509,7 +492,7 @@ class Meta: from ietf.name.resources import DocRelationshipNameResource class RelatedDocHistoryResource(ModelResource): source = ToOneField(DocHistoryResource, 'source') - target = ToOneField(DocAliasResource, 'target') + target = ToOneField(DocumentResource, 'target') relationship = ToOneField(DocRelationshipNameResource, 'relationship') class Meta: cache = SimpleCache() @@ -859,3 +842,26 @@ class Meta: "responsible": ALL_WITH_RELATIONS, } api.doc.register(BofreqResponsibleDocEventResource()) + + +class StoredObjectResource(ModelResource): + class Meta: + queryset = StoredObject.objects.all() + serializer = api.Serializer() + cache = SimpleCache() + #resource_name = 'storedobject' + ordering = ['id', ] + filtering = { + "id": ALL, + "store": ALL, + "name": ALL, + "sha384": ALL, + "len": ALL, + "store_created": ALL, + "created": ALL, + "modified": ALL, + "doc_name": ALL, + "doc_rev": ALL, + "deleted": ALL, + } +api.doc.register(StoredObjectResource()) diff --git a/ietf/doc/storage.py b/ietf/doc/storage.py new file mode 100644 index 00000000000..375620ccaf3 --- /dev/null +++ b/ietf/doc/storage.py @@ -0,0 +1,182 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +from typing import Optional + +import debug # pyflakes:ignore +import json + +from contextlib import contextmanager +from storages.backends.s3 import S3Storage + +from django.core.files.base import File + +from ietf.blobdb.storage import BlobdbStorage +from ietf.doc.models import StoredObject +from ietf.utils.log import log +from ietf.utils.storage import MetadataFile +from ietf.utils.timezone import timezone + + +class StoredObjectFile(MetadataFile): + """Django storage File object that represents a StoredObject""" + def __init__(self, file, name, mtime=None, content_type="", store=None, doc_name=None, doc_rev=None): + super().__init__( + file=file, + name=name, + mtime=mtime, + content_type=content_type, + ) + self.store = store + self.doc_name = doc_name + self.doc_rev = doc_rev + + @classmethod + def from_storedobject(cls, file, name, store): + """Alternate constructor for objects that already exist in the StoredObject table""" + stored_object = StoredObject.objects.exclude_deleted().filter(store=store, name=name).first() + if stored_object is None: + raise FileNotFoundError(f"StoredObject for {store}:{name} does not exist or was deleted") + file = cls(file, name, store, doc_name=stored_object.doc_name, doc_rev=stored_object.doc_rev) + if int(file.custom_metadata["len"]) != stored_object.len: + raise RuntimeError(f"File length changed unexpectedly for {store}:{name}") + if file.custom_metadata["sha384"] != stored_object.sha384: + raise RuntimeError(f"SHA-384 hash changed unexpectedly for {store}:{name}") + return file + + +@contextmanager +def maybe_log_timing(enabled, op, **kwargs): + """If enabled, log elapsed time and additional data from kwargs + + Emits log even if an exception occurs + """ + before = timezone.now() + exception = None + try: + yield + except Exception as err: + exception = err + raise + finally: + if enabled: + dt = timezone.now() - before + log( + json.dumps( + { + "log": "S3Storage_timing", + "seconds": dt.total_seconds(), + "op": op, + "exception": "" if exception is None else repr(exception), + **kwargs, + } + ) + ) + + +class MetadataS3Storage(S3Storage): + def get_default_settings(self): + # add a default for the ietf_log_blob_timing boolean + return super().get_default_settings() | {"ietf_log_blob_timing": False} + + def _save(self, name, content: File): + with maybe_log_timing( + self.ietf_log_blob_timing, "_save", bucket_name=self.bucket_name, name=name + ): + return super()._save(name, content) + + def _open(self, name, mode="rb"): + with maybe_log_timing( + self.ietf_log_blob_timing, + "_open", + bucket_name=self.bucket_name, + name=name, + mode=mode, + ): + return super()._open(name, mode) + + def delete(self, name): + with maybe_log_timing( + self.ietf_log_blob_timing, "delete", bucket_name=self.bucket_name, name=name + ): + super().delete(name) + + def _get_write_parameters(self, name, content=None): + # debug.show('f"getting write parameters for {name}"') + params = super()._get_write_parameters(name, content) + # If we have a non-empty explicit content type, use it + content_type = getattr(content, "content_type", "").strip() + if content_type != "": + params["ContentType"] = content_type + if "Metadata" not in params: + params["Metadata"] = {} + if hasattr(content, "custom_metadata"): + params["Metadata"].update(content.custom_metadata) + return params + + +class StoredObjectBlobdbStorage(BlobdbStorage): + ietf_log_blob_timing = True + warn_if_missing = True # TODO-BLOBSTORE make this configurable (or remove it) + + def _save_stored_object(self, name, content) -> StoredObject: + now = timezone.now() + record, created = StoredObject.objects.get_or_create( + store=self.bucket_name, + name=name, + defaults=dict( + sha384=content.custom_metadata["sha384"], + len=int(content.custom_metadata["len"]), + store_created=now, + created=now, + modified=now, + doc_name=getattr( + content, + "doc_name", # Note that these are assumed to be invariant + None, # should be blank? + ), + doc_rev=getattr( + content, + "doc_rev", # for a given name + None, # should be blank? + ), + ), + ) + if not created and ( + record.sha384 != content.custom_metadata["sha384"] + or record.len != int(content.custom_metadata["len"]) + or record.deleted is not None + ): + record.sha384 = content.custom_metadata["sha384"] + record.len = int(content.custom_metadata["len"]) + record.modified = now + record.deleted = None + record.save() + return record + + def _delete_stored_object(self, name) -> Optional[StoredObject]: + existing_record = StoredObject.objects.filter(store=self.bucket_name, name=name) + if not existing_record.exists() and self.warn_if_missing: + complaint = ( + f"WARNING: Asked to delete {name} from {self.bucket_name} storage, " + f"but there was no matching StoredObject" + ) + log(complaint) + debug.show("complaint") + else: + now = timezone.now() + # Note that existing_record is a queryset that will have one matching object + existing_record.exclude_deleted().update(deleted=now) + return existing_record.first() + + def _save(self, name, content): + """Perform the save operation + + In principle the name could change on save to the blob store. As of now, BlobdbStorage + will not change it, but allow for that possibility. Callers should be prepared for this. + """ + saved_name = super()._save(name, content) + self._save_stored_object(saved_name, content) + return saved_name + + def delete(self, name): + self._delete_stored_object(name) + super().delete(name) diff --git a/ietf/doc/storage_utils.py b/ietf/doc/storage_utils.py new file mode 100644 index 00000000000..81588c83ec3 --- /dev/null +++ b/ietf/doc/storage_utils.py @@ -0,0 +1,197 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +import datetime +from io import BufferedReader +from typing import Optional, Union + +import debug # pyflakes ignore + +from django.conf import settings +from django.core.files.base import ContentFile, File +from django.core.files.storage import storages, Storage + +from ietf.utils.log import log + + +class StorageUtilsError(Exception): + pass + + +class AlreadyExistsError(StorageUtilsError): + pass + + +def _get_storage(kind: str) -> Storage: + if kind in settings.ARTIFACT_STORAGE_NAMES: + return storages[kind] + else: + debug.say(f"Got into not-implemented looking for {kind}") + raise NotImplementedError(f"Don't know how to store {kind}") + + +def exists_in_storage(kind: str, name: str) -> bool: + if settings.ENABLE_BLOBSTORAGE: + try: + store = _get_storage(kind) + with store.open(name): + return True + except FileNotFoundError: + return False + except Exception as err: + log(f"Blobstore Error: Failed to test existence of {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise + return False + + +def remove_from_storage(kind: str, name: str, warn_if_missing: bool = True) -> None: + if settings.ENABLE_BLOBSTORAGE: + try: + if exists_in_storage(kind, name): + _get_storage(kind).delete(name) + elif warn_if_missing: + complaint = ( + f"WARNING: Asked to delete non-existent {name} from {kind} storage" + ) + debug.show("complaint") + log(complaint) + except Exception as err: + log(f"Blobstore Error: Failed to remove {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise + return None + + +def store_file( + kind: str, + name: str, + file: Union[File, BufferedReader], + allow_overwrite: bool = False, + doc_name: Optional[str] = None, + doc_rev: Optional[str] = None, + content_type: str="", + mtime: Optional[datetime.datetime]=None, +) -> None: + from .storage import StoredObjectFile # avoid circular import + if settings.ENABLE_BLOBSTORAGE: + try: + is_new = not exists_in_storage(kind, name) + # debug.show('f"Asked to store {name} in {kind}: is_new={is_new}, allow_overwrite={allow_overwrite}"') + if not allow_overwrite and not is_new: + debug.show('f"Failed to save {kind}:{name} - name already exists in store"') + raise AlreadyExistsError(f"Failed to save {kind}:{name} - name already exists in store") + new_name = _get_storage(kind).save( + name, + StoredObjectFile( + file=file, + name=name, + doc_name=doc_name, + doc_rev=doc_rev, + mtime=mtime, + content_type=content_type, + ), + ) + if new_name != name: + complaint = f"Error encountered saving '{name}' - results stored in '{new_name}' instead." + debug.show("complaint") + raise StorageUtilsError(complaint) + except Exception as err: + log(f"Blobstore Error: Failed to store file {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise # TODO-BLOBSTORE eventually make this an error for all modes + return None + + +def store_bytes( + kind: str, + name: str, + content: bytes, + allow_overwrite: bool = False, + doc_name: Optional[str] = None, + doc_rev: Optional[str] = None, + content_type: str = "", + mtime: Optional[datetime.datetime] = None, +) -> None: + if settings.ENABLE_BLOBSTORAGE: + try: + store_file( + kind, + name, + ContentFile(content), + allow_overwrite, + doc_name, + doc_rev, + content_type, + mtime, + ) + except Exception as err: + # n.b., not likely to get an exception here because store_file or store_bytes will catch it + log(f"Blobstore Error: Failed to store bytes to {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise # TODO-BLOBSTORE eventually make this an error for all modes + return None + + +def store_str( + kind: str, + name: str, + content: str, + allow_overwrite: bool = False, + doc_name: Optional[str] = None, + doc_rev: Optional[str] = None, + content_type: str = "", + mtime: Optional[datetime.datetime] = None, +) -> None: + if settings.ENABLE_BLOBSTORAGE: + try: + content_bytes = content.encode("utf-8") + store_bytes( + kind, + name, + content_bytes, + allow_overwrite, + doc_name, + doc_rev, + content_type, + mtime, + ) + except Exception as err: + # n.b., not likely to get an exception here because store_file or store_bytes will catch it + log(f"Blobstore Error: Failed to store string to {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise # TODO-BLOBSTORE eventually make this an error for all modes + return None + + +def retrieve_bytes(kind: str, name: str) -> bytes: + from ietf.doc.storage import maybe_log_timing + content = b"" + if settings.ENABLE_BLOBSTORAGE: + try: + store = _get_storage(kind) + with store.open(name) as f: + with maybe_log_timing( + hasattr(store, "ietf_log_blob_timing") and store.ietf_log_blob_timing, + "read", + bucket_name=store.bucket_name if hasattr(store, "bucket_name") else "", + name=name, + ): + content = f.read() + except Exception as err: + log(f"Blobstore Error: Failed to read bytes from {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise + return content + + +def retrieve_str(kind: str, name: str) -> str: + content = "" + if settings.ENABLE_BLOBSTORAGE: + try: + content_bytes = retrieve_bytes(kind, name) + # TODO-BLOBSTORE: try to decode all the different ways doc.text() does + content = content_bytes.decode("utf-8") + except Exception as err: + log(f"Blobstore Error: Failed to read string from {kind}:{name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise + return content diff --git a/ietf/doc/tasks.py b/ietf/doc/tasks.py new file mode 100644 index 00000000000..4f7fe377823 --- /dev/null +++ b/ietf/doc/tasks.py @@ -0,0 +1,130 @@ +# Copyright The IETF Trust 2024-2025, All Rights Reserved +# +# Celery task definitions +# +import datetime +import debug # pyflakes:ignore + +from celery import shared_task +from pathlib import Path + +from django.conf import settings +from django.utils import timezone + +from ietf.utils import log +from ietf.utils.timezone import datetime_today + +from .expire import ( + in_draft_expire_freeze, + get_expired_drafts, + expirable_drafts, + send_expire_notice_for_draft, + expire_draft, + clean_up_draft_files, + get_soon_to_expire_drafts, + send_expire_warning_for_draft, +) +from .lastcall import get_expired_last_calls, expire_last_call +from .models import Document, NewRevisionDocEvent +from .utils import ( + generate_idnits2_rfc_status, + generate_idnits2_rfcs_obsoleted, + update_or_create_draft_bibxml_file, + ensure_draft_bibxml_path_exists, + investigate_fragment, +) + + +@shared_task +def expire_ids_task(): + try: + if not in_draft_expire_freeze(): + log.log("Expiring drafts ...") + for doc in get_expired_drafts(): + # verify expirability -- it might have changed after get_expired_drafts() was run + # (this whole loop took about 2 minutes on 04 Jan 2018) + # N.B., re-running expirable_drafts() repeatedly is fairly expensive. Where possible, + # it's much faster to run it once on a superset query of the objects you are going + # to test and keep its results. That's not desirable here because it would defeat + # the purpose of double-checking that a document is still expirable when it is actually + # being marked as expired. + if expirable_drafts( + Document.objects.filter(pk=doc.pk) + ).exists() and doc.expires < datetime_today() + datetime.timedelta(1): + send_expire_notice_for_draft(doc) + expire_draft(doc) + log.log(f" Expired draft {doc.name}-{doc.rev}") + + log.log("Cleaning up draft files") + clean_up_draft_files() + except Exception as e: + log.log("Exception in expire-ids: %s" % e) + raise + + +@shared_task +def notify_expirations_task(notify_days=14): + for doc in get_soon_to_expire_drafts(notify_days): + send_expire_warning_for_draft(doc) + + +@shared_task +def expire_last_calls_task(): + for doc in get_expired_last_calls(): + try: + expire_last_call(doc) + except Exception: + log.log(f"ERROR: Failed to expire last call for {doc.file_tag()} (id={doc.pk})") + else: + log.log(f"Expired last call for {doc.file_tag()} (id={doc.pk})") + + +@shared_task +def generate_idnits2_rfc_status_task(): + outpath = Path(settings.DERIVED_DIR) / "idnits2-rfc-status" + blob = generate_idnits2_rfc_status() + try: + outpath.write_text(blob, encoding="utf8") # TODO-BLOBSTORE + except Exception as e: + log.log(f"failed to write idnits2-rfc-status: {e}") + + +@shared_task +def generate_idnits2_rfcs_obsoleted_task(): + outpath = Path(settings.DERIVED_DIR) / "idnits2-rfcs-obsoleted" + blob = generate_idnits2_rfcs_obsoleted() + try: + outpath.write_text(blob, encoding="utf8") # TODO-BLOBSTORE + except Exception as e: + log.log(f"failed to write idnits2-rfcs-obsoleted: {e}") + + +@shared_task +def generate_draft_bibxml_files_task(days=7, process_all=False): + """Generate bibxml files for recently updated docs + + If process_all is False (the default), processes only docs with new revisions + in the last specified number of days. + """ + if not process_all and days < 1: + raise ValueError("Must call with days >= 1 or process_all=True") + ensure_draft_bibxml_path_exists() + doc_events = NewRevisionDocEvent.objects.filter( + type="new_revision", + doc__type_id="draft", + ).order_by("time") + if not process_all: + doc_events = doc_events.filter(time__gte=timezone.now() - datetime.timedelta(days=days)) + for event in doc_events: + try: + update_or_create_draft_bibxml_file(event.doc, event.rev) + except Exception as err: + log.log(f"Error generating bibxml for {event.doc.name}-{event.rev}: {err}") + + +@shared_task(ignore_result=False) +def investigate_fragment_task(name_fragment: str): + return { + "name_fragment": name_fragment, + "results": investigate_fragment(name_fragment), + } diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py index af8f268ebd1..c60d6dcd1af 100644 --- a/ietf/doc/templatetags/active_groups_menu.py +++ b/ietf/doc/templatetags/active_groups_menu.py @@ -11,7 +11,7 @@ @register.simple_tag def active_groups_menu(flavor): - parents = GroupTypeName.objects.filter(slug__in=["ag", "area", "rag", "team", "dir", "program"]) + parents = GroupTypeName.objects.filter(slug__in=["ag", "area", "rag", "team", "dir", "program", "iabworkshop"]) others = [] for group in Group.objects.filter(acronym__in=("rsoc",), state_id="active"): group.menu_url = reverse("ietf.group.views.group_home", kwargs=dict(acronym=group.acronym)) # type: ignore @@ -23,4 +23,4 @@ def active_groups_menu(flavor): return render_to_string( "base/menu_active_groups.html", {"parents": parents, "others": others, "flavor": flavor}, - ) \ No newline at end of file + ) diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py index 9ddb3833a15..07a6c7f9265 100644 --- a/ietf/doc/templatetags/ballot_icon.py +++ b/ietf/doc/templatetags/ballot_icon.py @@ -96,9 +96,14 @@ def sort_key(t): positions = list(ballot.active_balloter_positions().items()) positions.sort(key=sort_key) + request = context.get("request") + ballot_edit_return_point_param = f"ballot_edit_return_point={request.path}" + right_click_string = '' if has_role(user, "Area Director"): - right_click_string = 'oncontextmenu="window.location.href=\'%s\';return false;"' % urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk)) + right_click_string = 'oncontextmenu="window.location.href=\'{}?{}\';return false;"'.format( + urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk)), + ballot_edit_return_point_param) my_blocking = False for i, (balloter, pos) in enumerate(positions): @@ -113,10 +118,14 @@ def sort_key(t): typename = "RSAB" else: typename = "IESG" + + modal_url = "{}?{}".format( + urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)), + ballot_edit_return_point_param) res = [' goal2: - class_name = "bg-danger" + class_name = "text-bg-danger" elif days > goal1: - class_name = "bg-warning" + class_name = "text-bg-warning" else: # don't show a badge when things are in the green; clutters display # class_name = "text-success" @@ -247,6 +256,6 @@ def auth48_alert_badge(doc): rfced_state = doc.get_state_slug('draft-rfceditor') if rfced_state == 'auth48': - return mark_safe('AUTH48') + return mark_safe('AUTH48') return '' diff --git a/ietf/doc/templatetags/document_type_badge.py b/ietf/doc/templatetags/document_type_badge.py new file mode 100644 index 00000000000..a82c606ff90 --- /dev/null +++ b/ietf/doc/templatetags/document_type_badge.py @@ -0,0 +1,29 @@ +# Copyright The IETF Trust 2015-2020, All Rights Reserved +from django import template +from django.conf import settings +from django.template.loader import render_to_string +from ietf.utils.log import log + +register = template.Library() + + +@register.simple_tag +def document_type_badge(doc, snapshot, submission, resurrected_by): + context = {"doc": doc, "snapshot": snapshot, "submission": submission, "resurrected_by": resurrected_by} + if doc.type_id == "rfc": + return render_to_string( + "doc/badge/doc-badge-rfc.html", + context, + ) + elif doc.type_id == "draft": + return render_to_string( + "doc/badge/doc-badge-draft.html", + context, + ) + else: + error_message = f"Unsupported document type {doc.type_id}." + if settings.SERVER_MODE != 'production': + raise ValueError(error_message) + else: + log(error_message) + return "" diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 332e5ca1528..5cabe1728d0 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -1,9 +1,10 @@ -# Copyright The IETF Trust 2007-2020, All Rights Reserved +# Copyright The IETF Trust 2007-2023, All Rights Reserved # -*- coding: utf-8 -*- import datetime import re +from pathlib import Path from urllib.parse import urljoin from zoneinfo import ZoneInfo @@ -13,8 +14,7 @@ from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags from django.utils.safestring import mark_safe, SafeData from django.utils.html import strip_tags -from django.utils.encoding import force_text -from django.utils.encoding import force_str # pyflakes:ignore force_str is used in the doctests +from django.utils.encoding import force_str from django.urls import reverse as urlreverse from django.core.cache import cache from django.core.exceptions import ValidationError @@ -23,13 +23,14 @@ import debug # pyflakes:ignore -from ietf.doc.models import BallotDocEvent, DocAlias +from ietf.doc.models import BallotDocEvent, Document from ietf.doc.models import ConsensusDocEvent from ietf.ietfauth.utils import can_request_rfc_publication as utils_can_request_rfc_publication -from ietf.utils.html import sanitize_fragment from ietf.utils import log from ietf.doc.utils import prettify_std_name -from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped, bleach_linker, bleach_cleaner, validate_url +from ietf.utils.html import clean_html +from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped, linkify +from ietf.utils.validators import validate_url register = template.Library() @@ -98,7 +99,7 @@ def sanitize(value): attributes to those deemed acceptable. See ietf/utils/html.py for the details. """ - return mark_safe(sanitize_fragment(value)) + return mark_safe(clean_html(value)) # For use with ballot view @@ -132,7 +133,7 @@ def bracketpos(pos,posslug): @register.filter def prettystdname(string, space=" "): from ietf.doc.utils import prettify_std_name - return prettify_std_name(force_text(string or ""), space) + return prettify_std_name(force_str(string or ""), space) @register.filter def rfceditor_info_url(rfcnum : str): @@ -140,15 +141,16 @@ def rfceditor_info_url(rfcnum : str): return urljoin(settings.RFC_EDITOR_INFO_BASE_URL, f'rfc{rfcnum}') -def doc_canonical_name(name): +def doc_name(name): """Check whether a given document exists, and return its canonical name""" def find_unique(n): key = hash(n) found = cache.get(key) if not found: - exact = DocAlias.objects.filter(name=n).first() + exact = Document.objects.filter(name=n).first() found = exact.name if exact else "_" + # TODO review this cache policy (and the need for these entire function) cache.set(key, found, timeout=60*60*24) # cache for one day return None if found == "_" else found @@ -174,7 +176,7 @@ def find_unique(n): def link_charter_doc_match(match): - if not doc_canonical_name(match[0]): + if not doc_name(match[0]): return match[0] url = urlreverse( "ietf.doc.views_doc.document_main", @@ -187,7 +189,7 @@ def link_non_charter_doc_match(match): name = match[0] # handle "I-D.*"" reference-style matches name = re.sub(r"^i-d\.(.*)", r"draft-\1", name, flags=re.IGNORECASE) - cname = doc_canonical_name(name) + cname = doc_name(name) if not cname: return match[0] if name == cname: @@ -202,7 +204,7 @@ def link_non_charter_doc_match(match): url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname)) return f'{match[0]}' - cname = doc_canonical_name(name) + cname = doc_name(name) if not cname: return match[0] if name == cname: @@ -222,12 +224,11 @@ def link_non_charter_doc_match(match): def link_other_doc_match(match): doc = match[2].strip().lower() rev = match[3] - if not doc_canonical_name(doc + rev): + if not doc_name(doc + rev): return match[0] url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc + rev)) return f'{match[1]}' - @register.filter(name="urlize_ietf_docs", is_safe=True, needs_autoescape=True) def urlize_ietf_docs(string, autoescape=None): """ @@ -256,6 +257,7 @@ def urlize_ietf_docs(string, autoescape=None): string, flags=re.IGNORECASE | re.ASCII, ) + return mark_safe(string) @@ -268,7 +270,7 @@ def urlize_related_source_list(related, document_html=False): names = set() titles = set() for rel in related: - name=rel.source.canonical_name() + name=rel.source.name title = rel.source.title if name in names and title in titles: continue @@ -283,14 +285,14 @@ def urlize_related_source_list(related, document_html=False): url=url) )) return links - + @register.filter(name='urlize_related_target_list', is_safe=True, document_html=False) def urlize_related_target_list(related, document_html=False): """Convert a list of RelatedDocuments into list of links using the target document's canonical name""" links = [] for rel in related: - name=rel.target.document.canonical_name() - title = rel.target.document.title + name=rel.target.name + title = rel.target.title url = urlreverse('ietf.doc.views_doc.document_main' if document_html is False else 'ietf.doc.views_doc.document_html', kwargs=dict(name=name)) name = escape(name) title = escape(title) @@ -300,7 +302,7 @@ def urlize_related_target_list(related, document_html=False): url=url) )) return links - + @register.filter(name='dashify') def dashify(string): """ @@ -410,9 +412,9 @@ def startswith(x, y): return str(x).startswith(y) -@register.filter(name='removesuffix', is_safe=False) -def removesuffix(value, suffix): - """Remove an exact-match suffix +@register.filter(name='removeprefix', is_safe=False) +def removeprefix(value, prefix): + """Remove an exact-match prefix The is_safe flag is False because indiscriminate use of this could result in non-safe output. See https://docs.djangoproject.com/en/2.2/howto/custom-template-tags/#filters-and-auto-escaping @@ -420,8 +422,8 @@ def removesuffix(value, suffix): HTML-unsafe output. """ base = str(value) - if base.endswith(suffix): - return base[:-len(suffix)] + if base.startswith(prefix): + return base[len(prefix):] else: return base @@ -445,16 +447,16 @@ def ad_area(user): @register.filter def format_history_text(text, trunc_words=25): """Run history text through some cleaning and add ellipsis if it's too long.""" - full = mark_safe(bleach_cleaner.clean(text)) - full = bleach_linker.linkify(urlize_ietf_docs(full)) + full = mark_safe(clean_html(text)) + full = linkify(urlize_ietf_docs(full)) return format_snippet(full, trunc_words) @register.filter def format_snippet(text, trunc_words=25): # urlize if there aren't already links present - text = bleach_linker.linkify(text) - full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text))))) + text = linkify(text) + full = keep_spacing(collapsebr(linebreaksbr(mark_safe(clean_html(text))))) snippet = truncatewords_html(full, trunc_words) if snippet != full: return mark_safe('
%s
%s
' % (snippet, full)) @@ -478,6 +480,19 @@ def state(doc, slug): slug = "%s-stream-%s" % (doc.type_id, doc.stream_id) return doc.get_state(slug) + +@register.filter +def is_unexpected_wg_state(doc): + """Returns a flag indicating whether the document has an unexpected wg state.""" + if not doc.type_id == "draft": + return False + + draft_iesg_state = doc.get_state("draft-iesg") + draft_stream_state = doc.get_state("draft-stream-ietf") + + return draft_iesg_state.slug != "idexists" and draft_stream_state is not None and draft_stream_state.slug != "sub-pub" + + @register.filter def statehelp(state): "Output help icon with tooltip for state." @@ -506,10 +521,52 @@ def plural(text, seq, arg='s'): else: return text + pluralize(len(seq), arg) + +# Translation table to escape ICS characters. The {} | {} construction builds up a dict +# mapping characters to arbitrary-length strings or None. Values in later dicts override +# earlier ones prior to conversion to a translation table, so excluding a char and then +# mapping it to an escape sequence results in its being escaped, not dropped. +rfc5545_text_escapes = str.maketrans( + # text = *(TSAFE-CHAR / ":" / DQUOTE / ESCAPED-CHAR) + # TSAFE-CHAR = WSP / %x21 / %x23-2B / %x2D-39 / %x3C-5B / + # %x5D-7E / NON-US-ASCII + {chr(c): None for c in range(0x00, 0x20)} # strip 0x00-0x20 + | { + # ESCAPED-CHAR = ("\\" / "\;" / "\," / "\N" / "\n") + "\n": r"\n", + ";": r"\;", + ",": r"\,", + "\\": r"\\", # rhs is two backslashes! + "\t": "\t", # htab ok (0x09) + " ": " ", # space ok (0x20) + } +) + + @register.filter def ics_esc(text): - text = re.sub(r"([\n,;\\])", r"\\\1", text) - return text + """Escape a string to use in an iCalendar text context + + >>> ics_esc('simple') + 'simple' + + For the next tests, it helps to know: + chr(0x09) = "\t" + chr(0x0a) = "\n" + chr(0x0d) = "\r" + chr(0x5c) = "\\" + + >>> ics_esc(f'strips{chr(0x0d)}out{chr(0x0d)}LFs') + 'stripsoutLFs' + + + >>> ics_esc(f'escapes;and,and{chr(0x5c)}and{chr(0x0a)}') + 'escapes\\\\;and\\\\,and\\\\\\\\and\\\\n' + + >>> ics_esc(f"keeps spaces : and{chr(0x09)}tabs") + 'keeps spaces : and\\ttabs' + """ + return text.translate(rfc5545_text_escapes) @register.simple_tag @@ -531,15 +588,22 @@ def ics_date_time(dt, tzname): >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'UTC') ':20220102T030405Z' + >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'GmT') + ':20220102T030405Z' + >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'America/Los_Angeles') ';TZID=America/Los_Angeles:20220102T030405' """ timestamp = dt.strftime('%Y%m%dT%H%M%S') - if tzname.lower() == 'utc': + if tzname.lower() in ('gmt', 'utc'): return f':{timestamp}Z' else: return f';TZID={ics_esc(tzname)}:{timestamp}' +@register.filter +def next_day(value): + return value + datetime.timedelta(days=1) + @register.filter def consensus(doc): @@ -557,7 +621,7 @@ def consensus(doc): @register.filter def std_level_to_label_format(doc): """Returns valid Bootstrap classes to label a status level badge.""" - if doc.is_rfc(): + if doc.type_id == "rfc": if doc.related_that("obs"): return "obs" else: @@ -654,7 +718,7 @@ def rfcbis(s): @stringfilter def urlize(value): raise RuntimeError("Use linkify from textfilters instead of urlize") - + @register.filter @stringfilter def charter_major_rev(rev): @@ -705,10 +769,10 @@ def action_holder_badge(action_holder): '' >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=16))) - ' 16' + ' 16' >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=30))) - ' 30' + ' 30' >>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit """ @@ -716,7 +780,7 @@ def action_holder_badge(action_holder): age = (timezone.now() - action_holder.time_added).days if age > age_limit: return mark_safe( - ' %d' + ' %d' % (age, "s" if age != 1 else "", age_limit, age) ) else: @@ -843,3 +907,113 @@ def is_valid_url(url): except ValidationError: return False return True + + +@register.filter +def badgeify(blob): + """ + Add an appropriate bootstrap badge around "text", based on its contents. + """ + config = [ + (r"rejected|not ready|serious issues", "danger", "x-lg"), + (r"complete|accepted|ready", "success", ""), + (r"has nits|almost ready", "info", "info-lg"), + (r"has issues|on the right track", "warning", "exclamation-lg"), + (r"assigned", "info", "person-plus-fill"), + (r"will not review|overtaken by events|withdrawn", "secondary", "dash-lg"), + (r"no response", "warning", "question-lg"), + ] + text = str(blob) + + for pattern, color, icon in config: + if re.search(pattern, text, flags=re.IGNORECASE): + # Shorten the badge text + text = re.sub(r"with ", "w/", text, flags=re.IGNORECASE) + text = re.sub(r"document", "doc", text, flags=re.IGNORECASE) + text = re.sub(r"will not", "won't", text, flags=re.IGNORECASE) + + return mark_safe( + f""" + + {text.capitalize()} + + """ + ) + + return text + +@register.filter +def simple_history_delta_changes(history): + """Returns diff between given history and previous entry.""" + prev = history.prev_record + if prev: + delta = history.diff_against(prev) + return delta.changes + return [] + +@register.filter +def simple_history_delta_change_cnt(history): + """Returns number of changes between given history and previous entry.""" + prev = history.prev_record + if prev: + delta = history.diff_against(prev) + return len(delta.changes) + return 0 + +@register.filter +def mtime(path): + """Returns a datetime object representing mtime given a pathlib Path object""" + return datetime.datetime.fromtimestamp(path.stat().st_mtime).astimezone(ZoneInfo(settings.TIME_ZONE)) + +@register.filter +def mtime_is_epoch(path): + return path.stat().st_mtime == 0 + +@register.filter +def url_for_path(path): + """Consructs a 'best' URL for web access to the given pathlib Path object. + + Assumes that the path is into the Internet-Draft archive or the proceedings. + """ + if Path(settings.AGENDA_PATH) in path.parents: + return ( + f"https://www.ietf.org/proceedings/{path.relative_to(settings.AGENDA_PATH)}" + ) + elif any( + [ + pathdir in path.parents + for pathdir in [ + Path(settings.INTERNET_DRAFT_PATH), + Path(settings.INTERNET_DRAFT_ARCHIVE_DIR).parent, + Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), + ] + ] + ): + return f"{settings.IETF_ID_ARCHIVE_URL}{path.name}" + else: + return "#" + + +@register.filter +def is_in_stream(doc): + """ + Check if the doc is in one of the states in it stream that + indicate that is actually adopted, i.e., part of the stream. + (There are various "candidate" states that necessitate this + filter.) + """ + if not doc.stream: + return False + stream = doc.stream.slug + state = doc.get_state_slug(f"draft-stream-{doc.stream.slug}") + if not state: + return True + if stream == "ietf": + return state not in ["wg-cand", "c-adopt"] + elif stream == "irtf": + return state != "candidat" + elif stream == "iab": + return state not in ["candidat", "diff-org"] + elif stream == "editorial": + return True + return False diff --git a/ietf/doc/templatetags/tests_ietf_filters.py b/ietf/doc/templatetags/tests_ietf_filters.py index f791d615301..b5130849ea2 100644 --- a/ietf/doc/templatetags/tests_ietf_filters.py +++ b/ietf/doc/templatetags/tests_ietf_filters.py @@ -3,13 +3,26 @@ from django.conf import settings from ietf.doc.factories import ( - WgDraftFactory, + WgRfcFactory, IndividualDraftFactory, CharterFactory, NewRevisionDocEventFactory, + StatusChangeFactory, + RgDraftFactory, + EditorialDraftFactory, + WgDraftFactory, + ConflictReviewFactory, + BofreqFactory, + StatementFactory, + RfcFactory, +) +from ietf.doc.models import DocEvent +from ietf.doc.templatetags.ietf_filters import ( + urlize_ietf_docs, + is_valid_url, + is_in_stream, + is_unexpected_wg_state, ) -from ietf.doc.models import State, DocEvent, DocAlias -from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs, is_valid_url from ietf.person.models import Person from ietf.utils.test_utils import TestCase @@ -19,29 +32,42 @@ class IetfFiltersTests(TestCase): + def test_is_in_stream(self): + for draft in [ + IndividualDraftFactory(), + CharterFactory(), + StatusChangeFactory(), + ConflictReviewFactory(), + StatementFactory(), + BofreqFactory(), + ]: + self.assertFalse(is_in_stream(draft)) + for draft in [RgDraftFactory(), WgDraftFactory(), EditorialDraftFactory()]: + self.assertTrue(is_in_stream(draft)) + for stream in ["iab", "ietf", "irtf", "ise", "editorial"]: + self.assertTrue(is_in_stream(IndividualDraftFactory(stream_id=stream))) + def test_is_valid_url(self): cases = [(settings.IDTRACKER_BASE_URL, True), ("not valid", False)] for url, result in cases: self.assertEqual(is_valid_url(url), result) def test_urlize_ietf_docs(self): - wg_id = WgDraftFactory() - wg_id.set_state(State.objects.get(type="draft", slug="rfc")) - wg_id.std_level_id = "bcp" - wg_id.save_with_history( + rfc = WgRfcFactory(rfc_number=123456, std_level_id="bcp") + rfc.save_with_history( [ DocEvent.objects.create( - doc=wg_id, - rev=wg_id.rev, + doc=rfc, + rev=rfc.rev, type="published_rfc", by=Person.objects.get(name="(System)"), ) ] ) - DocAlias.objects.create(name="rfc123456").docs.add(wg_id) - DocAlias.objects.create(name="bcp123456").docs.add(wg_id) - DocAlias.objects.create(name="std123456").docs.add(wg_id) - DocAlias.objects.create(name="fyi123456").docs.add(wg_id) + # TODO - bring these into existance when subseries are well modeled + # DocAlias.objects.create(name="bcp123456").docs.add(rfc) + # DocAlias.objects.create(name="std123456").docs.add(rfc) + # DocAlias.objects.create(name="fyi123456").docs.add(rfc) id = IndividualDraftFactory(name="draft-me-rfc123456bis") id_num = IndividualDraftFactory(name="draft-rosen-rfcefdp-update-2026") @@ -59,15 +85,16 @@ def test_urlize_ietf_docs(self): cases = [ ("no change", "no change"), - ("bCp123456", 'bCp123456'), - ("Std 00123456", 'Std 00123456'), - ( - "FyI 0123456 changes std 00123456", - 'FyI 0123456 changes std 00123456', - ), + # TODO: rework subseries when we add them + # ("bCp123456", 'bCp123456'), + # ("Std 00123456", 'Std 00123456'), + # ( + # "FyI 0123456 changes std 00123456", + # 'FyI 0123456 changes std 00123456', + # ), ("rfc123456", 'rfc123456'), ("Rfc 0123456", 'Rfc 0123456'), - (wg_id.name, f'{wg_id.name}'), + (rfc.name, f'{rfc.name}'), ( f"{id.name}-{id.rev}.txt", f'{id.name}-{id.rev}.txt', @@ -149,3 +176,17 @@ def test_urlize_ietf_docs(self): for input, output in cases: # debug.show("(input, urlize_ietf_docs(input), output)") self.assertEqual(urlize_ietf_docs(input), output) + + def test_is_unexpected_wg_state(self): + """ + Test that the unexpected_wg_state function works correctly + """ + # test documents with expected wg states + self.assertFalse(is_unexpected_wg_state(RfcFactory())) + self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'sub-pub')]))) + self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-iesg', 'idexists')]))) + self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'wg-cand'), ('draft-iesg','idexists')]))) + + # test documents with unexpected wg states due to invalid combination of states + self.assertTrue(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'wg-cand'), ('draft-iesg','lc-req')]))) + self.assertTrue(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'chair-w'), ('draft-iesg','pub-req')]))) diff --git a/ietf/doc/templatetags/wg_menu.py b/ietf/doc/templatetags/wg_menu.py index 76bf7eb4d0c..3e8d209448a 100644 --- a/ietf/doc/templatetags/wg_menu.py +++ b/ietf/doc/templatetags/wg_menu.py @@ -62,8 +62,6 @@ @register.simple_tag def wg_menu(flavor): - global parents - for p in parents: p.short_name = parent_short_names.get(p.acronym) or p.name if p.short_name.endswith(" Area"): diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index 65859bf4be5..16dcfb7754d 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -1,13 +1,16 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2024, All Rights Reserved # -*- coding: utf-8 -*- import os import datetime import io +from hashlib import sha384 + +from django.http import HttpRequest import lxml import bibtexparser -import mock +from unittest import mock import json import copy import random @@ -16,11 +19,9 @@ from pathlib import Path from pyquery import PyQuery from urllib.parse import urlparse, parse_qs -from tempfile import NamedTemporaryFile from collections import defaultdict from zoneinfo import ZoneInfo -from django.core.management import call_command from django.urls import reverse as urlreverse from django.conf import settings from django.forms import Form @@ -31,20 +32,30 @@ from tastypie.test import ResourceTestCaseMixin +from weasyprint.urls import URLFetchingError + import debug # pyflakes:ignore -from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State, +from ietf.doc.models import ( Document, DocRelationshipName, RelatedDocument, State, DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, NewRevisionDocEvent, BallotType, - EditedAuthorsDocEvent ) -from ietf.doc.factories import ( DocumentFactory, DocEventFactory, CharterFactory, + EditedAuthorsDocEvent, StateType) +from ietf.doc.factories import ( DocumentFactory, DocEventFactory, CharterFactory, ConflictReviewFactory, WgDraftFactory, IndividualDraftFactory, WgRfcFactory, IndividualRfcFactory, StateDocEventFactory, BallotPositionDocEventFactory, BallotDocEventFactory, DocumentAuthorFactory, NewRevisionDocEventFactory, - StatusChangeFactory, BofreqFactory, DocExtResourceFactory, RgDraftFactory) + StatusChangeFactory, DocExtResourceFactory, RgDraftFactory, BcpFactory) from ietf.doc.forms import NotifyForm from ietf.doc.fields import SearchableDocumentsField -from ietf.doc.utils import create_ballot_if_not_open, uppercase_std_abbreviated_name -from ietf.doc.views_search import ad_dashboard_group, ad_dashboard_group_type, shorten_group_name # TODO: red flag that we're importing from views in tests. Move these to utils. +from ietf.doc.utils import ( + create_ballot_if_not_open, + investigate_fragment, + uppercase_std_abbreviated_name, + DraftAliasGenerator, + generate_idnits2_rfc_status, + generate_idnits2_rfcs_obsoleted, + get_doc_email_aliases, +) +from ietf.doc.views_doc import get_diff_revisions from ietf.group.models import Group, Role from ietf.group.factories import GroupFactory, RoleFactory from ietf.ipr.factories import HolderIprDisclosureFactory @@ -52,20 +63,22 @@ from ietf.meeting.factories import ( MeetingFactory, SessionFactory, SessionPresentationFactory, ProceedingsMaterialFactory ) -from ietf.name.models import SessionStatusName, BallotPositionName, DocTypeName +from ietf.name.models import SessionStatusName, BallotPositionName, DocTypeName, RoleName from ietf.person.models import Person from ietf.person.factories import PersonFactory, EmailFactory -from ietf.utils.mail import outbox, empty_outbox +from ietf.utils.mail import get_payload_text, outbox, empty_outbox from ietf.utils.test_utils import login_testing_unauthorized, unicontent from ietf.utils.test_utils import TestCase from ietf.utils.text import normalize_text from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO, RPC_TZINFO +from ietf.doc.utils_search import AD_WORKLOAD class SearchTests(TestCase): def test_search(self): draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory()) + rfc = WgRfcFactory() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req")) old_draft = IndividualDraftFactory(name='draft-foo-mars-test',authors=[PersonFactory()],title="Optimizing Martian Network Topologies") old_draft.set_state(State.objects.get(used=True, type="draft", slug="expired")) @@ -97,11 +110,12 @@ def test_search(self): self.assertEqual(r.status_code, 200) self.assertContains(r, "draft-foo-mars-test") - # find by rfc/active/inactive - draft.set_state(State.objects.get(type="draft", slug="rfc")) - r = self.client.get(base_url + "?rfcs=on&name=%s" % draft.name) + # find by RFC + r = self.client.get(base_url + "?rfcs=on&name=%s" % rfc.name) self.assertEqual(r.status_code, 200) - self.assertContains(r, draft.title) + self.assertContains(r, rfc.title) + + # find by active/inactive draft.set_state(State.objects.get(type="draft", slug="active")) r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.name) @@ -154,6 +168,23 @@ def test_search(self): self.assertEqual(r.status_code, 200) self.assertContains(r, draft.title) + def test_search_became_rfc(self): + draft = WgDraftFactory() + rfc = WgRfcFactory() + draft.set_state(State.objects.get(type="draft", slug="rfc")) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) + base_url = urlreverse('ietf.doc.views_search.search') + + # find by RFC + r = self.client.get(base_url + f"?rfcs=on&name={rfc.name}") + self.assertEqual(r.status_code, 200) + self.assertContains(r, rfc.title) + + # find by draft + r = self.client.get(base_url + f"?activedrafts=on&rfcs=on&name={draft.name}") + self.assertEqual(r.status_code, 200) + self.assertContains(r, rfc.title) + def test_search_for_name(self): draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory()) draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req")) @@ -261,6 +292,17 @@ def test_search_for_name(self): parsed = urlparse(r["Location"]) self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search')) self.assertEqual(parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42") + + def test_search_rfc(self): + rfc = WgRfcFactory(name="rfc0000") + + # search for existing RFC should redirect directly to the RFC page + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=rfc.name))) + self.assertRedirects(r, f'/doc/{rfc.name}/', status_code=302, target_status_code=200) + + # search for existing RFC with revision number should redirect to the RFC page + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=rfc.name + "-99")), follow=True) + self.assertRedirects(r, f'/doc/{rfc.name}/', status_code=302, target_status_code=200) def test_frontpage(self): r = self.client.get("/") @@ -268,52 +310,68 @@ def test_frontpage(self): self.assertContains(r, "Document Search") def test_ad_workload(self): - Role.objects.filter(name_id='ad').delete() - ad = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active',person__name='Example Areadirector').person - doc_type_names = ['bofreq', 'charter', 'conflrev', 'draft', 'statchg'] - expected = defaultdict(lambda :0) - for doc_type_name in doc_type_names: - if doc_type_name=='draft': - states = State.objects.filter(type='draft-iesg', used=True).values_list('slug', flat=True) - else: - states = State.objects.filter(type=doc_type_name, used=True).values_list('slug', flat=True) - - for state in states: - target_num = random.randint(0,2) + Role.objects.filter(name_id="ad").delete() + ad = RoleFactory( + name_id="ad", + group__type_id="area", + group__state_id="active", + person__name="Example Areadirector", + ).person + expected = defaultdict(lambda: 0) + for doc_type_slug in AD_WORKLOAD: + for state in AD_WORKLOAD[doc_type_slug]: + target_num = random.randint(0, 2) for _ in range(target_num): - if doc_type_name == 'draft': - doc = IndividualDraftFactory(ad=ad,states=[('draft-iesg', state),('draft','rfc' if state=='pub' else 'active')]) - elif doc_type_name == 'charter': - doc = CharterFactory(ad=ad, states=[(doc_type_name, state)]) - elif doc_type_name == 'bofreq': - # Note that the view currently doesn't handle bofreqs - doc = BofreqFactory(states=[(doc_type_name, state)], bofreqresponsibledocevent__responsible=[ad]) - elif doc_type_name == 'conflrev': - doc = ConflictReviewFactory(ad=ad, states=State.objects.filter(type_id=doc_type_name, slug=state)) - elif doc_type_name == 'statchg': - doc = StatusChangeFactory(ad=ad, states=State.objects.filter(type_id=doc_type_name, slug=state)) - else: - # Currently unreachable - doc = DocumentFactory(type_id=doc_type_name, ad=ad, states=[(doc_type_name, state)]) - - if not slugify(ad_dashboard_group_type(doc)) in ('document', 'none'): - expected[(slugify(ad_dashboard_group_type(doc)), slugify(ad.full_name_as_key()), slugify(shorten_group_name(ad_dashboard_group(doc))))] += 1 - - url = urlreverse('ietf.doc.views_search.ad_workload') + if ( + doc_type_slug == "draft" + or doc_type_slug == "rfc" + and state == "rfcqueue" + ): + IndividualDraftFactory( + ad=ad, + states=[ + ("draft-iesg", state), + ("draft", "rfc" if state == "pub" else "active"), + ], + ) + elif doc_type_slug == "rfc": + WgRfcFactory.create( + states=[("draft", "rfc"), ("draft-iesg", "pub")] + ) + + elif doc_type_slug == "charter": + CharterFactory(ad=ad, states=[(doc_type_slug, state)]) + elif doc_type_slug == "conflrev": + ConflictReviewFactory( + ad=ad, + states=State.objects.filter( + type_id=doc_type_slug, slug=state + ), + ) + elif doc_type_slug == "statchg": + StatusChangeFactory( + ad=ad, + states=State.objects.filter( + type_id=doc_type_slug, slug=state + ), + ) + self.client.login(username="ad", password="ad+password") + url = urlreverse("ietf.doc.views_search.ad_workload") r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) for group_type, ad, group in expected: - self.assertEqual(int(q(f'#{group_type}-{ad}-{group}').text()),expected[(group_type, ad, group)]) + self.assertEqual( + int(q(f"#{group_type}-{ad}-{group}").text()), + expected[(group_type, ad, group)], + ) def test_docs_for_ad(self): ad = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person draft = IndividualDraftFactory(ad=ad) draft.action_holders.set([PersonFactory()]) draft.set_state(State.objects.get(type='draft-iesg', slug='lc')) - rfc = IndividualDraftFactory(ad=ad) - rfc.set_state(State.objects.get(type='draft', slug='rfc')) - DocAlias.objects.create(name='rfc6666').docs.add(rfc) + rfc = IndividualRfcFactory(ad=ad) conflrev = DocumentFactory(type_id='conflrev',ad=ad) conflrev.set_state(State.objects.get(type='conflrev', slug='iesgeval')) statchg = DocumentFactory(type_id='statchg',ad=ad) @@ -337,7 +395,7 @@ def test_docs_for_ad(self): self.assertEqual(r.status_code, 200) self.assertContains(r, draft.name) self.assertContains(r, escape(draft.action_holders.first().name)) - self.assertContains(r, rfc.canonical_name()) + self.assertContains(r, rfc.name) self.assertContains(r, conflrev.name) self.assertContains(r, statchg.name) self.assertContains(r, charter.name) @@ -345,6 +403,30 @@ def test_docs_for_ad(self): self.assertContains(r, discuss_other.doc.name) self.assertContains(r, block_other.doc.name) + def test_docs_for_iesg(self): + ad1 = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person + ad2 = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person + + draft = IndividualDraftFactory(ad=ad1) + draft.action_holders.set([PersonFactory()]) + draft.set_state(State.objects.get(type='draft-iesg', slug='lc')) + rfc = IndividualRfcFactory(ad=ad2) + conflrev = DocumentFactory(type_id='conflrev',ad=ad1) + conflrev.set_state(State.objects.get(type='conflrev', slug='iesgeval')) + statchg = DocumentFactory(type_id='statchg',ad=ad2) + statchg.set_state(State.objects.get(type='statchg', slug='iesgeval')) + charter = CharterFactory(name='charter-ietf-ames',ad=ad1) + charter.set_state(State.objects.get(type='charter', slug='iesgrev')) + + r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_iesg')) + self.assertEqual(r.status_code, 200) + self.assertContains(r, draft.name) + self.assertContains(r, escape(draft.action_holders.first().name)) + self.assertNotContains(r, rfc.name) + self.assertContains(r, conflrev.name) + self.assertContains(r, statchg.name) + self.assertContains(r, charter.name) + def test_auth48_doc_for_ad(self): """Docs in AUTH48 state should have a decoration""" ad = RoleFactory(name_id='ad', group__type_id='area', group__state_id='active').person @@ -367,17 +449,6 @@ def test_drafts_in_last_call(self): self.assertContains(r, draft.title) self.assertContains(r, escape(draft.action_holders.first().name)) - def test_in_iesg_process(self): - doc_in_process = IndividualDraftFactory() - doc_in_process.action_holders.set([PersonFactory()]) - doc_in_process.set_state(State.objects.get(type='draft-iesg', slug='lc')) - doc_not_in_process = IndividualDraftFactory() - r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_iesg_process')) - self.assertEqual(r.status_code, 200) - self.assertContains(r, doc_in_process.title) - self.assertContains(r, escape(doc_in_process.action_holders.first().name)) - self.assertNotContains(r, doc_not_in_process.title) - def test_indexes(self): draft = IndividualDraftFactory() rfc = WgRfcFactory() @@ -385,16 +456,17 @@ def test_indexes(self): r = self.client.get(urlreverse('ietf.doc.views_search.index_all_drafts')) self.assertEqual(r.status_code, 200) self.assertContains(r, draft.name) - self.assertContains(r, rfc.canonical_name().upper()) + self.assertContains(r, rfc.name.upper()) r = self.client.get(urlreverse('ietf.doc.views_search.index_active_drafts')) self.assertEqual(r.status_code, 200) self.assertContains(r, draft.title) def test_ajax_search_docs(self): - draft = IndividualDraftFactory() + draft = IndividualDraftFactory(name="draft-ietf-rfc1234bis") + rfc = IndividualRfcFactory(rfc_number=1234) + bcp = IndividualRfcFactory(name="bcp12345", type_id="bcp") - # Document url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ "model_name": "document", "doc_type": "draft", @@ -404,18 +476,27 @@ def test_ajax_search_docs(self): data = r.json() self.assertEqual(data[0]["id"], draft.pk) - # DocAlias - doc_alias = draft.docalias.first() - url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ - "model_name": "docalias", - "doc_type": "draft", + "model_name": "document", + "doc_type": "rfc", }) + r = self.client.get(url, dict(q=rfc.name)) + self.assertEqual(r.status_code, 200) + data = r.json() + self.assertEqual(data[0]["id"], rfc.pk) - r = self.client.get(url, dict(q=doc_alias.name)) + url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ + "model_name": "document", + "doc_type": "all", + }) + r = self.client.get(url, dict(q="1234")) self.assertEqual(r.status_code, 200) data = r.json() - self.assertEqual(data[0]["id"], doc_alias.pk) + self.assertEqual(len(data), 3) + pks = set([data[i]["id"] for i in range(3)]) + self.assertEqual(pks, set([bcp.pk, rfc.pk, draft.pk])) + + def test_recent_drafts(self): # Three drafts to show with various warnings @@ -434,8 +515,8 @@ def test_recent_drafts(self): self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertEqual(len(q('td.doc')),3) - self.assertTrue(q('td.status span.bg-warning[title*="%s"]' % "for 15 days")) - self.assertTrue(q('td.status span.bg-danger[title*="%s"]' % "for 29 days")) + self.assertTrue(q('td.status span.text-bg-warning[title*="%s"]' % "for 15 days")) + self.assertTrue(q('td.status span.text-bg-danger[title*="%s"]' % "for 29 days")) for ah in [draft.action_holders.first() for draft in drafts]: self.assertContains(r, escape(ah.name)) @@ -619,23 +700,22 @@ def setUp(self): def test_document_draft(self): draft = WgDraftFactory(name='draft-ietf-mars-test',rev='01', create_revisions=range(0,2)) - HolderIprDisclosureFactory(docs=[draft]) # Docs for testing relationships. Does not test 'possibly-replaces'. The 'replaced_by' direction # is tested separately below. replaced = IndividualDraftFactory() - draft.relateddocument_set.create(relationship_id='replaces',source=draft,target=replaced.docalias.first()) + draft.relateddocument_set.create(relationship_id='replaces',source=draft,target=replaced) obsoleted = IndividualDraftFactory() - draft.relateddocument_set.create(relationship_id='obs',source=draft,target=obsoleted.docalias.first()) + draft.relateddocument_set.create(relationship_id='obs',source=draft,target=obsoleted) obsoleted_by = IndividualDraftFactory() - obsoleted_by.relateddocument_set.create(relationship_id='obs',source=obsoleted_by,target=draft.docalias.first()) + obsoleted_by.relateddocument_set.create(relationship_id='obs',source=obsoleted_by,target=draft) updated = IndividualDraftFactory() - draft.relateddocument_set.create(relationship_id='updates',source=draft,target=updated.docalias.first()) + draft.relateddocument_set.create(relationship_id='updates',source=draft,target=updated) updated_by = IndividualDraftFactory() - updated_by.relateddocument_set.create(relationship_id='updates',source=obsoleted_by,target=draft.docalias.first()) + updated_by.relateddocument_set.create(relationship_id='updates',source=obsoleted_by,target=draft) - external_resource = DocExtResourceFactory(doc=draft) + DocExtResourceFactory(doc=draft) # these tests aren't testing all attributes yet, feel free to # expand them @@ -646,69 +726,32 @@ def test_document_draft(self): if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off': self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) - self.assertContains(r, external_resource.value) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=0") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=foo") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=1") self.assertEqual(r.status_code, 200) self.assertContains(r, "Active Internet-Draft") self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) self.client.cookies = SimpleCookie({str('full_draft'): str('on')}) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) @@ -716,17 +759,8 @@ def test_document_draft(self): self.assertContains(r, "Active Internet-Draft") self.assertNotContains(r, "Show full document") self.assertContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) self.client.cookies = SimpleCookie({str('full_draft'): str('off')}) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) @@ -734,17 +768,8 @@ def test_document_draft(self): self.assertContains(r, "Active Internet-Draft") self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) self.client.cookies = SimpleCookie({str('full_draft'): str('foo')}) r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) @@ -753,17 +778,8 @@ def test_document_draft(self): if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off': self.assertContains(r, "Show full document") self.assertNotContains(r, "Deimos street") - self.assertContains(r, replaced.canonical_name()) + self.assertContains(r, replaced.name) self.assertContains(r, replaced.title) - # obs/updates not included until draft is RFC - self.assertNotContains(r, obsoleted.canonical_name()) - self.assertNotContains(r, obsoleted.title) - self.assertNotContains(r, obsoleted_by.canonical_name()) - self.assertNotContains(r, obsoleted_by.title) - self.assertNotContains(r, updated.canonical_name()) - self.assertNotContains(r, updated.title) - self.assertNotContains(r, updated_by.canonical_name()) - self.assertNotContains(r, updated_by.title) r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 200) @@ -789,16 +805,16 @@ def test_document_draft(self): rfc = WgRfcFactory() rfc.save_with_history([DocEventFactory(doc=rfc)]) (Path(settings.RFC_PATH) / rfc.get_base_name()).touch() - r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name()))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name))) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEqual(q('title').text(), f'RFC {rfc.rfc_number()} - {rfc.title}') + self.assertEqual(q('title').text(), f'RFC {rfc.rfc_number} - {rfc.title}') # synonyms for the rfc should be redirected to its canonical view - r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number()))) - self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name()))) - r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number()}'))) - self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name()))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number))) + self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number}'))) + self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name))) # expired draft draft.set_state(State.objects.get(type="draft", slug="expired")) @@ -817,48 +833,55 @@ def test_document_draft(self): stream_id=draft.stream_id, group_id=draft.group_id, abstract=draft.abstract,stream=draft.stream, rev=draft.rev, pages=draft.pages, intended_std_level_id=draft.intended_std_level_id, shepherd_id=draft.shepherd_id, ad_id=draft.ad_id, expires=draft.expires, - notify=draft.notify, note=draft.note) + notify=draft.notify) rel = RelatedDocument.objects.create(source=replacement, - target=draft.docalias.get(name__startswith="draft"), + target=draft, relationship_id="replaces") r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 200) self.assertContains(r, "Replaced Internet-Draft") - self.assertContains(r, replacement.canonical_name()) + self.assertContains(r, replacement.name) self.assertContains(r, replacement.title) rel.delete() # draft published as RFC draft.set_state(State.objects.get(type="draft", slug="rfc")) - draft.std_level_id = "bcp" - draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="published_rfc", by=Person.objects.get(name="(System)"))]) + draft.std_level_id = "ps" + + rfc = WgRfcFactory(group=draft.group, name="rfc123456") + rfc.save_with_history([DocEvent.objects.create(doc=rfc, rev=None, type="published_rfc", by=Person.objects.get(name="(System)"))]) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) - rfc_alias = DocAlias.objects.create(name="rfc123456") - rfc_alias.docs.add(draft) - bcp_alias = DocAlias.objects.create(name="bcp123456") - bcp_alias.docs.add(draft) + obsoleted = IndividualRfcFactory() + rfc.relateddocument_set.create(relationship_id='obs',target=obsoleted) + obsoleted_by = IndividualRfcFactory() + obsoleted_by.relateddocument_set.create(relationship_id='obs',target=rfc) + updated = IndividualRfcFactory() + rfc.relateddocument_set.create(relationship_id='updates',target=updated) + updated_by = IndividualRfcFactory() + updated_by.relateddocument_set.create(relationship_id='updates',target=rfc) + + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=draft.rev))) + self.assertEqual(r.status_code, 200) + self.assertContains(r, "This is an older version of an Internet-Draft that was ultimately published as") r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 302) - r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=bcp_alias.name))) - self.assertEqual(r.status_code, 302) - r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_alias.name))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))) self.assertEqual(r.status_code, 200) self.assertContains(r, "RFC 123456") self.assertContains(r, draft.name) - self.assertContains(r, replaced.canonical_name()) - self.assertContains(r, replaced.title) # obs/updates included with RFC - self.assertContains(r, obsoleted.canonical_name()) + self.assertContains(r, obsoleted.name) self.assertContains(r, obsoleted.title) - self.assertContains(r, obsoleted_by.canonical_name()) + self.assertContains(r, obsoleted_by.name) self.assertContains(r, obsoleted_by.title) - self.assertContains(r, updated.canonical_name()) + self.assertContains(r, updated.name) self.assertContains(r, updated.title) - self.assertContains(r, updated_by.canonical_name()) + self.assertContains(r, updated_by.name) self.assertContains(r, updated_by.title) # naked RFC - also weird that we test a PS from the ISE @@ -891,7 +914,7 @@ def test_draft_status_changes(self): draft = WgRfcFactory() status_change_doc = StatusChangeFactory( group=draft.group, - changes_status_of=[('tops', draft.docalias.first())], + changes_status_of=[('tops', draft)], ) status_change_url = urlreverse( 'ietf.doc.views_doc.document_main', @@ -899,7 +922,7 @@ def test_draft_status_changes(self): ) proposed_status_change_doc = StatusChangeFactory( group=draft.group, - changes_status_of=[('tobcp', draft.docalias.first())], + changes_status_of=[('tobcp', draft)], states=[State.objects.get(slug='needshep', type='statchg')], ) proposed_status_change_url = urlreverse( @@ -910,7 +933,7 @@ def test_draft_status_changes(self): r = self.client.get( urlreverse( 'ietf.doc.views_doc.document_main', - kwargs={'name': draft.canonical_name()}, + kwargs={'name': draft.name}, ) ) self.assertEqual(r.status_code, 200) @@ -1444,6 +1467,14 @@ def test_document_draft_action_holders_buttons(self, mock_method): """Buttons for action holders should be shown when AD or secretary""" draft = WgDraftFactory() draft.action_holders.set([PersonFactory()]) + other_group = GroupFactory(type_id=draft.group.type_id) + + # create a test RoleName and put it in the docman_roles for the document group + RoleName.objects.create(slug="wrangler", name="Wrangler", used=True) + draft.group.features.docman_roles.append("wrangler") + draft.group.features.save() + wrangler = RoleFactory(group=draft.group, name_id="wrangler").person + wrangler_of_other_group = RoleFactory(group=other_group, name_id="wrangler").person url = urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=draft.name)) edit_ah_url = urlreverse('ietf.doc.views_doc.edit_action_holders', kwargs=dict(name=draft.name)) @@ -1476,6 +1507,8 @@ def _run_test(username=None, expect_buttons=False): _run_test(None, False) _run_test('plain', False) + _run_test(wrangler_of_other_group.user.username, False) + _run_test(wrangler.user.username, True) _run_test('ad', True) _run_test('secretary', True) @@ -1490,11 +1523,11 @@ def test_draft_group_link(self): self.assertEqual(r.status_code, 200) self.assert_correct_wg_group_link(r, group) - rfc = WgRfcFactory(name='draft-rfc-document-%s' % group_type_id, group=group) + rfc = WgRfcFactory(group=group) + draft = WgDraftFactory(group=group) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) DocEventFactory.create(doc=rfc, type='published_rfc', time=event_datetime) - # get the rfc name to avoid a redirect - rfc_name = rfc.docalias.filter(name__startswith='rfc').first().name - r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_name))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))) self.assertEqual(r.status_code, 200) self.assert_correct_wg_group_link(r, group) @@ -1505,14 +1538,33 @@ def test_draft_group_link(self): self.assertEqual(r.status_code, 200) self.assert_correct_non_wg_group_link(r, group) - rfc = WgRfcFactory(name='draft-rfc-document-%s' % group_type_id, group=group) + rfc = WgRfcFactory(group=group) + draft = WgDraftFactory(name='draft-rfc-document-%s'% group_type_id, group=group) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) DocEventFactory.create(doc=rfc, type='published_rfc', time=event_datetime) - # get the rfc name to avoid a redirect - rfc_name = rfc.docalias.filter(name__startswith='rfc').first().name - r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_name))) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))) self.assertEqual(r.status_code, 200) self.assert_correct_non_wg_group_link(r, group) + def test_document_email_authors_button(self): + # rfc not from draft + rfc = WgRfcFactory() + DocEventFactory.create(doc=rfc, type='published_rfc') + url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertEqual(len(q('a:contains("Email authors")')), 0, 'Did not expect "Email authors" button') + + # rfc from draft + draft = WgDraftFactory(group=rfc.group) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) + draft.set_state(State.objects.get(used=True, type="draft", slug="rfc")) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertEqual(len(q('a:contains("Email authors")')), 1, 'Expected "Email authors" button') + def test_document_primary_and_history_views(self): IndividualDraftFactory(name='draft-imaginary-independent-submission') ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission') @@ -1610,13 +1662,17 @@ def test_status_change(self): statchg = StatusChangeFactory() r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.name))) self.assertEqual(r.status_code, 200) - r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target.document))) - self.assertEqual(r.status_code, 302) + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target))) + self.assertEqual(r.status_code, 200) def test_document_charter(self): CharterFactory(name='charter-ietf-mars') r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="charter-ietf-mars"))) self.assertEqual(r.status_code, 200) + + def test_incorrect_rfc_url(self): + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="rfc8989", rev="00"))) + self.assertEqual(r.status_code, 404) def test_document_conflict_review(self): ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission') @@ -1654,6 +1710,17 @@ def test_document_material(self): r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) self.assertEqual(r.status_code, 200) + self.assertNotContains(r, "The session for this document was cancelled.") + + SchedulingEvent.objects.create( + session=session, + status_id='canceled', + by = Person.objects.get(user__username="marschairman"), + ) + + r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(r.status_code, 200) + self.assertContains(r, "The session for this document was cancelled.") def test_document_ballot(self): doc = IndividualDraftFactory() @@ -1771,26 +1838,26 @@ def test_document_ballot_needed_positions(self): self.assertNotContains(r, 'more YES or NO') # status change - DocAlias.objects.create(name='rfc9998').docs.add(IndividualDraftFactory()) - DocAlias.objects.create(name='rfc9999').docs.add(IndividualDraftFactory()) + Document.objects.create(name='rfc9998') + Document.objects.create(name='rfc9999') doc = DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review') iesgeval_pk = str(State.objects.get(slug='iesgeval',type__slug='statchg').pk) empty_outbox() self.client.login(username='ad', password='ad+password') r = self.client.post(urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name)),dict(new_state=iesgeval_pk)) self.assertEqual(r.status_code, 302) - r = self.client.get(r._headers["location"][1]) + r = self.client.get(r.headers["location"]) self.assertContains(r, ">IESG Evaluation<") self.assertEqual(len(outbox), 2) self.assertIn('iesg-secretary',outbox[0]['To']) self.assertIn('drafts-eval',outbox[1]['To']) - doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist') + doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist') r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name))) self.assertNotContains(r, 'Needs a YES') self.assertNotContains(r, 'more YES or NO') - doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois') + doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois') r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name))) self.assertContains(r, 'more YES or NO') @@ -1837,6 +1904,18 @@ def test_writeup(self): self.assertContains(r, notes.text) self.assertContains(r, rfced_note.text) + def test_diff_revisions(self): + ind_doc = IndividualDraftFactory(create_revisions=range(2)) + wg_doc = WgDraftFactory( + relations=[("replaces", ind_doc)], create_revisions=range(2) + ) + diff_revisions = get_diff_revisions(HttpRequest(), wg_doc.name, wg_doc) + self.assertEqual(len(diff_revisions), 4) + self.assertEqual( + [t[3] for t in diff_revisions], + [f"{n}-{v:02d}" for n in [wg_doc.name, ind_doc.name] for v in [1, 0]], + ) + def test_history(self): doc = IndividualDraftFactory() @@ -1853,15 +1932,14 @@ def test_history(self): self.assertContains(r, e.desc) def test_history_bis_00(self): - rfcname='rfc9090' - rfc = WgRfcFactory(alias2=rfcname) - bis_draft = WgDraftFactory(name='draft-ietf-{}-{}bis'.format(rfc.group.acronym,rfcname)) + rfc = WgRfcFactory(rfc_number=9090) + bis_draft = WgDraftFactory(name='draft-ietf-{}-{}bis'.format(rfc.group.acronym,rfc.name)) url = urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=bis_draft.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(unicontent(r)) - attr1='value="{}"'.format(rfcname) + attr1='value="{}"'.format(rfc.name) self.assertEqual(len(q('option['+attr1+'][selected="selected"]')), 1) @@ -1911,11 +1989,31 @@ def test_last_call_feed(self): self.assertContains(r, doc.name) def test_rfc_feed(self): - WgRfcFactory() + rfc = WgRfcFactory(rfc_number=9000) + DocEventFactory(doc=rfc, type="published_rfc") r = self.client.get("/feed/rfc/") self.assertTrue(r.status_code, 200) + q = PyQuery(r.content[39:]) # Strip off the xml declaration + self.assertEqual(len(q("item")), 1) + item = q("item")[0] + media_content = item.findall("{http://search.yahoo.com/mrss/}content") + self.assertEqual(len(media_content),4) + types = set([m.attrib["type"] for m in media_content]) + self.assertEqual(types, set(["application/rfc+xml", "text/plain", "text/html", "application/pdf"])) + rfcs_2016 = WgRfcFactory.create_batch(3) # rfc numbers will be well below v3 + for rfc in rfcs_2016: + e = DocEventFactory(doc=rfc, type="published_rfc") + e.time = e.time.replace(year=2016) + e.save() r = self.client.get("/feed/rfc/2016") self.assertTrue(r.status_code, 200) + q = PyQuery(r.content[39:]) + self.assertEqual(len(q("item")), 3) + item = q("item")[0] + media_content = item.findall("{http://search.yahoo.com/mrss/}content") + self.assertEqual(len(media_content), 3) + types = set([m.attrib["type"] for m in media_content]) + self.assertEqual(types, set(["text/plain", "text/html", "application/pdf"])) def test_state_help(self): url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="draft-iesg")) @@ -1948,70 +2046,91 @@ def _parse_bibtex_response(self, response) -> dict: @override_settings(RFC_EDITOR_INFO_BASE_URL='https://www.rfc-editor.ietf.org/info/') def test_document_bibtex(self): + + for factory in [CharterFactory, BcpFactory, StatusChangeFactory, ConflictReviewFactory]: # Should be extended to all other doc types + doc = factory() + url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=doc.name)) + r = self.client.get(url) + self.assertEqual(r.status_code, 404) rfc = WgRfcFactory.create( - #other_aliases = ['rfc6020',], - states = [('draft','rfc'),('draft-iesg','pub')], - std_level_id = 'ps', - time = datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE)), - ) - num = rfc.rfc_number() + time=datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE)) + ) + num = rfc.rfc_number DocEventFactory.create( doc=rfc, - type='published_rfc', + type="published_rfc", time=datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO), ) # - url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=rfc.name)) + url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=rfc.name)) r = self.client.get(url) - entry = self._parse_bibtex_response(r)["rfc%s"%num] - self.assertEqual(entry['series'], 'Request for Comments') - self.assertEqual(entry['number'], num) - self.assertEqual(entry['doi'], '10.17487/RFC%s'%num) - self.assertEqual(entry['year'], '2010') - self.assertEqual(entry['month'].lower()[0:3], 'oct') - self.assertEqual(entry['url'], f'https://www.rfc-editor.ietf.org/info/rfc{num}') + entry = self._parse_bibtex_response(r)["rfc%s" % num] + self.assertEqual(entry["series"], "Request for Comments") + self.assertEqual(int(entry["number"]), num) + self.assertEqual(entry["doi"], "10.17487/RFC%s" % num) + self.assertEqual(entry["year"], "2010") + self.assertEqual(entry["month"].lower()[0:3], "oct") + self.assertEqual(entry["url"], f"https://www.rfc-editor.ietf.org/info/rfc{num}") # - self.assertNotIn('day', entry) - + self.assertNotIn("day", entry) + + # test for incorrect case - revision for RFC + rfc = WgRfcFactory(name="rfc0000") + url = urlreverse( + "ietf.doc.views_doc.document_bibtex", kwargs=dict(name=rfc.name, rev="00") + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + april1 = IndividualRfcFactory.create( - stream_id = 'ise', - states = [('draft','rfc'),('draft-iesg','pub')], - std_level_id = 'inf', - time = datetime.datetime(1990, 4, 1, tzinfo=ZoneInfo(settings.TIME_ZONE)), - ) - num = april1.rfc_number() + stream_id="ise", + std_level_id="inf", + time=datetime.datetime(1990, 4, 1, tzinfo=ZoneInfo(settings.TIME_ZONE)), + ) + num = april1.rfc_number DocEventFactory.create( doc=april1, - type='published_rfc', + type="published_rfc", time=datetime.datetime(1990, 4, 1, tzinfo=RPC_TZINFO), ) # - url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=april1.name)) + url = urlreverse( + "ietf.doc.views_doc.document_bibtex", kwargs=dict(name=april1.name) + ) r = self.client.get(url) - self.assertEqual(r.get('Content-Type'), 'text/plain; charset=utf-8') - entry = self._parse_bibtex_response(r)["rfc%s"%num] - self.assertEqual(entry['series'], 'Request for Comments') - self.assertEqual(entry['number'], num) - self.assertEqual(entry['doi'], '10.17487/RFC%s'%num) - self.assertEqual(entry['year'], '1990') - self.assertEqual(entry['month'].lower()[0:3], 'apr') - self.assertEqual(entry['day'], '1') - self.assertEqual(entry['url'], f'https://www.rfc-editor.ietf.org/info/rfc{num}') - + self.assertEqual(r.get("Content-Type"), "text/plain; charset=utf-8") + entry = self._parse_bibtex_response(r)["rfc%s" % num] + self.assertEqual(entry["series"], "Request for Comments") + self.assertEqual(int(entry["number"]), num) + self.assertEqual(entry["doi"], "10.17487/RFC%s" % num) + self.assertEqual(entry["year"], "1990") + self.assertEqual(entry["month"].lower()[0:3], "apr") + self.assertEqual(entry["day"], "1") + self.assertEqual(entry["url"], f"https://www.rfc-editor.ietf.org/info/rfc{num}") + draft = IndividualDraftFactory.create() - docname = '%s-%s' % (draft.name, draft.rev) - bibname = docname[6:] # drop the 'draft-' prefix - url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=draft.name)) + docname = "%s-%s" % (draft.name, draft.rev) + bibname = docname[6:] # drop the 'draft-' prefix + url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=draft.name)) r = self.client.get(url) entry = self._parse_bibtex_response(r)[bibname] - self.assertEqual(entry['note'], 'Work in Progress') - self.assertEqual(entry['number'], docname) - self.assertEqual(entry['year'], str(draft.pub_date().year)) - self.assertEqual(entry['month'].lower()[0:3], draft.pub_date().strftime('%b').lower()) - self.assertEqual(entry['day'], str(draft.pub_date().day)) - self.assertEqual(entry['url'], settings.IDTRACKER_BASE_URL + urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=draft.rev))) + self.assertEqual(entry["note"], "Work in Progress") + self.assertEqual(entry["number"], docname) + self.assertEqual(entry["year"], str(draft.pub_date().year)) + self.assertEqual( + entry["month"].lower()[0:3], draft.pub_date().strftime("%b").lower() + ) + self.assertEqual(entry["day"], str(draft.pub_date().day)) + self.assertEqual( + entry["url"], + settings.IDTRACKER_BASE_URL + + urlreverse( + "ietf.doc.views_doc.document_main", + kwargs=dict(name=draft.name, rev=draft.rev), + ), + ) # - self.assertNotIn('doi', entry) + self.assertNotIn("doi", entry) def test_document_bibxml(self): draft = IndividualDraftFactory.create() @@ -2042,20 +2161,19 @@ def test_trailing_hypen_digit_name_bibxml(self): class AddCommentTestCase(TestCase): def test_add_comment(self): - draft = WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars') - url = urlreverse('ietf.doc.views_doc.add_comment', kwargs=dict(name=draft.name)) + draft = WgDraftFactory(name="draft-ietf-mars-test", group__acronym="mars") + url = urlreverse("ietf.doc.views_doc.add_comment", kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(unicontent(r)) - self.assertEqual(len(q('form textarea[name=comment]')), 1) + self.assertEqual(len(q("form textarea[name=comment]")), 1) - # request resurrect events_before = draft.docevent_set.count() mailbox_before = len(outbox) - + r = self.client.post(url, dict(comment="This is a test.")) self.assertEqual(r.status_code, 302) @@ -2063,9 +2181,9 @@ def test_add_comment(self): self.assertEqual("This is a test.", draft.latest_event().desc) self.assertEqual("added_comment", draft.latest_event().type) self.assertEqual(len(outbox), mailbox_before + 1) - self.assertIn("Comment added", outbox[-1]['Subject']) - self.assertIn(draft.name, outbox[-1]['Subject']) - self.assertIn('draft-ietf-mars-test@', outbox[-1]['To']) + self.assertIn("Comment added", outbox[-1]["Subject"]) + self.assertIn(draft.name, outbox[-1]["Subject"]) + self.assertIn("draft-ietf-mars-test@", outbox[-1]["To"]) # Make sure we can also do it as IANA self.client.login(username="iana", password="iana+password") @@ -2074,7 +2192,22 @@ def test_add_comment(self): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(unicontent(r)) - self.assertEqual(len(q('form textarea[name=comment]')), 1) + self.assertEqual(len(q("form textarea[name=comment]")), 1) + + empty_outbox() + rfc = WgRfcFactory() + self.client.login(username="rfc", password="rfc+password") + url = urlreverse("ietf.doc.views_doc.add_comment", kwargs=dict(name=rfc.name)) + r = self.client.post( + url, dict(comment="This is an RFC Editor comment on an RFC.") + ) + self.assertEqual(r.status_code, 302) + + self.assertEqual( + "This is an RFC Editor comment on an RFC.", rfc.latest_event().desc + ) + self.assertEqual(len(outbox), 1) + self.assertIn("This is an RFC Editor comment on an RFC.", get_payload_text(outbox[0])) class TemplateTagTest(TestCase): @@ -2088,7 +2221,7 @@ class ReferencesTest(TestCase): def test_references(self): doc1 = WgDraftFactory(name='draft-ietf-mars-test') - doc2 = IndividualDraftFactory(name='draft-imaginary-independent-submission').docalias.first() + doc2 = IndividualDraftFactory(name='draft-imaginary-independent-submission') RelatedDocument.objects.get_or_create(source=doc1,target=doc2,relationship=DocRelationshipName.objects.get(slug='refnorm')) url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name)) r = self.client.get(url) @@ -2100,124 +2233,169 @@ def test_references(self): self.assertContains(r, doc1.name) class GenerateDraftAliasesTests(TestCase): - def setUp(self): - super().setUp() - self.doc_aliases_file = NamedTemporaryFile(delete=False, mode='w+') - self.doc_aliases_file.close() - self.doc_virtual_file = NamedTemporaryFile(delete=False, mode='w+') - self.doc_virtual_file.close() - self.saved_draft_aliases_path = settings.DRAFT_ALIASES_PATH - self.saved_draft_virtual_path = settings.DRAFT_VIRTUAL_PATH - settings.DRAFT_ALIASES_PATH = self.doc_aliases_file.name - settings.DRAFT_VIRTUAL_PATH = self.doc_virtual_file.name - - def tearDown(self): - settings.DRAFT_ALIASES_PATH = self.saved_draft_aliases_path - settings.DRAFT_VIRTUAL_PATH = self.saved_draft_virtual_path - os.unlink(self.doc_aliases_file.name) - os.unlink(self.doc_virtual_file.name) - super().tearDown() - - def testManagementCommand(self): - a_month_ago = (timezone.now() - datetime.timedelta(30)).astimezone(RPC_TZINFO) - a_month_ago = a_month_ago.replace(hour=0, minute=0, second=0, microsecond=0) - ad = RoleFactory(name_id='ad', group__type_id='area', group__state_id='active').person - shepherd = PersonFactory() - author1 = PersonFactory() - author2 = PersonFactory() - author3 = PersonFactory() - author4 = PersonFactory() - author5 = PersonFactory() - author6 = PersonFactory() - mars = GroupFactory(type_id='wg', acronym='mars') - marschairman = PersonFactory(user__username='marschairman') - mars.role_set.create(name_id='chair', person=marschairman, email=marschairman.email()) - doc1 = IndividualDraftFactory(authors=[author1], shepherd=shepherd.email(), ad=ad) - doc2 = WgDraftFactory(name='draft-ietf-mars-test', group__acronym='mars', authors=[author2], ad=ad) - doc3 = WgRfcFactory.create(name='draft-ietf-mars-finished', group__acronym='mars', authors=[author3], ad=ad, std_level_id='ps', states=[('draft','rfc'),('draft-iesg','pub')], time=a_month_ago) - DocEventFactory.create(doc=doc3, type='published_rfc', time=a_month_ago) - doc4 = WgRfcFactory.create(authors=[author4,author5], ad=ad, std_level_id='ps', states=[('draft','rfc'),('draft-iesg','pub')], time=datetime.datetime(2010,10,10, tzinfo=ZoneInfo(settings.TIME_ZONE))) - DocEventFactory.create(doc=doc4, type='published_rfc', time=datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO)) - doc5 = IndividualDraftFactory(authors=[author6]) - - args = [ ] - kwargs = { } - out = io.StringIO() - call_command("generate_draft_aliases", *args, **kwargs, stdout=out, stderr=out) - self.assertFalse(out.getvalue()) - - with open(settings.DRAFT_ALIASES_PATH) as afile: - acontent = afile.read() - self.assertTrue(all([x in acontent for x in [ - 'xfilter-' + doc1.name, - 'xfilter-' + doc1.name + '.ad', - 'xfilter-' + doc1.name + '.authors', - 'xfilter-' + doc1.name + '.shepherd', - 'xfilter-' + doc1.name + '.all', - 'xfilter-' + doc2.name, - 'xfilter-' + doc2.name + '.ad', - 'xfilter-' + doc2.name + '.authors', - 'xfilter-' + doc2.name + '.chairs', - 'xfilter-' + doc2.name + '.all', - 'xfilter-' + doc3.name, - 'xfilter-' + doc3.name + '.ad', - 'xfilter-' + doc3.name + '.authors', - 'xfilter-' + doc3.name + '.chairs', - 'xfilter-' + doc5.name, - 'xfilter-' + doc5.name + '.authors', - 'xfilter-' + doc5.name + '.all', - ]])) - self.assertFalse(all([x in acontent for x in [ - 'xfilter-' + doc1.name + '.chairs', - 'xfilter-' + doc2.name + '.shepherd', - 'xfilter-' + doc3.name + '.shepherd', - 'xfilter-' + doc4.name, - 'xfilter-' + doc5.name + '.shepherd', - 'xfilter-' + doc5.name + '.ad', - ]])) - - with open(settings.DRAFT_VIRTUAL_PATH) as vfile: - vcontent = vfile.read() - self.assertTrue(all([x in vcontent for x in [ - ad.email_address(), - shepherd.email_address(), - marschairman.email_address(), - author1.email_address(), - author2.email_address(), - author3.email_address(), - author6.email_address(), - ]])) - self.assertFalse(all([x in vcontent for x in [ - author4.email_address(), - author5.email_address(), - ]])) - self.assertTrue(all([x in vcontent for x in [ - 'xfilter-' + doc1.name, - 'xfilter-' + doc1.name + '.ad', - 'xfilter-' + doc1.name + '.authors', - 'xfilter-' + doc1.name + '.shepherd', - 'xfilter-' + doc1.name + '.all', - 'xfilter-' + doc2.name, - 'xfilter-' + doc2.name + '.ad', - 'xfilter-' + doc2.name + '.authors', - 'xfilter-' + doc2.name + '.chairs', - 'xfilter-' + doc2.name + '.all', - 'xfilter-' + doc3.name, - 'xfilter-' + doc3.name + '.ad', - 'xfilter-' + doc3.name + '.authors', - 'xfilter-' + doc3.name + '.chairs', - 'xfilter-' + doc5.name, - 'xfilter-' + doc5.name + '.authors', - 'xfilter-' + doc5.name + '.all', - ]])) - self.assertFalse(all([x in vcontent for x in [ - 'xfilter-' + doc1.name + '.chairs', - 'xfilter-' + doc2.name + '.shepherd', - 'xfilter-' + doc3.name + '.shepherd', - 'xfilter-' + doc4.name, - 'xfilter-' + doc5.name + '.shepherd', - 'xfilter-' + doc5.name + '.ad', - ]])) + @override_settings(TOOLS_SERVER="tools.example.org", DRAFT_ALIAS_DOMAIN="draft.example.org") + def test_generator_class(self): + """The DraftAliasGenerator should generate the same lists as the old mgmt cmd""" + a_month_ago = (timezone.now() - datetime.timedelta(30)).astimezone(RPC_TZINFO) + a_month_ago = a_month_ago.replace(hour=0, minute=0, second=0, microsecond=0) + ad = RoleFactory( + name_id="ad", group__type_id="area", group__state_id="active" + ).person + shepherd = PersonFactory() + author1 = PersonFactory() + author2 = PersonFactory() + author3 = PersonFactory() + author4 = PersonFactory() + author5 = PersonFactory() + author6 = PersonFactory() + mars = GroupFactory(type_id="wg", acronym="mars") + marschairman = PersonFactory(user__username="marschairman") + mars.role_set.create( + name_id="chair", person=marschairman, email=marschairman.email() + ) + doc1 = IndividualDraftFactory(authors=[author1], shepherd=shepherd.email(), ad=ad) + doc2 = WgDraftFactory( + name="draft-ietf-mars-test", group__acronym="mars", authors=[author2], ad=ad + ) + doc2.notify = f"{doc2.name}.ad@draft.example.org" + doc2.save() + doc3 = WgDraftFactory.create( + name="draft-ietf-mars-finished", + group__acronym="mars", + authors=[author3], + ad=ad, + std_level_id="ps", + states=[("draft", "rfc"), ("draft-iesg", "pub")], + time=a_month_ago, + ) + rfc3 = WgRfcFactory() + DocEventFactory.create(doc=rfc3, type="published_rfc", time=a_month_ago) + doc3.relateddocument_set.create(relationship_id="became_rfc", target=rfc3) + doc4 = WgDraftFactory.create( + authors=[author4, author5], + ad=ad, + std_level_id="ps", + states=[("draft", "rfc"), ("draft-iesg", "pub")], + time=datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE)), + ) + rfc4 = WgRfcFactory() + DocEventFactory.create( + doc=rfc4, + type="published_rfc", + time=datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO), + ) + doc4.relateddocument_set.create(relationship_id="became_rfc", target=rfc4) + doc5 = IndividualDraftFactory(authors=[author6]) + + output = [(alias, alist) for alias, alist in DraftAliasGenerator()] + alias_dict = dict(output) + self.assertEqual(len(alias_dict), len(output)) # no duplicate aliases + expected_dict = { + doc1.name: [author1.email_address()], + doc1.name + ".ad": [ad.email_address()], + doc1.name + ".authors": [author1.email_address()], + doc1.name + ".shepherd": [shepherd.email_address()], + doc1.name + + ".all": [ + author1.email_address(), + ad.email_address(), + shepherd.email_address(), + ], + doc2.name: [author2.email_address()], + doc2.name + ".ad": [ad.email_address()], + doc2.name + ".authors": [author2.email_address()], + doc2.name + ".chairs": [marschairman.email_address()], + doc2.name + ".notify": [ad.email_address()], + doc2.name + + ".all": [ + author2.email_address(), + ad.email_address(), + marschairman.email_address(), + ], + doc3.name: [author3.email_address()], + doc3.name + ".ad": [ad.email_address()], + doc3.name + ".authors": [author3.email_address()], + doc3.name + ".chairs": [marschairman.email_address()], + doc3.name + + ".all": [ + author3.email_address(), + ad.email_address(), + marschairman.email_address(), + ], + doc5.name: [author6.email_address()], + doc5.name + ".authors": [author6.email_address()], + doc5.name + ".all": [author6.email_address()], + } + # Sort lists for comparison + self.assertEqual( + {k: sorted(v) for k, v in alias_dict.items()}, + {k: sorted(v) for k, v in expected_dict.items()}, + ) + + # check single name + output = [(alias, alist) for alias, alist in DraftAliasGenerator(Document.objects.filter(name=doc1.name))] + alias_dict = dict(output) + self.assertEqual(len(alias_dict), len(output)) # no duplicate aliases + expected_dict = { + doc1.name: [author1.email_address()], + doc1.name + ".ad": [ad.email_address()], + doc1.name + ".authors": [author1.email_address()], + doc1.name + ".shepherd": [shepherd.email_address()], + doc1.name + + ".all": [ + author1.email_address(), + ad.email_address(), + shepherd.email_address(), + ], + } + # Sort lists for comparison + self.assertEqual( + {k: sorted(v) for k, v in alias_dict.items()}, + {k: sorted(v) for k, v in expected_dict.items()}, + ) + + @override_settings(TOOLS_SERVER="tools.example.org", DRAFT_ALIAS_DOMAIN="draft.example.org") + def test_get_draft_notify_emails(self): + ad = PersonFactory() + shepherd = PersonFactory() + author = PersonFactory() + doc = DocumentFactory(authors=[author], shepherd=shepherd.email(), ad=ad) + generator = DraftAliasGenerator() + + doc.notify = f"{doc.name}@draft.example.org" + doc.save() + self.assertCountEqual(generator.get_draft_notify_emails(doc), [author.email_address()]) + + doc.notify = f"{doc.name}.ad@draft.example.org" + doc.save() + self.assertCountEqual(generator.get_draft_notify_emails(doc), [ad.email_address()]) + + doc.notify = f"{doc.name}.shepherd@draft.example.org" + doc.save() + self.assertCountEqual(generator.get_draft_notify_emails(doc), [shepherd.email_address()]) + + doc.notify = f"{doc.name}.all@draft.example.org" + doc.save() + self.assertCountEqual( + generator.get_draft_notify_emails(doc), + [ad.email_address(), author.email_address(), shepherd.email_address()] + ) + + doc.notify = f"{doc.name}.notify@draft.example.org" + doc.save() + self.assertCountEqual(generator.get_draft_notify_emails(doc), []) + + doc.notify = f"{doc.name}.ad@somewhere.example.com" + doc.save() + self.assertCountEqual(generator.get_draft_notify_emails(doc), [f"{doc.name}.ad@somewhere.example.com"]) + + doc.notify = f"somebody@example.com, nobody@example.com, {doc.name}.ad@tools.example.org" + doc.save() + self.assertCountEqual( + generator.get_draft_notify_emails(doc), + ["somebody@example.com", "nobody@example.com", ad.email_address()] + ) + class EmailAliasesTests(TestCase): @@ -2226,37 +2404,20 @@ def setUp(self): WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars') WgDraftFactory(name='draft-ietf-ames-test',group__acronym='ames') RoleFactory(group__type_id='review', group__acronym='yangdoctors', name_id='secr') - self.doc_alias_file = NamedTemporaryFile(delete=False, mode='w+') - self.doc_alias_file.write("""# Generated by hand at 2015-02-12_16:26:45 -virtual.ietf.org anything -draft-ietf-mars-test@ietf.org xfilter-draft-ietf-mars-test -expand-draft-ietf-mars-test@virtual.ietf.org mars-author@example.com, mars-collaborator@example.com -draft-ietf-mars-test.authors@ietf.org xfilter-draft-ietf-mars-test.authors -expand-draft-ietf-mars-test.authors@virtual.ietf.org mars-author@example.mars, mars-collaborator@example.mars -draft-ietf-mars-test.chairs@ietf.org xfilter-draft-ietf-mars-test.chairs -expand-draft-ietf-mars-test.chairs@virtual.ietf.org mars-chair@example.mars -draft-ietf-mars-test.all@ietf.org xfilter-draft-ietf-mars-test.all -expand-draft-ietf-mars-test.all@virtual.ietf.org mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars -draft-ietf-ames-test@ietf.org xfilter-draft-ietf-ames-test -expand-draft-ietf-ames-test@virtual.ietf.org ames-author@example.com, ames-collaborator@example.com -draft-ietf-ames-test.authors@ietf.org xfilter-draft-ietf-ames-test.authors -expand-draft-ietf-ames-test.authors@virtual.ietf.org ames-author@example.ames, ames-collaborator@example.ames -draft-ietf-ames-test.chairs@ietf.org xfilter-draft-ietf-ames-test.chairs -expand-draft-ietf-ames-test.chairs@virtual.ietf.org ames-chair@example.ames -draft-ietf-ames-test.all@ietf.org xfilter-draft-ietf-ames-test.all -expand-draft-ietf-ames-test.all@virtual.ietf.org ames-author@example.ames, ames-collaborator@example.ames, ames-chair@example.ames - -""") - self.doc_alias_file.close() - self.saved_draft_virtual_path = settings.DRAFT_VIRTUAL_PATH - settings.DRAFT_VIRTUAL_PATH = self.doc_alias_file.name - - def tearDown(self): - settings.DRAFT_VIRTUAL_PATH = self.saved_draft_virtual_path - os.unlink(self.doc_alias_file.name) - super().tearDown() - - def testAliases(self): + + + @mock.patch("ietf.doc.views_doc.get_doc_email_aliases") + def testAliases(self, mock_get_aliases): + mock_get_aliases.return_value = [ + {"doc_name": "draft-ietf-mars-test", "alias_type": "", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".authors", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".chairs", "expansion": "mars-chair@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".all", "expansion": "mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars"}, + {"doc_name": "draft-ietf-ames-test", "alias_type": "", "expansion": "ames-author@example.ames, ames-collaborator@example.ames"}, + {"doc_name": "draft-ietf-ames-test", "alias_type": ".authors", "expansion": "ames-author@example.ames, ames-collaborator@example.ames"}, + {"doc_name": "draft-ietf-ames-test", "alias_type": ".chairs", "expansion": "ames-chair@example.ames"}, + {"doc_name": "draft-ietf-ames-test", "alias_type": ".all", "expansion": "ames-author@example.ames, ames-collaborator@example.ames, ames-chair@example.ames"}, + ] PersonFactory(user__username='plain') url = urlreverse('ietf.doc.urls.redirect.document_email', kwargs=dict(name="draft-ietf-mars-test")) r = self.client.get(url) @@ -2266,16 +2427,70 @@ def testAliases(self): login_testing_unauthorized(self, "plain", url) r = self.client.get(url) self.assertEqual(r.status_code, 200) + self.assertEqual(mock_get_aliases.call_args, mock.call()) self.assertTrue(all([x in unicontent(r) for x in ['mars-test@','mars-test.authors@','mars-test.chairs@']])) self.assertTrue(all([x in unicontent(r) for x in ['ames-test@','ames-test.authors@','ames-test.chairs@']])) - def testExpansions(self): + + @mock.patch("ietf.doc.views_doc.get_doc_email_aliases") + def testExpansions(self, mock_get_aliases): + mock_get_aliases.return_value = [ + {"doc_name": "draft-ietf-mars-test", "alias_type": "", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".authors", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".chairs", "expansion": "mars-chair@example.mars"}, + {"doc_name": "draft-ietf-mars-test", "alias_type": ".all", "expansion": "mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars"}, + ] url = urlreverse('ietf.doc.views_doc.document_email', kwargs=dict(name="draft-ietf-mars-test")) r = self.client.get(url) + self.assertEqual(mock_get_aliases.call_args, mock.call("draft-ietf-mars-test")) self.assertEqual(r.status_code, 200) self.assertContains(r, 'draft-ietf-mars-test.all@ietf.org') self.assertContains(r, 'iesg_ballot_saved') + + @mock.patch("ietf.doc.utils.DraftAliasGenerator") + def test_get_doc_email_aliases(self, mock_alias_gen_cls): + mock_alias_gen_cls.return_value = [ + ("draft-something-or-other.some-type", ["somebody@example.com"]), + ("draft-something-or-other", ["somebody@example.com"]), + ("draft-nothing-at-all", ["nobody@example.com"]), + ("draft-nothing-at-all.some-type", ["nobody@example.com"]), + ] + # order is important in the response - should be sorted by doc name and otherwise left + # in order + self.assertEqual( + get_doc_email_aliases(), + [ + { + "doc_name": "draft-nothing-at-all", + "alias_type": "", + "expansion": "nobody@example.com", + }, + { + "doc_name": "draft-nothing-at-all", + "alias_type": ".some-type", + "expansion": "nobody@example.com", + }, + { + "doc_name": "draft-something-or-other", + "alias_type": ".some-type", + "expansion": "somebody@example.com", + }, + { + "doc_name": "draft-something-or-other", + "alias_type": "", + "expansion": "somebody@example.com", + }, + ], + ) + self.assertEqual(mock_alias_gen_cls.call_args, mock.call(None)) + # Repeat with a name, no need to re-test that the alias list is actually passed through, just + # check that the DraftAliasGenerator is called correctly + draft = WgDraftFactory() + get_doc_email_aliases(draft.name) + self.assertQuerySetEqual(mock_alias_gen_cls.call_args[0][0], Document.objects.filter(pk=draft.pk)) + + class DocumentMeetingTests(TestCase): def setUp(self): @@ -2298,8 +2513,8 @@ def setUp(self): def test_view_document_meetings(self): doc = IndividualDraftFactory.create() - doc.sessionpresentation_set.create(session=self.inprog,rev=None) - doc.sessionpresentation_set.create(session=self.interim,rev=None) + doc.presentations.create(session=self.inprog,rev=None) + doc.presentations.create(session=self.interim,rev=None) url = urlreverse('ietf.doc.views_doc.all_presentations', kwargs=dict(name=doc.name)) response = self.client.get(url) @@ -2310,8 +2525,8 @@ def test_view_document_meetings(self): self.assertFalse(q('#addsessionsbutton')) self.assertFalse(q("a.btn:contains('Remove document')")) - doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None) - doc.sessionpresentation_set.create(session=self.past,rev=None) + doc.presentations.create(session=self.past_cutoff,rev=None) + doc.presentations.create(session=self.past,rev=None) self.client.login(username="secretary", password="secretary+password") response = self.client.get(url) @@ -2344,41 +2559,72 @@ def test_view_document_meetings(self): self.assertFalse(q("#futuremeets a.btn:contains('Remove document')")) self.assertFalse(q("#pastmeets a.btn:contains('Remove document')")) - def test_edit_document_session(self): + @override_settings(MEETECHO_API_CONFIG="fake settings") + @mock.patch("ietf.doc.views_doc.SlidesManager") + def test_edit_document_session(self, mock_slides_manager_cls): doc = IndividualDraftFactory.create() - sp = doc.sessionpresentation_set.create(session=self.future,rev=None) + sp = doc.presentations.create(session=self.future,rev=None) url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=0)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username) response = self.client.get(url) self.assertEqual(response.status_code, 404) - + self.assertFalse(mock_slides_manager_cls.called) + self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username) response = self.client.get(url) self.assertEqual(response.status_code, 200) q = PyQuery(response.content) self.assertEqual(2,len(q('select#id_version option'))) + self.assertFalse(mock_slides_manager_cls.called) + # edit draft self.assertEqual(1,doc.docevent_set.count()) response = self.client.post(url,{'version':'00','save':''}) self.assertEqual(response.status_code, 302) - self.assertEqual(doc.sessionpresentation_set.get(pk=sp.pk).rev,'00') + self.assertEqual(doc.presentations.get(pk=sp.pk).rev,'00') self.assertEqual(2,doc.docevent_set.count()) + self.assertFalse(mock_slides_manager_cls.called) + + # editing slides should call Meetecho API + slides = SessionPresentationFactory( + session=self.future, + document__type_id="slides", + document__rev="00", + rev=None, + order=1, + ).document + url = urlreverse( + "ietf.doc.views_doc.edit_sessionpresentation", + kwargs={"name": slides.name, "session_id": self.future.pk}, + ) + response = self.client.post(url, {"version": "00", "save": ""}) + self.assertEqual(response.status_code, 302) + self.assertEqual(mock_slides_manager_cls.call_count, 1) + self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings")) + self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1) + self.assertEqual( + mock_slides_manager_cls.return_value.send_update.call_args, + mock.call(self.future), + ) def test_edit_document_session_after_proceedings_closed(self): doc = IndividualDraftFactory.create() - sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None) + sp = doc.presentations.create(session=self.past_cutoff,rev=None) url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id)) self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username) @@ -2391,39 +2637,64 @@ def test_edit_document_session_after_proceedings_closed(self): q=PyQuery(response.content) self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')"))) - def test_remove_document_session(self): + @override_settings(MEETECHO_API_CONFIG="fake settings") + @mock.patch("ietf.doc.views_doc.SlidesManager") + def test_remove_document_session(self, mock_slides_manager_cls): doc = IndividualDraftFactory.create() - sp = doc.sessionpresentation_set.create(session=self.future,rev=None) + sp = doc.presentations.create(session=self.future,rev=None) url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=0)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id)) response = self.client.get(url) self.assertEqual(response.status_code, 404) + self.assertFalse(mock_slides_manager_cls.called) self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username) response = self.client.get(url) self.assertEqual(response.status_code, 404) - + self.assertFalse(mock_slides_manager_cls.called) + self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username) response = self.client.get(url) self.assertEqual(response.status_code, 200) + self.assertFalse(mock_slides_manager_cls.called) + # removing a draft self.assertEqual(1,doc.docevent_set.count()) response = self.client.post(url,{'remove_session':''}) self.assertEqual(response.status_code, 302) - self.assertFalse(doc.sessionpresentation_set.filter(pk=sp.pk).exists()) + self.assertFalse(doc.presentations.filter(pk=sp.pk).exists()) self.assertEqual(2,doc.docevent_set.count()) + self.assertFalse(mock_slides_manager_cls.called) + + # removing slides should call Meetecho API + slides = SessionPresentationFactory(session=self.future, document__type_id="slides", order=1).document + url = urlreverse( + "ietf.doc.views_doc.remove_sessionpresentation", + kwargs={"name": slides.name, "session_id": self.future.pk}, + ) + response = self.client.post(url, {"remove_session": ""}) + self.assertEqual(response.status_code, 302) + self.assertEqual(mock_slides_manager_cls.call_count, 1) + self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings")) + self.assertEqual(mock_slides_manager_cls.return_value.delete.call_count, 1) + self.assertEqual( + mock_slides_manager_cls.return_value.delete.call_args, + mock.call(self.future, slides), + ) def test_remove_document_session_after_proceedings_closed(self): doc = IndividualDraftFactory.create() - sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None) + sp = doc.presentations.create(session=self.past_cutoff,rev=None) url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id)) self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username) @@ -2436,28 +2707,49 @@ def test_remove_document_session_after_proceedings_closed(self): q=PyQuery(response.content) self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')"))) - def test_add_document_session(self): + @override_settings(MEETECHO_API_CONFIG="fake settings") + @mock.patch("ietf.doc.views_doc.SlidesManager") + def test_add_document_session(self, mock_slides_manager_cls): doc = IndividualDraftFactory.create() url = urlreverse('ietf.doc.views_doc.add_sessionpresentation',kwargs=dict(name=doc.name)) login_testing_unauthorized(self,self.group_chair.user.username,url) response = self.client.get(url) self.assertEqual(response.status_code,200) - + self.assertFalse(mock_slides_manager_cls.called) + response = self.client.post(url,{'session':0,'version':'current'}) self.assertEqual(response.status_code,200) q=PyQuery(response.content) self.assertTrue(q('.form-select.is-invalid')) + self.assertFalse(mock_slides_manager_cls.called) response = self.client.post(url,{'session':self.future.pk,'version':'bogus version'}) self.assertEqual(response.status_code,200) q=PyQuery(response.content) self.assertTrue(q('.form-select.is-invalid')) + self.assertFalse(mock_slides_manager_cls.called) + # adding a draft self.assertEqual(1,doc.docevent_set.count()) response = self.client.post(url,{'session':self.future.pk,'version':'current'}) self.assertEqual(response.status_code,302) self.assertEqual(2,doc.docevent_set.count()) + self.assertEqual(doc.presentations.get(session__pk=self.future.pk).order, 0) + self.assertFalse(mock_slides_manager_cls.called) + + # adding slides should set order / call Meetecho API + slides = DocumentFactory(type_id="slides") + url = urlreverse("ietf.doc.views_doc.add_sessionpresentation", kwargs=dict(name=slides.name)) + response = self.client.post(url, {"session": self.future.pk, "version": "current"}) + self.assertEqual(response.status_code,302) + self.assertEqual(slides.presentations.get(session__pk=self.future.pk).order, 1) + self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings")) + self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1) + self.assertEqual( + mock_slides_manager_cls.return_value.add.call_args, + mock.call(self.future, slides, order=1), + ) def test_get_related_meeting(self): """Should be able to retrieve related meeting""" @@ -2490,60 +2782,6 @@ def test_get_related_meeting(self): self.assertIsNone(doc.get_related_meeting(), f'{doc.type.slug} should not be related to meeting') class ChartTests(ResourceTestCaseMixin, TestCase): - def test_search_chart_conf(self): - doc = IndividualDraftFactory() - - conf_url = urlreverse('ietf.doc.views_stats.chart_conf_newrevisiondocevent') - - # No qurey arguments; expect an empty json object - r = self.client.get(conf_url) - self.assertValidJSONResponse(r) - self.assertEqual(unicontent(r), '{}') - - # No match - r = self.client.get(conf_url + '?activedrafts=on&name=thisisnotadocumentname') - self.assertValidJSONResponse(r) - d = r.json() - self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type']) - - r = self.client.get(conf_url + '?activedrafts=on&name=%s'%doc.name[6:12]) - self.assertValidJSONResponse(r) - d = r.json() - self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type']) - self.assertEqual(len(d['series'][0]['data']), 0) - - def test_search_chart_data(self): - doc = IndividualDraftFactory() - - data_url = urlreverse('ietf.doc.views_stats.chart_data_newrevisiondocevent') - - # No qurey arguments; expect an empty json list - r = self.client.get(data_url) - self.assertValidJSONResponse(r) - self.assertEqual(unicontent(r), '[]') - - # No match - r = self.client.get(data_url + '?activedrafts=on&name=thisisnotadocumentname') - self.assertValidJSONResponse(r) - d = r.json() - self.assertEqual(unicontent(r), '[]') - - r = self.client.get(data_url + '?activedrafts=on&name=%s'%doc.name[6:12]) - self.assertValidJSONResponse(r) - d = r.json() - self.assertEqual(len(d), 1) - self.assertEqual(len(d[0]), 2) - - def test_search_chart(self): - doc = IndividualDraftFactory() - - chart_url = urlreverse('ietf.doc.views_stats.chart_newrevisiondocevent') - r = self.client.get(chart_url) - self.assertEqual(r.status_code, 200) - - r = self.client.get(chart_url + '?activedrafts=on&name=%s'%doc.name[6:12]) - self.assertEqual(r.status_code, 200) - def test_personal_chart(self): person = PersonFactory.create() IndividualDraftFactory.create( @@ -2565,6 +2803,7 @@ def test_personal_chart(self): d = r.json() self.assertEqual(len(d), 1) self.assertEqual(len(d[0]), 2) + self.assertEqual(d[0][1], 1) page_url = urlreverse('ietf.person.views.profile', kwargs=dict(email_or_name=person.name)) r = self.client.get(page_url) @@ -2649,49 +2888,59 @@ def test_markdown_and_text(self): class Idnits2SupportTests(TestCase): settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['DERIVED_DIR'] - def test_obsoleted(self): - rfc = WgRfcFactory(alias2__name='rfc1001') - WgRfcFactory(alias2__name='rfc1003',relations=[('obs',rfc)]) - rfc = WgRfcFactory(alias2__name='rfc1005') - WgRfcFactory(alias2__name='rfc1007',relations=[('obs',rfc)]) + def test_generate_idnits2_rfcs_obsoleted(self): + rfc = WgRfcFactory(rfc_number=1001) + WgRfcFactory(rfc_number=1003,relations=[('obs',rfc)]) + rfc = WgRfcFactory(rfc_number=1005) + WgRfcFactory(rfc_number=1007,relations=[('obs',rfc)]) + blob = generate_idnits2_rfcs_obsoleted() + self.assertEqual(blob, b'1001 1003\n1005 1007\n'.decode("utf8")) + def test_obsoleted(self): url = urlreverse('ietf.doc.views_doc.idnits2_rfcs_obsoleted') r = self.client.get(url) self.assertEqual(r.status_code, 404) - call_command('generate_idnits2_rfcs_obsoleted') + # value written is arbitrary, expect it to be passed through + (Path(settings.DERIVED_DIR) / "idnits2-rfcs-obsoleted").write_bytes(b'1001 1003\n1005 1007\n') url = urlreverse('ietf.doc.views_doc.idnits2_rfcs_obsoleted') r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertEqual(r.content, b'1001 1003\n1005 1007\n') - def test_rfc_status(self): + def test_generate_idnits2_rfc_status(self): for slug in ('bcp', 'ds', 'exp', 'hist', 'inf', 'std', 'ps', 'unkn'): WgRfcFactory(std_level_id=slug) + blob = generate_idnits2_rfc_status().replace("\n", "") + self.assertEqual(blob[6312-1], "O") + + def test_rfc_status(self): url = urlreverse('ietf.doc.views_doc.idnits2_rfc_status') r = self.client.get(url) self.assertEqual(r.status_code,404) - call_command('generate_idnits2_rfc_status') + # value written is arbitrary, expect it to be passed through + (Path(settings.DERIVED_DIR) / "idnits2-rfc-status").write_bytes(b'1001 1003\n1005 1007\n') r = self.client.get(url) self.assertEqual(r.status_code,200) - blob = unicontent(r).replace('\n','') - self.assertEqual(blob[6312-1],'O') + self.assertEqual(r.content, b'1001 1003\n1005 1007\n') def test_idnits2_state(self): rfc = WgRfcFactory() - url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=rfc.canonical_name())) + draft = WgDraftFactory() + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) + url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=rfc.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertContains(r,'rfcnum') draft = WgDraftFactory() - url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.canonical_name())) + url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertNotContains(r,'rfcnum') self.assertContains(r,'Unknown') draft = WgDraftFactory(intended_std_level_id='ps') - url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.canonical_name())) + url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertContains(r,'Proposed') @@ -2736,16 +2985,12 @@ def test_raw_id(self): self.should_succeed(dict(name=draft.name, rev='00',ext='txt')) self.should_404(dict(name=draft.name, rev='00',ext='html')) - def test_raw_id_rfc(self): - rfc = WgRfcFactory() - dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR - (Path(dir) / f'{rfc.name}-{rfc.rev}.txt').touch() - self.should_succeed(dict(name=rfc.name)) - self.should_404(dict(name=rfc.canonical_name())) + # test_raw_id_rfc intentionally removed + # an rfc is no longer a pseudo-version of a draft. def test_non_draft(self): - charter = CharterFactory() - self.should_404(dict(name=charter.name)) + for doc in [CharterFactory(), WgRfcFactory()]: + self.should_404(dict(name=doc.name)) class PdfizedTests(TestCase): @@ -2757,31 +3002,47 @@ def should_succeed(self, argdict): url = urlreverse(self.view, kwargs=argdict) r = self.client.get(url) self.assertEqual(r.status_code,200) - self.assertEqual(r.get('Content-Type'),'application/pdf;charset=utf-8') + self.assertEqual(r.get('Content-Type'),'application/pdf') def should_404(self, argdict): url = urlreverse(self.view, kwargs=argdict) r = self.client.get(url) self.assertEqual(r.status_code, 404) + # This takes a _long_ time (32s on a 2022 m1 macbook pro) - is it worth what it covers? def test_pdfized(self): - rfc = WgRfcFactory(create_revisions=range(0,2)) + rfc = WgRfcFactory() + draft = WgDraftFactory(create_revisions=range(0,2)) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) dir = settings.RFC_PATH - with (Path(dir) / f'{rfc.canonical_name()}.txt').open('w') as f: + with (Path(dir) / f'{rfc.name}.txt').open('w') as f: f.write('text content') dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR for r in range(0,2): - with (Path(dir) / f'{rfc.name}-{r:02d}.txt').open('w') as f: + with (Path(dir) / f'{draft.name}-{r:02d}.txt').open('w') as f: f.write('text content') - self.should_succeed(dict(name=rfc.canonical_name())) + self.assertTrue( + login_testing_unauthorized( + self, + PersonFactory().user.username, + urlreverse(self.view, kwargs={"name": draft.name}), + ) + ) self.should_succeed(dict(name=rfc.name)) + self.should_succeed(dict(name=draft.name)) for r in range(0,2): - self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}')) + self.should_succeed(dict(name=draft.name,rev=f'{r:02d}')) for ext in ('pdf','txt','html','anythingatall'): - self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}',ext=ext)) - self.should_404(dict(name=rfc.name,rev='02')) + self.should_succeed(dict(name=draft.name,rev=f'{r:02d}',ext=ext)) + self.should_404(dict(name=draft.name,rev='02')) + + with mock.patch('ietf.doc.models.DocumentInfo.pdfized', side_effect=URLFetchingError): + url = urlreverse(self.view, kwargs=dict(name=rfc.name)) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + self.assertContains(r, "Error while rendering PDF") class NotifyValidationTests(TestCase): def test_notify_validation(self): @@ -2864,3 +3125,383 @@ def test_gets_request_conflict_review_action_button(self): r = self.client.get(url) self.assertContains(r, target_string) +class DocInfoMethodsTests(TestCase): + + def test_became_rfc(self): + draft = WgDraftFactory() + rfc = WgRfcFactory() + draft.relateddocument_set.create(relationship_id="became_rfc",target=rfc) + self.assertEqual(draft.became_rfc(), rfc) + self.assertEqual(rfc.came_from_draft(), draft) + + charter = CharterFactory() + self.assertIsNone(charter.became_rfc()) + self.assertIsNone(charter.came_from_draft()) + + def test_revisions(self): + draft = WgDraftFactory(rev="09",create_revisions=range(0,10)) + self.assertEqual(draft.revisions_by_dochistory(),[f"{i:02d}" for i in range(0,10)]) + self.assertEqual(draft.revisions_by_newrevisionevent(),[f"{i:02d}" for i in range(0,10)]) + rfc = WgRfcFactory() + self.assertEqual(rfc.revisions_by_newrevisionevent(),[]) + self.assertEqual(rfc.revisions_by_dochistory(),[]) + + draft.history_set.filter(rev__lt="08").delete() + draft.docevent_set.filter(newrevisiondocevent__rev="05").delete() + self.assertEqual(draft.revisions_by_dochistory(),[f"{i:02d}" for i in range(8,10)]) + self.assertEqual(draft.revisions_by_newrevisionevent(),[f"{i:02d}" for i in [*range(0,5), *range(6,10)]]) + + def test_referenced_by_rfcs(self): + # n.b., no significance to the ref* values in this test + referring_draft = WgDraftFactory() + (rfc, referring_rfc) = WgRfcFactory.create_batch(2) + rfc.targets_related.create(relationship_id="refnorm", source=referring_draft) + rfc.targets_related.create(relationship_id="refnorm", source=referring_rfc) + self.assertCountEqual( + rfc.referenced_by_rfcs(), + rfc.targets_related.filter(source=referring_rfc), + ) + + def test_referenced_by_rfcs_as_rfc_or_draft(self): + # n.b., no significance to the ref* values in this test + draft = WgDraftFactory() + rfc = WgRfcFactory() + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) + + # Draft referring to the rfc and the draft - should not be reported at all + draft_referring_to_both = WgDraftFactory() + draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft) + draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc) + + # RFC referring only to the draft - should be reported for either the draft or the rfc + rfc_referring_to_draft = WgRfcFactory() + rfc_referring_to_draft.relateddocument_set.create(relationship_id="refinfo", target=draft) + + # RFC referring only to the rfc - should be reported only for the rfc + rfc_referring_to_rfc = WgRfcFactory() + rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc) + + # RFC referring only to the rfc - should be reported only for the rfc + rfc_referring_to_rfc = WgRfcFactory() + rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc) + + # RFC referring to the rfc and the draft - should be reported for both + rfc_referring_to_both = WgRfcFactory() + rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft) + rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc) + + self.assertCountEqual( + draft.referenced_by_rfcs_as_rfc_or_draft(), + draft.targets_related.filter(source__type="rfc"), + ) + + self.assertCountEqual( + rfc.referenced_by_rfcs_as_rfc_or_draft(), + draft.targets_related.filter(source__type="rfc") | rfc.targets_related.filter(source__type="rfc"), + ) + +class StateIndexTests(TestCase): + + def test_state_index(self): + url = urlreverse('ietf.doc.views_help.state_index') + r = self.client.get(url) + q = PyQuery(r.content) + content = [ e.text for e in q('#content table td a ') ] + names = StateType.objects.values_list('slug', flat=True) + # The following doesn't cover all doc types, only a selection + for name in names: + if not '-' in name: + self.assertIn(name, content) + +class InvestigateTests(TestCase): + settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [ + "AGENDA_PATH", + # "INTERNET_DRAFT_PATH", + # "INTERNET_DRAFT_ARCHIVE_DIR", + # "INTERNET_ALL_DRAFTS_ARCHIVE_DIR", + ] + + def setUp(self): + super().setUp() + # Contort the draft archive dir temporary replacement + # to match the "collections" concept + archive_tmp_dir = Path(settings.INTERNET_DRAFT_ARCHIVE_DIR) + new_archive_dir = archive_tmp_dir / "draft-archive" + new_archive_dir.mkdir() + settings.INTERNET_DRAFT_ARCHIVE_DIR = str(new_archive_dir) + donated_personal_copy_dir = archive_tmp_dir / "donated-personal-copy" + donated_personal_copy_dir.mkdir() + meeting_dir = Path(settings.AGENDA_PATH) / "666" + meeting_dir.mkdir() + all_archive_dir = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) + repository_dir = Path(settings.INTERNET_DRAFT_PATH) + + for path in [repository_dir, all_archive_dir]: + (path / "draft-this-is-active-00.txt").touch() + for path in [new_archive_dir, all_archive_dir]: + (path / "draft-old-but-can-authenticate-00.txt").touch() + (path / "draft-has-mixed-provenance-01.txt").touch() + for path in [donated_personal_copy_dir, all_archive_dir]: + (path / "draft-donated-from-a-personal-collection-00.txt").touch() + (path / "draft-has-mixed-provenance-00.txt").touch() + (path / "draft-has-mixed-provenance-00.txt.Z").touch() + (all_archive_dir / "draft-this-should-not-be-possible-00.txt").touch() + (meeting_dir / "draft-this-predates-the-archive-00.txt").touch() + + def test_investigate_fragment(self): + + result = investigate_fragment("this-is-active") + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-this-is-active-00.txt" + ) + + result = investigate_fragment("old-but-can") + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-old-but-can-authenticate-00.txt" + ) + + result = investigate_fragment("predates") + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-this-predates-the-archive-00.txt" + ) + + result = investigate_fragment("personal-collection") + self.assertEqual(len(result["can_verify"]), 0) + self.assertEqual(len(result["unverifiable_collections"]), 1) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["unverifiable_collections"])[0].name, + "draft-donated-from-a-personal-collection-00.txt", + ) + + result = investigate_fragment("mixed-provenance") + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 2) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-has-mixed-provenance-01.txt" + ) + self.assertEqual( + set([p.name for p in result["unverifiable_collections"]]), + set( + [ + "draft-has-mixed-provenance-00.txt", + "draft-has-mixed-provenance-00.txt.Z", + ] + ), + ) + + result = investigate_fragment("not-be-possible") + self.assertEqual(len(result["can_verify"]), 0) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 1) + self.assertEqual( + list(result["unexpected"])[0].name, + "draft-this-should-not-be-possible-00.txt", + ) + + @mock.patch("ietf.doc.utils.caches") + def test_investigate_fragment_cache(self, mock_caches): + """investigate_fragment should cache its result""" + mock_default_cache = mock_caches["default"] + mock_default_cache.get.return_value = None # disable cache + result = investigate_fragment("this-is-active") + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-this-is-active-00.txt" + ) + self.assertTrue(mock_default_cache.get.called) + self.assertTrue(mock_default_cache.set.called) + expected_key = f"investigate_fragment:{sha384(b'this-is-active').hexdigest()}" + self.assertEqual(mock_default_cache.set.call_args.kwargs["key"], expected_key) + cached_value = mock_default_cache.set.call_args.kwargs["value"] # hang on to this + mock_default_cache.reset_mock() + + # Check that a cached value is used + mock_default_cache.get.return_value = cached_value + with mock.patch("ietf.doc.utils.Path") as mock_path: + result = investigate_fragment("this-is-active") + # Check that we got the same results + self.assertEqual(len(result["can_verify"]), 1) + self.assertEqual(len(result["unverifiable_collections"]), 0) + self.assertEqual(len(result["unexpected"]), 0) + self.assertEqual( + list(result["can_verify"])[0].name, "draft-this-is-active-00.txt" + ) + # And that we used the cache + self.assertFalse(mock_path.called) # a proxy for "did the method do any real work" + self.assertTrue(mock_default_cache.get.called) + self.assertEqual(mock_default_cache.get.call_args, mock.call(expected_key)) + + def test_investigate_get(self): + """GET with no querystring should retrieve the investigate UI""" + url = urlreverse("ietf.doc.views_doc.investigate") + login_testing_unauthorized(self, "secretary", url) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertEqual(len(q("form#investigate")), 1) + self.assertEqual(len(q("div#results")), 0) + + @mock.patch("ietf.doc.views_doc.AsyncResult") + def test_investgate_get_task_id(self, mock_asyncresult): + """GET with querystring should lookup task status""" + url = urlreverse("ietf.doc.views_doc.investigate") + login_testing_unauthorized(self, "secretary", url) + mock_asyncresult.return_value.ready.return_value = True + r = self.client.get(url + "?id=a-task-id") + self.assertEqual(r.status_code, 200) + self.assertEqual(r.json(), {"status": "ready"}) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + mock_asyncresult.reset_mock() + + mock_asyncresult.return_value.ready.return_value = False + r = self.client.get(url + "?id=a-task-id") + self.assertEqual(r.status_code, 200) + self.assertEqual(r.json(), {"status": "notready"}) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + + @mock.patch("ietf.doc.views_doc.investigate_fragment_task") + def test_investigate_post(self, mock_investigate_fragment_task): + """POST with a name_fragment and no task_id should start a celery task""" + url = urlreverse("ietf.doc.views_doc.investigate") + login_testing_unauthorized(self, "secretary", url) + + # test some invalid cases + r = self.client.post(url, {"name_fragment": "short"}) # limit is >= 8 characters + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertEqual(len(q("#id_name_fragment.is-invalid")), 1) + self.assertFalse(mock_investigate_fragment_task.delay.called) + for char in ["*", "%", "/", "\\"]: + r = self.client.post(url, {"name_fragment": f"bad{char}character"}) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertEqual(len(q("#id_name_fragment.is-invalid")), 1) + self.assertFalse(mock_investigate_fragment_task.delay.called) + + # now a valid one + mock_investigate_fragment_task.delay.return_value.id = "a-task-id" + r = self.client.post(url, {"name_fragment": "this-is-a-valid-fragment"}) + self.assertEqual(r.status_code, 200) + self.assertTrue(mock_investigate_fragment_task.delay.called) + self.assertEqual(mock_investigate_fragment_task.delay.call_args, mock.call("this-is-a-valid-fragment")) + self.assertEqual(r.json(), {"id": "a-task-id"}) + + @mock.patch("ietf.doc.views_doc.AsyncResult") + def test_investigate_post_task_id(self, mock_asyncresult): + """POST with name_fragment and task_id should retrieve results""" + url = urlreverse("ietf.doc.views_doc.investigate") + login_testing_unauthorized(self, "secretary", url) + + # First, test a non-successful result - this could be a failure or non-existent task id + mock_result = mock_asyncresult.return_value + mock_result.successful.return_value = False + r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"}) + self.assertContains(r, "The investigation task failed.", status_code=200) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + self.assertFalse(mock_result.get.called) + mock_asyncresult.reset_mock() + q = PyQuery(r.content) + self.assertEqual(q("#id_name_fragment").val(), "some-fragment") + self.assertEqual(q("#id_task_id").val(), "a-task-id") + + # now the various successful result mixes + mock_result = mock_asyncresult.return_value + mock_result.successful.return_value = True + mock_result.get.return_value = { + "name_fragment": "different-fragment", + "results": { + "can_verify": set(), + "unverifiable_collections": set(), + "unexpected": set(), + } + } + r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"}) + self.assertEqual(r.status_code, 200) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + mock_asyncresult.reset_mock() + q = PyQuery(r.content) + self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset") + self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared") + self.assertEqual(len(q("div#results")), 1) + self.assertEqual(len(q("table#authenticated")), 0) + self.assertEqual(len(q("table#unverifiable")), 0) + self.assertEqual(len(q("table#unexpected")), 0) + + # This file was created in setUp. It allows the view to render properly + # but its location / content don't matter for this test otherwise. + a_file_that_exists = Path(settings.INTERNET_DRAFT_PATH) / "draft-this-is-active-00.txt" + + mock_result.get.return_value = { + "name_fragment": "different-fragment", + "results": { + "can_verify": {a_file_that_exists}, + "unverifiable_collections": {a_file_that_exists}, + "unexpected": set(), + } + } + r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"}) + self.assertEqual(r.status_code, 200) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + mock_asyncresult.reset_mock() + q = PyQuery(r.content) + self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset") + self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared") + self.assertEqual(len(q("div#results")), 1) + self.assertEqual(len(q("table#authenticated")), 1) + self.assertEqual(len(q("table#unverifiable")), 1) + self.assertEqual(len(q("table#unexpected")), 0) + + mock_result.get.return_value = { + "name_fragment": "different-fragment", + "results": { + "can_verify": set(), + "unverifiable_collections": set(), + "unexpected": {a_file_that_exists}, + } + } + r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"}) + self.assertEqual(r.status_code, 200) + self.assertTrue(mock_asyncresult.called) + self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id")) + mock_asyncresult.reset_mock() + q = PyQuery(r.content) + self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset") + self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared") + self.assertEqual(len(q("div#results")), 1) + self.assertEqual(len(q("table#authenticated")), 0) + self.assertEqual(len(q("table#unverifiable")), 0) + self.assertEqual(len(q("table#unexpected")), 1) + + +class LogIOErrorTests(TestCase): + + def test_doc_text_io_error(self): + + d = IndividualDraftFactory() + + with mock.patch("ietf.doc.models.Path") as path_cls_mock: + with mock.patch("ietf.doc.models.log.log") as log_mock: + path_cls_mock.return_value.exists.return_value = True + path_cls_mock.return_value.open.return_value.__enter__.return_value.read.side_effect = IOError("Bad things happened") + text = d.text() + self.assertIsNone(text) + self.assertTrue(log_mock.called) + self.assertIn("Bad things happened", log_mock.call_args[0][0]) diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index 8a4717c748e..8420e411e29 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -3,7 +3,7 @@ import datetime -import mock +from unittest import mock from pyquery import PyQuery @@ -17,28 +17,37 @@ from ietf.doc.models import (Document, State, DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, TelechatDocEvent) from ietf.doc.factories import (DocumentFactory, IndividualDraftFactory, IndividualRfcFactory, WgDraftFactory, - BallotPositionDocEventFactory, BallotDocEventFactory, IRSGBallotDocEventFactory) + BallotPositionDocEventFactory, BallotDocEventFactory, IRSGBallotDocEventFactory, RgDraftFactory) from ietf.doc.templatetags.ietf_filters import can_defer from ietf.doc.utils import create_ballot_if_not_open +from ietf.doc.views_ballot import parse_ballot_edit_return_point from ietf.doc.views_doc import document_ballot_content from ietf.group.models import Group, Role from ietf.group.factories import GroupFactory, RoleFactory, ReviewTeamFactory from ietf.ipr.factories import HolderIprDisclosureFactory -from ietf.name.models import BallotPositionName from ietf.iesg.models import TelechatDate -from ietf.person.models import Person, PersonalApiKey -from ietf.person.factories import PersonFactory +from ietf.person.models import Person +from ietf.person.factories import PersonFactory, PersonalApiKeyFactory from ietf.person.utils import get_active_ads from ietf.utils.test_utils import TestCase, login_testing_unauthorized from ietf.utils.mail import outbox, empty_outbox, get_payload_text from ietf.utils.text import unwrap -from ietf.utils.timezone import date_today +from ietf.utils.timezone import date_today, datetime_today class EditPositionTests(TestCase): + + # N.B. This test needs to be rewritten to exercise all types of ballots (iesg, irsg, rsab) + # and test against the output of the mailtriggers instead of looking for hardcoded values + # in the To and CC results. See #7864 def test_edit_position(self): ad = Person.objects.get(user__username="ad") - draft = IndividualDraftFactory(ad=ad,stream_id='ietf') + draft = WgDraftFactory( + ad=ad, + stream_id="ietf", + notify="somebody@example.com", + group__acronym="mars", + ) ballot = create_ballot_if_not_open(None, draft, ad, 'approve') url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) @@ -54,11 +63,20 @@ def test_edit_position(self): self.assertEqual(len(q('form textarea[name=comment]')), 1) # vote + empty_outbox() events_before = draft.docevent_set.count() - - r = self.client.post(url, dict(position="discuss", - discuss=" This is a discussion test. \n ", - comment=" This is a test. \n ")) + + r = self.client.post( + url, + dict( + position="discuss", + discuss=" This is a discussion test. \n ", + comment=" This is a test. \n ", + additional_cc="test298347@example.com", + cc_choices=["doc_notify", "doc_group_chairs"], + send_mail=1, + ), + ) self.assertEqual(r.status_code, 302) pos = draft.latest_event(BallotPositionDocEvent, balloter=ad) @@ -69,6 +87,22 @@ def test_edit_position(self): self.assertTrue(pos.comment_time != None) self.assertTrue("New position" in pos.desc) self.assertEqual(draft.docevent_set.count(), events_before + 3) + self.assertEqual(len(outbox),1) + m = outbox[0] + self.assertTrue("COMMENT" in m['Subject']) + self.assertTrue("DISCUSS" in m['Subject']) + self.assertTrue(draft.name in m['Subject']) + self.assertTrue("This is a discussion test." in str(m)) + self.assertTrue("This is a test" in str(m)) + self.assertTrue("iesg@" in m['To']) + # cc_choice doc_group_chairs + self.assertTrue("mars-chairs@" in m['Cc']) + # cc_choice doc_notify + self.assertTrue("somebody@example.com" in m['Cc']) + # cc_choice doc_group_email_list was not selected + self.assertFalse(draft.group.list_email in m['Cc']) + # extra-cc + self.assertTrue("test298347@example.com" in m['Cc']) # recast vote events_before = draft.docevent_set.count() @@ -110,7 +144,7 @@ def test_api_set_position(self): create_ballot_if_not_open(None, draft, ad, 'approve') ad.user.last_login = timezone.now() ad.user.save() - apikey = PersonalApiKey.objects.create(endpoint=url, person=ad) + apikey = PersonalApiKeyFactory(endpoint=url, person=ad) # vote events_before = draft.docevent_set.count() @@ -229,61 +263,6 @@ def test_cannot_edit_position_as_pre_ad(self): r = self.client.post(url, dict(position="discuss", discuss="Test discuss text")) self.assertEqual(r.status_code, 403) - def test_send_ballot_comment(self): - ad = Person.objects.get(user__username="ad") - draft = WgDraftFactory(ad=ad,group__acronym='mars') - draft.notify = "somebody@example.com" - draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")]) - - ballot = create_ballot_if_not_open(None, draft, ad, 'approve') - - BallotPositionDocEvent.objects.create( - doc=draft, rev=draft.rev, type="changed_ballot_position", - by=ad, balloter=ad, ballot=ballot, pos=BallotPositionName.objects.get(slug="discuss"), - discuss="This draft seems to be lacking a clearer title?", - discuss_time=timezone.now(), - comment="Test!", - comment_time=timezone.now()) - - url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, - ballot_id=ballot.pk)) - login_testing_unauthorized(self, "ad", url) - - # normal get - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertTrue(len(q('form input[name="extra_cc"]')) > 0) - - # send - mailbox_before = len(outbox) - - r = self.client.post(url, dict(extra_cc="test298347@example.com", cc_choices=['doc_notify','doc_group_chairs'])) - self.assertEqual(r.status_code, 302) - - self.assertEqual(len(outbox), mailbox_before + 1) - m = outbox[-1] - self.assertTrue("COMMENT" in m['Subject']) - self.assertTrue("DISCUSS" in m['Subject']) - self.assertTrue(draft.name in m['Subject']) - self.assertTrue("clearer title" in str(m)) - self.assertTrue("Test!" in str(m)) - self.assertTrue("iesg@" in m['To']) - # cc_choice doc_group_chairs - self.assertTrue("mars-chairs@" in m['Cc']) - # cc_choice doc_notify - self.assertTrue("somebody@example.com" in m['Cc']) - # cc_choice doc_group_email_list was not selected - self.assertFalse(draft.group.list_email in m['Cc']) - # extra-cc - self.assertTrue("test298347@example.com" in m['Cc']) - - r = self.client.post(url, dict(cc="")) - self.assertEqual(r.status_code, 302) - self.assertEqual(len(outbox), mailbox_before + 2) - m = outbox[-1] - self.assertTrue("iesg@" in m['To']) - self.assertFalse(m['Cc'] and draft.group.list_email in m['Cc']) class BallotWriteupsTests(TestCase): @@ -356,7 +335,7 @@ def test_request_last_call(self): self.assertTrue('aread@' in outbox[-1]['Cc']) def test_edit_ballot_writeup(self): - draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','iesg-eva')]) + draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','iesg-eva')], stream_id='ietf') url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) @@ -386,8 +365,25 @@ def test_edit_ballot_writeup(self): self.assertTrue("This is a simple test" in d.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text").text) self.assertTrue('iesg-eva' == d.get_state_slug('draft-iesg')) + def test_edit_ballot_writeup_unauthorized_stream(self): + # Test that accessing a document from unauthorized (irtf) stream returns a 404 error + draft = RgDraftFactory() + url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) + login_testing_unauthorized(self, "ad", url) + + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + + def test_edit_ballot_writeup_invalid_name(self): + # Test that accessing a non-existent document returns a 404 error + url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name="invalid_name")) + login_testing_unauthorized(self, "ad", url) + + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + def test_edit_ballot_writeup_already_approved(self): - draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','approved')]) + draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','approved')], stream_id='ietf') url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) @@ -461,7 +457,7 @@ def test_edit_ballot_rfceditornote(self): def test_issue_ballot(self): ad = Person.objects.get(user__username="ad") for case in ('none','past','future'): - draft = IndividualDraftFactory(ad=ad) + draft = IndividualDraftFactory(ad=ad, stream_id='ietf') if case in ('past','future'): LastCallDocEvent.objects.create( by=Person.objects.get(name='(System)'), @@ -500,7 +496,7 @@ def test_issue_ballot(self): def test_issue_ballot_auto_state_change(self): ad = Person.objects.get(user__username="ad") - draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','writeupw')]) + draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','writeupw')], stream_id='ietf') url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) @@ -524,11 +520,12 @@ def test_issue_ballot_auto_state_change(self): def test_issue_ballot_warn_if_early(self): ad = Person.objects.get(user__username="ad") - draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','lc')]) + draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','lc')], stream_id='ietf') url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # expect warning about issuing a ballot before IETF Last Call is done + # No last call has yet been issued r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) @@ -536,6 +533,38 @@ def test_issue_ballot_warn_if_early(self): self.assertTrue(q('[class=text-danger]:contains("not completed IETF Last Call")')) self.assertTrue(q('[type=submit]:contains("Save")')) + # Last call exists but hasn't expired + LastCallDocEvent.objects.create( + doc=draft, + expires=datetime_today()+datetime.timedelta(days=14), + by=Person.objects.get(name="(System)") + ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertTrue(q('[class=text-danger]:contains("not completed IETF Last Call")')) + + # Last call exists and has expired + LastCallDocEvent.objects.filter(doc=draft).update(expires=datetime_today()-datetime.timedelta(days=2)) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertFalse(q('[class=text-danger]:contains("not completed IETF Last Call")')) + + for state_slug in ["lc", "ad-eval"]: + draft.set_state(State.objects.get(type="draft-iesg",slug=state_slug)) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertTrue(q('[class=text-danger]:contains("It would be unexpected to issue a ballot while in this state.")')) + + draft.set_state(State.objects.get(type="draft-iesg",slug="writeupw")) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertFalse(q('[class=text-danger]:contains("It would be unexpected to issue a ballot while in this state.")')) + + def test_edit_approval_text(self): ad = Person.objects.get(user__username="ad") draft = WgDraftFactory(ad=ad,states=[('draft','active'),('draft-iesg','iesg-eva')],intended_std_level_id='ps',group__parent=Group.objects.get(acronym='farfut')) @@ -773,7 +802,7 @@ def test_clear_ballot(self): ballot = create_ballot_if_not_open(None, draft, ad, 'approve') old_ballot_id = ballot.id draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) - url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug=draft.ballot_open('approve').ballot_type.slug)) + url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug="approve")) login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) self.assertEqual(r.status_code, 200) @@ -783,6 +812,11 @@ def test_clear_ballot(self): self.assertIsNotNone(ballot) self.assertEqual(ballot.ballotpositiondocevent_set.count(),0) self.assertNotEqual(old_ballot_id, ballot.id) + # It's not valid to clear a ballot of a type where there's no matching state + url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug="statchg")) + r = self.client.post(url,{}) + self.assertEqual(r.status_code, 404) + def test_ballot_downref_approve(self): ad = Person.objects.get(name="Areað Irector") @@ -803,8 +837,8 @@ def test_ballot_downref_approve(self): desc='Last call announcement was changed', text='this is simple last call text.' ) rfc = IndividualRfcFactory.create( + name = "rfc6666", stream_id='ise', - other_aliases=['rfc6666',], states=[('draft','rfc'),('draft-iesg','pub')], std_level_id='inf', ) @@ -821,7 +855,7 @@ def test_ballot_downref_approve(self): self.assertContains(r, "No downward references for") # Add a downref, the page should ask if it should be added to the registry - rel = draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm') + rel = draft.relateddocument_set.create(target=rfc, relationship_id='refnorm') d = [rdoc for rdoc in draft.relateddocument_set.all() if rel.is_approved_downref()] original_len = len(d) r = self.client.get(url) @@ -1121,13 +1155,13 @@ def test_regenerate_last_call(self): self.assertFalse("contains these normative down" in lc_text) rfc = IndividualRfcFactory.create( + rfc_number=6666, stream_id='ise', - other_aliases=['rfc6666',], states=[('draft','rfc'),('draft-iesg','pub')], std_level_id='inf', ) - draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm') + draft.relateddocument_set.create(target=rfc,relationship_id='refnorm') r = self.client.post(url, dict(regenerate_last_call_text="1")) self.assertEqual(r.status_code, 200) @@ -1137,7 +1171,7 @@ def test_regenerate_last_call(self): self.assertTrue("rfc6666" in lc_text) self.assertTrue("Independent Submission" in lc_text) - draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'), relationship_id='downref-approval') + draft.relateddocument_set.create(target=rfc, relationship_id='downref-approval') r = self.client.post(url, dict(regenerate_last_call_text="1")) self.assertEqual(r.status_code, 200) @@ -1413,3 +1447,28 @@ def test_document_ballot_content_without_send_email_values(self): self._assertBallotMessage(q, balloters[0], 'No discuss send log available') self._assertBallotMessage(q, balloters[1], 'No comment send log available') self._assertBallotMessage(q, old_balloter, 'No ballot position send log available') + +class ReturnToUrlTests(TestCase): + def test_invalid_return_to_url(self): + with self.assertRaises(ValueError): + parse_ballot_edit_return_point('/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718') + + with self.assertRaises(ValueError): + parse_ballot_edit_return_point('/a-route-that-does-not-exist/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718') + + with self.assertRaises(ValueError): + parse_ballot_edit_return_point('https://example.com/phishing', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718') + + def test_valid_default_return_to_url(self): + self.assertEqual(parse_ballot_edit_return_point( + None, + 'draft-ietf-opsawg-ipfix-tcpo-v6eh', + '998718' + ), '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/') + + def test_valid_return_to_url(self): + self.assertEqual(parse_ballot_edit_return_point( + '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/', + 'draft-ietf-opsawg-ipfix-tcpo-v6eh', + '998718' + ), '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/') diff --git a/ietf/doc/tests_bofreq.py b/ietf/doc/tests_bofreq.py index 2fdc8c282a3..6a7c9393ef8 100644 --- a/ietf/doc/tests_bofreq.py +++ b/ietf/doc/tests_bofreq.py @@ -16,9 +16,10 @@ from django.template.loader import render_to_string from django.utils import timezone +from ietf.doc.storage_utils import retrieve_str from ietf.group.factories import RoleFactory from ietf.doc.factories import BofreqFactory, NewRevisionDocEventFactory -from ietf.doc.models import State, Document, DocAlias, NewRevisionDocEvent +from ietf.doc.models import State, Document, NewRevisionDocEvent from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible from ietf.ietfauth.utils import has_role from ietf.person.factories import PersonFactory @@ -32,7 +33,7 @@ class BofreqTests(TestCase): settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['BOFREQ_PATH'] def write_bofreq_file(self, bofreq): - fname = Path(settings.BOFREQ_PATH) / ("%s-%s.md" % (bofreq.canonical_name(), bofreq.rev)) + fname = Path(settings.BOFREQ_PATH) / ("%s-%s.md" % (bofreq.name, bofreq.rev)) with fname.open("w") as f: f.write(f"""# This is a test bofreq. Version: {bofreq.rev} @@ -54,8 +55,8 @@ def test_show_bof_requests(self): self.assertEqual(r.status_code, 200) q = PyQuery(r.content) for state in states: - self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1) - self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3) + self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1 if state.slug!="spam" else 0) + self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3 if state.slug!="spam" else 0) self.assertFalse(q('#start_button')) PersonFactory(user__username='nobody') self.client.login(username='nobody', password='nobody+password') @@ -63,6 +64,13 @@ def test_show_bof_requests(self): self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(q('#start_button')) + self.client.logout() + self.client.login(username='secretary', password='secretary+password') + r = self.client.get(url) + q = PyQuery(r.content) + for state in states: + self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1) + self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3) def test_bofreq_main_page(self): @@ -333,6 +341,7 @@ def test_submit(self): doc = reload_db_objects(doc) self.assertEqual('%02d'%(int(rev)+1) ,doc.rev) self.assertEqual(f'# {username}', doc.text()) + self.assertEqual(f'# {username}', retrieve_str('bofreq',doc.get_base_name())) self.assertEqual(docevent_count+1, doc.docevent_set.count()) self.assertEqual(1, len(outbox)) rev = doc.rev @@ -366,13 +375,13 @@ def test_start_new_bofreq(self): name = f"bofreq-{xslugify(nobody.last_name())[:64]}-{postdict['title']}".replace(' ','-') bofreq = Document.objects.filter(name=name,type_id='bofreq').first() self.assertIsNotNone(bofreq) - self.assertIsNotNone(DocAlias.objects.filter(name=name).first()) self.assertEqual(bofreq.title, postdict['title']) self.assertEqual(bofreq.rev, '00') self.assertEqual(bofreq.get_state_slug(), 'proposed') self.assertEqual(list(bofreq_editors(bofreq)), [nobody]) self.assertEqual(bofreq.latest_event(NewRevisionDocEvent).rev, '00') self.assertEqual(bofreq.text_or_error(), 'some stuff') + self.assertEqual(retrieve_str('bofreq',bofreq.get_base_name()), 'some stuff') self.assertEqual(len(outbox),1) finally: os.unlink(file.name) diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py index f65cf14e088..62e49559e28 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright The IETF Trust 2011-2020, All Rights Reserved +# Copyright The IETF Trust 2011-2023, All Rights Reserved import datetime @@ -16,6 +16,7 @@ from ietf.doc.factories import CharterFactory, NewRevisionDocEventFactory, TelechatDocEventFactory from ietf.doc.models import ( Document, State, BallotDocEvent, BallotType, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent ) +from ietf.doc.storage_utils import retrieve_str from ietf.doc.utils_charter import ( next_revision, default_review_text, default_action_text, charter_name_for_group ) from ietf.doc.utils import close_open_ballots @@ -87,11 +88,12 @@ def test_view_revisions(self): class EditCharterTests(TestCase): settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CHARTER_PATH'] + def setUp(self): + super().setUp() + (Path(settings.FTP_DIR)/"charter").mkdir() + def write_charter_file(self, charter): - with (Path(settings.CHARTER_PATH) / - ("%s-%s.txt" % (charter.canonical_name(), charter.rev)) - ).open("w") as f: - f.write("This is a charter.") + (Path(settings.CHARTER_PATH) / f"{charter.name}-{charter.rev}.txt").write_text("This is a charter.") def test_startstop_process(self): CharterFactory(group__acronym='mars') @@ -509,8 +511,21 @@ def test_submit_charter(self): self.assertEqual(charter.rev, next_revision(prev_rev)) self.assertTrue("new_revision" in charter.latest_event().type) - with (Path(settings.CHARTER_PATH) / (charter.canonical_name() + "-" + charter.rev + ".txt")).open(encoding='utf-8') as f: - self.assertEqual(f.read(), "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode('utf-8')) + charter_path = Path(settings.CHARTER_PATH) / (charter.name + "-" + charter.rev + ".txt") + file_contents = (charter_path).read_text("utf-8") + self.assertEqual( + file_contents, + "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode("utf-8"), + ) + ftp_charter_path = Path(settings.FTP_DIR) / "charter" / charter_path.name + self.assertTrue(ftp_charter_path.exists()) + self.assertTrue(charter_path.samefile(ftp_charter_path)) + blobstore_contents = retrieve_str("charter", charter.get_base_name()) + self.assertEqual( + blobstore_contents, + "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode("utf-8"), + ) + def test_submit_initial_charter(self): group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.org') @@ -538,6 +553,24 @@ def test_submit_initial_charter(self): group = Group.objects.get(pk=group.pk) self.assertEqual(group.charter, charter) + def test_submit_charter_with_invalid_name(self): + self.client.login(username="secretary", password="secretary+password") + ietf_group = GroupFactory(type_id="wg") + for bad_name in ("charter-irtf-{}", "charter-randomjunk-{}", "charter-ietf-thisisnotagroup"): + url = urlreverse("ietf.doc.views_charter.submit", kwargs={"name": bad_name.format(ietf_group.acronym)}) + r = self.client.get(url) + self.assertEqual(r.status_code, 404, f"GET of charter named {bad_name} should 404") + r = self.client.post(url, {}) + self.assertEqual(r.status_code, 404, f"POST of charter named {bad_name} should 404") + + irtf_group = GroupFactory(type_id="rg") + for bad_name in ("charter-ietf-{}", "charter-whatisthis-{}", "charter-irtf-thisisnotagroup"): + url = urlreverse("ietf.doc.views_charter.submit", kwargs={"name": bad_name.format(irtf_group.acronym)}) + r = self.client.get(url) + self.assertEqual(r.status_code, 404, f"GET of charter named {bad_name} should 404") + r = self.client.post(url, {}) + self.assertEqual(r.status_code, 404, f"POST of charter named {bad_name} should 404") + def test_edit_review_announcement_text(self): area = GroupFactory(type_id='area') RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) @@ -788,9 +821,11 @@ def test_approve(self): self.assertTrue(not charter.ballot_open("approve")) self.assertEqual(charter.rev, "01") - self.assertTrue( - (Path(settings.CHARTER_PATH) / ("charter-ietf-%s-%s.txt" % (group.acronym, charter.rev))).exists() - ) + charter_path = Path(settings.CHARTER_PATH) / ("charter-ietf-%s-%s.txt" % (group.acronym, charter.rev)) + charter_ftp_path = Path(settings.FTP_DIR) / "charter" / charter_path.name + self.assertTrue(charter_path.exists()) + self.assertTrue(charter_ftp_path.exists()) + self.assertTrue(charter_path.samefile(charter_ftp_path)) self.assertEqual(len(outbox), 2) # @@ -817,6 +852,19 @@ def test_approve(self): self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1) self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1) + def test_approve_irtf(self): + charter = CharterFactory(group__type_id='rg') + url = urlreverse('ietf.doc.views_charter.approve', kwargs=dict(name=charter.name)) + login_testing_unauthorized(self, "secretary", url) + empty_outbox() + r = self.client.post(url, dict()) + self.assertEqual(r.status_code, 302) + self.assertEqual(len(outbox), 2) + self.assertTrue("IRTF" in outbox[1]['From']) + self.assertTrue("irtf-announce" in outbox[1]['To']) + self.assertTrue(charter.group.acronym in outbox[1]['Cc']) + self.assertTrue("RG Action" in outbox[1]['Subject']) + def test_charter_with_milestones(self): charter = CharterFactory() diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py index 6fa1a4d9b68..791db17f5a2 100644 --- a/ietf/doc/tests_conflict_review.py +++ b/ietf/doc/tests_conflict_review.py @@ -1,9 +1,10 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2023, All Rights Reserved # -*- coding: utf-8 -*- import io import os +from pathlib import Path from pyquery import PyQuery from textwrap import wrap @@ -13,8 +14,9 @@ import debug # pyflakes:ignore -from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory -from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State +from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory, RgDraftFactory +from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State, DocTagName +from ietf.doc.storage_utils import retrieve_str from ietf.doc.utils import create_ballot_if_not_open from ietf.doc.views_conflict_review import default_approval_text from ietf.group.models import Person @@ -70,12 +72,12 @@ def test_start_review_as_secretary(self): self.assertEqual(review_doc.ad.name,'Areað Irector') self.assertEqual(review_doc.notify,'ipu@ietf.org') doc = Document.objects.get(name='draft-imaginary-independent-submission') - self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) + self.assertTrue(doc in [x.target for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith("IETF conflict review requested")) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith("IETF conflict review initiated")) self.assertTrue('Conflict Review requested' in outbox[-1]['Subject']) - + # verify you can't start a review when a review is already in progress r = self.client.post(url,dict(ad="Areað Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org')) self.assertEqual(r.status_code, 404) @@ -119,7 +121,7 @@ def test_start_review_as_stream_owner(self): self.assertEqual(review_doc.ad.name,'Ietf Chair') self.assertEqual(review_doc.notify,'ipu@ietf.org') doc = Document.objects.get(name='draft-imaginary-independent-submission') - self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) + self.assertTrue(doc in [x.target for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) self.assertEqual(len(outbox), messages_before + 2) @@ -168,6 +170,21 @@ def test_change_state(self): self.assertTrue(review_doc.active_ballot()) self.assertEqual(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes') + # try to change to an AD-forbidden state + appr_noprob_sent_pk = str(State.objects.get(used=True, slug='appr-noprob-sent',type__slug='conflrev').pk) + r = self.client.post(url,dict(review_state=appr_noprob_sent_pk,comment='xyzzy')) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertTrue(q('form .invalid-feedback')) + + # try again as secretariat + self.client.logout() + login_testing_unauthorized(self, 'secretary', url) + r = self.client.post(url,dict(review_state=appr_noprob_sent_pk,comment='xyzzy')) + self.assertEqual(r.status_code, 302) + review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') + self.assertEqual(review_doc.get_state('conflrev').slug, 'appr-noprob-sent') + def test_edit_notices(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') @@ -372,7 +389,7 @@ def setUp(self): class ConflictReviewSubmitTests(TestCase): - settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CONFLICT_REVIEW_PATH'] + settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CONFLICT_REVIEW_PATH','FTP_PATH'] def test_initial_submission(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') url = urlreverse('ietf.doc.views_conflict_review.submit',kwargs=dict(name=doc.name)) @@ -388,9 +405,15 @@ def test_initial_submission(self): # Right now, nothing to test - we let people put whatever the web browser will let them put into that textbox # sane post using textbox - path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) + basename = f"{doc.name}-{doc.rev}.txt" + path = Path(settings.CONFLICT_REVIEW_PATH) / basename + ftp_dir = Path(settings.FTP_DIR) / "conflict-reviews" + if not ftp_dir.exists(): + ftp_dir.mkdir() + ftp_path = ftp_dir / basename self.assertEqual(doc.rev,'00') - self.assertFalse(os.path.exists(path)) + self.assertFalse(path.exists()) + self.assertFalse(ftp_path.exists()) r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1")) self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') @@ -398,7 +421,9 @@ def test_initial_submission(self): with io.open(path) as f: self.assertEqual(f.read(),"Some initial review text\n") f.close() + self.assertTrue(ftp_path.exists()) self.assertTrue( "submission-00" in doc.latest_event(NewRevisionDocEvent).desc) + self.assertEqual(retrieve_str("conflrev",basename), "Some initial review text\n") def test_subsequent_submission(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') @@ -408,7 +433,7 @@ def test_subsequent_submission(self): # A little additional setup # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp self.assertEqual(doc.rev,'00') - path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) + path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.name, doc.rev)) with io.open(path,'w') as f: f.write('This is the old proposal.') f.close() @@ -435,7 +460,7 @@ def test_subsequent_submission(self): self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') self.assertEqual(doc.rev,'01') - path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) + path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.name, doc.rev)) with io.open(path) as f: self.assertEqual(f.read(),"This is a new proposal.") f.close() @@ -450,3 +475,89 @@ def test_subsequent_submission(self): def setUp(self): super().setUp() ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission',review_of=IndividualDraftFactory(name='draft-imaginary-irtf-submission',stream_id='irtf'),notify='notifyme@example.net') + +class ConflictReviewStreamStateTests(TestCase): + + def start_review(self, stream, role, kwargs=None): + doc = RgDraftFactory() if stream=='irtf' else IndividualDraftFactory(stream=StreamName.objects.get(slug='ise')) + url = urlreverse('ietf.doc.views_conflict_review.start_review', kwargs=dict(name=doc.name)) + login_testing_unauthorized(self, role, url) + r = self.client.post(url, kwargs) + self.assertEqual(r.status_code, 302) + self.assertEqual(doc.get_state('draft-stream-'+stream).slug, 'iesg-rev') + + def test_start_irtf_review_as_secretary(self): + ad_strpk = str(Person.objects.get(name='Areað Irector').pk) + state_strpk = str(State.objects.get(used=True, slug='needshep', type__slug='conflrev').pk) + self.start_review('irtf', 'secretary', kwargs=dict(ad=ad_strpk, create_in_state=state_strpk)) + + def test_start_ise_review_as_secretary(self): + ad_strpk = str(Person.objects.get(name='Areað Irector').pk) + state_strpk = str(State.objects.get(used=True, slug='needshep', type__slug='conflrev').pk) + self.start_review('ise', 'secretary', kwargs=dict(ad=ad_strpk, create_in_state=state_strpk)) + + def test_start_irtf_review_as_stream_owner(self): + self.start_review('irtf', 'irtf-chair') + + def test_start_ise_review_as_stream_owner(self): + self.start_review('ise', 'ise-chair') + + def close_review(self, close_type, stream, role): + doc = RgDraftFactory() if stream=='irtf' else IndividualDraftFactory(stream=StreamName.objects.get(slug='ise')) + review = ConflictReviewFactory(review_of=doc) + url = urlreverse('ietf.doc.views_conflict_review.change_state', kwargs=dict(name=review.name)) + login_testing_unauthorized(self, role, url) + strpk = str(State.objects.get(used=True, slug=close_type, type__slug='conflrev').pk) + r = self.client.post(url, dict(review_state=strpk)) + self.assertEqual(r.status_code, 302) + self.assertEqual(doc.get_state('draft-stream-'+stream).slug, 'chair-w' if stream=='irtf' else 'ise-rev') + self.assertIn(DocTagName.objects.get(pk='iesg-com'), doc.tags.all()) + + def test_close_irtf_review_reqnopub_as_secretary(self): + self.close_review('appr-reqnopub-sent', 'irtf', 'secretary') + + def test_close_ise_review_reqnopub_as_secretary(self): + self.close_review('appr-reqnopub-sent', 'ise', 'secretary') + + def test_close_irtf_review_noprob_as_secretary(self): + self.close_review('appr-noprob-sent', 'irtf', 'secretary') + + def test_close_ise_review_noprob_as_secretary(self): + self.close_review('appr-noprob-sent', 'ise', 'secretary') + + def test_close_irtf_review_withdraw_as_secretary(self): + self.close_review('withdraw', 'irtf', 'secretary') + + def test_close_ise_review_withdraw_as_secretary(self): + self.close_review('withdraw', 'ise', 'secretary') + + def test_close_irtf_review_dead_as_secretary(self): + self.close_review('dead', 'irtf', 'secretary') + + def test_close_ise_review_dead_as_secretary(self): + self.close_review('dead', 'ise', 'secretary') + + def test_close_irtf_review_withdraw_as_ad(self): + self.close_review('withdraw', 'irtf', 'ad') + + def test_close_ise_review_withdraw_as_ad(self): + self.close_review('withdraw', 'ise', 'ad') + + def test_close_irtf_review_dead_as_ad(self): + self.close_review('dead', 'irtf', 'ad') + + def test_close_ise_review_dead_as_ad(self): + self.close_review('dead', 'ise', 'ad') + + def test_approve_review(self): + doc = RgDraftFactory() + review = ConflictReviewFactory(review_of=doc) + review.set_state(State.objects.get(used=True, slug='appr-noprob-pend', type='conflrev')) + + url = urlreverse('ietf.doc.views_conflict_review.approve_conflict_review', kwargs=dict(name=review.name)) + login_testing_unauthorized(self, 'secretary', url) + + r = self.client.post(url, dict(announcement_text=default_approval_text(review))) + self.assertEqual(r.status_code, 302) + self.assertEqual(doc.get_state('draft-stream-irtf').slug, 'chair-w') + self.assertIn(DocTagName.objects.get(pk='iesg-com'), doc.tags.all()) diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py index 258494e364c..0222ad79423 100644 --- a/ietf/doc/tests_downref.py +++ b/ietf/doc/tests_downref.py @@ -19,12 +19,9 @@ def setUp(self): super().setUp() PersonFactory(name='Plain Man',user__username='plain') self.draft = WgDraftFactory(name='draft-ietf-mars-test') - self.draftalias = self.draft.docalias.get(name='draft-ietf-mars-test') self.doc = WgDraftFactory(name='draft-ietf-mars-approved-document',states=[('draft-iesg','rfcqueue')]) - self.docalias = self.doc.docalias.get(name='draft-ietf-mars-approved-document') - self.rfc = WgRfcFactory(alias2__name='rfc9998') - self.rfcalias = self.rfc.docalias.get(name='rfc9998') - RelatedDocument.objects.create(source=self.doc, target=self.rfcalias, relationship_id='downref-approval') + self.rfc = WgRfcFactory(rfc_number=9998) + RelatedDocument.objects.create(source=self.doc, target=self.rfc, relationship_id='downref-approval') def test_downref_registry(self): url = urlreverse('ietf.doc.views_downref.downref_registry') @@ -64,44 +61,44 @@ def test_downref_registry_add(self): self.assertContains(r, 'Save downref') # error - already in the downref registry - r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.docalias.pk, ))) + r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.doc.pk, ))) self.assertContains(r, 'Downref is already in the registry') # error - source is not in an approved state r = self.client.get(url) self.assertEqual(r.status_code, 200) - r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draftalias.pk, ))) + r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, ))) self.assertContains(r, 'Draft is not yet approved') # error - the target is not a normative reference of the source self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub")) r = self.client.get(url) self.assertEqual(r.status_code, 200) - r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draftalias.pk, ))) + r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, ))) self.assertContains(r, 'There does not seem to be a normative reference to RFC') self.assertContains(r, 'Save downref anyway') # normal - approve the document so the downref is now okay - RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm') + RelatedDocument.objects.create(source=self.draft, target=self.rfc, relationship_id='refnorm') draft_de_count_before = self.draft.docevent_set.count() rfc_de_count_before = self.rfc.docevent_set.count() r = self.client.get(url) self.assertEqual(r.status_code, 200) - r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draftalias.pk, ))) + r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, ))) self.assertEqual(r.status_code, 302) newurl = urlreverse('ietf.doc.views_downref.downref_registry') r = self.client.get(newurl) self.assertContains(r, 'tr>th:first-child").text() + self.assertNotIn("IESG", top_level_metadata_headings) + self.assertNotIn("IANA", top_level_metadata_headings) + +class BallotEmailAjaxTests(TestCase): + def test_ajax_build_position_email(self): + def _post_json(self, url, json_to_post): + r = self.client.post( + url, json.dumps(json_to_post), content_type="application/json" + ) + self.assertEqual(r.status_code, 200) + return json.loads(r.content) + + doc = WgDraftFactory() + ad = RoleFactory( + name_id="ad", group=doc.group, person__name="Some Areadirector" + ).person + url = urlreverse("ietf.doc.views_ballot.ajax_build_position_email") + login_testing_unauthorized(self, "secretary", url) + r = self.client.get(url) + self.assertEqual(r.status_code, 405) + response = _post_json(self, url, {}) + self.assertFalse(response["success"]) + self.assertEqual(response["errors"], ["post_data not provided"]) + response = _post_json(self, url, {"dictis": "not empty"}) + self.assertFalse(response["success"]) + self.assertEqual(response["errors"], ["post_data not provided"]) + response = _post_json(self, url, {"post_data": {}}) + self.assertFalse(response["success"]) + self.assertEqual(len(response["errors"]), 7) + response = _post_json( + self, + url, + { + "post_data": { + "discuss": "aaaaaa", + "comment": "bbbbbb", + "position": "discuss", + "balloter": Person.objects.aggregate(maxpk=Max("pk") + 1)["maxpk"], + "docname": "this-draft-does-not-exist", + "cc_choices": ["doc_group_mail_list"], + "additional_cc": "foo@example.com", + } + }, + ) + self.assertFalse(response["success"]) + self.assertEqual( + response["errors"], + ["No person found matching balloter", "No document found matching docname"], + ) + response = _post_json( + self, + url, + { + "post_data": { + "discuss": "aaaaaa", + "comment": "bbbbbb", + "position": "discuss", + "balloter": ad.pk, + "docname": doc.name, + "cc_choices": ["doc_group_mail_list"], + "additional_cc": "foo@example.com", + } + }, + ) + self.assertTrue(response["success"]) + for snippet in [ + "aaaaaa", + "bbbbbb", + "DISCUSS", + ad.plain_name(), + doc.name, + doc.group.list_email, + "foo@example.com", + ]: + self.assertIn(snippet, response["text"]) + diff --git a/ietf/doc/tests_irsg_ballot.py b/ietf/doc/tests_irsg_ballot.py index 92752e48c48..d96cf9dbefe 100644 --- a/ietf/doc/tests_irsg_ballot.py +++ b/ietf/doc/tests_irsg_ballot.py @@ -288,7 +288,7 @@ def test_edit_ballot_position_permissions(self): def test_iesg_ballot_no_irsg_actions(self): ad = Person.objects.get(user__username="ad") - wg_draft = IndividualDraftFactory(ad=ad) + wg_draft = IndividualDraftFactory(ad=ad, stream_id='ietf') irsgmember = get_active_irsg()[0] url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=wg_draft.name)) @@ -355,28 +355,35 @@ def test_issue_ballot(self): def test_take_and_email_position(self): draft = RgDraftFactory() ballot = IRSGBallotDocEventFactory(doc=draft) - url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter + url = ( + urlreverse( + "ietf.doc.views_ballot.edit_position", + kwargs=dict(name=draft.name, ballot_id=ballot.pk), + ) + + self.balloter + ) empty_outbox() login_testing_unauthorized(self, self.username, url) r = self.client.get(url) self.assertEqual(r.status_code, 200) - r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email')) + empty_outbox() + r = self.client.post( + url, + dict( + position="yes", + comment="oib239sb", + send_mail="Save and send email", + cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"], + ), + ) self.assertEqual(r.status_code, 302) e = draft.latest_event(BallotPositionDocEvent) - self.assertEqual(e.pos.slug,'yes') - self.assertEqual(e.comment, 'oib239sb') - - url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter - - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff")) - self.assertEqual(r.status_code, 302) - self.assertEqual(len(outbox),1) - self.assertNotIn('discuss-criteria', get_payload_text(outbox[0])) + self.assertEqual(e.pos.slug, "yes") + self.assertEqual(e.comment, "oib239sb") + self.assertEqual(len(outbox), 1) + self.assertNotIn("discuss-criteria", get_payload_text(outbox[0])) def test_close_ballot(self): draft = RgDraftFactory() @@ -482,27 +489,31 @@ def test_cant_take_position_on_iesg_ballot(self): def test_take_and_email_position(self): draft = RgDraftFactory() ballot = IRSGBallotDocEventFactory(doc=draft) - url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + url = urlreverse( + "ietf.doc.views_ballot.edit_position", + kwargs=dict(name=draft.name, ballot_id=ballot.pk), + ) empty_outbox() login_testing_unauthorized(self, self.username, url) r = self.client.get(url) self.assertEqual(r.status_code, 200) - r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email')) + r = self.client.post( + url, + dict( + position="yes", + comment="oib239sb", + send_mail="Save and send email", + cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"], + ), + ) self.assertEqual(r.status_code, 302) e = draft.latest_event(BallotPositionDocEvent) - self.assertEqual(e.pos.slug,'yes') - self.assertEqual(e.comment, 'oib239sb') - - url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) - - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff")) + self.assertEqual(e.pos.slug, "yes") + self.assertEqual(e.comment, "oib239sb") self.assertEqual(r.status_code, 302) - self.assertEqual(len(outbox),1) + self.assertEqual(len(outbox), 1) class IESGMemberTests(TestCase): diff --git a/ietf/doc/tests_js.py b/ietf/doc/tests_js.py index 02daaae9048..9a5aad13b9c 100644 --- a/ietf/doc/tests_js.py +++ b/ietf/doc/tests_js.py @@ -41,7 +41,7 @@ def _fill_in_author_form(form_elt, name, email, affiliation, country): (By.CSS_SELECTOR, result_selector), name )) - input.send_keys('\n') # select the object + self.driver.find_element(By.CSS_SELECTOR, result_selector).click() # After the author is selected, the email select options will be populated. # Wait for that, then click on the option corresponding to the requested email. @@ -92,12 +92,8 @@ def _read_author_form(form_elt): self.assertEqual(len(author_forms), 1) # get the "add author" button so we can add blank author forms - add_author_button = self.driver.find_element(By.ID, 'add-author-button') for index, auth in enumerate(authors): - self.driver.execute_script("arguments[0].scrollIntoView();", add_author_button) # FIXME: no idea why this fails: - # self.scroll_to_element(add_author_button) # Can only click if it's in view! - self.driver.execute_script("arguments[0].click();", add_author_button) # FIXME: no idea why this fails: - # add_author_button.click() # Create a new form. Automatically scrolls to it. + self.scroll_and_click((By.ID, 'add-author-button')) # Create new form. Automatically scrolls to it. author_forms = authors_list.find_elements(By.CLASS_NAME, 'author-panel') authors_added = index + 1 self.assertEqual(len(author_forms), authors_added + 1) # Started with 1 author, hence +1 @@ -118,10 +114,9 @@ def _read_author_form(form_elt): # Must provide a "basis" (change reason) self.driver.find_element(By.ID, 'id_basis').send_keys('change testing') # Now click the 'submit' button and check that the update was accepted. - submit_button = self.driver.find_element(By.CSS_SELECTOR, 'button[type="submit"]') - self.driver.execute_script("arguments[0].click();", submit_button) # FIXME: no idea why this fails: - # self.scroll_to_element(submit_button) - # submit_button.click() + submit_button = self.driver.find_element(By.CSS_SELECTOR, '#content button[type="submit"]') + self.scroll_to_element(submit_button) + submit_button.click() # Wait for redirect to the document_main view self.wait.until( expected_conditions.url_to_be( @@ -132,4 +127,4 @@ def _read_author_form(form_elt): self.assertEqual( list(draft.documentauthor_set.values_list('person', flat=True)), [first_auth.person.pk] + [auth.pk for auth in authors] - ) \ No newline at end of file + ) diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py index 05bbc2078b6..04779bdaf14 100644 --- a/ietf/doc/tests_material.py +++ b/ietf/doc/tests_material.py @@ -6,19 +6,22 @@ import shutil import io +from unittest.mock import call, patch from pathlib import Path from pyquery import PyQuery import debug # pyflakes:ignore from django.conf import settings +from django.test import override_settings from django.urls import reverse as urlreverse from django.utils import timezone -from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent +from ietf.doc.models import Document, State, NewRevisionDocEvent +from ietf.doc.storage_utils import retrieve_str from ietf.group.factories import RoleFactory from ietf.group.models import Group -from ietf.meeting.factories import MeetingFactory, SessionFactory +from ietf.meeting.factories import MeetingFactory, SessionFactory, SessionPresentationFactory from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent from ietf.name.models import SessionStatusName from ietf.person.models import Person @@ -26,7 +29,7 @@ class GroupMaterialTests(TestCase): - settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH'] + settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH', 'FTP_DIR'] def setUp(self): super().setUp() self.materials_dir = self.tempdir("materials") @@ -35,6 +38,10 @@ def setUp(self): self.slides_dir.mkdir() self.saved_document_path_pattern = settings.DOCUMENT_PATH_PATTERN settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/" + self.assertTrue(Path(settings.FTP_DIR).exists()) + ftp_slides_dir = Path(settings.FTP_DIR) / "slides" + if not ftp_slides_dir.exists(): + ftp_slides_dir.mkdir() self.meeting_slides_dir = Path(settings.AGENDA_PATH) / "42" / "slides" if not self.meeting_slides_dir.exists(): @@ -54,7 +61,6 @@ def create_slides(self): doc = Document.objects.create(name="slides-testteam-test-file", rev="01", type_id="slides", group=group) doc.set_state(State.objects.get(type="slides", slug="active")) doc.set_state(State.objects.get(type="reuse_policy", slug="multiple")) - DocAlias.objects.create(name=doc.name).docs.add(doc) NewRevisionDocEvent.objects.create(doc=doc,by=Person.objects.get(name="(System)"),rev='00',type='new_revision',desc='New revision available') NewRevisionDocEvent.objects.create(doc=doc,by=Person.objects.get(name="(System)"),rev='01',type='new_revision',desc='New revision available') @@ -111,8 +117,16 @@ def test_upload_slides(self): self.assertEqual(doc.title, "Test File - with fancy title") self.assertEqual(doc.get_state_slug(), "active") - with io.open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f: + basename=f"{doc.name}-{doc.rev}.pdf" + filepath=Path(self.materials_dir) / "slides" / basename + with filepath.open() as f: self.assertEqual(f.read(), content) + ftp_filepath=Path(settings.FTP_DIR) / "slides" / basename + with ftp_filepath.open() as f: + self.assertEqual(f.read(), content) + # This test is very sloppy wrt the actual file content. + # Working with/around that for the moment. + self.assertEqual(retrieve_str("slides", basename), content) # check that posting same name is prevented test_file.seek(0) @@ -136,19 +150,47 @@ def test_change_state(self): doc = Document.objects.get(name=doc.name) self.assertEqual(doc.get_state_slug(), "deleted") - def test_edit_title(self): + @override_settings(MEETECHO_API_CONFIG="fake settings") + @patch("ietf.doc.views_material.SlidesManager") + def test_edit_title(self, mock_slides_manager_cls): doc = self.create_slides() url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="title")) login_testing_unauthorized(self, "secretary", url) + self.assertFalse(mock_slides_manager_cls.called) # post r = self.client.post(url, dict(title="New title")) self.assertEqual(r.status_code, 302) doc = Document.objects.get(name=doc.name) self.assertEqual(doc.title, "New title") + self.assertFalse(mock_slides_manager_cls.return_value.send_update.called) + + # assign to a session to see that it now sends updates to Meetecho + session = SessionPresentationFactory(session__group=doc.group, document=doc).session + + # Grab the title on the slides when the API call was made (to be sure it's not before it was updated) + titles_sent = [] + mock_slides_manager_cls.return_value.send_update.side_effect = lambda sess: titles_sent.extend( + list(sess.presentations.values_list("document__title", flat=True)) + ) + + r = self.client.post(url, dict(title="Newer title")) + self.assertEqual(r.status_code, 302) + doc = Document.objects.get(name=doc.name) + self.assertEqual(doc.title, "Newer title") + self.assertTrue(mock_slides_manager_cls.called) + self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings")) + self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1) + self.assertEqual( + mock_slides_manager_cls.return_value.send_update.call_args, + call(session), + ) + self.assertEqual(titles_sent, ["Newer title"]) - def test_revise(self): + @override_settings(MEETECHO_API_CONFIG="fake settings") + @patch("ietf.doc.views_material.SlidesManager") + def test_revise(self, mock_slides_manager_cls): doc = self.create_slides() session = SessionFactory( @@ -166,11 +208,18 @@ def test_revise(self): url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="revise")) login_testing_unauthorized(self, "secretary", url) + self.assertFalse(mock_slides_manager_cls.called) content = "some text" test_file = io.StringIO(content) test_file.name = "unnamed.txt" + # Grab the title on the slides when the API call was made (to be sure it's not before it was updated) + titles_sent = [] + mock_slides_manager_cls.return_value.send_update.side_effect = lambda sess: titles_sent.extend( + list(sess.presentations.values_list("document__title", flat=True)) + ) + # post r = self.client.post(url, dict(title="New title", abstract="New abstract", @@ -181,7 +230,17 @@ def test_revise(self): self.assertEqual(doc.rev, "02") self.assertEqual(doc.title, "New title") self.assertEqual(doc.get_state_slug(), "active") + self.assertTrue(mock_slides_manager_cls.called) + self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings")) + self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1) + self.assertEqual( + mock_slides_manager_cls.return_value.send_update.call_args, + call(session), + ) + self.assertEqual(titles_sent, ["New title"]) with io.open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")) as f: self.assertEqual(f.read(), content) + self.assertEqual(retrieve_str("slides", f"{doc.name}-{doc.rev}.txt"), content) + diff --git a/ietf/doc/tests_models.py b/ietf/doc/tests_models.py new file mode 100644 index 00000000000..d835f646fb6 --- /dev/null +++ b/ietf/doc/tests_models.py @@ -0,0 +1,113 @@ +# Copyright The IETF Trust 2016-2023, All Rights Reserved +# -*- coding: utf-8 -*- + +import itertools + +from ietf.doc.factories import WgRfcFactory +from ietf.doc.models import RelatedDocument +from ietf.utils.test_utils import TestCase + + +class RelatedDocumentTests(TestCase): + def test_is_downref(self): + rfcs = [ + WgRfcFactory(std_level_id=lvl) + for lvl in ["inf", "exp", "bcp", "ps", "ds", "std", "unkn"] + ] + + result_matrix = { + # source + "inf": { + "inf": None, # target + "exp": None, # target + "bcp": None, # target + "ps": None, # target + "ds": None, # target + "std": None, # target + "unkn": None, # target + }, + # source + "exp": { + "inf": None, # target + "exp": None, # target + "bcp": None, # target + "ps": None, # target + "ds": None, # target + "std": None, # target + "unkn": None, # target + }, + # source + "bcp": { + "inf": "Downref", # target + "exp": "Downref", # target + "bcp": None, # target + "ps": None, # target + "ds": None, # target + "std": None, # target + "unkn": "Possible Downref", # target + }, + # source + "ps": { + "inf": "Downref", # target + "exp": "Downref", # target + "bcp": None, # target + "ps": None, # target + "ds": None, # target + "std": None, # target + "unkn": "Possible Downref", # target + }, + # source + "ds": { + "inf": "Downref", # target + "exp": "Downref", # target + "bcp": None, # target + "ps": "Downref", # target + "ds": None, # target + "std": None, # target + "unkn": "Possible Downref", # target + }, + # source + "std": { + "inf": "Downref", # target + "exp": "Downref", # target + "bcp": None, # target + "ps": "Downref", # target + "ds": "Downref", # target + "std": None, # target + "unkn": "Possible Downref", # target + }, + # source + "unkn": { + "inf": None, # target + "exp": None, # target + "bcp": None, # target + "ps": "Possible Downref", # target + "ds": "Possible Downref", # target + "std": None, # target + "unkn": "Possible Downref", # target + }, + } + + for rel in ["refnorm", "refinfo", "refunk", "refold"]: + for source, target in itertools.product(rfcs, rfcs): + ref = RelatedDocument.objects.create( + source=source, + target=target, + relationship_id=rel, + ) + + result = ref.is_downref() + + desired_result = ( + result_matrix[source.std_level_id][target.std_level_id] + if ref.relationship.slug in ["refnorm", "refunk"] + else None + ) + if ( + ref.relationship.slug == "refunk" + and desired_result is not None + and not desired_result.startswith("Possible") + ): + desired_result = f"Possible {desired_result}" + + self.assertEqual(desired_result, result) diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index 1f84303a91f..8c1fc99ffe2 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -1,13 +1,14 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved +# Copyright The IETF Trust 2016-2023, All Rights Reserved # -*- coding: utf-8 -*- -import datetime, os, shutil +from pathlib import Path +import datetime import io -import tarfile, tempfile, mailbox -import email.mime.multipart, email.mime.text, email.utils +import os +import shutil -from mock import patch +from unittest.mock import patch, Mock from requests import Response from django.apps import apps @@ -19,11 +20,12 @@ import debug # pyflakes:ignore +from ietf.doc.storage_utils import retrieve_str import ietf.review.mailarch from ietf.doc.factories import ( NewRevisionDocEventFactory, IndividualDraftFactory, WgDraftFactory, WgRfcFactory, ReviewFactory, DocumentFactory) -from ietf.doc.models import ( Document, DocumentAuthor, RelatedDocument, DocEvent, ReviewRequestDocEvent, +from ietf.doc.models import ( DocumentAuthor, RelatedDocument, DocEvent, ReviewRequestDocEvent, ReviewAssignmentDocEvent, ) from ietf.group.factories import RoleFactory, ReviewTeamFactory from ietf.group.models import Group @@ -47,6 +49,7 @@ def setUp(self): self.review_dir = self.tempdir('review') self.old_document_path_pattern = settings.DOCUMENT_PATH_PATTERN settings.DOCUMENT_PATH_PATTERN = self.review_dir + "/{doc.type_id}/" + (Path(settings.FTP_DIR) / "review").mkdir() self.review_subdir = os.path.join(self.review_dir, "review") if not os.path.exists(self.review_subdir): @@ -57,6 +60,17 @@ def tearDown(self): settings.DOCUMENT_PATH_PATTERN = self.old_document_path_pattern super().tearDown() + def verify_review_files_were_written(self, assignment, expected_content = "This is a review\nwith two lines"): + review_file = Path(self.review_subdir) / f"{assignment.review.name}.txt" + content = review_file.read_text() + self.assertEqual(content, expected_content) + self.assertEqual( + retrieve_str("review", review_file.name), + expected_content + ) + review_ftp_file = Path(settings.FTP_DIR) / "review" / review_file.name + self.assertTrue(review_file.samefile(review_ftp_file)) + def test_request_review(self): doc = WgDraftFactory(group__acronym='mars',rev='01') NewRevisionDocEventFactory(doc=doc,rev='01') @@ -137,10 +151,18 @@ def test_request_review_of_rfc(self): url = urlreverse('ietf.doc.views_review.request_review', kwargs={ "name": doc.name }) login_testing_unauthorized(self, "ad", url) - # get should fail + # get should fail - all non draft types 404 + r = self.client.get(url) + self.assertEqual(r.status_code, 404) + + # Can only request reviews on active draft documents + doc = WgDraftFactory(states=[("draft","rfc")]) + url = urlreverse('ietf.doc.views_review.request_review', kwargs={ "name": doc.name }) r = self.client.get(url) self.assertEqual(r.status_code, 403) + + def test_doc_page(self): doc = WgDraftFactory(group__acronym='mars',rev='01') @@ -153,8 +175,8 @@ def test_doc_page(self): # check we can fish it out old_doc = WgDraftFactory(name="draft-foo-mars-test") older_doc = WgDraftFactory(name="draft-older") - RelatedDocument.objects.create(source=old_doc, target=older_doc.docalias.first(), relationship_id='replaces') - RelatedDocument.objects.create(source=doc, target=old_doc.docalias.first(), relationship_id='replaces') + RelatedDocument.objects.create(source=old_doc, target=older_doc, relationship_id='replaces') + RelatedDocument.objects.create(source=doc, target=old_doc, relationship_id='replaces') review_req.doc = older_doc review_req.save() @@ -355,6 +377,42 @@ def test_assign_reviewer(self): request_events = review_req.reviewrequestdocevent_set.all() self.assertEqual(request_events.count(), 0) + def test_assign_reviewer_after_reject(self): + doc = WgDraftFactory() + review_team = ReviewTeamFactory() + rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer') + reviewer_email = Email.objects.get(person__user__username="reviewer") + RoleFactory(group=review_team,person__user__username='reviewsecretary',name_id='secr') + review_req = ReviewRequestFactory(team=review_team,doc=doc) + ReviewAssignmentFactory(review_request=review_req, state_id='rejected', reviewer=rev_role.person.email_set.first()) + + url = urlreverse('ietf.doc.views_review.assign_reviewer', kwargs={ "name": doc.name, "request_id": review_req.pk }) + login_testing_unauthorized(self, "reviewsecretary", url) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + reviewer_label = q("option[value=\"{}\"]".format(reviewer_email.address)).text().lower() + self.assertIn("rejected review of document before", reviewer_label) + + def test_assign_reviewer_after_withdraw(self): + doc = WgDraftFactory() + review_team = ReviewTeamFactory() + rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer') + RoleFactory(group=review_team,person__user__username='reviewsecretary',name_id='secr') + review_req = ReviewRequestFactory(team=review_team,doc=doc) + reviewer = rev_role.person.email_set.first() + ReviewAssignmentFactory(review_request=review_req, state_id='withdrawn', reviewer=reviewer) + req_url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk }) + assign_url = urlreverse('ietf.doc.views_review.assign_reviewer', kwargs={ "name": doc.name, "request_id": review_req.pk }) + + login_testing_unauthorized(self, "reviewsecretary", assign_url) + r = self.client.post(assign_url, { "action": "assign", "reviewer": reviewer.pk }) + self.assertRedirects(r, req_url) + review_req = reload_db_objects(review_req) + assignment = review_req.reviewassignment_set.last() + self.assertEqual(assignment.state, ReviewAssignmentStateName.objects.get(slug='assigned')) + self.assertEqual(review_req.state, ReviewRequestStateName.objects.get(slug='assigned')) + def test_previously_reviewed_replaced_doc(self): review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut")) rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',person__name='Some Reviewer',name_id='reviewer') @@ -418,9 +476,50 @@ def test_reject_reviewer_assignment(self): r = self.client.get(req_url) self.assertEqual(r.status_code, 200) self.assertContains(r, reject_url) + + # anonymous user should not be able to reject + self.client.logout() + r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" }) + self.assertEqual(r.status_code, 302) # forwards to login page + assignment = reload_db_objects(assignment) + self.assertEqual(assignment.state_id, "accepted") + + # unrelated person should not be able to reject + other_person = PersonFactory() + login_testing_unauthorized(self, other_person.user.username, reject_url) + r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" }) + self.assertEqual(r.status_code, 403) + assignment = reload_db_objects(assignment) + self.assertEqual(assignment.state_id, "accepted") + + # Check that user can reject it + login_testing_unauthorized(self, assignment.reviewer.person.user.username, reject_url) + r = self.client.get(reject_url) + self.assertEqual(r.status_code, 200) + self.assertContains(r, escape(assignment.reviewer.person.name)) + self.assertNotContains(r, 'can not be rejected') + self.assertContains(r, ' -
    • -
    • - - + {% bootstrap_form form %} +
    + + + +
    diff --git a/ietf/secr/templates/announcement/index.html b/ietf/secr/templates/announcement/index.html new file mode 100644 index 00000000000..ad7226e3bc1 --- /dev/null +++ b/ietf/secr/templates/announcement/index.html @@ -0,0 +1,31 @@ +{# Copyright The IETF Trust 2024, All Rights Reserved #} +{% extends "base.html" %} +{% load static %} +{% load ietf_filters %} +{% load django_bootstrap5 %} +{% block title %}Announcement{% endblock %} +{% block content %} +

    Announcement

    + {% if form.non_field_errors %}
    {{ form.non_field_errors }}
    {% endif %} + +
    + {% csrf_token %} + {% bootstrap_field form.nomcom layout='horizontal' %} + {% bootstrap_field form.to layout='horizontal' %} + {% bootstrap_field form.to_custom layout='horizontal' %} + {% bootstrap_field form.frm layout='horizontal' %} + {% bootstrap_field form.cc layout='horizontal' %} + {% bootstrap_field form.bcc layout='horizontal' %} + {% bootstrap_field form.reply_to layout='horizontal' %} + {% bootstrap_field form.subject layout='horizontal' %} + {% bootstrap_field form.body layout='horizontal' %} + + + Cancel +
    + +{% endblock %} +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/announcement/main.html b/ietf/secr/templates/announcement/main.html deleted file mode 100644 index c88b4a2406c..00000000000 --- a/ietf/secr/templates/announcement/main.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "base_site.html" %} - -{% block title %}Announcement{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Announcement -{% endblock %} - -{% block content %} - -
    -

    Announcement

    - -
    {% csrf_token %} - - - {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %} - {% for field in form.visible_fields %} - - - - - {% endfor %} - -
    {{ field.label_tag }}{% if field.field.required %} *{% endif %}{{ field.errors }}{{ field }}{% if field.help_text %}
    {{ field.help_text }}{% endif %}
    -
    -
      -
      • -
      • -
    -
    - -
    -
    - -{% endblock %} diff --git a/ietf/secr/templates/areas/list.html b/ietf/secr/templates/areas/list.html deleted file mode 100644 index a0ed1ae4a37..00000000000 --- a/ietf/secr/templates/areas/list.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} -{% block title %}Areas{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Areas -{% endblock %} - -{% block content %} - -
    -

    Areas

    - - - - - - - - - - {% for item in results %} - - - - - - {% endfor %} - -
    NameAcronymStatus
    {{ item.name }}{{ item.acronym }}{{ item.state }}
    - -
    -
      -
    -
    -
    - -{% endblock %} diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html deleted file mode 100644 index e84dc1a7988..00000000000 --- a/ietf/secr/templates/areas/people.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} -{% block title %}Areas - People{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Areas - » {{ area.acronym }} - » People -{% endblock %} - -{% block content %} - -
    -

    Area Directors ({{ area.acronym }})

    - - {% for director in directors %} - {% csrf_token %} - - - - - {% endif %} - - - - {% endfor %} -
    {{ director.person.name }}{% if director.name.slug == "ad" %} - Voting Enabled - {% else %} -
    - -
    -

    Add new Director

    -

    -

    {% csrf_token %} - - - - {{ form.as_table }} - - - - - -
    -
    -
    - -
    -
      -
      • -
    -
    -
    - -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/areas/view.html b/ietf/secr/templates/areas/view.html deleted file mode 100644 index e3ecac70a1f..00000000000 --- a/ietf/secr/templates/areas/view.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} -{% block title %}Areas - View{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Areas - » {{ area.acronym }} -{% endblock %} - -{% block content %} - -
    -

    Area - View

    - - - - - - - - - - -
    Area Acronym:{{ area.acronym }}
    Area Name:{{ area.name }}
    Status:{{ area.state }}
    Start Date:{{ area.start_date|date:"Y-m-d" }}
    Concluded Date:{{ area.concluded_date|date:"Y-m-d" }}
    Last Modified Date:{{ area.time|date:"Y-m-d" }}
    Comments:{{ area.comments}}
    - -
    -

    Directors

    - - - {% for director in directors %} - - {% endfor %} - -
    {{ director.person.name }}{% if director.name.slug == "pre-ad" %} (Incoming){% endif %}
    -
    - -
    -
      - -
      • -
      • -
    -
    -
    - -{% endblock %} diff --git a/ietf/secr/templates/base_secr.html b/ietf/secr/templates/base_secr.html index 47b893f0439..18d77e47bae 100644 --- a/ietf/secr/templates/base_secr.html +++ b/ietf/secr/templates/base_secr.html @@ -1,5 +1,5 @@ -{% load staticfiles %} +{% load static %} diff --git a/ietf/secr/templates/base_secr_bootstrap.html b/ietf/secr/templates/base_secr_bootstrap.html index 2eee566a121..a326346847b 100644 --- a/ietf/secr/templates/base_secr_bootstrap.html +++ b/ietf/secr/templates/base_secr_bootstrap.html @@ -1,5 +1,5 @@ -{% load staticfiles %} +{% load static %} diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html index d369a40ec17..5e3ddc62d86 100644 --- a/ietf/secr/templates/base_site.html +++ b/ietf/secr/templates/base_site.html @@ -1,7 +1,7 @@ {% extends "base_secr.html" %} {% load i18n %} {% load ietf_filters %} -{% load staticfiles %} +{% load static %} {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}{% endblock %} diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html index c1c2fdac6b7..1653b26b856 100644 --- a/ietf/secr/templates/base_site_bootstrap.html +++ b/ietf/secr/templates/base_site_bootstrap.html @@ -1,7 +1,7 @@ {% extends "base_secr_bootstrap.html" %} {% load i18n %} {% load ietf_filters %} -{% load staticfiles %} +{% load static %} {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %} diff --git a/ietf/secr/templates/confirm_cancel.html b/ietf/secr/templates/confirm_cancel.html index 6bae631a7ec..541c82863fb 100644 --- a/ietf/secr/templates/confirm_cancel.html +++ b/ietf/secr/templates/confirm_cancel.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Confirm Cancel{% endblock %} diff --git a/ietf/secr/templates/confirm_delete.html b/ietf/secr/templates/confirm_delete.html index ccfc7b1c2fc..3f8fd19c8fa 100644 --- a/ietf/secr/templates/confirm_delete.html +++ b/ietf/secr/templates/confirm_delete.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Confirm Delete{% endblock %} diff --git a/ietf/secr/templates/console/main.html b/ietf/secr/templates/console/main.html deleted file mode 100644 index 5aadefc558a..00000000000 --- a/ietf/secr/templates/console/main.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "base_site.html" %} - -{% block title %}Console{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Console -{% endblock %} - -{% block content %} - -
    -

    Console

    - - - - - -
    Latest DocEvent{{ latest_docevent }}
    - -
    - -{% endblock %} diff --git a/ietf/secr/templates/includes/activities.html b/ietf/secr/templates/includes/activities.html deleted file mode 100644 index 3e79c9aed48..00000000000 --- a/ietf/secr/templates/includes/activities.html +++ /dev/null @@ -1,23 +0,0 @@ -

    Activies Log

    -
    - - - - - - - - - - - {% for entry in activities %} - - - - - - - {% endfor %} - -
    DateTimeActionName
    {{ entry.act_date }}{{ entry.act_time }}{{ entry.activity }}{{ entry.act_by }}
    -
    diff --git a/ietf/secr/templates/includes/buttons_next_cancel.html b/ietf/secr/templates/includes/buttons_next_cancel.html deleted file mode 100644 index 95d25f55bcc..00000000000 --- a/ietf/secr/templates/includes/buttons_next_cancel.html +++ /dev/null @@ -1,6 +0,0 @@ -
    -
      -
      • -
      • -
    -
    diff --git a/ietf/secr/templates/includes/buttons_submit_cancel.html b/ietf/secr/templates/includes/buttons_submit_cancel.html deleted file mode 100644 index df40c982559..00000000000 --- a/ietf/secr/templates/includes/buttons_submit_cancel.html +++ /dev/null @@ -1,6 +0,0 @@ -
    -
      -
      • -
      • -
    -
    diff --git a/ietf/secr/templates/includes/sessions_footer.html b/ietf/secr/templates/includes/sessions_footer.html deleted file mode 100755 index 2a26440047f..00000000000 --- a/ietf/secr/templates/includes/sessions_footer.html +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html deleted file mode 100755 index cd36fe45f1d..00000000000 --- a/ietf/secr/templates/includes/sessions_request_form.html +++ /dev/null @@ -1,139 +0,0 @@ -* Required Field -
    {% csrf_token %} - {{ form.session_forms.management_form }} - {% if form.non_field_errors %} - {{ form.non_field_errors }} - {% endif %} - - - - - - {% if group.features.acts_like_wg %} - - {% if not is_virtual %} - - {% endif %} - - {% else %}{# else not group.features.acts_like_wg #} - {% for session_form in form.session_forms %} - - {% endfor %} - {% endif %} - - - - - - - - - - {% if not is_virtual %} - - - - - - - - - - - - - - - - - - - - - - - {% endif %} - - - - - - {% if form.notifications_optional %} - - - - - {% endif %} - -
    Working Group Name:{{ group.name }} ({{ group.acronym }})
    Area Name:{% if group.parent %}{{ group.parent.name }} ({{ group.parent.acronym }}){% endif %}
    Number of Sessions:*{{ form.num_session.errors }}{{ form.num_session }}
    Session 1:*{% include 'meeting/session_details_form.html' with form=form.session_forms.0 hide_onsite_tool_prompt=True only %}
    Session 2:*{% include 'meeting/session_details_form.html' with form=form.session_forms.1 hide_onsite_tool_prompt=True only %}
    Time between two sessions:{{ form.session_time_relation.errors }}{{ form.session_time_relation }}
    Additional Session Request:{{ form.third_session }} Check this box to request an additional session.
    - Additional slot may be available after agenda scheduling has closed and with the approval of an Area Director.
    -
    - Third Session: - {% include 'meeting/session_details_form.html' with form=form.session_forms.2 hide_onsite_tool_prompt=True only %} -
    -
    Session {{ forloop.counter }}:*{% include 'meeting/session_details_form.html' with form=session_form only %}
    Number of Attendees:{% if not is_virtual %}*{% endif %}{{ form.attendees.errors }}{{ form.attendees }}
    Participants who must be present: - {{ form.bethere.errors }} - {{ form.bethere }} -

    - Do not include Area Directors and WG Chairs; the system already tracks their availability. -

    -
    Conflicts to Avoid: - - - - - - - {% for cname, cfield, cselector in form.wg_constraint_fields %} - - {% if forloop.first %}{% endif %} - - - - {% empty %}{# shown if there are no constraint fields #} - - {% endfor %} - {% if form.inactive_wg_constraints %} - {% for cname, value, field in form.inactive_wg_constraints %} - - {% if forloop.first %} - - {% endif %} - - - - {% endfor %} - {% endif %} - - - - - -
    Other WGs that included {{ group.name }} in their conflict lists:{{ session_conflicts.inbound|default:"None" }}
    WG Sessions:
    You may select multiple WGs within each category    		{{ cname|title }}{{ cselector }} -
    - {{ cfield.errors }}{{ cfield }} -
    No constraints are enabled for this meeting.
    - Disabled for this meeting - {{ cname|title }}
    {{ field }} {{ field.label }}
    BOF Sessions:If the sessions can not be found in the fields above, please enter free form requests in the Special Requests field below.
    -
    Resources requested: - {{ form.resources.errors }} {{ form.resources }} -
    Times during which this WG can not meet:
    Please explain any selections in Special Requests below.    		{{ form.timeranges.errors }}{{ form.timeranges }}
    - Plan session adjacent with another WG:
    - (Immediately before or after another WG, no break in between, in the same room.) -     		{{ form.adjacent_with_wg.errors }}{{ form.adjacent_with_wg }}
    - Joint session with:
    - (To request one session for multiple WGs together.) -     		{{ form.joint_with_groups_selector }} -
    - {{ form.joint_with_groups.errors }}{{ form.joint_with_groups }} -
    - Of the sessions requested by this WG, the joint session, if applicable, is: - {{ form.joint_for_session.errors }}{{ form.joint_for_session }}
    Special Requests:
     
    i.e. restrictions on meeting times / days, etc.
    (limit 200 characters)    		{{ form.comments.errors }}{{ form.comments }}
    {{ form.send_notifications.label }}{{ form.send_notifications.errors }}{{ form.send_notifications }}
    - -
    -
      -
      • -
      • -
    -
    -
    \ No newline at end of file diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html deleted file mode 100644 index bc6aef06116..00000000000 --- a/ietf/secr/templates/includes/sessions_request_view.html +++ /dev/null @@ -1,73 +0,0 @@ -{% load ams_filters %} - - - - - - {% if form %} - {% include 'includes/sessions_request_view_formset.html' with formset=form.session_forms group=group session=session only %} - {% else %} - {% include 'includes/sessions_request_view_session_set.html' with session_set=sessions group=group session=session only %} - {% endif %} - - - - - - - - - - {% if not is_virtual %} - - - - - {% endif %} - - - - - - - - - {% if not is_virtual %} - - - - - - - - - {% endif %} - - {% if form and form.notifications_optional %} - - - - - {% endif %} - -
    Working Group Name:{{ group.name }} ({{ group.acronym }})
    Area Name:{{ group.parent }}
    Number of Sessions Requested:{% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %}
    Number of Attendees:{{ session.attendees }}
    Conflicts to Avoid: - {% if session_conflicts.outbound %} - - - {% for conflict in session_conflicts.outbound %} - - {% endfor %} - -
    {{ conflict.name|title }}: {{ conflict.groups }}
    - {% else %}None{% endif %} -
    Other WGs that included {{ group }} in their conflict list:{% if session_conflicts.inbound %}{{ session_conflicts.inbound }}{% else %}None so far{% endif %}
    Resources requested:{% if session.resources %}
      {% for resource in session.resources %}
    • {{ resource.desc }}
      • {% endfor %}
    {% else %}None so far{% endif %}
    Participants who must be present:{% if session.bethere %}
      {% for person in session.bethere %}
    • {{ person }}
      • {% endfor %}
    {% else %}None{% endif %}
    Can not meet on:{% if session.timeranges_display %}{{ session.timeranges_display|join:', ' }}{% else %}No constraints{% endif %}
    Adjacent with WG:{{ session.adjacent_with_wg|default:'No preference' }}
    Joint session: - {% if session.joint_with_groups %} - {{ session.joint_for_session_display }} with: {{ session.joint_with_groups }} - {% else %} - Not a joint session - {% endif %} -
    Special Requests:{{ session.comments }}
    - {{ form.send_notifications.label}} - - {% if form.cleaned_data.send_notifications %}Yes{% else %}No{% endif %} -
    \ No newline at end of file diff --git a/ietf/secr/templates/includes/sessions_request_view_formset.html b/ietf/secr/templates/includes/sessions_request_view_formset.html deleted file mode 100644 index 80cad8d829e..00000000000 --- a/ietf/secr/templates/includes/sessions_request_view_formset.html +++ /dev/null @@ -1,32 +0,0 @@ -{% load ams_filters %}{# keep this in sync with sessions_request_view_session_set.html #} -{% for sess_form in formset %}{% if sess_form.cleaned_data and not sess_form.cleaned_data.DELETE %} - - Session {{ forloop.counter }}: - -
    -
    Length
    -
    {{ sess_form.cleaned_data.requested_duration.total_seconds|display_duration }}
    - {% if sess_form.cleaned_data.name %} -
    Name
    -
    {{ sess_form.cleaned_data.name }}
    {% endif %} - {% if sess_form.cleaned_data.purpose.slug != 'regular' %} -
    Purpose
    -
    - {{ sess_form.cleaned_data.purpose }} - {% if sess_form.cleaned_data.purpose.timeslot_types|length > 1 %}({{ sess_form.cleaned_data.type }} - ){% endif %} -
    -
    Onsite tool?
    -
    {{ sess_form.cleaned_data.has_onsite_tool|yesno }}
    - {% endif %} -
    - - - {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %} - - Time between sessions: - {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No - preference{% endif %} - - {% endif %} -{% endif %}{% endfor %} \ No newline at end of file diff --git a/ietf/secr/templates/includes/sessions_request_view_session_set.html b/ietf/secr/templates/includes/sessions_request_view_session_set.html deleted file mode 100644 index a434b9d22b5..00000000000 --- a/ietf/secr/templates/includes/sessions_request_view_session_set.html +++ /dev/null @@ -1,32 +0,0 @@ -{% load ams_filters %}{# keep this in sync with sessions_request_view_formset.html #} -{% for sess in session_set %} - - Session {{ forloop.counter }}: - -
    -
    Length
    -
    {{ sess.requested_duration.total_seconds|display_duration }}
    - {% if sess.name %} -
    Name
    -
    {{ sess.name }}
    {% endif %} - {% if sess.purpose.slug != 'regular' %} -
    Purpose
    -
    - {{ sess.purpose }} - {% if sess.purpose.timeslot_types|length > 1 %}({{ sess.type }} - ){% endif %} -
    -
    Onsite tool?
    -
    {{ sess.has_onsite_tool|yesno }}
    - {% endif %} -
    - - - {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %} - - Time between sessions: - {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No - preference{% endif %} - - {% endif %} -{% endfor %} \ No newline at end of file diff --git a/ietf/secr/templates/index.html b/ietf/secr/templates/index.html new file mode 100644 index 00000000000..9ea70212793 --- /dev/null +++ b/ietf/secr/templates/index.html @@ -0,0 +1,31 @@ +{# Copyright The IETF Trust 2007-2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static %} +{% load ietf_filters %} +{% block title %}Secretariat Dashboard{% endblock %} +{% block content %} +

    Secretariat Dashboard

    +
    + {% if user|has_role:"Secretariat" %} +

    IESG

    + + +

    IDs and WGs Process

    + + +

    Meetings and Proceedings

    + + {% else %} + + {% endif %} +
    +{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/main.html b/ietf/secr/templates/main.html deleted file mode 100644 index 455895c76d5..00000000000 --- a/ietf/secr/templates/main.html +++ /dev/null @@ -1,77 +0,0 @@ -{% extends "base_site.html" %} -{% load ietf_filters %} - -{% block content %} -
    - - {% if user|has_role:"Secretariat" %} - - - - - - - - - - - - -
    -

    IESG

    - -     		-

    IDs and WGs Process

    - -
    -

    Meetings and Proceedings

    - -     		-

    IPR

    - -
    - - {% else %} - - - - - - - - - - - - -
    -

    Section 1

    - -     		-

    Section 2

    -
    -

    Section 3

    -     		-

    Section 4

    -
    - - {% endif %} - -
    -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/meetings/add.html b/ietf/secr/templates/meetings/add.html index 5a782552653..b2cc2617dc3 100644 --- a/ietf/secr/templates/meetings/add.html +++ b/ietf/secr/templates/meetings/add.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings - Add{% endblock %} diff --git a/ietf/secr/templates/meetings/base_rooms_times.html b/ietf/secr/templates/meetings/base_rooms_times.html index f856b1f62c6..263418fabf9 100644 --- a/ietf/secr/templates/meetings/base_rooms_times.html +++ b/ietf/secr/templates/meetings/base_rooms_times.html @@ -1,5 +1,5 @@ {% extends "base_site_bootstrap.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings{% endblock %} diff --git a/ietf/secr/templates/meetings/blue_sheet.html b/ietf/secr/templates/meetings/blue_sheet.html deleted file mode 100644 index d67efd9f636..00000000000 --- a/ietf/secr/templates/meetings/blue_sheet.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Meetings - Blue Sheet{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Meetings - » {{ meeting.number }} - » Blue Sheets -{% endblock %} - -{% block content %} - -
    -

    IETF {{ meeting.number }} - Blue Sheet

    - -

    Use this to generate blue sheets for meeting sessions.

    -
      -
    • -
      {% csrf_token %} - -
      -   Last run: - {% if last_run %} - {{ last_run }} - {% else %} - Never - {% endif %} -
      • -
    -

    Use this to download the blue sheets from the server.

    -
      -
    • - -
      • -
    - -
    -

    - Use the session details page for a group to upload scanned bluesheets. The session details pages for a group can be reached from the meeting's materials page. -

    -
    - -{% endblock %} diff --git a/ietf/secr/templates/meetings/edit_meeting.html b/ietf/secr/templates/meetings/edit_meeting.html index 773536e654a..474373dbee6 100644 --- a/ietf/secr/templates/meetings/edit_meeting.html +++ b/ietf/secr/templates/meetings/edit_meeting.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings - Edit{% endblock %} diff --git a/ietf/secr/templates/meetings/main.html b/ietf/secr/templates/meetings/main.html index 90c38028921..ff110dd9782 100755 --- a/ietf/secr/templates/meetings/main.html +++ b/ietf/secr/templates/meetings/main.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings{% endblock %} diff --git a/ietf/secr/templates/meetings/notifications.html b/ietf/secr/templates/meetings/notifications.html index bf7099577eb..dbe66ff283e 100644 --- a/ietf/secr/templates/meetings/notifications.html +++ b/ietf/secr/templates/meetings/notifications.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings{% endblock %} diff --git a/ietf/secr/templates/meetings/regular_session_edit.html b/ietf/secr/templates/meetings/regular_session_edit.html index fbfba4f967f..9993858be11 100644 --- a/ietf/secr/templates/meetings/regular_session_edit.html +++ b/ietf/secr/templates/meetings/regular_session_edit.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles tz %} +{% load static tz %} {% block title %}Meetings{% endblock %} diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html index d552d38dcae..89bd8f7e03d 100644 --- a/ietf/secr/templates/meetings/view.html +++ b/ietf/secr/templates/meetings/view.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Meetings{% endblock %} @@ -37,7 +37,6 @@

    IETF {{ meeting.number }} - View

      • -
    • diff --git a/ietf/secr/templates/rolodex/add.html b/ietf/secr/templates/rolodex/add.html index 272b844fa30..5adb738f2b0 100644 --- a/ietf/secr/templates/rolodex/add.html +++ b/ietf/secr/templates/rolodex/add.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Rolodex - Add{% endblock %} diff --git a/ietf/secr/templates/rolodex/edit.html b/ietf/secr/templates/rolodex/edit.html index 28a125f1041..ed4c0f97e2e 100644 --- a/ietf/secr/templates/rolodex/edit.html +++ b/ietf/secr/templates/rolodex/edit.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Rolodex - Edit{% endblock %} diff --git a/ietf/secr/templates/rolodex/search.html b/ietf/secr/templates/rolodex/search.html index 8994cfabd17..065b0463f89 100644 --- a/ietf/secr/templates/rolodex/search.html +++ b/ietf/secr/templates/rolodex/search.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Rolodex - Search{% endblock %} diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html index 73d1c3f58ba..d1a78cfaa54 100644 --- a/ietf/secr/templates/rolodex/view.html +++ b/ietf/secr/templates/rolodex/view.html @@ -44,7 +44,7 @@

      Roles

      {{ role.name }} {% if role.group.type.slug == "area" %} - {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} + {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} {% else %} {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %} {% endif %} diff --git a/ietf/secr/templates/sreq/confirm.html b/ietf/secr/templates/sreq/confirm.html deleted file mode 100755 index 4215c89c309..00000000000 --- a/ietf/secr/templates/sreq/confirm.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Sessions - Confirm{% endblock %} - -{% block extrastyle %} - -{% endblock %} - -{% block extrahead %}{{ block.super }} - - {{ form.media }} -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions - » New - » Session Request Confirmation -{% endblock %} - -{% block content %} - -
      -

      Sessions - Confirm

      - - {% include "includes/sessions_request_view.html" %} - - {% if group.features.acts_like_wg and form.session_forms.forms_to_keep|length > 2 %} -
      -

      - - Note: Your request for a third session must be approved by an area director before - being submitted to agenda@ietf.org. Click "Submit" below to email an approval - request to the area directors. - -

      -
      - {% endif %} - -
      - {% csrf_token %} - {{ form }} - {{ form.session_forms.management_form }} - {% for sf in form.session_forms %} - {% include 'meeting/session_details_form.html' with form=sf hidden=True only %} - {% endfor %} - {% include "includes/buttons_submit_cancel.html" %} -
      - -
      - -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/edit.html b/ietf/secr/templates/sreq/edit.html deleted file mode 100755 index b0bfbc1e0c1..00000000000 --- a/ietf/secr/templates/sreq/edit.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} -{% block title %}Sessions - Edit{% endblock %} - -{% block extrahead %}{{ block.super }} - - - {{ form.media }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions - » {{ group.acronym }} - » Edit -{% endblock %} - -{% block instructions %} - Instructions -{% endblock %} - -{% block content %} -
      -

      IETF {{ meeting.number }}: Edit Session Request

      -
      -
      - - {% include "includes/sessions_request_form.html" %} - -
      -
      -{% endblock %} - -{% block footer-extras %} - {% include "includes/sessions_footer.html" %} -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/locked.html b/ietf/secr/templates/sreq/locked.html deleted file mode 100755 index 5f619f37cb6..00000000000 --- a/ietf/secr/templates/sreq/locked.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Sessions{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions (Locked) -{% endblock %} - -{% block content %} -

      » View list of timeslot requests

      -
      -

      Sessions - Status

      - -

      {{ message }}

      - -
      -
        -
        • -
      -
      - - -
      - -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html deleted file mode 100755 index bdb33bb77d0..00000000000 --- a/ietf/secr/templates/sreq/main.html +++ /dev/null @@ -1,65 +0,0 @@ -{% extends "base_site.html" %} -{% load ietf_filters %} -{% load staticfiles %} - -{% block title %}Sessions{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions -{% endblock %} -{% block instructions %} - Instructions -{% endblock %} - -{% block content %} -

      » View list of timeslot requests

      -
      -

      - Sessions Request Tool: IETF {{ meeting.number }} - {% if user|has_role:"Secretariat" %} - {% if is_locked %} - Tool Status: Locked - {% else %} - Tool Status: Unlocked - {% endif %} - {% endif %} -

      -
      -

      Request New Session

      -

      The list below includes those working groups that you currently chair which do not already have a session scheduled. You can click on an acronym to initiate a request for a new session at the upcoming IETF meeting. Click "Group will not meet" to send a notification that the group does not plan to meet.

      -
        - {% for group in unscheduled_groups %} -
      • - {{ group.acronym }} - {% if group.not_meeting %} - (Currently, this group does not plan to hold a session at IETF {{ meeting.number }}) - {% endif %} -
        • - {% empty %} -
      • NONE
        • - {% endfor %} -
      -
      -
      -
      -

      Edit / Cancel Previously Requested Sessions

      -

      The list below includes those working groups for which you or your co-chair has requested sessions at the upcoming IETF meeting. You can click on an acronym to initiate changes to a session, or cancel a session.

      - -
      -
      - -{% endblock %} - -{% block footer-extras %} - {% include "includes/sessions_footer.html" %} -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/new.html b/ietf/secr/templates/sreq/new.html deleted file mode 100755 index 2c6afb55767..00000000000 --- a/ietf/secr/templates/sreq/new.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Sessions- New{% endblock %} - -{% block extrahead %}{{ block.super }} - - - {{ form.media }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions - » New Session Request -{% endblock %} - -{% block instructions %} - Instructions -{% endblock %} - -{% block content %} -
      -

      IETF {{ meeting.number }}: New Session Request

      -
      -
      -
        -
        • -
        • -
      -
      - {% include "includes/sessions_request_form.html" %} - -
      - -{% endblock %} - -{% block footer-extras %} - {% include "includes/sessions_footer.html" %} -{% endblock %} \ No newline at end of file diff --git a/ietf/secr/templates/sreq/not_meeting_notification.txt b/ietf/secr/templates/sreq/not_meeting_notification.txt deleted file mode 100644 index 1120f8480c1..00000000000 --- a/ietf/secr/templates/sreq/not_meeting_notification.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% load ams_filters %} - -{{ login|smart_login }} {{ group.acronym }} working group, indicated that the {{ group.acronym }} working group does not plan to hold a session at IETF {{ meeting.number }}. - -This message was generated and sent by the IETF Meeting Session Request Tool. - - diff --git a/ietf/secr/templates/sreq/session_approval_notification.txt b/ietf/secr/templates/sreq/session_approval_notification.txt deleted file mode 100644 index 7bb63aa3fa0..00000000000 --- a/ietf/secr/templates/sreq/session_approval_notification.txt +++ /dev/null @@ -1,15 +0,0 @@ -Dear {{ group.parent }} Director(s): - -{{ header }} meeting session request has just been -submitted by {{ requester }}. -The third session requires your approval. - -To approve the session go to the session request view here: -{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.secr.sreq.views.view" acronym=group.acronym %} -and click "Approve Third Session". - -Regards, - -The IETF Secretariat. - -{% include "includes/session_info.txt" %} diff --git a/ietf/secr/templates/sreq/session_cancel_notification.txt b/ietf/secr/templates/sreq/session_cancel_notification.txt deleted file mode 100644 index 3e6dd43f693..00000000000 --- a/ietf/secr/templates/sreq/session_cancel_notification.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load ams_filters %} - -A request to cancel a meeting session has just been submitted by {{ requester }}. - diff --git a/ietf/secr/templates/sreq/session_request_notification.txt b/ietf/secr/templates/sreq/session_request_notification.txt deleted file mode 100644 index a41f202447a..00000000000 --- a/ietf/secr/templates/sreq/session_request_notification.txt +++ /dev/null @@ -1,5 +0,0 @@ -{% load ams_filters %} - -{% filter wordwrap:78 %}{{ header }} meeting session request has just been submitted by {{ requester }}.{% endfilter %} - -{% include "includes/session_info.txt" %} diff --git a/ietf/secr/templates/sreq/tool_status.html b/ietf/secr/templates/sreq/tool_status.html deleted file mode 100755 index cf5131c2267..00000000000 --- a/ietf/secr/templates/sreq/tool_status.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Sessions{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions - » Session Status -{% endblock %} - -{% block content %} - -
      -

      Sessions - Status

      -

      Enter the message that you would like displayed to the WG Chair when this tool is locked.

      -
      {% csrf_token %} - - - - {{ form.as_table }} - -
      -
      -
        - {% if is_locked %} -
        • - {% else %} -
        • - {% endif %} -
        • -
      -
      - -
      - -
      - -{% endblock %} diff --git a/ietf/secr/templates/sreq/view.html b/ietf/secr/templates/sreq/view.html deleted file mode 100644 index c7ae2d27ba7..00000000000 --- a/ietf/secr/templates/sreq/view.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "base_site.html" %} -{% load staticfiles %} - -{% block title %}Sessions - View{% endblock %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} - -{% block extrastyle %} - -{% endblock %} - -{% block breadcrumbs %}{{ block.super }} - » Sessions - » {{ group.acronym }} -{% endblock %} - -{% block instructions %} - Instructions -{% endblock %} - -{% block content %} - -
      -

      Sessions - View (meeting: {{ meeting.number }})

      - - {% include "includes/sessions_request_view.html" %} - -
      - - {% include "includes/activities.html" %} - -
      -
        -
        • - {% if show_approve_button %} -
        • - {% endif %} -
        • -
        • -
      -
      -
      - -{% endblock %} - -{% block footer-extras %} - {% include "includes/sessions_footer.html" %} -{% endblock %} diff --git a/ietf/secr/templates/telechat/base_telechat.html b/ietf/secr/templates/telechat/base_telechat.html index 73d42ea71e2..1c8feaff6fd 100644 --- a/ietf/secr/templates/telechat/base_telechat.html +++ b/ietf/secr/templates/telechat/base_telechat.html @@ -1,5 +1,5 @@ {% extends "base_site.html" %} -{% load staticfiles %} +{% load static %} {% block title %}Telechat{% endblock %} diff --git a/ietf/secr/templates/telechat/doc.html b/ietf/secr/templates/telechat/doc.html index 9d37db4cb0e..6727e157f57 100644 --- a/ietf/secr/templates/telechat/doc.html +++ b/ietf/secr/templates/telechat/doc.html @@ -85,13 +85,13 @@

      Ballot Writeup

      {% if downrefs %}

      Downward References

      {% for ref in downrefs %} -

      Add {{ref.target.document.canonical_name}} - ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}}) +

      Add {{ref.target.name}} + ({{ref.target.std_level}} - {{ref.target.stream.desc}} stream) to downref registry.
      - {% if not ref.target.document.std_level %} + {% if not ref.target.std_level %} +++ Warning: The standards level has not been set yet!!!
      {% endif %} - {% if not ref.target.document.stream %} + {% if not ref.target.stream %} +++ Warning: document stream has not been set yet!!!
      {% endif %} {% endfor %}

      diff --git a/ietf/secr/templates/telechat/group.html b/ietf/secr/templates/telechat/group.html index 890c451e833..4e04f0e16e5 100644 --- a/ietf/secr/templates/telechat/group.html +++ b/ietf/secr/templates/telechat/group.html @@ -3,7 +3,7 @@ Does anyone have an objection to the creation of this working group being sent for EXTERNAL REVIEW?

      External Review APPROVED; "The Secretariat will send a Working Group Review announcement with a copy to new-work and place it back on the agenda for the next telechat."

      External Review NOT APPROVED; -
      +
      The Secretariat will wait for instructions from
      The IESG decides the document needs more time in INTERNAL REVIEW. The Secretariat will put it back on the agenda for the next teleconference in the same category.
      The IESG has made changes since the charter was seen in INTERNAL REVIEW, and decides to send it back to INTERNAL REVIEW the charter again. diff --git a/ietf/secr/urls.py b/ietf/secr/urls.py index 5a3df23d0b9..ab210466544 100644 --- a/ietf/secr/urls.py +++ b/ietf/secr/urls.py @@ -1,13 +1,22 @@ -from django.conf.urls import url, include +# Copyright The IETF Trust 2025, All Rights Reserved + +from django.conf import settings +from django.urls import re_path, include from django.views.generic import TemplateView +from django.views.generic.base import RedirectView urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='main.html')), - url(r'^announcement/', include('ietf.secr.announcement.urls')), - url(r'^areas/', include('ietf.secr.areas.urls')), - url(r'^console/', include('ietf.secr.console.urls')), - url(r'^meetings/', include('ietf.secr.meetings.urls')), - url(r'^rolodex/', include('ietf.secr.rolodex.urls')), - url(r'^sreq/', include('ietf.secr.sreq.urls')), - url(r'^telechat/', include('ietf.secr.telechat.urls')), + re_path(r'^$', TemplateView.as_view(template_name='index.html'), name='ietf.secr'), + re_path(r'^announcement/', include('ietf.secr.announcement.urls')), + re_path(r'^meetings/', include('ietf.secr.meetings.urls')), + re_path(r'^rolodex/', include('ietf.secr.rolodex.urls')), + # remove these redirects after 125 + re_path(r'^sreq/$', RedirectView.as_view(url='/meeting/session/request/', permanent=True)), + re_path(r'^sreq/%(acronym)s/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/view/', permanent=True)), + re_path(r'^sreq/%(acronym)s/edit/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/edit/', permanent=True)), + re_path(r'^sreq/%(acronym)s/new/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/new/', permanent=True)), + re_path(r'^sreq/(?P[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/%(num)s/session/request/%(acronym)s/view/', permanent=True)), + re_path(r'^sreq/(?P[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/%(num)s/session/request/%(acronym)s/edit/', permanent=True)), + # --------------------------------- + re_path(r'^telechat/', include('ietf.secr.telechat.urls')), ] diff --git a/ietf/secr/utils/decorators.py b/ietf/secr/utils/decorators.py index f635bc7eceb..5887c3c9ccd 100644 --- a/ietf/secr/utils/decorators.py +++ b/ietf/secr/utils/decorators.py @@ -1,12 +1,12 @@ # Copyright The IETF Trust 2013-2020, All Rights Reserved from functools import wraps +from urllib.parse import quote as urlquote from django.conf import settings from django.contrib.auth import REDIRECT_FIELD_NAME from django.core.exceptions import ObjectDoesNotExist from django.http import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 -from django.utils.http import urlquote from ietf.ietfauth.utils import has_role from ietf.doc.models import Document diff --git a/ietf/secr/utils/document.py b/ietf/secr/utils/document.py index 0a34512a173..361bf836dfd 100644 --- a/ietf/secr/utils/document.py +++ b/ietf/secr/utils/document.py @@ -13,15 +13,6 @@ def get_full_path(doc): return None return os.path.join(doc.get_file_path(), doc.uploaded_filename) -def get_rfc_num(doc): - qs = doc.docalias.filter(name__startswith='rfc') - return qs[0].name[3:] if qs else None - -def is_draft(doc): - if doc.docalias.filter(name__startswith='rfc'): - return False - else: - return True def get_start_date(doc): ''' diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py deleted file mode 100644 index a4c1c0f98a9..00000000000 --- a/ietf/secr/utils/group.py +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright The IETF Trust 2013-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -# Python imports -import io -import os - -# Django imports -from django.conf import settings -from django.core.exceptions import ObjectDoesNotExist - -# Datatracker imports -from ietf.group.models import Group -from ietf.ietfauth.utils import has_role - - - - -def current_nomcom(): - qs = Group.objects.filter(acronym__startswith='nomcom',state__slug="active").order_by('-time') - if qs.count(): - return qs[0] - else: - return None - -def get_charter_text(group): - ''' - Takes a group object and returns the text or the group's charter as a string - ''' - charter = group.charter - path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev)) - f = io.open(path,'r') - text = f.read() - f.close() - - return text - -def get_my_groups(user,conclude=False): - ''' - Takes a Django user object (from request) - Returns a list of groups the user has access to. Rules are as follows - secretariat - has access to all groups - area director - has access to all groups in their area - wg chair or secretary - has access to their own group - chair of irtf has access to all irtf groups - - If user=None than all groups are returned. - concluded=True means include concluded groups. Need this to upload materials for groups - after they've been concluded. it happens. - ''' - my_groups = set() - states = ['bof','proposed','active'] - if conclude: - states.extend(['conclude','bof-conc']) - - all_groups = Group.objects.filter(type__features__has_meetings=True, state__in=states).order_by('acronym') - if user == None or has_role(user,'Secretariat'): - return all_groups - - try: - person = user.person - except ObjectDoesNotExist: - return list() - - for group in all_groups: - if group.role_set.filter(person=person,name__in=('chair','secr','ad')): - my_groups.add(group) - continue - if group.parent and group.parent.role_set.filter(person=person,name__in=('ad','chair')): - my_groups.add(group) - continue - - return list(my_groups) diff --git a/ietf/settings.py b/ietf/settings.py index 7934a42a750..f8d8a28d650 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007-2022, All Rights Reserved +# Copyright The IETF Trust 2007-2025, All Rights Reserved # -*- coding: utf-8 -*- @@ -9,24 +9,40 @@ import os import sys import datetime +import pathlib import warnings +from hashlib import sha384 from typing import Any, Dict, List, Tuple # pyflakes:ignore +# DeprecationWarnings are suppressed by default, enable them warnings.simplefilter("always", DeprecationWarning) -warnings.filterwarnings("ignore", message="'urllib3\[secure\]' extra is deprecated") -warnings.filterwarnings("ignore", message="The logout\(\) view is superseded by") + +# Warnings that must be resolved for Django 5.x +warnings.filterwarnings("ignore", "Log out via GET requests is deprecated") # caused by oidc_provider +warnings.filterwarnings("ignore", message="The django.utils.timezone.utc alias is deprecated.", module="oidc_provider") +warnings.filterwarnings("ignore", message="The django.utils.datetime_safe module is deprecated.", module="tastypie") +warnings.filterwarnings("ignore", message="The USE_DEPRECATED_PYTZ setting,") # https://github.com/ietf-tools/datatracker/issues/5635 +warnings.filterwarnings("ignore", message="The USE_L10N setting is deprecated.") # https://github.com/ietf-tools/datatracker/issues/5648 +warnings.filterwarnings("ignore", message="django.contrib.auth.hashers.CryptPasswordHasher is deprecated.") # https://github.com/ietf-tools/datatracker/issues/5663 + +# Other DeprecationWarnings +warnings.filterwarnings("ignore", message="pkg_resources is deprecated as an API", module="pyang.plugin") warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report") -warnings.filterwarnings("ignore", message="{% load staticfiles %} is deprecated") -warnings.filterwarnings("ignore", message="Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated", module="bleach") -warnings.filterwarnings("ignore", message="HTTPResponse.getheader\(\) is deprecated", module='selenium.webdriver') -try: - import syslog - syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER) -except ImportError: - pass +warnings.filterwarnings("ignore", message="currentThread\\(\\) is deprecated", module="coverage.pytracer") +warnings.filterwarnings("ignore", message="co_lnotab is deprecated", module="coverage.parser") +warnings.filterwarnings("ignore", message="datetime.datetime.utcnow\\(\\) is deprecated", module="botocore.auth") +warnings.filterwarnings("ignore", message="datetime.datetime.utcnow\\(\\) is deprecated", module="oic.utils.time_util") +warnings.filterwarnings("ignore", message="datetime.datetime.utcfromtimestamp\\(\\) is deprecated", module="oic.utils.time_util") +warnings.filterwarnings("ignore", message="datetime.datetime.utcfromtimestamp\\(\\) is deprecated", module="pytz.tzinfo") +warnings.filterwarnings("ignore", message="'instantiateVariableFont' is deprecated", module="weasyprint") + + +base_path = pathlib.Path(__file__).resolve().parent +BASE_DIR = str(base_path) -BASE_DIR = os.path.dirname(os.path.abspath(__file__)) -sys.path.append(os.path.abspath(BASE_DIR + "/..")) +project_path = base_path.parent +PROJECT_DIR = str(project_path) +sys.path.append(PROJECT_DIR) from ietf import __version__ import debug @@ -59,6 +75,26 @@ 'django.contrib.auth.hashers.CryptPasswordHasher', ] + +PASSWORD_POLICY_MIN_LENGTH = 12 +PASSWORD_POLICY_ENFORCE_AT_LOGIN = False # should turn this on for prod + +AUTH_PASSWORD_VALIDATORS = [ + { + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", + "OPTIONS": { + "min_length": PASSWORD_POLICY_MIN_LENGTH, + } + }, + { + "NAME": "ietf.ietfauth.password_validation.StrongPasswordValidator", + }, +] +# In dev environments, settings_local overrides the password validators. Save +# a handle to the original value so settings_test can restore it so tests match +# production. +ORIG_AUTH_PASSWORD_VALIDATORS = AUTH_PASSWORD_VALIDATORS + ALLOWED_HOSTS = [".ietf.org", ".ietf.org.", "209.208.19.216", "4.31.198.44", "127.0.0.1", "localhost", ] # Server name of the tools server @@ -101,7 +137,27 @@ # to load the internationalization machinery. USE_I18N = False +# Django 4.0 changed the default setting of USE_L10N to True. The setting +# is deprecated and will be removed in Django 5.0. +USE_L10N = False + USE_TZ = True +USE_DEPRECATED_PYTZ = True # supported until Django 5 + +# The DjangoDivFormRenderer is a transitional class that opts in to defaulting to the div.html +# template for formsets. This will become the default behavior in Django 5.0. This configuration +# can be removed at that point. +# See https://docs.djangoproject.com/en/4.2/releases/4.1/#forms +FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer" + +# Default primary key field type to use for models that don’t have a field with primary_key=True. +# In the future (relative to 4.2), the default will become 'django.db.models.BigAutoField.' +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + +# OIDC configuration +_SITE_URL = os.environ.get("OIDC_SITE_URL", None) +if _SITE_URL is not None: + SITE_URL = _SITE_URL if SERVER_MODE == 'production': MEDIA_ROOT = '/a/www/www6s/lib/dt/media/' @@ -137,7 +193,6 @@ # Absolute path to the directory static files should be collected to. # Example: "/var/www/example.com/static/" - SERVE_CDN_PHOTOS = True SERVE_CDN_FILES_LOCALLY_IN_DEV_MODE = True @@ -147,7 +202,7 @@ STATIC_URL = "/static/" STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/") else: - STATIC_URL = "https://www.ietf.org/lib/dt/%s/"%__version__ + STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__ STATIC_ROOT = "/a/www/www6s/lib/dt/%s/"%__version__ # List of finder classes that know how to find static files in @@ -157,6 +212,19 @@ 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) +# Client-side static.ietf.org URL +STATIC_IETF_ORG = "https://static.ietf.org" +# Server-side static.ietf.org URL (used in pdfized) +STATIC_IETF_ORG_INTERNAL = STATIC_IETF_ORG + +ENABLE_BLOBSTORAGE = True + +# "standard" retry mode is used, which does exponential backoff with a base factor of 2 +# and a cap of 20. +BLOBSTORAGE_MAX_ATTEMPTS = 5 # boto3 default is 3 (for "standard" retry mode) +BLOBSTORAGE_CONNECT_TIMEOUT = 10 # seconds; boto3 default is 60 +BLOBSTORAGE_READ_TIMEOUT = 10 # seconds; boto3 default is 60 + WSGI_APPLICATION = "ietf.wsgi.application" AUTHENTICATION_BACKENDS = ( 'ietf.ietfauth.backends.CaseInsensitiveModelBackend', ) @@ -209,11 +277,11 @@ def skip_unreadable_post(record): # 'loggers': { 'django': { - 'handlers': ['debug_console', 'mail_admins'], + 'handlers': ['console', 'mail_admins'], 'level': 'INFO', }, 'django.request': { - 'handlers': ['debug_console'], + 'handlers': ['console'], 'level': 'ERROR', }, 'django.server': { @@ -221,13 +289,21 @@ def skip_unreadable_post(record): 'level': 'INFO', }, 'django.security': { - 'handlers': ['debug_console', ], + 'handlers': ['console', ], + 'level': 'INFO', + }, + 'oidc_provider': { + 'handlers': ['console', ], + 'level': 'DEBUG', + }, + 'datatracker': { + 'handlers': ['console'], + 'level': 'INFO', + }, + 'celery': { + 'handlers': ['console'], 'level': 'INFO', }, - 'oidc_provider': { - 'handlers': ['debug_console', ], - 'level': 'DEBUG', - }, }, # # No logger filters @@ -238,13 +314,6 @@ def skip_unreadable_post(record): 'class': 'logging.StreamHandler', 'formatter': 'plain', }, - 'syslog': { - 'level': 'DEBUG', - 'class': 'logging.handlers.SysLogHandler', - 'facility': 'user', - 'formatter': 'plain', - 'address': '/dev/log', - }, 'debug_console': { # Active only when DEBUG=True 'level': 'DEBUG', @@ -298,28 +367,24 @@ def skip_unreadable_post(record): 'style': '{', 'format': '{levelname}: {name}:{lineno}: {message}', }, + 'json' : { + "class": "ietf.utils.jsonlogger.DatatrackerJsonFormatter", + "style": "{", + "format": "{asctime}{levelname}{message}{name}{pathname}{lineno}{funcName}{process}", + } }, } -# This should be overridden by settings_local for any logger where debug (or -# other) custom log settings are wanted. Use "ietf/manage.py showloggers -l" -# to show registered loggers. The content here should match the levels above -# and is shown as an example: -UTILS_LOGGER_LEVELS: Dict[str, str] = { -# 'django': 'INFO', -# 'django.server': 'INFO', -} - # End logging # ------------------------------------------------------------------------ X_FRAME_OPTIONS = 'SAMEORIGIN' CSRF_TRUSTED_ORIGINS = [ - 'ietf.org', - '*.ietf.org', - 'meetecho.com', - '*.meetecho.com', + "https://ietf.org", + "https://*.ietf.org", + 'https://meetecho.com', + 'https://*.meetecho.com', ] CSRF_COOKIE_SAMESITE = 'None' CSRF_COOKIE_SECURE = True @@ -330,11 +395,7 @@ def skip_unreadable_post(record): SESSION_COOKIE_SECURE = True SESSION_EXPIRE_AT_BROWSER_CLOSE = False -# We want to use the JSON serialisation, as it's safer -- but there is /secr/ -# code which stashes objects in the session that can't be JSON serialized. -# Switch when that code is rewritten. -#SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer" -SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' +SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer" SESSION_ENGINE = "django.contrib.sessions.backends.cache" SESSION_SAVE_EVERY_REQUEST = True SESSION_CACHE_ALIAS = 'sessions' @@ -350,6 +411,7 @@ def skip_unreadable_post(record): ], 'OPTIONS': { 'context_processors': [ + 'ietf.context_processors.traceparent_id', 'django.contrib.auth.context_processors.auth', 'django.template.context_processors.debug', # makes 'sql_queries' available in templates 'django.template.context_processors.i18n', @@ -382,42 +444,45 @@ def skip_unreadable_post(record): MIDDLEWARE = [ - 'django.middleware.csrf.CsrfViewMiddleware', - 'corsheaders.middleware.CorsMiddleware', # see docs on CORS_REPLACE_HTTPS_REFERER before using it - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.http.ConditionalGetMiddleware', - 'simple_history.middleware.HistoryRequestMiddleware', + "ietf.middleware.add_otel_traceparent_header", + "django.middleware.csrf.CsrfViewMiddleware", + "corsheaders.middleware.CorsMiddleware", # see docs on CORS_REPLACE_HTTPS_REFERER before using it + "django.middleware.common.CommonMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.http.ConditionalGetMiddleware", + "simple_history.middleware.HistoryRequestMiddleware", # comment in this to get logging of SQL insert and update statements: - #'ietf.middleware.sql_log_middleware', - 'ietf.middleware.SMTPExceptionMiddleware', - 'ietf.middleware.Utf8ExceptionMiddleware', - 'ietf.middleware.redirect_trailing_period_middleware', - 'django_referrer_policy.middleware.ReferrerPolicyMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', - # 'csp.middleware.CSPMiddleware', - 'ietf.middleware.unicode_nfkc_normalization_middleware', + #"ietf.middleware.sql_log_middleware", + "ietf.middleware.SMTPExceptionMiddleware", + "ietf.middleware.Utf8ExceptionMiddleware", + "ietf.middleware.redirect_trailing_period_middleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", + "django.middleware.security.SecurityMiddleware", + "ietf.middleware.unicode_nfkc_normalization_middleware", + "ietf.middleware.is_authenticated_header_middleware", ] ROOT_URLCONF = 'ietf.urls' -DJANGO_VITE_ASSETS_PATH = os.path.join(BASE_DIR, 'static/dist-neue') +# Configure django_vite +DJANGO_VITE: dict = {"default": {}} if DEBUG: - DJANGO_VITE_MANIFEST_PATH = os.path.join(BASE_DIR, 'static/dist-neue/manifest.json') + DJANGO_VITE["default"]["manifest_path"] = os.path.join( + BASE_DIR, 'static/dist-neue/manifest.json' + ) # Additional locations of static files (in addition to each app's static/ dir) STATICFILES_DIRS = ( - DJANGO_VITE_ASSETS_PATH, + os.path.join(BASE_DIR, "static/dist-neue"), # for django_vite os.path.join(BASE_DIR, 'static/dist'), os.path.join(BASE_DIR, 'secr/static/dist'), ) INSTALLED_APPS = [ # Django apps - 'django.contrib.admin', + 'ietf.admin', # replaces django.contrib.admin 'django.contrib.admindocs', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -432,16 +497,20 @@ def skip_unreadable_post(record): 'django_vite', 'django_bootstrap5', 'django_celery_beat', + 'django_celery_results', 'corsheaders', 'django_markup', - 'django_password_strength', - 'form_utils', 'oidc_provider', + 'drf_spectacular', + 'drf_standardized_errors', + 'rest_framework', + 'rangefilter', 'simple_history', 'tastypie', 'widget_tweaks', # IETF apps 'ietf.api', + 'ietf.blobdb', 'ietf.community', 'ietf.dbtemplate', 'ietf.doc', @@ -462,15 +531,14 @@ def skip_unreadable_post(record): 'ietf.release', 'ietf.review', 'ietf.stats', + 'ietf.status', 'ietf.submit', 'ietf.sync', 'ietf.utils', # IETF Secretariat apps 'ietf.secr.announcement', - 'ietf.secr.areas', 'ietf.secr.meetings', 'ietf.secr.rolodex', - 'ietf.secr.sreq', 'ietf.secr.telechat', ] @@ -510,8 +578,6 @@ def skip_unreadable_post(record): CORS_ALLOW_METHODS = ( 'GET', 'OPTIONS', ) CORS_URLS_REGEX = r'^(/api/.*|.*\.json|.*/json/?)$' -# Setting for django_referrer_policy.middleware.ReferrerPolicyMiddleware -REFERRER_POLICY = 'strict-origin-when-cross-origin' # django.middleware.security.SecurityMiddleware SECURE_BROWSER_XSS_FILTER = True @@ -522,6 +588,9 @@ def skip_unreadable_post(record): #SECURE_REDIRECT_EXEMPT #SECURE_SSL_HOST #SECURE_SSL_REDIRECT = True +# Relax the COOP policy to allow Meetecho authentication pop-up +SECURE_CROSS_ORIGIN_OPENER_POLICY = "unsafe-none" +SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin" # Override this in your settings_local with the IP addresses relevant for you: INTERNAL_IPS = ( @@ -530,17 +599,83 @@ def skip_unreadable_post(record): '::1', ) +# django-rest-framework configuration +REST_FRAMEWORK = { + "DEFAULT_AUTHENTICATION_CLASSES": [ + "ietf.api.authentication.ApiKeyAuthentication", + "rest_framework.authentication.SessionAuthentication", + ], + "DEFAULT_PERMISSION_CLASSES": [ + "ietf.api.permissions.HasApiKey", + ], + "DEFAULT_RENDERER_CLASSES": [ + "rest_framework.renderers.JSONRenderer", + ], + "DEFAULT_PARSER_CLASSES": [ + "rest_framework.parsers.JSONParser", + ], + "DEFAULT_SCHEMA_CLASS": "drf_standardized_errors.openapi.AutoSchema", + "EXCEPTION_HANDLER": "drf_standardized_errors.handler.exception_handler", +} + +# DRF OpenApi schema settings +SPECTACULAR_SETTINGS = { + "TITLE": "Datatracker API", + "DESCRIPTION": "Datatracker API", + "VERSION": "1.0.0", + "SCHEMA_PATH_PREFIX": "/api/", + "COMPONENT_SPLIT_REQUEST": True, + "COMPONENT_NO_READ_ONLY_REQUIRED": True, + "SERVERS": [ + {"url": "http://localhost:8000", "description": "local dev server"}, + {"url": "https://datatracker.ietf.org", "description": "production server"}, + ], + # The following settings are needed for drf-standardized-errors + "ENUM_NAME_OVERRIDES": { + "ValidationErrorEnum": "drf_standardized_errors.openapi_serializers.ValidationErrorEnum.choices", + "ClientErrorEnum": "drf_standardized_errors.openapi_serializers.ClientErrorEnum.choices", + "ServerErrorEnum": "drf_standardized_errors.openapi_serializers.ServerErrorEnum.choices", + "ErrorCode401Enum": "drf_standardized_errors.openapi_serializers.ErrorCode401Enum.choices", + "ErrorCode403Enum": "drf_standardized_errors.openapi_serializers.ErrorCode403Enum.choices", + "ErrorCode404Enum": "drf_standardized_errors.openapi_serializers.ErrorCode404Enum.choices", + "ErrorCode405Enum": "drf_standardized_errors.openapi_serializers.ErrorCode405Enum.choices", + "ErrorCode406Enum": "drf_standardized_errors.openapi_serializers.ErrorCode406Enum.choices", + "ErrorCode415Enum": "drf_standardized_errors.openapi_serializers.ErrorCode415Enum.choices", + "ErrorCode429Enum": "drf_standardized_errors.openapi_serializers.ErrorCode429Enum.choices", + "ErrorCode500Enum": "drf_standardized_errors.openapi_serializers.ErrorCode500Enum.choices", + }, + "POSTPROCESSING_HOOKS": ["drf_standardized_errors.openapi_hooks.postprocess_schema_enums"], +} + +# DRF Standardized Errors settings +DRF_STANDARDIZED_ERRORS = { + # enable the standardized errors when DEBUG=True for unhandled exceptions. + # By default, this is set to False so you're able to view the traceback in + # the terminal and get more information about the exception. + "ENABLE_IN_DEBUG_FOR_UNHANDLED_EXCEPTIONS": False, + # ONLY the responses that correspond to these status codes will appear + # in the API schema. + "ALLOWED_ERROR_STATUS_CODES": [ + "400", + # "401", + # "403", + "404", + # "405", + # "406", + # "415", + # "429", + # "500", + ], + +} + # no slash at end IDTRACKER_BASE_URL = "https://datatracker.ietf.org" RFCDIFF_BASE_URL = "https://author-tools.ietf.org/iddiff" IDNITS_BASE_URL = "https://author-tools.ietf.org/api/idnits" +IDNITS3_BASE_URL = "https://author-tools.ietf.org/idnits3/results" IDNITS_SERVICE_URL = "https://author-tools.ietf.org/idnits" -# Content security policy configuration (django-csp) -# (In current production, the Content-Security-Policy header is completely set by nginx configuration, but -# we try to keep this in sync to avoid confusion) -CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} http://ietf.org/ https://www.ietf.org/ https://analytics.ietf.org/ https://static.ietf.org") - # The name of the method to use to invoke the test suite TEST_RUNNER = 'ietf.utils.test_runner.IetfTestRunner' @@ -550,8 +685,6 @@ def skip_unreadable_post(record): TEST_DIFF_FAILURE_DIR = "/tmp/test/failure/" -TEST_GHOSTDRIVER_LOG_PATH = "ghostdriver.log" - # These are regexes TEST_URL_COVERAGE_EXCLUDE = [ r"^\^admin/", @@ -578,9 +711,10 @@ def skip_unreadable_post(record): "ietf/utils/test_runner.py", "ietf/name/generate_fixtures.py", "ietf/review/import_from_review_tool.py", - "ietf/stats/backfill_data.py", "ietf/utils/patch.py", "ietf/utils/test_data.py", + "ietf/utils/jstest.py", + "ietf/utils/coverage.py", ] # These are code line regex patterns @@ -594,12 +728,15 @@ def skip_unreadable_post(record): ] # These are filename globs. They are used by test_parse_templates() and -# get_template_paths() +# get_template_paths(). Globs are applied via pathlib.Path().match, using +# the path to the template from the project root. TEST_TEMPLATE_IGNORE = [ - ".*", # dot-files - "*~", # tilde temp-files - "#*", # files beginning with a hashmark - "500.html" # isn't loaded by regular loader, but checked by test_500_page() + ".*", # dot-files + "*~", # tilde temp-files + "#*", # files beginning with a hashmark + "500.html", # isn't loaded by regular loader, but checked by test_500_page() + "ietf/templates/admin/meeting/RegistrationTicket/change_list.html", + "ietf/templates/admin/meeting/Registration/change_list.html", ] TEST_COVERAGE_MAIN_FILE = os.path.join(BASE_DIR, "../release-coverage.json") @@ -607,8 +744,8 @@ def skip_unreadable_post(record): TEST_CODE_COVERAGE_CHECKER = None if SERVER_MODE != 'production': - import coverage - TEST_CODE_COVERAGE_CHECKER = coverage.Coverage(source=[ BASE_DIR ], cover_pylib=False, omit=TEST_CODE_COVERAGE_EXCLUDE_FILES) + from ietf.utils.coverage import CoverageManager + TEST_CODE_COVERAGE_CHECKER = CoverageManager() TEST_CODE_COVERAGE_REPORT_PATH = "coverage/" TEST_CODE_COVERAGE_REPORT_URL = os.path.join(STATIC_URL, TEST_CODE_COVERAGE_REPORT_PATH, "index.html") @@ -635,6 +772,7 @@ def skip_unreadable_post(record): "acronym": r"(?P[-a-z0-9]+)", "bofreq": r"(?Pbofreq-[-a-z0-9]+)", "charter": r"(?Pcharter-[-a-z0-9]+)", + "statement": r"(?Pstatement-[-a-z0-9]+)", "date": r"(?P\d{4}-\d{2}-\d{2})", "name": r"(?P[A-Za-z0-9._+-]+?)", "document": r"(?P[a-z][-a-z0-9]+)", # regular document names @@ -643,35 +781,92 @@ def skip_unreadable_post(record): "schedule_name": r"(?P[A-Za-z0-9-:_]+)", } +STORAGES: dict[str, Any] = { + "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"}, + "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}, +} + +# Storages for artifacts stored as blobs +ARTIFACT_STORAGE_NAMES: list[str] = [ + "active-draft", + "agenda", + "bibxml-ids", + "bluesheets", + "bofreq", + "charter", + "chatlog", + "conflrev", + "draft", + "floorplan", + "indexes", + "liai-att", + "meetinghostlogo", + "minutes", + "narrativeminutes", + "photo", + "polls", + "procmaterials", + "review", + "slides", + "staging", + "statchg", + "statement", +] +for storagename in ARTIFACT_STORAGE_NAMES: + STORAGES[storagename] = { + "BACKEND": "ietf.doc.storage.StoredObjectBlobdbStorage", + "OPTIONS": {"bucket_name": storagename}, + } + +# Buckets / doc types of meeting materials the CF worker is allowed to serve. This +# differs from the list in Session.meeting_related() by the omission of "recording" +MATERIALS_TYPES_SERVED_BY_WORKER = [ + "agenda", + "bluesheets", + "chatlog", + "minutes", + "narrativeminutes", + "polls", + "procmaterials", + "slides", +] + + # Override this in settings_local.py if needed # *_PATH variables ends with a slash/ . -#DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/' DOCUMENT_PATH_PATTERN = '/a/ietfdata/doc/{doc.type_id}/' INTERNET_DRAFT_PATH = '/a/ietfdata/doc/draft/repository' INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/' RFC_PATH = '/a/www/ietf-ftp/rfc/' CHARTER_PATH = '/a/ietfdata/doc/charter/' +CHARTER_COPY_PATH = '/a/www/ietf-ftp/ietf' # copy 1wg-charters files here if set +CHARTER_COPY_OTHER_PATH = '/a/ftp/ietf' +CHARTER_COPY_THIRD_PATH = '/a/ftp/charter' +GROUP_SUMMARY_PATH = '/a/www/ietf-ftp/ietf' BOFREQ_PATH = '/a/ietfdata/doc/bofreq/' CONFLICT_REVIEW_PATH = '/a/ietfdata/doc/conflict-review' STATUS_CHANGE_PATH = '/a/ietfdata/doc/status-change' AGENDA_PATH = '/a/www/www6s/proceedings/' MEETINGHOST_LOGO_PATH = AGENDA_PATH # put these in the same place as other proceedings files -IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/' -IESG_WG_EVALUATION_DIR = "/a/www/www6/iesg/evaluation" # Move drafts to this directory when they expire INTERNET_DRAFT_ARCHIVE_DIR = '/a/ietfdata/doc/draft/collection/draft-archive/' -# The following directory contains linked copies of all drafts, but don't -# write anything to this directory -- its content is maintained by ghostlinkd: +# The following directory contains copies of all drafts - it used to be +# a set of hardlinks maintained by ghostlinkd, but is now explicitly written to INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/a/ietfdata/doc/draft/archive' MEETING_RECORDINGS_DIR = '/a/www/audio' DERIVED_DIR = '/a/ietfdata/derived' +FTP_DIR = '/a/ftp' +ALL_ID_DOWNLOAD_DIR = '/a/www/www6s/download' +NFS_METRICS_TMP_DIR = '/a/tmp' DOCUMENT_FORMAT_ALLOWLIST = ["txt", "ps", "pdf", "xml", "html", ] # Mailing list info URL for lists hosted on the IETF servers -MAILING_LIST_INFO_URL = "https://www.ietf.org/mailman/listinfo/%(list_addr)s" +MAILING_LIST_INFO_URL = "https://mailman3.%(domain)s/mailman3/lists/%(list_addr)s.%(domain)s" MAILING_LIST_ARCHIVE_URL = "https://mailarchive.ietf.org" +MAILING_LIST_ARCHIVE_SEARCH_URL = "https://mailarchive.ietf.org/api/v1/message/search/" +MAILING_LIST_ARCHIVE_API_KEY = "changeme" # Liaison Statement Tool settings (one is used in DOC_HREFS below) LIAISON_UNIVERSAL_FROM = 'Liaison Statement Management Tool ' @@ -683,7 +878,7 @@ def skip_unreadable_post(record): DOC_HREFS = { "charter": "https://www.ietf.org/charter/{doc.name}-{doc.rev}.txt", "draft": "https://www.ietf.org/archive/id/{doc.name}-{doc.rev}.txt", - "rfc": "https://www.rfc-editor.org/rfc/rfc{doc.rfcnum}.txt", + "rfc": "https://www.rfc-editor.org/rfc/rfc{doc.rfc_number}.txt", "slides": "https://www.ietf.org/slides/{doc.name}-{doc.rev}", "procmaterials": "https://www.ietf.org/procmaterials/{doc.name}-{doc.rev}", "conflrev": "https://www.ietf.org/cr/{doc.name}-{doc.rev}.txt", @@ -703,44 +898,6 @@ def skip_unreadable_post(record): CACHE_MIDDLEWARE_SECONDS = 300 CACHE_MIDDLEWARE_KEY_PREFIX = '' -# The default with no CACHES setting is 'django.core.cache.backends.locmem.LocMemCache' -# This setting is possibly overridden further down, after the import of settings_local -CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '127.0.0.1:11211', - 'VERSION': __version__, - 'KEY_PREFIX': 'ietf:dt', - }, - 'sessions': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '127.0.0.1:11211', - # No release-specific VERSION setting. - 'KEY_PREFIX': 'ietf:dt', - }, - 'htmlized': { - 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/a/cache/datatracker/htmlized', - 'OPTIONS': { - 'MAX_ENTRIES': 100000, # 100,000 - }, - }, - 'pdfized': { - 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/a/cache/datatracker/pdfized', - 'OPTIONS': { - 'MAX_ENTRIES': 100000, # 100,000 - }, - }, - 'slowpages': { - 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/a/cache/datatracker/slowpages', - 'OPTIONS': { - 'MAX_ENTRIES': 5000, - }, - }, -} - HTMLIZER_VERSION = 1 HTMLIZER_URL_PREFIX = "/doc/html" HTMLIZER_CACHE_TIME = 60*60*24*14 # 14 days @@ -753,16 +910,14 @@ def skip_unreadable_post(record): SESSION_REQUEST_FROM_EMAIL = 'IETF Meeting Session Request Tool ' SECRETARIAT_SUPPORT_EMAIL = "support@ietf.org" -SECRETARIAT_ACTION_EMAIL = "ietf-action@ietf.org" -SECRETARIAT_INFO_EMAIL = "ietf-info@ietf.org" +SECRETARIAT_ACTION_EMAIL = SECRETARIAT_SUPPORT_EMAIL +SECRETARIAT_INFO_EMAIL = SECRETARIAT_SUPPORT_EMAIL # Put real password in settings_local.py IANA_SYNC_PASSWORD = "secret" IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes" IANA_SYNC_PROTOCOLS_URL = "https://www.iana.org/protocols/" -RFC_TEXT_RSYNC_SOURCE="ftp.rfc-editor.org::rfcs-text-only" - RFC_EDITOR_SYNC_PASSWORD="secret" RFC_EDITOR_SYNC_NOTIFICATION_URL = "https://www.rfc-editor.org/parser/parser.php" RFC_EDITOR_GROUP_NOTIFICATION_EMAIL = "webmaster@rfc-editor.org" @@ -780,7 +935,7 @@ def skip_unreadable_post(record): NOMCOM_FROM_EMAIL = 'nomcom-chair-{year}@ietf.org' OPENSSL_COMMAND = '/usr/bin/openssl' DAYS_TO_EXPIRE_NOMINATION_LINK = '' -NOMINEE_FEEDBACK_TYPES = ['comment', 'questio', 'nomina'] +NOMINEE_FEEDBACK_TYPES = ['comment', 'questio', 'nomina', 'obe'] # SlideSubmission settings SLIDE_STAGING_PATH = '/a/www/www6s/staging/' @@ -835,7 +990,8 @@ def skip_unreadable_post(record): # Max time to allow for validation before a submission is subject to cancellation IDSUBMIT_MAX_VALIDATION_TIME = datetime.timedelta(minutes=20) -IDSUBMIT_MANUAL_STAGING_DIR = '/tmp/' +# Age at which a submission expires if not posted +IDSUBMIT_EXPIRATION_AGE = datetime.timedelta(days=14) IDSUBMIT_FILE_TYPES = ( 'txt', @@ -875,6 +1031,7 @@ def skip_unreadable_post(record): MEETING_DOC_LOCAL_HREFS = { "agenda": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", "minutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", + "narrativeminutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", "slides": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", "chatlog": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", "polls": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", @@ -886,6 +1043,7 @@ def skip_unreadable_post(record): MEETING_DOC_CDN_HREFS = { "agenda": "https://www.ietf.org/proceedings/{meeting.number}/agenda/{doc.name}-{doc.rev}", "minutes": "https://www.ietf.org/proceedings/{meeting.number}/minutes/{doc.name}-{doc.rev}", + "narrativeminutes": "https://www.ietf.org/proceedings/{meeting.number}/narrative-minutes/{doc.name}-{doc.rev}", "slides": "https://www.ietf.org/proceedings/{meeting.number}/slides/{doc.name}-{doc.rev}", "recording": "{doc.external_url}", "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", @@ -897,6 +1055,7 @@ def skip_unreadable_post(record): MEETING_DOC_OLD_HREFS = { "agenda": "/meeting/{meeting.number}/materials/{doc.name}", "minutes": "/meeting/{meeting.number}/materials/{doc.name}", + "narrativeminutes" : "/meeting/{meeting.number}/materials/{doc.name}", "slides": "/meeting/{meeting.number}/materials/{doc.name}", "recording": "{doc.external_url}", "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", @@ -906,6 +1065,7 @@ def skip_unreadable_post(record): MEETING_DOC_GREFS = { "agenda": "/meeting/{meeting.number}/materials/{doc.name}", "minutes": "/meeting/{meeting.number}/materials/{doc.name}", + "narrativeminutes": "/meeting/{meeting.number}/materials/{doc.name}", "slides": "/meeting/{meeting.number}/materials/{doc.name}", "recording": "{doc.external_url}", "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", @@ -919,6 +1079,7 @@ def skip_unreadable_post(record): MEETING_VALID_UPLOAD_EXTENSIONS = { 'agenda': ['.txt','.html','.htm', '.md', ], 'minutes': ['.txt','.html','.htm', '.md', '.pdf', ], + 'narrativeminutes': ['.txt','.html','.htm', '.md', '.pdf', ], 'slides': ['.doc','.docx','.pdf','.ppt','.pptx','.txt', ], # Note the removal of .zip 'bluesheets': ['.pdf', '.txt', ], 'procmaterials':['.pdf', ], @@ -928,6 +1089,7 @@ def skip_unreadable_post(record): MEETING_VALID_UPLOAD_MIME_TYPES = { 'agenda': ['text/plain', 'text/html', 'text/markdown', 'text/x-markdown', ], 'minutes': ['text/plain', 'text/html', 'application/pdf', 'text/markdown', 'text/x-markdown', ], + 'narrativeminutes': ['text/plain', 'text/html', 'application/pdf', 'text/markdown', 'text/x-markdown', ], 'slides': [], 'bluesheets': ['application/pdf', 'text/plain', ], 'procmaterials':['application/pdf', ], @@ -982,15 +1144,12 @@ def skip_unreadable_post(record): # ============================================================================== -RSYNC_BINARY = '/usr/bin/rsync' YANGLINT_BINARY = '/usr/bin/yanglint' DE_GFM_BINARY = '/usr/bin/de-gfm.ruby2.5' # Account settings DAYS_TO_EXPIRE_REGISTRATION_LINK = 3 MINUTES_TO_EXPIRE_RESET_PASSWORD_LINK = 60 -HTPASSWD_COMMAND = "/usr/bin/htpasswd" -HTPASSWD_FILE = "/www/htpasswd" # Generation of pdf files GHOSTSCRIPT_COMMAND = "/usr/bin/gs" @@ -1001,13 +1160,19 @@ def skip_unreadable_post(record): # Timezone files for iCalendar TZDATA_ICS_PATH = BASE_DIR + '/../vzic/zoneinfo/' -SECR_BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf' -SECR_BLUE_SHEET_URL = IDTRACKER_BASE_URL + '/documents/blue_sheet.rtf' -SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim' -SECR_MAX_UPLOAD_SIZE = 40960000 -SECR_PROCEEDINGS_DIR = '/a/www/www6s/proceedings/' -SECR_PPT2PDF_COMMAND = ['/usr/bin/soffice','--headless','--convert-to','pdf:writer_globaldocument_pdf_Export','--outdir'] -STATS_REGISTRATION_ATTENDEES_JSON_URL = 'https://registration.ietf.org/{number}/attendees/' +DATATRACKER_MAX_UPLOAD_SIZE = 40960000 +PPT2PDF_COMMAND = [ + "/usr/bin/soffice", + "--headless", # no GUI + "--safe-mode", # use a new libreoffice profile every time (ensures no reliance on accumulated profile config) + "--norestore", # don't attempt to restore files after a previous crash (ensures that one crash won't block future conversions until UI intervention) + "--convert-to", "pdf:writer_globaldocument_pdf_Export", + "--outdir" +] + +REGISTRATION_PARTICIPANTS_API_URL = 'https://registration.ietf.org/api/v1/participants-dt/' +REGISTRATION_PARTICIPANTS_API_KEY = 'changeme' + PROCEEDINGS_VERSION_CHANGES = [ 0, # version 1 97, # version 2: meeting 97 and later (was number was NEW_PROCEEDINGS_START) @@ -1027,7 +1192,6 @@ def skip_unreadable_post(record): # CHAT_ARCHIVE_URL_PATTERN = 'https://www.ietf.org/jabber/logs/{chat_room_name}?C=M;O=D' PYFLAKES_DEFAULT_ARGS= ["ietf", ] -VULTURE_DEFAULT_ARGS= ["ietf", ] # Automatic Scheduling # @@ -1074,16 +1238,6 @@ def skip_unreadable_post(record): TEST_DATA_DIR = os.path.abspath(BASE_DIR + "/../test/data") -# Path to the email alias lists. Used by ietf.utils.aliases -DRAFT_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "draft-aliases") -DRAFT_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "draft-virtual") -DRAFT_VIRTUAL_DOMAIN = "virtual.ietf.org" - -GROUP_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "group-aliases") -GROUP_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "group-virtual") -GROUP_VIRTUAL_DOMAIN = "virtual.ietf.org" - -POSTCONFIRM_PATH = "/a/postconfirm/wrapper" USER_PREFERENCE_DEFAULTS = { "expires_soon" : "14", @@ -1099,21 +1253,23 @@ def skip_unreadable_post(record): "@ietf.org$", ] +# Configuration for django-markup MARKUP_SETTINGS = { 'restructuredtext': { 'settings_overrides': { + 'report_level': 3, # error (3) or severe (4) only 'initial_header_level': 3, 'doctitle_xform': False, 'footnote_references': 'superscript', 'trim_footnote_reference_space': True, 'default_reference_context': 'view', + 'raw_enabled': False, # critical for security + 'file_insertion_enabled': False, # critical for security 'link_base': '' } } } -MAILMAN_LIB_DIR = '/usr/lib/mailman' - # This is the number of seconds required between subscribing to an ietf # mailing list and datatracker account creation being accepted LIST_ACCOUNT_DELAY = 60*60*25 # 25 hours @@ -1122,14 +1278,13 @@ def skip_unreadable_post(record): SILENCED_SYSTEM_CHECKS = [ "fields.W342", # Setting unique=True on a ForeignKey has the same effect as using a OneToOneField. + "fields.W905", # django.contrib.postgres.fields.CICharField is deprecated. (see https://github.com/ietf-tools/datatracker/issues/5660) ] CHECKS_LIBRARY_PATCHES_TO_APPLY = [ 'patch/change-oidc-provider-field-sizes-228.patch', 'patch/fix-oidc-access-token-post.patch', 'patch/fix-jwkest-jwt-logging.patch', - 'patch/fix-django-password-strength-kwargs.patch', - 'patch/add-django-http-cookie-value-none.patch', 'patch/django-cookie-delete-with-all-settings.patch', 'patch/tastypie-django22-fielderror-response.patch', ] @@ -1172,6 +1327,19 @@ def skip_unreadable_post(record): CELERY_BROKER_URL = 'amqp://mq/' CELERY_BEAT_SCHEDULER = 'django_celery_beat.schedulers:DatabaseScheduler' CELERY_BEAT_SYNC_EVERY = 1 # update DB after every event +CELERY_BEAT_CRON_STARTING_DEADLINE = 1800 # seconds after a missed deadline before abandoning a cron task +CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True # the default, but setting it squelches a warning +# Use a result backend so we can chain tasks. This uses the rpc backend, see +# https://docs.celeryq.dev/en/stable/userguide/tasks.html#rpc-result-backend-rabbitmq-qpid +# Results can be retrieved only once and only by the caller of the task. Results will be +# lost if the message broker restarts. +CELERY_RESULT_BACKEND = 'django-cache' # use a Django cache for results +CELERY_CACHE_BACKEND = 'celery-results' # which Django cache to use +CELERY_RESULT_EXPIRES = datetime.timedelta(minutes=5) # how long are results valid? (Default is 1 day) +CELERY_TASK_IGNORE_RESULT = True # ignore results unless specifically enabled for a task +CELERY_TASK_ROUTES = { + "ietf.blobdb.tasks.pybob_the_blob_replicator_task": {"queue": "blobdb"} +} # Meetecho API setup: Uncomment this and provide real credentials to enable # Meetecho conference creation for interim session requests @@ -1181,12 +1349,17 @@ def skip_unreadable_post(record): # 'client_id': 'datatracker', # 'client_secret': 'some secret', # 'request_timeout': 3.01, # python-requests doc recommend slightly > a multiple of 3 seconds +# # How many minutes before/after session to enable slide update API. Defaults to 15. Set to None to disable, +# # or < 0 to _always_ send updates (useful for debugging) +# 'slides_notify_time': 15, +# 'debug': False, # if True, API calls will be echoed as debug instead of sent (only works for slides for now) # } # Meetecho URLs - instantiate with url.format(session=some_session) MEETECHO_ONSITE_TOOL_URL = "https://meetings.conf.meetecho.com/onsite{session.meeting.number}/?session={session.pk}" MEETECHO_VIDEO_STREAM_URL = "https://meetings.conf.meetecho.com/ietf{session.meeting.number}/?session={session.pk}" MEETECHO_AUDIO_STREAM_URL = "https://mp3.conf.meetecho.com/ietf{session.meeting.number}/{session.pk}.m3u" +MEETECHO_SESSION_RECORDING_URL = "https://meetecho-player.ietf.org/playout/?session={session_label}" # Put the production SECRET_KEY in settings_local.py, and also any other # sensitive or site-specific changes. DO NOT commit settings_local.py to svn. @@ -1207,6 +1380,122 @@ def skip_unreadable_post(record): MIDDLEWARE += DEV_MIDDLEWARE TEMPLATES[0]['OPTIONS']['context_processors'] += DEV_TEMPLATE_CONTEXT_PROCESSORS +if "CACHES" not in locals(): + if SERVER_MODE == "production": + MEMCACHED_HOST = os.environ.get("MEMCACHED_SERVICE_HOST", "127.0.0.1") + MEMCACHED_PORT = os.environ.get("MEMCACHED_SERVICE_PORT", "11211") + CACHES = { + "default": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + "VERSION": __version__, + "KEY_PREFIX": "ietf:dt", + # Key function is default except with sha384-encoded key + "KEY_FUNCTION": lambda key, key_prefix, version: ( + f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}" + ), + }, + "proceedings": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + # No release-specific VERSION setting. + "KEY_PREFIX": "ietf:dt:proceedings", + # Key function is default except with sha384-encoded key + "KEY_FUNCTION": lambda key, key_prefix, version: ( + f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}" + ), + }, + "sessions": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + # No release-specific VERSION setting. + "KEY_PREFIX": "ietf:dt", + }, + "htmlized": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/htmlized", + "OPTIONS": { + "MAX_ENTRIES": 100000, # 100,000 + }, + }, + "pdfized": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/pdfized", + "OPTIONS": { + "MAX_ENTRIES": 100000, # 100,000 + }, + }, + "slowpages": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/slowpages", + "OPTIONS": { + "MAX_ENTRIES": 5000, + }, + }, + "celery-results": { + "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + "KEY_PREFIX": "ietf:celery", + }, + } + else: + CACHES = { + "default": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + #'BACKEND': 'ietf.utils.cache.LenientMemcacheCache', + #'LOCATION': '127.0.0.1:11211', + #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + "VERSION": __version__, + "KEY_PREFIX": "ietf:dt", + }, + "proceedings": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + # "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + # "LOCATION": "127.0.0.1:11211", + # No release-specific VERSION setting. + "KEY_PREFIX": "ietf:dt:proceedings", + # Key function is default except with sha384-encoded key + "KEY_FUNCTION": lambda key, key_prefix, version: ( + f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}" + ), + }, + "sessions": { + "BACKEND": "django.core.cache.backends.locmem.LocMemCache", + }, + "htmlized": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + "LOCATION": "/var/cache/datatracker/htmlized", + "OPTIONS": { + "MAX_ENTRIES": 1000, + }, + }, + "pdfized": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + "LOCATION": "/var/cache/datatracker/pdfized", + "OPTIONS": { + "MAX_ENTRIES": 1000, + }, + }, + "slowpages": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + "LOCATION": "/var/cache/datatracker/", + "OPTIONS": { + "MAX_ENTRIES": 5000, + }, + }, + "celery-results": { + "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache", + "LOCATION": "app:11211", + "KEY_PREFIX": "ietf:celery", + }, + } + +PUBLISH_IPR_STATES = ['posted', 'removed', 'removed_objfalse'] + +ADVERTISE_VERSIONS = ["markdown", "pyang", "rfc2html", "xml2rfc"] # We provide a secret key only for test and development modes. It's # absolutely vital that django fails to start in production mode unless a @@ -1217,44 +1506,6 @@ def skip_unreadable_post(record): loaders = TEMPLATES[0]['OPTIONS']['loaders'] loaders = tuple(l for e in loaders for l in (e[1] if isinstance(e, tuple) and "cached.Loader" in e[0] else (e,))) TEMPLATES[0]['OPTIONS']['loaders'] = loaders - - CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', - #'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - #'LOCATION': '127.0.0.1:11211', - #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'VERSION': __version__, - 'KEY_PREFIX': 'ietf:dt', - }, - 'sessions': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - }, - 'htmlized': { - 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', - #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/var/cache/datatracker/htmlized', - 'OPTIONS': { - 'MAX_ENTRIES': 1000, - }, - }, - 'pdfized': { - 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', - #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/var/cache/datatracker/pdfized', - 'OPTIONS': { - 'MAX_ENTRIES': 1000, - }, - }, - 'slowpages': { - 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', - #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/var/cache/datatracker/', - 'OPTIONS': { - 'MAX_ENTRIES': 5000, - }, - }, - } SESSION_ENGINE = "django.contrib.sessions.backends.db" if 'SECRET_KEY' not in locals(): @@ -1274,6 +1525,9 @@ def skip_unreadable_post(record): # Cannot have this set to True if we're using http: from the dev-server: CSRF_COOKIE_SECURE = False CSRF_COOKIE_SAMESITE = 'Lax' + CSRF_TRUSTED_ORIGINS += ['http://localhost:8000', 'http://127.0.0.1:8000', 'http://[::1]:8000'] SESSION_COOKIE_SECURE = False SESSION_COOKIE_SAMESITE = 'Lax' - + + +YOUTUBE_DOMAINS = ['www.youtube.com', 'youtube.com', 'youtu.be', 'm.youtube.com', 'youtube-nocookie.com', 'www.youtube-nocookie.com'] diff --git a/ietf/settings_postgrestest.py b/ietf/settings_postgrestest.py deleted file mode 100755 index 450fd9180b6..00000000000 --- a/ietf/settings_postgrestest.py +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright The IETF Trust 2010-2023, All Rights Reserved -# -*- coding: utf-8 -*- - - -# Standard settings except we use Postgres and skip migrations, this is -# useful for speeding up tests that depend on the test database, try -# for instance: -# -# ./manage.py test --settings=settings_postgrestest doc.ChangeStateTestCase -# - -import os -from ietf.settings import * # pyflakes:ignore -from ietf.settings import TEST_CODE_COVERAGE_CHECKER, BASE_DIR, PHOTOS_DIRNAME -import debug # pyflakes:ignore -debug.debug = True - -# Use a different hostname, to catch hardcoded values -IDTRACKER_BASE_URL = "https://postgrestest.ietf.org" - -# Workaround to avoid spending minutes stepping through the migrations in -# every test run. The result of this is to use the 'syncdb' way of creating -# the test database instead of doing it through the migrations. Taken from -# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09 - -class DisableMigrations(object): - - def __contains__(self, item): - return True - - def __getitem__(self, item): - return None - -MIGRATION_MODULES = DisableMigrations() - - -DATABASES = { - 'default': { - 'HOST': 'db', - 'PORT': '5432', - 'NAME': 'test.db', - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'USER': 'django', - 'PASSWORD': 'RkTkDPFnKpko', - }, - } - -if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore - TEST_CODE_COVERAGE_CHECKER.start() # pyflakes:ignore - -NOMCOM_PUBLIC_KEYS_DIR=os.path.abspath("tmp-nomcom-public-keys-dir") - -MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'test/media/') # pyflakes:ignore -MEDIA_URL = '/test/media/' -PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME # pyflakes:ignore - -# Undo any developer-dependent middleware when running the tests -MIDDLEWARE = [ c for c in MIDDLEWARE if not c in DEV_MIDDLEWARE ] # pyflakes:ignore - -TEMPLATES[0]['OPTIONS']['context_processors'] = [ p for p in TEMPLATES[0]['OPTIONS']['context_processors'] if not p in DEV_TEMPLATE_CONTEXT_PROCESSORS ] # pyflakes:ignore - -REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False diff --git a/ietf/settings_test.py b/ietf/settings_test.py new file mode 100755 index 00000000000..6479069db02 --- /dev/null +++ b/ietf/settings_test.py @@ -0,0 +1,116 @@ +# Copyright The IETF Trust 2010-2023, All Rights Reserved +# -*- coding: utf-8 -*- + + +# Standard settings except we use Postgres and skip migrations, this is +# useful for speeding up tests that depend on the test database, try +# for instance: +# +# ./manage.py test --settings=settings_test doc.ChangeStateTestCase +# + +import atexit +import os +import shutil +import tempfile +from ietf.settings import * # pyflakes:ignore +from ietf.settings import ORIG_AUTH_PASSWORD_VALIDATORS +import debug # pyflakes:ignore +debug.debug = True + +# Use a different hostname, to catch hardcoded values +IDTRACKER_BASE_URL = "https://postgrestest.ietf.org" + +# Workaround to avoid spending minutes stepping through the migrations in +# every test run. The result of this is to use the 'syncdb' way of creating +# the test database instead of doing it through the migrations. Taken from +# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09 + +class DisableMigrations(object): + + def __contains__(self, item): + return True + + def __getitem__(self, item): + return None + +MIGRATION_MODULES = DisableMigrations() + + +DATABASES = { + 'default': { + 'HOST': 'db', + 'PORT': '5432', + 'NAME': 'test.db', + 'ENGINE': 'django.db.backends.postgresql', + 'USER': 'django', + 'PASSWORD': 'RkTkDPFnKpko', + }, + } + +# test with a single DB - do not use a DB router +BLOBDB_DATABASE = "default" +DATABASE_ROUTERS = [] # type: ignore + +if TEST_CODE_COVERAGE_CHECKER: # pyflakes:ignore + TEST_CODE_COVERAGE_CHECKER.start() # pyflakes:ignore + +def tempdir_with_cleanup(**kwargs): + """Utility to create a temporary dir and arrange cleanup""" + _dir = tempfile.mkdtemp(**kwargs) + atexit.register(shutil.rmtree, _dir) + return _dir + + +NOMCOM_PUBLIC_KEYS_DIR = tempdir_with_cleanup(suffix="-nomcom-public-keys-dir") + +MEDIA_ROOT = tempdir_with_cleanup(suffix="-media") +PHOTOS_DIRNAME = "photo" +PHOTOS_DIR = os.path.join(MEDIA_ROOT, PHOTOS_DIRNAME) +os.mkdir(PHOTOS_DIR) + +# Undo any developer-dependent middleware when running the tests +MIDDLEWARE = [ c for c in MIDDLEWARE if not c in DEV_MIDDLEWARE ] # pyflakes:ignore + +TEMPLATES[0]['OPTIONS']['context_processors'] = [ p for p in TEMPLATES[0]['OPTIONS']['context_processors'] if not p in DEV_TEMPLATE_CONTEXT_PROCESSORS ] # pyflakes:ignore + +REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False + +# Override loggers with a safer set in case things go to the log during testing. Specifically, +# make sure there are no syslog loggers that might send things to a real syslog. +LOGGING["loggers"] = { # pyflakes:ignore + 'django': { + 'handlers': ['debug_console'], + 'level': 'INFO', + }, + 'django.request': { + 'handlers': ['debug_console'], + 'level': 'ERROR', + }, + 'django.server': { + 'handlers': ['django.server'], + 'level': 'INFO', + }, + 'django.security': { + 'handlers': ['debug_console', ], + 'level': 'INFO', + }, + 'oidc_provider': { + 'handlers': ['debug_console', ], + 'level': 'DEBUG', + }, + 'datatracker': { + 'handlers': ['debug_console'], + 'level': 'INFO', + }, + 'celery': { + 'handlers': ['debug_console'], + 'level': 'INFO', + }, +} + +# Restore AUTH_PASSWORD_VALIDATORS if they were reset in settings_local +try: + AUTH_PASSWORD_VALIDATORS = ORIG_AUTH_PASSWORD_VALIDATORS +except NameError: + pass diff --git a/ietf/settings_testcrawl.py b/ietf/settings_testcrawl.py index a1b5ce8946d..40744a228df 100644 --- a/ietf/settings_testcrawl.py +++ b/ietf/settings_testcrawl.py @@ -27,9 +27,11 @@ 'MAX_ENTRIES': 10000, }, }, + 'proceedings': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, 'sessions': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - # No version-specific VERSION setting. }, 'htmlized': { 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', diff --git a/ietf/static/css/custom-bs-import.scss b/ietf/static/css/custom-bs-import.scss new file mode 100644 index 00000000000..644efdcf108 --- /dev/null +++ b/ietf/static/css/custom-bs-import.scss @@ -0,0 +1,58 @@ +@import "bootstrap/scss/functions"; + +// Enable negative margin classes. +$enable-negative-margins: true; + +// Don't add carets to dropdowns by default. +// $enable-caret: false; + +$popover-max-width: 100%; + +// Override default fonts + +$font-family-sans-serif: "Inter", +system-ui, +-apple-system, +"Segoe UI", +Roboto, +"Helvetica Neue", +"Noto Sans", +"Liberation Sans", +Arial, +sans-serif, +"Apple Color Emoji", +"Segoe UI Emoji", +"Segoe UI Symbol", +"Noto Color Emoji"; +$font-family-monospace: "Noto Sans Mono", +SFMono-Regular, +Menlo, +Monaco, +Consolas, +"Liberation Mono", +"Courier New", +monospace; + +// Enable color modes +$color-mode-type: data; + +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/variables-dark"; + +$h1-font-size: $font-size-base * 2.2; +$h2-font-size: $font-size-base * 1.8; +$h3-font-size: $font-size-base * 1.6; +$h4-font-size: $font-size-base * 1.4; +$h5-font-size: $font-size-base * 1.2; +$h6-font-size: $font-size-base; + +// Default is gray-800, which is the same as the range slider background. +$light-bg-subtle-dark: mix($gray-800, $black); + +@import "bootstrap/scss/maps"; +@import "bootstrap/scss/mixins"; +@import "bootstrap/scss/utilities"; +@import "bootstrap/scss/root"; + + + diff --git a/ietf/static/css/datepicker.scss b/ietf/static/css/datepicker.scss index 21d6aac2469..88f9e835fdb 100644 --- a/ietf/static/css/datepicker.scss +++ b/ietf/static/css/datepicker.scss @@ -1,2 +1,6 @@ -@import "vanillajs-datepicker/sass/index-bs5"; +@import "custom-bs-import"; + +// FIXME: color.scale doesn't seem to work with CSS variables, so avoid those:` +$dp-cell-focus-background-color: $dropdown-link-hover-bg !default; + @import "vanillajs-datepicker/sass/datepicker-bs5"; diff --git a/ietf/static/css/document_html.scss b/ietf/static/css/document_html.scss index 32a1b9e4d15..47ef8d64b47 100644 --- a/ietf/static/css/document_html.scss +++ b/ietf/static/css/document_html.scss @@ -1,22 +1,9 @@ @use "sass:map"; -// FIXME: It's not clear why these three variables remain unset by bs5, but just -// set them to placeholder values so the CSS embedded in the HTML validates. -$btn-font-family: inherit !default; -$nav-link-font-weight: inherit !default; -$tooltip-margin: inherit !default; - -$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; -$font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - -@import "bootstrap/scss/functions"; -@import "bootstrap/scss/variables"; -@import "bootstrap/scss/maps"; -@import "bootstrap/scss/mixins"; -@import "bootstrap/scss/utilities"; -@import "bootstrap/scss/root"; +@import "custom-bs-import"; // Layout & components +// Only import what we need: @import "bootstrap/scss/reboot"; @import "bootstrap/scss/type"; // @import "bootstrap/scss/images"; @@ -26,7 +13,7 @@ $font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consola @import "bootstrap/scss/forms"; @import "bootstrap/scss/buttons"; @import "bootstrap/scss/transitions"; -// @import "bootstrap/scss/dropdown"; +@import "bootstrap/scss/dropdown"; @import "bootstrap/scss/button-group"; @import "bootstrap/scss/nav"; @import "bootstrap/scss/navbar"; @@ -66,12 +53,42 @@ $font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consola scrollbar-width: none; } -.sidebar-toggle[aria-expanded="true"] { +.sidebar-toggle[aria-expanded="true"] .sidebar-shown { display: none; } -.sidebar-toggle[aria-expanded="false"] { - display: inherit; +.sidebar-toggle[aria-expanded="false"] .sidebar-collapsed { + display: none; +} + +.sidebar-toolbar { + z-index: 1; +} + +// Toggle classes for dark/light modes +[data-bs-theme="dark"] { + .d-dm-none { + display: none; + } + + .d-lm-none { + display: initial; + } +} + +[data-bs-theme="light"] { + .d-dm-none { + display: initial; + } + + .d-lm-none { + display: none; + } +} + +// Show theme toggler checkbox +.dropdown-menu .active .bi { + display: block !important; } @media screen { @@ -141,6 +158,7 @@ $font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consola pre, code { font-size: 1em; + overflow: visible; } pre { @@ -302,6 +320,11 @@ tbody.meta tr { background-color: $danger; } +.badge-generic { + color: white; + background-color: $danger; +} + #toc-nav { width: inherit; overscroll-behavior-y: none; // Prevent overscrolling from scrolling the main content @@ -333,11 +356,13 @@ tbody.meta tr { page-break-inside: avoid; } + /* a:link, a:visited { // color: inherit; // text-decoration: none; } +*/ .newpage { page-break-before: always !important; diff --git a/ietf/static/css/document_html_txt.scss b/ietf/static/css/document_html_txt.scss index 278a340dbfd..a5991056c96 100644 --- a/ietf/static/css/document_html_txt.scss +++ b/ietf/static/css/document_html_txt.scss @@ -1,8 +1,7 @@ -// Based on https://github.com/martinthomson/rfc-txt-html/blob/db4be92247979541cd26a32b7b2bf0e044ca098b/txt.css -// (Version hash to make future merging easier.) +// Based on https://github.com/martinthomson/rfc-txt-html/blob/main/txt.css :root { - --line: 1.2em; + --line: 1.3em; --block: 0 0 0 3ch; --paragraph: var(--line) 0 var(--line) 3ch; } @@ -70,7 +69,7 @@ figure { blockquote { @include margin-paragraph; // margin: var(--paragraph); padding-left: calc(2ch - 2px); - border-left: 2px solid darkgrey; + border-left: 2px solid var(--bs-border-color); } /* Header junk */ @@ -166,6 +165,7 @@ blockquote { #identifiers dd.authors .author { display: inline-block; margin: 0 2ch 0 1ch; + min-height: calc(2 * var(--line)); } #identifiers dd.authors .author:last-of-type { margin-right: 0; @@ -344,7 +344,7 @@ div:is(.artwork, .sourcecode) pre { flex: 0 0 content; margin: 0; max-width: 72ch; - overflow: auto; + overflow: auto clip; } div:is(.artwork, .sourcecode) .pilcrow { flex: 0 0 1ch; @@ -375,7 +375,7 @@ thead, tfoot { border-bottom-style: double; } td, th { - border: 1px solid black; + border: 1px solid var(--bs-border-color); // padding: var(--half-line) 1ch; padding-top: var(--half-line); padding-right: 1ch; @@ -394,7 +394,7 @@ td, th { /* Links */ a.selfRef, a.pilcrow, .iref + a.internal { - color: black; + color: inherit; text-decoration: none; } a.relref, a.xref { @@ -425,8 +425,8 @@ sup, sub { /* Authors */ address, address.vcard { font-style: normal; - // margin: 2em 0 var(--line) 3ch; - margin-top: 2em; + // margin: var(--line) 0 var(--line) 3ch + margin-top: var(--line); margin-right: 0; margin-bottom: var(--line); margin-left: 3ch; @@ -450,4 +450,19 @@ section > p, section > dl.references > dd { * doesn't break words at '/' like other browsers. */ overflow-wrap: break-word; } + +/* From https://github.com/martinthomson/rfc-css/blob/main/rfc.css */ +/* SVG Trick: a prefix match works because only black and white are allowed */ +svg :is([stroke="black"], [stroke^="#000"]) { + stroke: var(--bs-body-color); +} +svg :is([stroke="white"], [stroke^="#fff"]) { + stroke: var(--bs-body-bg); +} +svg :is([fill="black"], [fill^="#000"], :not([fill])) { + fill: var(--bs-body-color); +} +svg :is([fill="white"], [fill^="#fff"]) { + fill: var(--bs-body-bg); +} } diff --git a/ietf/static/css/highcharts.scss b/ietf/static/css/highcharts.scss new file mode 100644 index 00000000000..d2f5d5e0e74 --- /dev/null +++ b/ietf/static/css/highcharts.scss @@ -0,0 +1,6 @@ +@import "npm:highcharts/css/highcharts.css"; +@import "custom-bs-import"; + +.highcharts-container { + font-family: $font-family-sans-serif; +} diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index 88c9cbda073..df973863d53 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -1,37 +1,9 @@ @use "sass:map"; -@import "bootstrap/scss/functions"; - -// Enable negative margin classes. -$enable-negative-margins: true; - -// Don't add carets to dropdowns by default. -// $enable-caret: false; - -$popover-max-width: 100%; - -// Override default fonts - -$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; -$font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - -// Only import what we need: - -@import "bootstrap/scss/variables"; - -$h1-font-size: $font-size-base * 2.2; -$h2-font-size: $font-size-base * 1.8; -$h3-font-size: $font-size-base * 1.6; -$h4-font-size: $font-size-base * 1.4; -$h5-font-size: $font-size-base * 1.2; -$h6-font-size: $font-size-base; - -@import "bootstrap/scss/maps"; -@import "bootstrap/scss/mixins"; -@import "bootstrap/scss/utilities"; -@import "bootstrap/scss/root"; +@import "custom-bs-import"; // Layout & components +// Only import what we need: @import "bootstrap/scss/reboot"; @import "bootstrap/scss/type"; @import "bootstrap/scss/images"; @@ -75,7 +47,7 @@ url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff") format("woff"); @import "bootstrap-icons/font/bootstrap-icons"; // Leave room for fixed-top navbar... -body { +body.navbar-offset { padding-top: 60px; } @@ -84,6 +56,55 @@ html { scroll-padding-top: 60px; } +// Toggle classes for dark/light modes +[data-bs-theme="dark"] { + .d-dm-none { + display: none; + } + + .d-lm-none { + display: initial; + } +} + +[data-bs-theme="light"] { + .d-dm-none { + display: initial; + } + + .d-lm-none { + display: none; + } +} + +// Make submenus open on hover. +@include media-breakpoint-up(lg) { + .dropdown-menu>li>ul { + display: none; + } + + .dropdown-menu>li:hover>ul { + display: block; + } + +} + +@include media-breakpoint-up(md) { + .leftmenu .nav>li>ul { + display: none; + } + + .leftmenu .nav>li:hover>ul { + display: block; + } +} + +:is(.dropdown-menu, .leftmenu .nav) .dropdown-menu { + top: 0; + left: 100%; + right: auto; +} + // Make textareas in forms use a monospace font textarea.form-control { font-family: $font-family-code; @@ -132,8 +153,8 @@ pre { --#{$prefix}dropdown-divider-bg: #{$dropdown-divider-bg}; --#{$prefix}dropdown-divider-margin-y: #{$dropdown-divider-margin-y}; --#{$prefix}dropdown-box-shadow: #{$dropdown-box-shadow}; - --#{$prefix}dropdown-link-color: #{$dropdown-link-color}; - --#{$prefix}dropdown-link-hover-color: #{$dropdown-link-hover-color}; + --#{$prefix}dropdown-link-color: #{$nav-link-color}; + --#{$prefix}dropdown-link-hover-color: #{$nav-link-hover-color}; --#{$prefix}dropdown-link-hover-bg: #{$dropdown-link-hover-bg}; --#{$prefix}dropdown-link-active-color: #{$dropdown-link-active-color}; --#{$prefix}dropdown-link-active-bg: #{$dropdown-link-active-bg}; @@ -208,16 +229,20 @@ th, .group-menu .dropdown-menu { height: auto; width: auto; - max-height: 35em; + max-height: 95vh; overflow-x: hidden; overflow-y: auto; } // Helper to constrain the size of the main logo .ietflogo { - width: 75%; + width: 100%; max-width: 300px; } +.ietflogo > img { + min-width: 100px; + width: 100%; +} // Make revision numbers pagination items fixed-width .revision-list { @@ -272,13 +297,13 @@ th, } // Styles for d3.js graphical SVG timelines -#timeline { +#doc-timeline { font-size: small; .axis path, .axis line { fill: none; - stroke: black; + stroke: var(--bs-body-color); } .axis.y path, @@ -295,7 +320,7 @@ th, } .bar text { - fill: black; + fill: var(--bs-body-color); dominant-baseline: central; pointer-events: none; } @@ -334,7 +359,7 @@ th, } .ballot-icon table .my { - border: 2 * $table-border-width solid #000; + border: calc(2 * $table-border-width) solid var(--bs-emphasis-color); } // See https://getbootstrap.com/docs/5.1/customize/color/#all-colors @@ -446,36 +471,64 @@ td.position-recuse { } td.position-norecord { - background-color: $white; // $color-norecord; + background-color: transparent; } td.position-empty { border: none !important; } -tr.position-moretime-row, -tr.position-notready-row, -tr.position-discuss-row, -tr.position-block-row { - background-color: tint-color($color-discuss, 85%); -} +[data-bs-theme="light"] { -tr.position-yes-row { - background-color: tint-color($color-yes, 75%); -} + tr.position-moretime-row, + tr.position-notready-row, + tr.position-discuss-row, + tr.position-block-row { + background-color: tint-color($color-discuss, 85%); + } -tr.position-noobj-row { - background-color: tint-color($color-noobj, 50%); -} + tr.position-yes-row { + background-color: tint-color($color-yes, 75%); + } -tr.position-abstain-row { - background-color: tint-color($color-abstain, 85%); -} + tr.position-noobj-row { + background-color: tint-color($color-noobj, 50%); + } -tr.position-recuse-row { - background-color: tint-color($color-recuse, 85%); + tr.position-abstain-row { + background-color: tint-color($color-abstain, 85%); + } + + tr.position-recuse-row { + background-color: tint-color($color-recuse, 85%); + } } +[data-bs-theme="dark"] { + + tr.position-moretime-row, + tr.position-notready-row, + tr.position-discuss-row, + tr.position-block-row { + background-color: shade-color($color-discuss, 65%); + } + + tr.position-yes-row { + background-color: shade-color($color-yes, 65%); + } + + tr.position-noobj-row { + background-color: shade-color($color-noobj, 65%); + } + + tr.position-abstain-row { + background-color: shade-color($color-abstain, 65%); + } + + tr.position-recuse-row { + background-color: shade-color($color-recuse, 65%); + } +} /* === Edit Meeting Schedule ====================================== */ @@ -513,7 +566,7 @@ tr.position-recuse-row { } .edit-meeting-schedule .edit-grid .day-label .swap-days:hover { - color: #666; + color: var(--bs-secondary-color); } .edit-meeting-schedule #swap-days-modal .modal-body label { @@ -545,15 +598,15 @@ tr.position-recuse-row { } .edit-meeting-schedule .edit-grid .time-header .time-label.would-violate-hint { - background-color: #ffe0e0; - outline: #ffe0e0 solid 0.4em; + background-color: var(--bs-danger-bg-subtle); + outline: var(--bs-danger-bg-subtle) solid 0.4em; } .edit-meeting-schedule .edit-grid .time-header .time-label span { display: inline-block; width: 100%; text-align: center; - color: #444444; + color: var(--bs-secondary-color); } .edit-meeting-schedule .edit-grid .timeslots { @@ -565,7 +618,7 @@ tr.position-recuse-row { .edit-meeting-schedule .edit-grid .timeslot { position: relative; display: inline-block; - background-color: #f4f4f4; + background-color: var(--bs-secondary-bg); height: 100%; overflow: hidden; } @@ -578,7 +631,7 @@ tr.position-recuse-row { width: 100%; align-items: center; justify-content: center; - color: #999; + color: var(--bs-tertiary-color); } .edit-meeting-schedule .edit-grid .timeslot .drop-target { @@ -595,22 +648,22 @@ tr.position-recuse-row { } .edit-meeting-schedule .edit-grid .timeslot.overfull { - border-right: 0.3em dashed #f55000; + border-right: 0.3em dashed var(--bs-danger); /* cut-off illusion */ } .edit-meeting-schedule .edit-grid .timeslot.would-violate-hint { - background-color: #ffe0e0; - outline: #ffe0e0 solid 0.4em; + background-color: var(--bs-danger-bg-subtle); + outline: var(--bs-danger-bg-subtle) solid 0.4em; } .edit-meeting-schedule .edit-grid .timeslot.would-violate-hint.dropping { - background-color: #ccb3b3; + background-color: var(--bs-danger); } .edit-meeting-schedule .constraints .encircled, .edit-meeting-schedule .formatted-constraints .encircled { - border: 1px solid #000; + border: 1px solid var( --bs-body-color); border-radius: 1em; padding: 0 0.3em; text-align: center; @@ -623,7 +676,7 @@ tr.position-recuse-row { /* sessions */ .edit-meeting-schedule .session { - background-color: #fff; + background-color: var(--bs-body-bg); margin: 0.2em; padding-right: 0.2em; padding-left: 0.5em; @@ -635,15 +688,15 @@ tr.position-recuse-row { .edit-meeting-schedule .session.selected { cursor: grabbing; - outline: #0000ff solid 0.2em; - /* blue, width matches margin on .session */ + outline: var(--bs-primary) solid 0.2em; + /* width matches margin on .session */ z-index: 2; /* render above timeslot outlines */ } .edit-meeting-schedule .session.other-session-selected { - outline: #00008b solid 0.2em; - /* darkblue, width matches margin on .session */ + outline: 0.3em solid var(--bs-info); + box-shadow: 0 0 1em var(--bs-info); z-index: 2; /* render above timeslot outlines */ } @@ -654,7 +707,7 @@ tr.position-recuse-row { .edit-meeting-schedule .session.readonly { cursor: default; - background-color: #ddd; + background-color: var(--bs-dark-bg-subtle); } .edit-meeting-schedule .session.hidden-parent * { @@ -668,13 +721,12 @@ tr.position-recuse-row { } .edit-meeting-schedule .session.highlight { - outline-color: #ff8c00; - /* darkorange */ - background-color: #f3f3f3; + outline-color: var(--bs-warning); + background-color: var(--bs-light); } .edit-meeting-schedule .session.would-violate-hint { - outline: 0.3em solid #F55000; + outline: 0.3em solid var(--bs-danger); z-index: 1; /* raise up so the outline is not overdrawn */ } @@ -696,6 +748,7 @@ tr.position-recuse-row { .edit-meeting-schedule .edit-grid, .edit-meeting-schedule .session { + // Removing this font-family style causes selenium tests to fail :-( font-family: arial, helvetica, sans-serif; font-size: 11px; } @@ -767,9 +820,9 @@ tr.position-recuse-row { bottom: 0; left: 0; width: 100%; - border-top: 0.2em solid #ccc; + border-top: 0.2em solid var(--bs-border-color); margin-bottom: 2em; - background-color: #fff; + background-color: var(--bs-body-bg); opacity: 0.95; z-index: 5; /* raise above edit-grid items */ @@ -784,7 +837,7 @@ tr.position-recuse-row { min-height: 4em; max-height: 13em; overflow-y: auto; - background-color: #f4f4f4; + background-color: var(--bs-secondary-bg); } .edit-meeting-schedule .unassigned-sessions.dropping { @@ -841,7 +894,7 @@ tr.position-recuse-row { font-weight: normal; margin-right: 1em; padding: 0 1em; - border: 0.1em solid #eee; + border: 0.1em solid var(--bs-border-color); cursor: pointer; } @@ -907,7 +960,7 @@ tr.position-recuse-row { } .edit-meeting-timeslots-and-misc-sessions .room-row { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid var(--bs-border-color); // height: 20px; display: flex; cursor: pointer; @@ -927,13 +980,13 @@ tr.position-recuse-row { } .edit-meeting-timeslots-and-misc-sessions .timeline.hover { - background: radial-gradient(#999 1px, transparent 1px); + background: radial-gradient(var(--bs-tertiary-color) 1px, transparent 1px); background-size: 20px 20px; } .edit-meeting-timeslots-and-misc-sessions .timeline.selected.hover, .edit-meeting-timeslots-and-misc-sessions .timeline.selected { - background: radial-gradient(#999 2px, transparent 2px); + background: radial-gradient(var(--bs-tertiary-color) 2px, transparent 2px); background-size: 20px 20px; } @@ -949,8 +1002,8 @@ tr.position-recuse-row { white-space: nowrap; cursor: pointer; padding-left: 0.2em; - border-left: 1px solid #999; - border-right: 1px solid #999; + border-left: 1px solid var(--bs-border-color); + border-right: 1px solid var(--bs-border-color); } .edit-meeting-timeslots-and-misc-sessions .timeslot:hover { @@ -970,10 +1023,10 @@ tr.position-recuse-row { bottom: 0; left: 0; width: 100%; - border-top: 0.2em solid #ccc; + border-top: 0.2em solid var(--bs-border-color); padding-top: 0.2em; margin-bottom: 2em; - background-color: #fff; + background-color: var(--bs-body-bg); opacity: 0.95; } @@ -1021,7 +1074,7 @@ tr.position-recuse-row { } .timeslot-edit .tstable div.timeslot { - border: #000000 solid 1px; + border: var(--bs-body-color) solid 1px; border-radius: 0.5em; padding: 0.5em; } @@ -1051,7 +1104,7 @@ tr.position-recuse-row { } .timeslot-edit .tstable .tstype_unavail { - background-color: #666; + background-color: var(--bs-secondary-color); } .timeslot-edit .official-use-warning { @@ -1134,3 +1187,32 @@ tr.position-recuse-row { } } } + +blockquote { + padding-left: 1rem; + border-left: solid 1px var(--bs-body-color); +} + +iframe.status { + background-color:transparent; + border:none; + width:100%; + height:3.5em; +} + +.overflow-shadows { + transition: box-shadow 0.5s; +} + +.overflow-shadows--both { + box-shadow: inset 0px 21px 18px -20px var(--bs-body-color), + inset 0px -21px 18px -20px var(--bs-body-color); +} + +.overflow-shadows--top-only { + box-shadow: inset 0px 21px 18px -20px var(--bs-body-color); +} + +.overflow-shadows--bottom-only { + box-shadow: inset 0px -21px 18px -20px var(--bs-body-color); +} diff --git a/ietf/static/css/list.scss b/ietf/static/css/list.scss index d52fc879a70..595bf360d57 100644 --- a/ietf/static/css/list.scss +++ b/ietf/static/css/list.scss @@ -1,6 +1,4 @@ -// Import bootstrap helpers -@import "bootstrap/scss/functions"; -@import "bootstrap/scss/variables"; +@import "custom-bs-import"; table .sort { cursor: pointer; diff --git a/ietf/static/css/select2.scss b/ietf/static/css/select2.scss index 44824a358a3..c8e3da7adc6 100644 --- a/ietf/static/css/select2.scss +++ b/ietf/static/css/select2.scss @@ -1,5 +1,7 @@ -@import "bootstrap/scss/functions"; -@import "bootstrap/scss/variables"; -@import "bootstrap/scss/mixins"; +@import "custom-bs-import"; + +// FIXME: bs-5.3.0 workaround from https://github.com/apalfrey/select2-bootstrap-5-theme/issues/75#issuecomment-1573265695 +$s2bs5-border-color: $border-color; + @import "select2/src/scss/core"; @import "select2-bootstrap-5-theme/src/include-all"; diff --git a/ietf/static/images/iab-logo-white.svg b/ietf/static/images/iab-logo-white.svg new file mode 100644 index 00000000000..264b7bb842f --- /dev/null +++ b/ietf/static/images/iab-logo-white.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + diff --git a/ietf/static/images/ietf-logo-nor-white.svg b/ietf/static/images/ietf-logo-nor-white.svg index 004e58af807..42c033600fd 100644 --- a/ietf/static/images/ietf-logo-nor-white.svg +++ b/ietf/static/images/ietf-logo-nor-white.svg @@ -1,26 +1,136 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ietf/static/images/ietf-logo-white.svg b/ietf/static/images/ietf-logo-white.svg new file mode 100644 index 00000000000..2417f917ce3 --- /dev/null +++ b/ietf/static/images/ietf-logo-white.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ietf/static/images/irtf-logo-white.svg b/ietf/static/images/irtf-logo-white.svg new file mode 100644 index 00000000000..a67412581e8 --- /dev/null +++ b/ietf/static/images/irtf-logo-white.svg @@ -0,0 +1,65 @@ + + + + + R + + + + + + diff --git a/ietf/static/images/irtf-logo.svg b/ietf/static/images/irtf-logo.svg index be64890b256..10b2a968163 100644 --- a/ietf/static/images/irtf-logo.svg +++ b/ietf/static/images/irtf-logo.svg @@ -6,7 +6,7 @@ version="1.1" id="svg303" sodipodi:docname="irtf-logo.svg" - inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)" + inkscape:version="1.2.2 (b0a84865, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -24,12 +24,12 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="1.0373737" - inkscape:cx="304.1334" - inkscape:cy="446.80136" + inkscape:cx="303.65142" + inkscape:cy="447.76535" inkscape:window-width="1797" inkscape:window-height="1083" inkscape:window-x="951" - inkscape:window-y="445" + inkscape:window-y="417" inkscape:window-maximized="0" inkscape:current-layer="svg303" /> R { + const form = document.getElementById('delete_recordings_form') + const dialog = document.getElementById('delete_confirm_dialog') + const dialog_link = document.getElementById('delete_confirm_link') + const dialog_submit = document.getElementById('delete_confirm_submit') + const dialog_cancel = document.getElementById('delete_confirm_cancel') + + dialog.style.maxWidth = '30vw' + + form.addEventListener('submit', (e) => { + e.preventDefault() + dialog_submit.value = e.submitter.value + const recording_link = e.submitter.closest('tr').querySelector('a') + dialog_link.setAttribute('href', recording_link.getAttribute('href')) + dialog_link.textContent = recording_link.textContent + dialog.showModal() + }) + + dialog_cancel.addEventListener('click', (e) => { + e.preventDefault() + dialog.close() + }) + + document.addEventListener('keydown', (e) => { + if (dialog.open && e.key === 'Escape') { + dialog.close() + } + }) +}) diff --git a/ietf/static/js/announcement.js b/ietf/static/js/announcement.js new file mode 100644 index 00000000000..95465120fa8 --- /dev/null +++ b/ietf/static/js/announcement.js @@ -0,0 +1,57 @@ +const announcementApp = (function() { + 'use strict'; + return { + // functions for Announcement + checkToField: function() { + document.documentElement.scrollTop = 0; // For most browsers + const toField = document.getElementById('id_to'); + const toCustomInput = document.getElementById('id_to_custom'); + const toCustomDiv = toCustomInput.closest('div.row'); + + if (toField.value === 'Other...') { + toCustomDiv.style.display = 'flex'; // Show the custom field + } else { + toCustomDiv.style.display = 'none'; // Hide the custom field + toCustomInput.value = ''; // Optionally clear the input value if hidden + } + } + }; +})(); + +// Extra care is required to ensure the back button +// works properly for the optional to_custom field. +// Take the case when a user selects "Other..." for +// "To" field. The "To custom" field appears and they +// enter a new address there. +// In Chrome, when the form is submitted and then the user +// uses the back button (or browser back), the page loads +// from bfcache then the javascript DOMContentLoaded event +// handler is run, hiding the empty to_custom field, THEN the +// browser autofills the form fields. Because to_submit +// is now hidden it does not get a value. This is a very +// bad experience for the user because the to_custom field +// was unexpectedly cleared and hidden. If they notice this +// they would need to know to first select another "To" +// option, then select "Other..." again just to get the +// to_custom field visible so they can re-enter the custom +// address. +// The solution is to use setTimeout to run checkToField +// after a short delay, giving the browser time to autofill +// the form fields before it checks to see if the to_custom +// field is empty and hides it. + +document.addEventListener('DOMContentLoaded', function() { + // Run the visibility check after allowing cache to populate values + setTimeout(announcementApp.checkToField, 300); + + const toField = document.getElementById('id_to'); + toField.addEventListener('change', announcementApp.checkToField); +}); + +// Handle back/forward navigation with pageshow +window.addEventListener('pageshow', function(event) { + if (event.persisted) { + // Then apply visibility logic after cache restoration + setTimeout(announcementApp.checkToField, 300); + } +}); \ No newline at end of file diff --git a/ietf/static/js/complete-review.js b/ietf/static/js/complete-review.js index a359dac237c..3a58ba97007 100644 --- a/ietf/static/js/complete-review.js +++ b/ietf/static/js/complete-review.js @@ -24,6 +24,8 @@ $(document) .before(mailArchiveSearchTemplate); var mailArchiveSearch = form.find(".mail-archive-search"); + const isReviewer = mailArchiveSearch.data('isReviewer'); + const searchMailArchiveUrl = mailArchiveSearch.data('searchMailArchiveUrl'); var retrievingData = null; @@ -190,4 +192,4 @@ $(document) form.find("[name=review_submission][value=link]") .trigger("click"); } - }); \ No newline at end of file + }); diff --git a/ietf/static/js/custom_striped.js b/ietf/static/js/custom_striped.js new file mode 100644 index 00000000000..480ad7cf828 --- /dev/null +++ b/ietf/static/js/custom_striped.js @@ -0,0 +1,16 @@ +// Copyright The IETF Trust 2025, All Rights Reserved + +document.addEventListener('DOMContentLoaded', () => { + // add stripes + const firstRow = document.querySelector('.custom-stripe .row') + if (firstRow) { + const parent = firstRow.parentElement; + const allRows = Array.from(parent.children).filter(child => child.classList.contains('row')) + allRows.forEach((row, index) => { + row.classList.remove('bg-light') + if (index % 2 === 1) { + row.classList.add('bg-light') + } + }) + } +}) diff --git a/ietf/static/js/document_timeline.js b/ietf/static/js/document_timeline.js index babde0deeb4..d8532c36233 100644 --- a/ietf/static/js/document_timeline.js +++ b/ietf/static/js/document_timeline.js @@ -86,7 +86,7 @@ function scale_x() { } function update_x_axis() { - d3.select("#timeline svg .x.axis") + d3.select("#doc-timeline svg .x.axis") .call(x_axis) .selectAll("text") .style("text-anchor", "end") @@ -96,7 +96,7 @@ function update_x_axis() { function update_timeline() { bar_y = {}; scale_x(); - var chart = d3.select("#timeline svg") + var chart = d3.select("#doc-timeline svg") .attr("width", width); // enter data (skip the last pseudo entry) var bar = chart.selectAll("g") @@ -111,12 +111,12 @@ function draw_timeline() { bar_height = parseFloat($("body") .css("line-height")); - var div = $("#timeline"); + var div = $("#doc-timeline"); div.addClass("my-3"); if (div.is(":empty")) { div.append(""); } - var chart = d3.select("#timeline svg") + var chart = d3.select("#doc-timeline svg") .attr("width", width); var defs = chart.append("defs"); @@ -249,7 +249,7 @@ d3.json("doc.json") published: expiration_date(data[data.length - 1]) }); - width = $("#timeline") + width = $("#doc-timeline") .width(); draw_timeline(); } @@ -258,11 +258,11 @@ d3.json("doc.json") $(window) .on({ resize: function () { - var g = $("#timeline svg"); + var g = $("#doc-timeline svg"); g.remove(); - width = $("#timeline") + width = $("#doc-timeline") .width(); - $("#timeline") + $("#doc-timeline") .append(g); update_timeline(); } diff --git a/ietf/static/js/draft-submit.js b/ietf/static/js/draft-submit.js index 4d813a7fbef..38ac7eb2633 100644 --- a/ietf/static/js/draft-submit.js +++ b/ietf/static/js/draft-submit.js @@ -66,28 +66,31 @@ $(function () { }); - // Reload page periodically if the enableAutoReload checkbox is present and checked - const autoReloadSwitch = document.getElementById("enableAutoReload"); - const timeSinceDisplay = document.getElementById("time-since-uploaded"); - if (autoReloadSwitch) { - const autoReloadTime = 30000; // ms - let autoReloadTimeoutId; - autoReloadSwitch.parentElement.classList.remove("d-none"); - timeSinceDisplay.classList.remove("d-none"); - autoReloadTimeoutId = setTimeout(() => location.reload(), autoReloadTime); - autoReloadSwitch.addEventListener("change", (e) => { - if (e.currentTarget.checked) { - if (!autoReloadTimeoutId) { - autoReloadTimeoutId = setTimeout(() => location.reload(), autoReloadTime); - timeSinceDisplay.classList.remove("d-none"); - } - } else { - if (autoReloadTimeoutId) { - clearTimeout(autoReloadTimeoutId); - autoReloadTimeoutId = null; - timeSinceDisplay.classList.add("d-none"); - } + // If draft is validating, poll until validation is complete, then reload the page + const submissionValidatingAlert = document.getElementById('submission-validating-alert'); + if (submissionValidatingAlert) { + let statusPollTimer; + const statusUrl = submissionValidatingAlert.dataset['submissionStatusUrl']; + let statusPollInterval = 2000; // ms + const maxPollInterval = 32000; // ms + + function checkStatus() { + if (statusPollInterval < maxPollInterval) { + statusPollInterval *= 2; } - }); + const xhr = new XMLHttpRequest(); + xhr.open("GET", statusUrl, true); + xhr.onload = (e) => { + if (xhr.response && xhr.response.state !== 'validating') { + location.reload(); + } else { + statusPollTimer = setTimeout(checkStatus, statusPollInterval); + } + }; + xhr.onerror = (e) => {statusPollTimer = setTimeout(checkStatus, statusPollInterval);}; + xhr.responseType = 'json'; + xhr.send(''); + } + statusPollTimer = setTimeout(checkStatus, statusPollInterval); } }); diff --git a/ietf/static/js/edit-meeting-schedule.js b/ietf/static/js/edit-meeting-schedule.js index 21fc284ca1c..2a73a8c29d4 100644 --- a/ietf/static/js/edit-meeting-schedule.js +++ b/ietf/static/js/edit-meeting-schedule.js @@ -50,6 +50,7 @@ $(function () { let sessionPurposeInputs = schedEditor.find('.session-purpose-toggles input'); let timeSlotGroupInputs = schedEditor.find("#timeslot-group-toggles-modal .modal-body .individual-timeslots input"); let sessionParentInputs = schedEditor.find(".session-parent-toggles input"); + let sessionParentToggleAll = schedEditor.find(".session-parent-toggles .session-parent-toggle-all") const classes_to_hide = '.hidden-timeslot-group,.hidden-timeslot-type'; // hack to work around lack of position sticky support in old browsers, see https://caniuse.com/#feat=css-sticky @@ -487,13 +488,13 @@ $(function () { // Disable a particular swap modal radio input let updateSwapRadios = function (labels, radios, disableValue, datePrecision) { - labels.removeClass('text-muted'); + labels.removeClass('text-body-secondary'); radios.prop('disabled', false); radios.prop('checked', false); // disable the input requested by value let disableInput = radios.filter('[value="' + disableValue + '"]'); if (disableInput) { - disableInput.parent().addClass('text-muted'); + disableInput.parent().addClass('text-body-secondary'); disableInput.prop('disabled', true); } if (officialSchedule) { @@ -502,7 +503,7 @@ $(function () { const past_radios = radios.filter( (_, radio) => parseISOTimestamp(radio.closest('*[data-start]').dataset.start).isSameOrBefore(now, datePrecision) ); - past_radios.parent().addClass('text-muted'); + past_radios.parent().addClass('text-body-secondary'); past_radios.prop('disabled', true); } return disableInput; // return the input that was specifically disabled, if any @@ -769,6 +770,17 @@ $(function () { sessionParentInputs.on("click", updateSessionParentToggling); updateSessionParentToggling(); + // Toggle _all_ session parents + function toggleAllSessionParents() { + if (sessionParentInputs.filter(":checked").length < sessionParentInputs.length) { + sessionParentInputs.prop("checked", true); + } else { + sessionParentInputs.prop("checked", false); + } + updateSessionParentToggling(); + } + sessionParentToggleAll.on("click", toggleAllSessionParents); + // Toggling timeslot types function updateTimeSlotTypeToggling() { const checkedTypes = jQuery.map(timeSlotTypeInputs.filter(":checked"), elt => elt.value); @@ -859,10 +871,10 @@ $(function () { .not('.hidden') .length === 0) { purpose_input.setAttribute('disabled', 'disabled'); - purpose_input.closest('.session-purpose-toggle').classList.add('text-muted'); + purpose_input.closest('.session-purpose-toggle').classList.add('text-body-secondary'); } else { purpose_input.removeAttribute('disabled'); - purpose_input.closest('.session-purpose-toggle').classList.remove('text-muted'); + purpose_input.closest('.session-purpose-toggle').classList.remove('text-body-secondary'); } }); } @@ -1020,4 +1032,4 @@ $(function () { .on("mouseleave", ".other-session", function () { sessions.filter("#session" + this.dataset.othersessionid).removeClass("highlight"); }); -}); \ No newline at end of file +}); diff --git a/ietf/static/js/highcharts.js b/ietf/static/js/highcharts.js index 0b99f87a59f..6c3b68051f0 100644 --- a/ietf/static/js/highcharts.js +++ b/ietf/static/js/highcharts.js @@ -6,6 +6,8 @@ import Highcharts_Export_Data from "highcharts/modules/export-data"; import Highcharts_Accessibility from "highcharts/modules/accessibility"; import Highcharts_Sunburst from "highcharts/modules/sunburst"; +document.documentElement.style.setProperty("--highcharts-background-color", "transparent"); + Highcharts_Exporting(Highcharts); Highcharts_Offline_Exporting(Highcharts); Highcharts_Export_Data(Highcharts); @@ -13,17 +15,9 @@ Highcharts_Accessibility(Highcharts); Highcharts_Sunburst(Highcharts); Highcharts.setOptions({ - // use colors from https://colorbrewer2.org/#type=qualitative&scheme=Paired&n=12 - colors: ['#a6cee3', '#1f78b4', '#b2df8a', '#33a02c', '#fb9a99', - '#e31a1c', '#fdbf6f', '#ff7f00', '#cab2d6', '#6a3d9a', - '#ffff99', '#b15928' - ], chart: { height: "100%", - style: { - fontFamily: getComputedStyle(document.body) - .getPropertyValue('--bs-body-font-family') - } + styledMode: true, }, credits: { enabled: false @@ -35,7 +29,7 @@ window.Highcharts = Highcharts; window.group_stats = function (url, chart_selector) { $.getJSON(url, function (data) { $(chart_selector) - .each(function (i, e) { + .each(function (_, e) { const dataset = e.dataset.dataset; if (!dataset) { console.log("dataset data attribute not set"); diff --git a/ietf/static/js/highstock.js b/ietf/static/js/highstock.js index e1965acb625..05b1250ed0c 100644 --- a/ietf/static/js/highstock.js +++ b/ietf/static/js/highstock.js @@ -5,9 +5,20 @@ import Highcharts_Offline_Exporting from "highcharts/modules/offline-exporting"; import Highcharts_Export_Data from "highcharts/modules/export-data"; import Highcharts_Accessibility from"highcharts/modules/accessibility"; +document.documentElement.style.setProperty("--highcharts-background-color", "transparent"); + Highcharts_Exporting(Highcharts); Highcharts_Offline_Exporting(Highcharts); Highcharts_Export_Data(Highcharts); Highcharts_Accessibility(Highcharts); +Highcharts.setOptions({ + chart: { + styledMode: true, + }, + credits: { + enabled: false + }, +}); + window.Highcharts = Highcharts; diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index d6be021a2bf..09fa324e42c 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -13,7 +13,7 @@ import "bootstrap/js/dist/scrollspy"; import "bootstrap/js/dist/tab"; // import "bootstrap/js/dist/toast"; import "bootstrap/js/dist/tooltip"; - +import { debounce } from 'lodash-es'; import jquery from "jquery"; window.$ = window.jQuery = jquery; @@ -57,7 +57,7 @@ $(document) var text = $(this) .text(); // insert some at strategic places - var newtext = text.replace(/([@._])/g, "$1"); + var newtext = text.replace(/(\S)([@._+])(\S)/g, "$1$2$3"); if (newtext === text) { return; } @@ -91,20 +91,57 @@ $(document) // }); }); -$(document) - .ready(function () { +function overflowShadows(el) { + function handleScroll(){ + const canScrollUp = el.scrollTop > 0 + const canScrollDown = el.offsetHeight + el.scrollTop < el.scrollHeight + el.classList.toggle("overflow-shadows--both", canScrollUp && canScrollDown) + el.classList.toggle("overflow-shadows--top-only", canScrollUp && !canScrollDown) + el.classList.toggle("overflow-shadows--bottom-only", !canScrollUp && canScrollDown) + } - function dropdown_hover(e) { - var navbar = $(this) - .closest(".navbar"); - if (navbar.length === 0 || navbar.find(".navbar-toggler") - .is(":hidden")) { - $(this) - .children(".dropdown-toggle") - .dropdown(e.type == "mouseenter" ? "show" : "hide"); - } + el.addEventListener("scroll", handleScroll, {passive: true}) + handleScroll() + + const observer = new IntersectionObserver(handleScroll) + observer.observe(el) // el won't have scrollTop etc when hidden, so we need to recalculate when it's revealed + + return () => { + el.removeEventListener("scroll", handleScroll) + observer.unobserve(el) + } +} + +function ensureDropdownOnscreen(elm) { + const handlePlacement = () => { + if(!(elm instanceof HTMLElement)) { + return } + const rect = elm.getBoundingClientRect() + const BUFFER_PX = 5 // additional distance from bottom of viewport + const existingStyleTop = parseInt(elm.style.top, 10) + const offscreenBy = Math.round(window.innerHeight - (rect.top + rect.height) - BUFFER_PX) + if(existingStyleTop === offscreenBy) { + console.log(`Already set top to ${offscreenBy}. Ignoring`) + // already set, nothing to do + return + } + if(offscreenBy < 0) { + elm.style.top = `${offscreenBy}px` + } + } + + const debouncedHandler = debounce(handlePlacement, 100) + + const observer = new MutationObserver(debouncedHandler) + observer.observe(elm, { + attributes: true + }) +} + +$(document) + .ready(function () { // load data for the menu $.ajax({ url: $(document.body) @@ -120,7 +157,7 @@ $(document) } attachTo.find(".dropdown-menu") .remove(); - var menu = ['
        ']; + var menu = ['
          ']; var groups = data[parentId]; var gtype = ""; for (var i = 0; i < groups.length; ++i) { @@ -135,14 +172,18 @@ $(document) g.acronym + " — " + g.name + ""); } menu.push("
        "); - for (i = 0; i < attachTo.length; i++) { - attachTo.closest(".dropdown-menu"); - } + attachTo.append(menu.join("")); - } - $("ul.nav li.dropdown, ul.nav li.dropend") - .on("mouseenter mouseleave", dropdown_hover); + attachTo.find(".overflow-shadows").each(function(){ + // needs to be a function(){} so that we can access jQuery's `this` + overflowShadows(this) + }) + attachTo.find(".dropdown-menu").each(function(){ + // needs to be a function(){} so that we can access jQuery's `this` + ensureDropdownOnscreen(this) + }) + } } }); }); @@ -155,7 +196,7 @@ $(function () { const heading_selector = ":is(h2, h3, h4, h5, h6, .h2, .h3, .h4, .h5, .h6, .nav-heading):not([style='display:none']):not(.navskip)"; const headings = contentElement .find(heading_selector) - .filter((i, el) => !el.closest(".navskip")); + .filter((i, el) => !el.closest(".navskip,.modal")); const contents = (headings.length > 0) && ($(headings) @@ -183,8 +224,8 @@ $(function () { .attr("tabindex", 0) .after($(`
        -
        - +
        +
        `)); diff --git a/ietf/static/js/investigate.js b/ietf/static/js/investigate.js new file mode 100644 index 00000000000..ee1c5451475 --- /dev/null +++ b/ietf/static/js/investigate.js @@ -0,0 +1,53 @@ +// Copyright The IETF Trust 2025, All Rights Reserved +document.addEventListener('DOMContentLoaded', () => { + const investigateForm = document.forms['investigate'] + investigateForm.addEventListener('submit', (event) => { + // Intercept submission unless we've filled in the task_id field + if (!investigateForm.elements['id_task_id'].value) { + event.preventDefault() + runInvestigation() + } + }) + + const runInvestigation = async () => { + // Submit the request + const response = await fetch('', { + method: investigateForm.method, body: new FormData(investigateForm) + }) + if (!response.ok) { + loadResultsFromTask('bogus-task-id') // bad task id will generate an error from Django + } + const taskId = (await response.json()).id + // Poll for completion of the investigation up to 60*10 = 600 seconds + waitForResults(taskId, 60) + } + + const waitForResults = async (taskId, retries) => { + // indicate that investigation is in progress + document.querySelectorAll('.investigation-indicator').forEach(elt => elt.classList.remove('d-none')) + document.getElementById('investigate-button').disabled = true + investigateForm.elements['id_name_fragment'].disabled = true + + const response = await fetch('?' + new URLSearchParams({ id: taskId })) + if (!response.ok) { + loadResultsFromTask('bogus-task-id') // bad task id will generate an error from Django + } + const result = await response.json() + if (result.status !== 'ready' && retries > 0) { + // 10 seconds per retry + setTimeout(waitForResults, 10000, taskId, retries - 1) + } else { + /* Either the response is ready or we timed out waiting. In either case, submit + the task_id via POST and let Django display an error if it's not ready. Before + submitting, re-enable the form fields so the POST is valid. Other in-progress + indicators will be reset when the POST response is loaded. */ + loadResultsFromTask(taskId) + } + } + + const loadResultsFromTask = (taskId) => { + investigateForm.elements['id_name_fragment'].disabled = false + investigateForm.elements['id_task_id'].value = taskId + investigateForm.submit() + } +}) diff --git a/ietf/static/js/ipr-edit.js b/ietf/static/js/ipr-edit.js index 9af5b03591a..9d07503791c 100644 --- a/ietf/static/js/ipr-edit.js +++ b/ietf/static/js/ipr-edit.js @@ -69,4 +69,69 @@ $(document) form.find(".draft-row") .each(updateRevisions); }, 10); - }); \ No newline at end of file + + // Manage fields that depend on the Blanket IPR Disclosure choice + const blanketCheckbox = document.getElementById('id_is_blanket_disclosure') + if (blanketCheckbox) { + const patentDetailInputs = [ + // The ids are from the HolderIprDisclosureForm and its base form class, + // intentionally excluding patent_notes because it's never required + 'id_patent_number', + 'id_patent_inventor', + 'id_patent_title', + 'id_patent_date' + ].map((id) => document.getElementById(id)) + const patentDetailRowDivs = patentDetailInputs.map( + (elt) => elt.closest('div.row') + ) + const royaltyFreeLicensingRadio = document.querySelector( + '#id_licensing input[value="royalty-free"]' + ) + let lastSelectedLicensingRadio + const otherLicensingRadios = document.querySelectorAll( + '#id_licensing input:not([value="royalty-free"])' + ) + + const handleBlanketCheckboxChange = () => { + const isBlanket = blanketCheckbox.checked + // Update required fields + for (elt of patentDetailInputs) { + // disable the input element + elt.required = !isBlanket + } + for (elt of patentDetailRowDivs) { + // update the styling on the row that indicates required field + if (isBlanket) { + elt.classList.remove('required') + } else { + elt.classList.add('required') + } + } + // Update licensing selection + if (isBlanket) { + lastSelectedLicensingRadio = document.querySelector( + '#id_licensing input:checked' + ) + royaltyFreeLicensingRadio.checked = true + otherLicensingRadios + .forEach( + (elt) => elt.setAttribute('disabled', '') + ) + } else { + royaltyFreeLicensingRadio.checked = false + if (lastSelectedLicensingRadio) { + lastSelectedLicensingRadio.checked = true + } + otherLicensingRadios + .forEach( + (elt) => elt.removeAttribute('disabled') + ) + } + } + handleBlanketCheckboxChange() + blanketCheckbox.addEventListener( + 'change', + (evt) => handleBlanketCheckboxChange() + ) + } + }); diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js index e7a76660c96..6c46cb6dfcf 100644 --- a/ietf/static/js/liaisons.js +++ b/ietf/static/js/liaisons.js @@ -197,16 +197,6 @@ var liaisonForm = { } }, - checkPostOnly: function (post_only) { - if (post_only) { - $("button[name=send]") - .hide(); - } else { - $("button[name=send]") - .show(); - } - }, - updateInfo: function (first_time, sender) { // don't overwrite fields when editing existing liaison if (liaisonForm.is_edit_form) { @@ -239,7 +229,6 @@ var liaisonForm = { liaisonForm.toggleApproval(response.needs_approval); liaisonForm.response_contacts.val(response.response_contacts); } - liaisonForm.checkPostOnly(response.post_only); } } }); @@ -326,4 +315,4 @@ $(document) .each(liaisonForm.init); $('#liaison_search_form') .each(searchForm.init); - }); \ No newline at end of file + }); diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js index 6a854afc058..c03368cd728 100644 --- a/ietf/static/js/list.js +++ b/ietf/static/js/list.js @@ -1,16 +1,24 @@ -import * as List from "list.js"; - -var dummy = new List(); +import { + default as List +} from "list.js"; function text_sort(a, b, options) { + + function prep(e, options) { + const el = $($.parseHTML(e.values()[options.valueName])); + const cell_el = e.elm.querySelector(`.${options.valueName}`) + const sort_by_number = cell_el?.getAttribute('data-sort-number') + return sort_by_number ?? el.text() + .trim() + .replaceAll(/\s+/g, ' '); + } + // sort by text content - return dummy.utils.naturalSort.caseInsensitive($($.parseHTML(a.values()[options.valueName])) - .text() - .trim() - .replaceAll(/\s+/g, ' '), $($.parseHTML(b.values()[options.valueName])) - .text() - .trim() - .replaceAll(/\s+/g, ' ')); + return prep(a, options).localeCompare(prep(b, options), "en", { + sensitivity: "base", + ignorePunctuation: false, + numeric: true + }); } function replace_with_internal(table, internal_table, i) { @@ -20,7 +28,7 @@ function replace_with_internal(table, internal_table, i) { .replaceWith(internal_table[i] .children("table") .children("tbody") - .clone()); + .clone(true)); } function field_magic(i, e, fields) { @@ -160,10 +168,10 @@ $(document) // create the internal table and add list.js to them var thead = $(this) .siblings("thead:first") - .clone(); + .clone(true); var tbody = $(this) - .clone(); + .clone(true); var tbody_rows = $(tbody) .find("tr") @@ -178,7 +186,7 @@ $(document) var parent = $(table) .parent() - .clone(); + .clone(true); $(parent) .children("table") @@ -204,12 +212,12 @@ $(document) } let newlist = new List(hook, pagination ? { - valueNames: fields, - pagination: pagination, - page: items_per_page - } : { - valueNames: fields - }); + valueNames: fields, + pagination: pagination, + page: items_per_page + } : { + valueNames: fields + }); // override search module with a patched version // see https://github.com/javve/list.js/issues/699 // TODO: check if this is still needed if list.js ever sees an update @@ -220,7 +228,7 @@ $(document) if (enable_search) { reset_search.on("click", function () { search_field.val(""); - $.each(list_instance, (i, e) => { + $.each(list_instance, (_, e) => { e.search(); }); }); @@ -229,7 +237,7 @@ $(document) if (event.key == "Escape") { reset_search.trigger("click"); } else { - $.each(list_instance, (i, e) => { + $.each(list_instance, (_, e) => { e.search($(this) .val()); }); @@ -239,18 +247,23 @@ $(document) $(table) .find(".sort") - .on("click", function () { + .on("click", function (ev) { + ev.preventDefault() var order = $(this) .hasClass("asc") ? "desc" : "asc"; - $.each(list_instance, (i, e) => { + $.each(list_instance, (_, e) => { e.sort($(this) - .attr("data-sort"), { order: order, sortFunction: text_sort }); + .attr("data-sort"), { + order: order, + sortFunction: text_sort + }); }); }); $.each(list_instance, (i, e) => { e.on("sortComplete", function () { replace_with_internal(table, internal_table, i); + $(table).find("[data-bs-original-title]").tooltip(); if (i == list_instance.length - 1) { $(table) .find("thead:first tr") @@ -266,6 +279,9 @@ $(document) }); } }); + e.on("searchComplete", function () { + replace_with_internal(table, internal_table, i); + }); }); $(table.addClass("tablesorter-done")); @@ -273,14 +289,23 @@ $(document) $(table)[0] .dispatchEvent(new Event("tablesorter:done")); - // if there is a data-default-sort attribute on a column, pre-sort the table on that - const presort_col = $(header_row).children("[data-default-sort]:first"); - if (presort_col) { - const order = presort_col.attr("data-default-sort"); - if (order == "asc" || order == "desc") { - $.each(list_instance, (i, e) => { - e.sort(presort_col.attr("data-sort"), { order: order, sortFunction: text_sort }); - }); + // check if there is a sort query argument, and leave the table alone if so + const params = new Proxy(new URLSearchParams(window.location.search), { + get: (searchParams, prop) => searchParams.get(prop), + }); + if (!params.sort) { + // else, if there is a data-default-sort attribute on a column, pre-sort the table on that + const presort_col = $(header_row).children("[data-default-sort]:first"); + if (presort_col) { + const order = presort_col.attr("data-default-sort"); + if (order === "asc" || order === "desc") { + $.each(list_instance, (_, e) => { + e.sort(presort_col.attr("data-sort"), { + order: order, + sortFunction: text_sort + }); + }); + } } } }); diff --git a/ietf/static/js/login.js b/ietf/static/js/login.js new file mode 100644 index 00000000000..770d091bf1a --- /dev/null +++ b/ietf/static/js/login.js @@ -0,0 +1,14 @@ +/** +* Disable Submit Button on Form Submit +*/ +function onLoginSubmit (ev) { + const submitBtn = document.querySelector('#dt-login-form button[type=submit]') + if (submitBtn) { + submitBtn.disabled = true + submitBtn.innerHTML = 'Signing in...' + } +} + +$(function() { + document.querySelector('#dt-login-form').addEventListener('submit', onLoginSubmit) +}) diff --git a/ietf/static/js/meeting-interim-request.js b/ietf/static/js/meeting-interim-request.js index e833cec1c8c..b7f7e3d9977 100644 --- a/ietf/static/js/meeting-interim-request.js +++ b/ietf/static/js/meeting-interim-request.js @@ -207,11 +207,12 @@ const interimRequest = (function() { toggleLocation: function () { if (this.checked) { - $(".location") + $(".location input, .location select") .prop('disabled', false); } else { - $(".location") - .prop('disabled', true); + $(".location input, .location select") + .prop('disabled', true) + .val(''); } }, diff --git a/ietf/static/js/password_strength.js b/ietf/static/js/password_strength.js index fddcca7bea0..74a245fb5c0 100644 --- a/ietf/static/js/password_strength.js +++ b/ietf/static/js/password_strength.js @@ -30,13 +30,13 @@ widget .find(".label-danger") - .addClass("bg-danger") + .addClass("text-bg-danger") .removeClass("label-danger"); widget - .find(".text-muted") + .find(".text-body-secondary") .addClass("form-text") - .removeClass("text-muted"); + .removeClass("text-body-secondary"); self.initListeners(); }, @@ -57,22 +57,40 @@ .parent() .parent() .find('.password_strength_offline_info'); + let password_improvement_hint = $(password_strength_info) + .find('.password_improvement_hint'); if ($(this) .val()) { var result = zxcvbn($(this) .val()); - - if (result.score < 3) { - password_strength_bar.removeClass('bg-success') - .addClass('bg-warning'); - password_strength_info.find('.badge') - .removeClass('d-none'); + const enforceStrength = !('disableStrengthEnforcement' in this.dataset); + const strongEnough = !enforceStrength || (result.score >= 3); + if (strongEnough) { + // Mark input as valid + this.setCustomValidity(''); } else { - password_strength_bar.removeClass('bg-warning') - .addClass('bg-success'); + // Mark input as invalid + this.setCustomValidity('This password does not meet complexity requirements'); + } + + if (this.checkValidity()) { + password_strength_bar.removeClass('text-bg-warning') + .addClass('text-bg-success'); password_strength_info.find('.badge') .addClass('d-none'); + this.classList.remove('is-invalid') + password_improvement_hint.addClass('d-none'); + password_improvement_hint.text('') + } else { + this.classList.add('is-invalid') + password_improvement_hint.text(this.validationMessage) + password_improvement_hint.removeClass('d-none'); + + password_strength_bar.removeClass('text-bg-success') + .addClass('text-bg-warning'); + password_strength_info.find('.badge') + .removeClass('d-none'); } password_strength_bar.width(((result.score + 1) / 5) * 100 + '%') @@ -86,8 +104,8 @@ .html(result.crack_times_display.offline_slow_hashing_1e4_per_second); password_strength_offline_info.removeClass('d-none'); } else { - password_strength_bar.removeClass('bg-success') - .addClass('bg-warning'); + password_strength_bar.removeClass('text-bg-success') + .addClass('text-bg-warning'); password_strength_bar.width('0%') .attr('aria-valuenow', 0); password_strength_info.addClass('d-none'); @@ -152,23 +170,31 @@ .data('confirm-with'); if (confirm_with && confirm_with == password_field.attr('id')) { - if (confirm_value && password) { + if (password) { if (confirm_value === password) { $(confirm_field) .parent() .find('.password_strength_info') .addClass('d-none'); + confirm_field.setCustomValidity('') + confirm_field.classList.remove('is-invalid') } else { - $(confirm_field) - .parent() - .find('.password_strength_info') - .removeClass('d-none'); + if (confirm_value !== '') { + $(confirm_field) + .parent() + .find('.password_strength_info') + .removeClass('d-none'); + } + confirm_field.setCustomValidity('Does not match new password') + confirm_field.classList.add('is-invalid') } } else { $(confirm_field) .parent() .find('.password_strength_info') .addClass('d-none'); + confirm_field.setCustomValidity('') + confirm_field.classList.remove('is-invalid') } } }); @@ -186,4 +212,4 @@ // Call the init for backwards compatibility djangoPasswordStrength.init(); -})(jQuery, window, document); \ No newline at end of file +})(jQuery, window, document); diff --git a/ietf/secr/static/js/session_form.js b/ietf/static/js/session_form.js similarity index 92% rename from ietf/secr/static/js/session_form.js rename to ietf/static/js/session_form.js index 6f28f16db41..bd61293d7c5 100644 --- a/ietf/secr/static/js/session_form.js +++ b/ietf/static/js/session_form.js @@ -1,4 +1,4 @@ -/* Copyright The IETF Trust 2021, All Rights Reserved +/* Copyright The IETF Trust 2021-2025, All Rights Reserved * * JS support for the SessionForm * */ diff --git a/ietf/static/js/session_request.js b/ietf/static/js/session_request.js new file mode 100644 index 00000000000..dfb169f6752 --- /dev/null +++ b/ietf/static/js/session_request.js @@ -0,0 +1,167 @@ +// Copyright The IETF Trust 2015-2025, All Rights Reserved +/* global alert */ +var ietf_sessions; // public interface + +(function() { + 'use strict'; + + function get_formset_management_data(prefix) { + return { + total_forms: document.getElementById('id_' + prefix + '-TOTAL_FORMS').value, + }; + } + + function update_session_form_visibility(session_num, is_visible) { + const elt = document.getElementById('session_row_' + session_num); + if (elt) { + elt.hidden = !is_visible; + elt.querySelector('[name$="DELETE"]').value = is_visible ? '' : 'on'; + } + } + + function have_additional_session() { + const elt = document.getElementById('id_third_session'); + return elt && elt.checked; + } + + function update_for_num_sessions(val) { + const total_forms = get_formset_management_data('session_set').total_forms; + val = Number(val); + if (have_additional_session()) { + val++; + } + + for (let i=0; i < total_forms; i++) { + update_session_form_visibility(i, i < val); + } + + const only_one_session = (val === 1); + if (document.form_post.session_time_relation) { + document.form_post.session_time_relation.disabled = only_one_session; + document.form_post.session_time_relation.closest('div.row').hidden = only_one_session; + } + if (document.form_post.joint_for_session) { + document.form_post.joint_for_session.disabled = only_one_session; + } + const third_session_row = document.getElementById('third_session_row'); + if (third_session_row) { + third_session_row.hidden = val < 2; + } + } + + function delete_last_joint_with_groups () { + var b = document.form_post.joint_with_groups.value; + var temp = b.split(' '); + temp.pop(); + b = temp.join(' '); + document.form_post.joint_with_groups.value = b; + document.form_post.joint_with_groups_selector.selectedIndex=0; + } + +/*******************************************************************/ +// WG constraint UI support + +// get the constraint field element for a given slug + function constraint_field(slug) { + return document.getElementById('id_constraint_' + slug); + } + +// get the wg selection element for a given slug + function constraint_selector(slug) { + return document.getElementById('id_wg_selector_' + slug); + } + + /** + * Handler for constraint select input 'change' event + */ + function wg_constraint_selector_changed() { + let slug = this.getAttribute('data-slug'); + let cfield = constraint_field(slug); + // add selected value to constraint_field + cfield.value += ' ' + this.options[this.selectedIndex].value; + } + + /** + * Remove the last group in a WG constraint field + * + * @param slug ConstraintName slug + */ + function delete_last_wg_constraint(slug) { + let cfield = constraint_field(slug); + if (cfield) { + var b = cfield.value; + var temp = b.split(' '); + temp.pop(); + b = temp.join(' '); + cfield.value = b; + constraint_selector(slug).selectedIndex = 0; + } + } + + /** + * Handle click event on a WG constraint's delete button + * + * @param slug ConstraintName slug + */ + function delete_wg_constraint_clicked(slug) { + delete_last_wg_constraint(slug); + } + + /** + * Handler for the change event on the session count select or 'third session' checkbox + */ + function handle_num_session_change(event) { + const num_select_value = Number(event.target.value); + if (num_select_value !== 2) { + if (document.form_post.third_session) { + document.form_post.third_session.checked = false; + } + } + update_for_num_sessions(num_select_value); + } + + function handle_third_session_change(event) { + const num_select_value = Number(document.getElementById('id_num_session').value); + if (num_select_value === 2) { + update_for_num_sessions(num_select_value); + } else { + event.target.checked = false; + } + } + + function wg_constraint_delete_clicked(event) { + const constraint_name = event.currentTarget.dataset.constraint_name; + delete_last_wg_constraint(constraint_name); + } + + /* Initialization */ + function on_load() { + // Attach event handler to session count select + const num_session_select = document.getElementById('id_num_session'); + num_session_select.addEventListener('change', handle_num_session_change); + const third_session_input = document.getElementById('id_third_session'); + if (third_session_input) { + third_session_input.addEventListener('change', handle_third_session_change); + } + update_for_num_sessions(num_session_select.value); + + // Attach event handlers to constraint selectors + let selectors = document.getElementsByClassName('wg_constraint_selector'); + for (let index = 0; index < selectors.length; index++) { + selectors[index].addEventListener('change', wg_constraint_selector_changed, false) + } + + // Attach event handler to constraint delete buttons + document.querySelectorAll('.wg_constraint_delete') + .forEach(btn => btn.addEventListener('click', wg_constraint_delete_clicked)); + } + + // initialize after page loads + window.addEventListener('load', on_load, false); + + // expose public interface methods + ietf_sessions = { + delete_last_joint_with_groups: delete_last_joint_with_groups, + delete_wg_constraint_clicked: delete_wg_constraint_clicked + } +})(); \ No newline at end of file diff --git a/ietf/static/js/theme.js b/ietf/static/js/theme.js new file mode 100644 index 00000000000..d10a472569a --- /dev/null +++ b/ietf/static/js/theme.js @@ -0,0 +1,93 @@ +/*! + * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/) + * Copyright 2011-2023 The Bootstrap Authors + * Licensed under the Creative Commons Attribution 3.0 Unported License. + * + * Based on the below, with some changes for the datatracker: + * https://github.com/twbs/bootstrap/blob/main/site/static/docs/5.3/assets/js/color-modes.js + */ + +(() => { + 'use strict' + + const getStoredTheme = () => localStorage.getItem('theme') || 'auto' + const setStoredTheme = theme => localStorage.setItem('theme', theme) + + const getPreferredTheme = () => { + const storedTheme = getStoredTheme() + if (storedTheme) { + return storedTheme + } + + return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light' + } + + const setTheme = theme => { + if (theme === 'auto') { + if (window.matchMedia('(prefers-color-scheme: dark)').matches) { + document.documentElement.setAttribute('data-bs-theme', 'dark') + } else if (window.matchMedia('(prefers-color-scheme: light)').matches) { + document.documentElement.setAttribute('data-bs-theme', 'light') + } + } else { + document.documentElement.setAttribute('data-bs-theme', theme) + } + } + + setTheme(getPreferredTheme()) + + const showActiveTheme = (theme, focus = false) => { + const themeSwitcher = document.querySelector('#bd-theme') + + if (!themeSwitcher) { + return + } + + // Commented-out lines are from the original bs5 js, which uses a more complicated pref dropdown. + // Kept them here for easier future diffing. + const themeSwitcherText = document.querySelector('#bd-theme-text') + const activeThemeIcon = document.querySelector('.theme-icon-active') + const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`) + const iconPattern = new RegExp(/\bbi-[\w-]+\b/); + const iconOfActiveBtn = btnToActive.querySelector('i').className.match(iconPattern)[0] + + document.querySelectorAll('[data-bs-theme-value]').forEach(element => { + element.classList.remove('active') + element.setAttribute('aria-pressed', 'false') + }) + + btnToActive.classList.add('active') + btnToActive.setAttribute('aria-pressed', 'true') + if (activeThemeIcon) { + activeThemeIcon.className = activeThemeIcon.className.replace(iconPattern, iconOfActiveBtn) + } + if (themeSwitcherText) { + const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})` + themeSwitcher.setAttribute('aria-label', themeSwitcherLabel) + } + if (focus) { + themeSwitcher.focus() + } + } + + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + const storedTheme = getStoredTheme() + if (storedTheme !== 'light' && storedTheme !== 'dark') { + setTheme(getPreferredTheme()) + } + }) + + window.addEventListener('DOMContentLoaded', () => { + showActiveTheme(getPreferredTheme()) + + document.querySelectorAll('[data-bs-theme-value]') + .forEach(toggle => { + toggle.addEventListener('click', () => { + const theme = toggle.getAttribute('data-bs-theme-value') + setStoredTheme(theme) + setTheme(theme) + showActiveTheme(theme, true) + }) + }) + }) +})() diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js index 0785d02cc75..9ab5821c048 100644 --- a/ietf/static/js/upcoming.js +++ b/ietf/static/js/upcoming.js @@ -34,7 +34,7 @@ function filter_calendar_events(filter_params, event_list) { } // format a moment in a tz -var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' }; +var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' , timezone: 'z'}; function format_moment(t_moment, tz, fmt_type) { return t_moment.tz(tz) @@ -43,6 +43,9 @@ function format_moment(t_moment, tz, fmt_type) { function make_display_events(event_data, tz) { var calendarEl = document.getElementById('calendar'); + if (!calendarEl) { + return; + } var glue = calendarEl.clientWidth > 720 ? ' ' : '\n'; return $.map(event_data, function (src_event) { var title; @@ -83,6 +86,9 @@ function update_calendar(tz, filter_params) { * filtered events. */ var calendarEl = document.getElementById('calendar'); + if (!calendarEl) { + return; + } event_calendar = new FullCalendar(calendarEl, { plugins: [dayGridPlugin, bootstrap5Plugin], initialView: 'dayGridMonth', @@ -136,7 +142,7 @@ function format_session_time(session_elt, tz) { .attr('data-start-utc')); var end = moment.utc($(session_elt) .attr('data-end-utc')); - return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time'); + return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time') + ' ' + format_moment(start, tz, 'timezone'); } function format_meeting_time(meeting_elt, tz) { diff --git a/ietf/static/js/upload-session-agenda.js b/ietf/static/js/upload-session-agenda.js new file mode 100644 index 00000000000..b63d460ed8e --- /dev/null +++ b/ietf/static/js/upload-session-agenda.js @@ -0,0 +1,28 @@ +$(document) + .ready(function () { + var form = $("form.my-3"); + + // review submission selection + form.find("[name=submission_method]") + .on("click change", function () { + var val = form.find("[name=submission_method]:checked") + .val(); + + var shouldBeVisible = { + upload: ['[name="file"]'], + enter: ['[name="content"]'] + }; + + for (var v in shouldBeVisible) { + for (var i in shouldBeVisible[v]) { + var selector = shouldBeVisible[v][i]; + var row = form.find(selector).parent(); + if ($.inArray(selector, shouldBeVisible[val]) != -1) + row.show(); + else + row.hide(); + } + } + }) + .trigger("change"); + }); \ No newline at end of file diff --git a/ietf/static/js/upload_statement.js b/ietf/static/js/upload_statement.js new file mode 100644 index 00000000000..7e8a4e8643a --- /dev/null +++ b/ietf/static/js/upload_statement.js @@ -0,0 +1,29 @@ +$(document) + .ready(function () { + var form = $("form.upload-content"); + // review submission selection + form.find("[name=statement_submission]") + .on("click change", function () { + var val = form.find("[name=statement_submission]:checked") + .val(); + + var shouldBeVisible = { + enter: ['[name="statement_content"]'], + upload: ['[name="statement_file"]'], + }; + + for (var v in shouldBeVisible) { + for (var i in shouldBeVisible[v]) { + var selector = shouldBeVisible[v][i]; + var row = form.find(selector); + if (!row.is(".row")) + row = row.closest(".row"); + if ($.inArray(selector, shouldBeVisible[val]) != -1) + row.show(); + else + row.hide(); + } + } + }) + .trigger("change"); + }); diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py deleted file mode 100755 index 176ee3335b7..00000000000 --- a/ietf/stats/backfill_data.py +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/env python -# Copyright The IETF Trust 2017-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import io -import sys -import os -import os.path -import argparse -import time - -from typing import Set, Optional # pyflakes:ignore - -basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) -sys.path = [ basedir ] + sys.path -os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" - -virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") -if os.path.exists(virtualenv_activation): - exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation)) - -import django -django.setup() - -from django.conf import settings - -import debug # pyflakes:ignore - -from ietf.doc.models import Document -from ietf.name.models import FormalLanguageName -from ietf.utils.draft import PlaintextDraft - -parser = argparse.ArgumentParser() -parser.add_argument("--document", help="specific document name") -parser.add_argument("--words", action="store_true", help="fill in word count") -parser.add_argument("--formlang", action="store_true", help="fill in formal languages") -parser.add_argument("--authors", action="store_true", help="fill in author info") -args = parser.parse_args() - -formal_language_dict = { l.pk: l for l in FormalLanguageName.objects.all() } - -docs_qs = Document.objects.filter(type="draft") - -if args.document: - docs_qs = docs_qs.filter(docalias__name=args.document) - -ts = time.strftime("%Y-%m-%d_%H:%M%z") -logfile = io.open('backfill-authorstats-%s.log'%ts, 'w') -print("Writing log to %s" % os.path.abspath(logfile.name)) - -def say(msg): - msg = msg.encode('utf8') - sys.stderr.write(msg) - sys.stderr.write('\n') - logfile.write(msg) - logfile.write('\n') - -def unicode(text): - if text is None: - return text - # order matters here: - for encoding in ['ascii', 'utf8', 'latin1', ]: - try: - utext = text.decode(encoding) -# if encoding == 'latin1': -# say("Warning: falling back to latin1 decoding for %s ..." % utext[:216]]) - return utext - except UnicodeDecodeError: - pass - -start = time.time() -say("Running query for documents to process ...") -for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentauthor_set", "documentauthor_set__person", "documentauthor_set__person__alias_set"): - canonical_name = doc.name - for n in doc.docalias.all(): - if n.name.startswith("rfc"): - canonical_name = n.name - - if canonical_name.startswith("rfc"): - path = os.path.join(settings.RFC_PATH, canonical_name + ".txt") - else: - path = os.path.join(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR, canonical_name + "-" + doc.rev + ".txt") - - if not os.path.exists(path): - say("Skipping %s, no txt file found at %s" % (doc.name, path)) - continue - - with io.open(path, 'rb') as f: - say("\nProcessing %s" % doc.name) - sys.stdout.flush() - d = PlaintextDraft(unicode(f.read()), path) - - updated = False - - updates = {} - - if args.words: - words = d.get_wordcount() - if words != doc.words: - updates["words"] = words - - if args.formlang: - langs = d.get_formal_languages() - - new_formal_languages = set(formal_language_dict[l] for l in langs) - old_formal_languages = set(doc.formal_languages.all()) - - if new_formal_languages != old_formal_languages: - for l in new_formal_languages - old_formal_languages: - doc.formal_languages.add(l) - updated = True - for l in old_formal_languages - new_formal_languages: - doc.formal_languages.remove(l) - updated = True - - if args.authors: - old_authors = doc.documentauthor_set.all() - old_authors_by_name = {} - old_authors_by_email = {} - for author in old_authors: - for alias in author.person.alias_set.all(): - old_authors_by_name[alias.name] = author - old_authors_by_name[author.person.plain_name()] = author - - if author.email_id: - old_authors_by_email[author.email_id] = author - - # the draft parser sometimes has a problem when - # affiliation isn't in the second line and it then thinks - # it's an extra author - skip those extra authors - seen = set() # type: Set[Optional[str]] - for full, _, _, _, _, email, country, company in d.get_author_list(): - assert full is None or isinstance(full, str) - assert email is None or isinstance(email, str) - assert country is None or isinstance(country, str) - assert isinstance(company, str) - #full, email, country, company = [ unicode(s) for s in [full, email, country, company, ] ] - if email in seen: - continue - seen.add(email) - - old_author = None - if email: - old_author = old_authors_by_email.get(email) - if not old_author: - old_author = old_authors_by_name.get(full) - - if not old_author: - say("UNKNOWN AUTHOR: %s, %s, %s, %s, %s" % (doc.name, full, email, country, company)) - continue - - if old_author.affiliation != company: - say("new affiliation: %s [ %s <%s> ] %s -> %s" % (canonical_name, full, email, old_author.affiliation, company)) - old_author.affiliation = company - old_author.save(update_fields=["affiliation"]) - updated = True - - if country is None: - country = "" - - if old_author.country != country: - say("new country: %s [ %s <%s> ] %s -> %s" % (canonical_name , full, email, old_author.country, country)) - old_author.country = country - old_author.save(update_fields=["country"]) - updated = True - - - if updates: - Document.objects.filter(pk=doc.pk).update(**updates) - updated = True - - if updated: - say("updated: %s" % canonical_name) - -stop = time.time() -dur = stop-start -sec = dur%60 -min = dur//60 -say("Processing time %d:%02d" % (min, sec)) - -print("\n\nWrote log to %s" % os.path.abspath(logfile.name)) -logfile.close() - diff --git a/ietf/stats/management/commands/fetch_meeting_attendance.py b/ietf/stats/management/commands/fetch_meeting_attendance.py deleted file mode 100644 index 7f936531d43..00000000000 --- a/ietf/stats/management/commands/fetch_meeting_attendance.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright The IETF Trust 2017-2019, All Rights Reserved -# Copyright 2016 IETF Trust - -import syslog - -from django.core.management.base import BaseCommand, CommandError -from django.utils import timezone - -import debug # pyflakes:ignore - -from ietf.meeting.models import Meeting -from ietf.stats.utils import get_meeting_registration_data - -logtag = __name__.split('.')[-1] -logname = "user.log" -syslog.openlog(str(logtag), syslog.LOG_PID, syslog.LOG_USER) - -class Command(BaseCommand): - help = "Fetch meeting attendee figures from ietf.org/registration/attendees." - - def add_arguments(self, parser): - parser.add_argument("--meeting", help="meeting to fetch data for") - parser.add_argument("--all", action="store_true", help="fetch data for all meetings") - parser.add_argument("--latest", type=int, help="fetch data for latest N meetings") - - def handle(self, *args, **options): - self.verbosity = options['verbosity'] - - meetings = Meeting.objects.none() - if options['meeting']: - meetings = Meeting.objects.filter(number=options['meeting'], type="ietf") - elif options['all']: - meetings = Meeting.objects.filter(type="ietf").order_by("date") - elif options['latest']: - meetings = Meeting.objects.filter(type="ietf", date__lte=timezone.now()).order_by("-date")[:options['latest']] - else: - raise CommandError("Please use one of --meeting, --all or --latest") - - for meeting in meetings: - added, processed, total = get_meeting_registration_data(meeting) - msg = "Fetched data for meeting %3s: %4d processed, %4d added, %4d in table" % (meeting.number, processed, added, total) - if self.stdout.isatty(): - self.stdout.write(msg+'\n') # make debugging a bit easier - else: - syslog.syslog(msg) - diff --git a/ietf/stats/management/commands/find_meetingregistration_person_issues.py b/ietf/stats/management/commands/find_meetingregistration_person_issues.py deleted file mode 100644 index 4eaf6ac2384..00000000000 --- a/ietf/stats/management/commands/find_meetingregistration_person_issues.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright The IETF Trust 2021, All Rights Reserved - -import debug # pyflakes:ignore - -from django.core.management.base import BaseCommand - -from ietf.stats.utils import find_meetingregistration_person_issues - -class Command(BaseCommand): - help = "Find possible Person/Email objects to repair based on MeetingRegistration objects" - - def add_arguments(self, parser): - parser.add_argument('--meeting',action='append') - - def handle(self, *args, **options): - meetings = options['meeting'] or None - summary = find_meetingregistration_person_issues(meetings) - - print(f'{summary.ok_records} records are OK') - - for msg in summary.could_be_fixed: - print(msg) - - for msg in summary.maybe_address: - print(msg) - - for msg in summary.different_person: - print(msg) - - for msg in summary.no_person: - print(msg) - - for msg in summary.maybe_person: - print(msg) - - for msg in summary.no_email: - print(msg) diff --git a/ietf/stats/management/commands/repair_meetingregistration_person.py b/ietf/stats/management/commands/repair_meetingregistration_person.py deleted file mode 100644 index 74b1a807a62..00000000000 --- a/ietf/stats/management/commands/repair_meetingregistration_person.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright The IETF Trust 2021, All Rights Reserved - -import debug # pyflakes:ignore - -from django.core.management.base import BaseCommand - -from ietf.stats.utils import repair_meetingregistration_person - -class Command(BaseCommand): - help = "Repair MeetingRegistration objects that have no person but an email matching a person" - - def add_arguments(self, parser): - parser.add_argument('--meeting',action='append') - - def handle(self, *args, **options): - meetings = options['meeting'] or None - repaired = repair_meetingregistration_person(meetings) - print(f'Repaired {repaired} MeetingRegistration objects') \ No newline at end of file diff --git a/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py b/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py new file mode 100644 index 00000000000..c1c516b2906 --- /dev/null +++ b/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.6 on 2023-10-27 17:57 + +''' +MeetingRegistration reg_type and checkedin fields are not populated for meetings +prior to 108. For meetings 72-106, all records are for onsite checkedin participants. +For meeting 107 all records are for remote paticipants. Set accordingly. +''' + +from django.db import migrations + + +def forward(apps, schema_editor): + MeetingRegistration = apps.get_model("stats", "MeetingRegistration") + MeetingRegistration.objects.filter(meeting__number=107).update(reg_type='remote') + MeetingRegistration.objects.filter(meeting__number__lte=106, reg_type='').update(reg_type='onsite', checkedin=True) + + +def reverse(apps, schema_editor): + MeetingRegistration = apps.get_model("stats", "MeetingRegistration") + MeetingRegistration.objects.filter(meeting__number=107).update(reg_type='') + MeetingRegistration.objects.filter(meeting__number__lte=106, reg_type='onsite').update(reg_type='', checkedin=False) + + +class Migration(migrations.Migration): + dependencies = [ + ("stats", "0001_initial"), + ] + + operations = [ + migrations.RunPython(forward, reverse), + ] diff --git a/ietf/stats/models.py b/ietf/stats/models.py index 422c5b78a8f..66e359f50ca 100644 --- a/ietf/stats/models.py +++ b/ietf/stats/models.py @@ -11,6 +11,10 @@ from ietf.person.models import Person from ietf.utils.models import ForeignKey +### NOTE WELL: These models are expected to be removed and the stats app reimplemented. +# A bare python file that should have been a management command was used to populate +# these models when the app was first installed - it has been removed from main, but +# can be seen at https://github.com/ietf-tools/datatracker/blob/f2b716fc052a0152c32b86b428ba6ebfdcdf5cd2/ietf/stats/backfill_data.py class AffiliationAlias(models.Model): """Records that alias should be treated as name for statistical @@ -24,7 +28,8 @@ def __str__(self): def save(self, *args, **kwargs): self.alias = self.alias.lower() - super(AffiliationAlias, self).save(*args, **kwargs) + update_fields = {"alias"}.union(kwargs.pop("update_fields", set())) + super(AffiliationAlias, self).save(update_fields=update_fields, *args, **kwargs) class Meta: verbose_name_plural = "affiliation aliases" @@ -61,7 +66,10 @@ class MeetingRegistration(models.Model): email = models.EmailField(blank=True, null=True) reg_type = models.CharField(blank=True, max_length=255) ticket_type = models.CharField(blank=True, max_length=255) + # attended was used prior to the introduction of the ietf.meeting.Attended model and is still used by + # Meeting.get_attendance() for older meetings. It should not be used except for dealing with legacy data. attended = models.BooleanField(default=False) + # checkedin indicates that the badge was picked up checkedin = models.BooleanField(default=False) def __str__(self): diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py index dae35275265..48552c8fbac 100644 --- a/ietf/stats/tests.py +++ b/ietf/stats/tests.py @@ -3,33 +3,21 @@ import calendar -import datetime import json -from mock import patch from pyquery import PyQuery -from requests import Response import debug # pyflakes:ignore from django.urls import reverse as urlreverse -from django.utils import timezone from ietf.utils.test_utils import login_testing_unauthorized, TestCase import ietf.stats.views -from ietf.submit.models import Submission -from ietf.doc.factories import WgDraftFactory, WgRfcFactory -from ietf.doc.models import Document, DocAlias, State, RelatedDocument, NewRevisionDocEvent, DocumentAuthor + from ietf.group.factories import RoleFactory -from ietf.meeting.factories import MeetingFactory, AttendedFactory from ietf.person.factories import PersonFactory -from ietf.person.models import Person, Email -from ietf.name.models import FormalLanguageName, DocRelationshipName, CountryName from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory, ReviewAssignmentFactory -from ietf.stats.models import MeetingRegistration, CountryAlias -from ietf.stats.factories import MeetingRegistrationFactory -from ietf.stats.utils import get_meeting_registration_data from ietf.utils.timezone import date_today @@ -40,122 +28,14 @@ def test_stats_index(self): self.assertEqual(r.status_code, 200) def test_document_stats(self): - WgRfcFactory() - draft = WgDraftFactory() - DocumentAuthor.objects.create( - document=draft, - person=Person.objects.get(email__address="aread@example.org"), - email=Email.objects.get(address="aread@example.org"), - country="Germany", - affiliation="IETF", - order=1 - ) - - # create some data for the statistics - Submission.objects.create( - authors=[ { "name": "Some Body", "email": "somebody@example.com", "affiliation": "Some Inc.", "country": "US" }], - pages=30, - rev=draft.rev, - words=4000, - draft=draft, - file_types=".txt", - state_id="posted", - ) - - draft.formal_languages.add(FormalLanguageName.objects.get(slug="xml")) - Document.objects.filter(pk=draft.pk).update(words=4000) - # move it back so it shows up in the yearly summaries - NewRevisionDocEvent.objects.filter(doc=draft, rev=draft.rev).update( - time=timezone.now() - datetime.timedelta(days=500)) - - referencing_draft = Document.objects.create( - name="draft-ietf-mars-referencing", - type_id="draft", - title="Referencing", - stream_id="ietf", - abstract="Test", - rev="00", - pages=2, - words=100 - ) - referencing_draft.set_state(State.objects.get(used=True, type="draft", slug="active")) - DocAlias.objects.create(name=referencing_draft.name).docs.add(referencing_draft) - RelatedDocument.objects.create( - source=referencing_draft, - target=draft.docalias.first(), - relationship=DocRelationshipName.objects.get(slug="refinfo") - ) - NewRevisionDocEvent.objects.create( - type="new_revision", - by=Person.objects.get(name="(System)"), - doc=referencing_draft, - desc="New revision available", - rev=referencing_draft.rev, - time=timezone.now() - datetime.timedelta(days=1000) - ) - - - # check redirect - url = urlreverse(ietf.stats.views.document_stats) - - authors_url = urlreverse(ietf.stats.views.document_stats, kwargs={ "stats_type": "authors" }) - - r = self.client.get(url) - self.assertEqual(r.status_code, 302) - self.assertTrue(authors_url in r["Location"]) + r = self.client.get(urlreverse("ietf.stats.views.document_stats")) + self.assertRedirects(r, urlreverse("ietf.stats.views.stats_index")) - # check various stats types - for stats_type in ["authors", "pages", "words", "format", "formlang", - "author/documents", "author/affiliation", "author/country", - "author/continent", "author/citations", "author/hindex", - "yearly/affiliation", "yearly/country", "yearly/continent"]: - for document_type in ["", "rfc", "draft"]: - for time_choice in ["", "5y"]: - url = urlreverse(ietf.stats.views.document_stats, kwargs={ "stats_type": stats_type }) - r = self.client.get(url, { - "type": document_type, - "time": time_choice, - }) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertTrue(q('#chart')) - if not stats_type.startswith("yearly"): - self.assertTrue(q('table.stats-data')) def test_meeting_stats(self): - # create some data for the statistics - meeting = MeetingFactory(type_id='ietf', date=date_today(), number="96") - MeetingRegistrationFactory(first_name='John', last_name='Smith', country_code='US', email="john.smith@example.us", meeting=meeting, attended=True) - CountryAlias.objects.get_or_create(alias="US", country=CountryName.objects.get(slug="US")) - p = MeetingRegistrationFactory(first_name='Jaume', last_name='Guillaume', country_code='FR', email="jaume.guillaume@example.fr", meeting=meeting, attended=False).person - CountryAlias.objects.get_or_create(alias="FR", country=CountryName.objects.get(slug="FR")) - AttendedFactory(session__meeting=meeting,person=p) - # check redirect - url = urlreverse(ietf.stats.views.meeting_stats) + r = self.client.get(urlreverse("ietf.stats.views.meeting_stats")) + self.assertRedirects(r, urlreverse("ietf.stats.views.stats_index")) - authors_url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": "overview" }) - - r = self.client.get(url) - self.assertEqual(r.status_code, 302) - self.assertTrue(authors_url in r["Location"]) - - # check various stats types - for stats_type in ["overview", "country", "continent"]: - url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": stats_type }) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertTrue(q('#chart')) - if stats_type == "overview": - self.assertTrue(q('table.stats-data')) - - for stats_type in ["country", "continent"]: - url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": stats_type, "num": meeting.number }) - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertTrue(q('#chart')) - self.assertTrue(q('table.stats-data')) def test_known_country_list(self): # check redirect @@ -229,47 +109,3 @@ def test_review_stats(self): self.assertEqual(r.status_code, 200) q = PyQuery(r.content) self.assertTrue(q('.review-stats td:contains("1")')) - - @patch('requests.get') - def test_get_meeting_registration_data(self, mock_get): - '''Test function to get reg data. Confirm leading/trailing spaces stripped''' - person = PersonFactory() - data = { - 'LastName': person.last_name() + ' ', - 'FirstName': person.first_name(), - 'Company': 'ABC', - 'Country': 'US', - 'Email': person.email().address, - 'RegType': 'onsite', - 'TicketType': 'week_pass', - 'CheckedIn': 'True', - } - data2 = data.copy() - data2['RegType'] = 'hackathon' - response_a = Response() - response_a.status_code = 200 - response_a._content = json.dumps([data, data2]).encode('utf8') - # second response one less record, it's been deleted - response_b = Response() - response_b.status_code = 200 - response_b._content = json.dumps([data]).encode('utf8') - # mock_get.return_value = response - mock_get.side_effect = [response_a, response_b] - meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016, 7, 14), number="96") - get_meeting_registration_data(meeting) - query = MeetingRegistration.objects.filter( - first_name=person.first_name(), - last_name=person.last_name(), - country_code='US') - self.assertEqual(query.count(), 2) - self.assertEqual(query.filter(reg_type='onsite').count(), 1) - self.assertEqual(query.filter(reg_type='hackathon').count(), 1) - onsite = query.get(reg_type='onsite') - self.assertEqual(onsite.ticket_type, 'week_pass') - self.assertEqual(onsite.checkedin, True) - # call a second time to test delete - get_meeting_registration_data(meeting) - query = MeetingRegistration.objects.filter(meeting=meeting, email=person.email()) - self.assertEqual(query.count(), 1) - self.assertEqual(query.filter(reg_type='onsite').count(), 1) - self.assertEqual(query.filter(reg_type='hackathon').count(), 0) diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py index ca1163e073e..a13e87a4f47 100644 --- a/ietf/stats/utils.py +++ b/ietf/stats/utils.py @@ -3,18 +3,12 @@ import re -import requests from collections import defaultdict -from django.conf import settings -from django.db.models import Q - import debug # pyflakes:ignore -from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias, MeetingRegistration +from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias from ietf.name.models import CountryName -from ietf.person.models import Person, Email -from ietf.utils.log import log import logging logger = logging.getLogger('django') @@ -221,165 +215,3 @@ def compute_hirsch_index(citation_counts): i += 1 return i - - -def get_meeting_registration_data(meeting): - """"Retrieve registration attendee data and summary statistics. Returns number - of Registration records created. - - MeetingRegistration records are created in realtime as people register for a - meeting. This function serves as an audit / reconciliation. Most records are - expected to already exist. The function has been optimized with this in mind. - """ - num_created = 0 - num_processed = 0 - try: - response = requests.get( - settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number), - timeout=settings.DEFAULT_REQUESTS_TIMEOUT, - ) - except requests.Timeout as exc: - log(f'GET request timed out for [{settings.STATS_REGISTRATION_ATTENDEES_JSON_URL}]: {exc}') - raise RuntimeError("Timeout retrieving data from registrations API") from exc - if response.status_code == 200: - decoded = [] - try: - decoded = response.json() - except ValueError: - if response.content.strip() == 'Invalid meeting': - logger.info('Invalid meeting: {}'.format(meeting.number)) - return (0,0,0) - else: - raise RuntimeError("Could not decode response from registrations API: '%s...'" % (response.content[:64], )) - - records = MeetingRegistration.objects.filter(meeting_id=meeting.pk).select_related('person') - meeting_registrations = {(r.email, r.reg_type):r for r in records} - for registration in decoded: - person = None - # capture the stripped registration values for later use - first_name = registration['FirstName'].strip() - last_name = registration['LastName'].strip() - affiliation = registration['Company'].strip() - country_code = registration['Country'].strip() - address = registration['Email'].strip() - reg_type = registration['RegType'].strip() - ticket_type = registration['TicketType'].strip() - checkedin = bool(registration['CheckedIn'].strip().lower() == 'true') - - if (address, reg_type) in meeting_registrations: - object = meeting_registrations.pop((address, reg_type)) - created = False - else: - object = MeetingRegistration.objects.create( - meeting_id=meeting.pk, - email=address, - reg_type=reg_type) - created = True - - if (object.first_name != first_name[:200] or - object.last_name != last_name[:200] or - object.affiliation != affiliation or - object.country_code != country_code or - object.ticket_type != ticket_type or - object.checkedin != checkedin): - object.first_name=first_name[:200] - object.last_name=last_name[:200] - object.affiliation=affiliation - object.country_code=country_code - object.ticket_type=ticket_type - object.checkedin=checkedin - object.save() - - # Add a Person object to MeetingRegistration object - # if valid email is available - if object and not object.person and address: - # If the person already exists do not try to create a new one - emails = Email.objects.filter(address=address) - # there can only be on Email object with a unique email address (primary key) - if emails.exists(): - person = emails.first().person - # Create a new Person object - else: - logger.error("No Person record for registration. email={}".format(address)) - # update the person object to an actual value - object.person = person - object.save() - - if created: - num_created += 1 - num_processed += 1 - - # any registrations left in meeting_registrations no longer exist in reg - # so must have been deleted - for r in meeting_registrations: - try: - MeetingRegistration.objects.get(meeting=meeting,email=r[0],reg_type=r[1]).delete() - logger.info('Removing deleted registration. email={}, reg_type={}'.format(r[0], r[1])) - except MeetingRegistration.DoesNotExist: - pass - else: - raise RuntimeError("Bad response from registrations API: %s, '%s'" % (response.status_code, response.content)) - num_total = MeetingRegistration.objects.filter( - meeting_id=meeting.pk, - reg_type__in=['onsite', 'remote'] - ).filter( - Q(attended=True) | Q(checkedin=True) - ).count() - if meeting.attendees is None or num_total > meeting.attendees: - meeting.attendees = num_total - meeting.save() - return num_created, num_processed, num_total - -def repair_meetingregistration_person(meetings=None): - repaired_records = 0 - qs = MeetingRegistration.objects.all() - if meetings: - qs = qs.filter(meeting__number__in=meetings) - for mr in qs: - if mr.email and not mr.person: - email_person = Person.objects.filter(email__address=mr.email).first() - if email_person: - mr.person = email_person - mr.save() - repaired_records += 1 - return repaired_records - -class MeetingRegistrationIssuesSummary(object): - pass - -def find_meetingregistration_person_issues(meetings=None): - summary = MeetingRegistrationIssuesSummary() - - summary.could_be_fixed = set() - summary.maybe_address = set() - summary.different_person = set() - summary.no_person = set() - summary.maybe_person = set() - summary.no_email = set() - summary.ok_records = 0 - - qs = MeetingRegistration.objects.all() - if meetings: - qs = qs.filter(meeting__number__in=meetings) - for mr in qs: - if mr.person and mr.email and mr.email in mr.person.email_set.values_list('address',flat=True): - summary.ok_records += 1 - elif mr.email: - email_person = Person.objects.filter(email__address=mr.email).first() - if mr.person: - if not email_person: - summary.maybe_address.add(f'{mr.email} is not present in any Email object. The MeetingRegistration object implies this is an address for {mr.person} ({mr.person.pk})') - elif email_person != mr.person: - summary.different_person.add(f'{mr} ({mr.pk}) has person {mr.person} ({mr.person.pk}) but an email {mr.email} attached to a different person {email_person} ({email_person.pk}).') - elif email_person: - summary.could_be_fixed.add(f'{mr} ({mr.pk}) has no person, but email {mr.email} matches {email_person} ({email_person.pk})') - else: - maybe_person_qs = Person.objects.filter(name__icontains=mr.last_name).filter(name__icontains=mr.first_name) - if maybe_person_qs.exists(): - summary.maybe_person.add(f'{mr} ({mr.pk}) has email address {mr.email} which cannot be associated with any Person. Consider these possible people {[(p,p.pk) for p in maybe_person_qs]}') - else: - summary.no_person.add(f'{mr} ({mr.pk}) has email address {mr.email} which cannot be associated with any Person') - else: - summary.no_email.add(f'{mr} ({mr.pk}) provides no email address') - - return summary diff --git a/ietf/stats/views.py b/ietf/stats/views.py index 44fbfb71799..504d84e86d6 100644 --- a/ietf/stats/views.py +++ b/ietf/stats/views.py @@ -2,25 +2,18 @@ # -*- coding: utf-8 -*- -import os import calendar import datetime -import email.utils import itertools import json import dateutil.relativedelta from collections import defaultdict -from django.conf import settings from django.contrib.auth.decorators import login_required -from django.core.cache import cache -from django.db.models import Count, Q from django.http import HttpResponseRedirect -from django.shortcuts import get_object_or_404, render +from django.shortcuts import render from django.urls import reverse as urlreverse -from django.utils import timezone -from django.utils.safestring import mark_safe -from django.utils.text import slugify + import debug # pyflakes:ignore @@ -29,18 +22,12 @@ ReviewAssignmentData, sum_period_review_assignment_stats, sum_raw_review_assignment_aggregations) -from ietf.submit.models import Submission from ietf.group.models import Role, Group from ietf.person.models import Person -from ietf.name.models import ReviewResultName, CountryName, DocRelationshipName, ReviewAssignmentStateName -from ietf.person.name import plain_name -from ietf.doc.models import DocAlias, Document, State, DocEvent -from ietf.meeting.models import Meeting -from ietf.stats.models import MeetingRegistration, CountryAlias -from ietf.stats.utils import get_aliased_affiliations, get_aliased_countries, compute_hirsch_index +from ietf.name.models import ReviewResultName, CountryName, ReviewAssignmentStateName from ietf.ietfauth.utils import has_role from ietf.utils.response import permission_denied -from ietf.utils.timezone import date_today, DEADLINE_TZINFO, RPC_TZINFO +from ietf.utils.timezone import date_today, DEADLINE_TZINFO def stats_index(request): @@ -135,622 +122,8 @@ def add_labeled_top_series_from_bins(chart_data, bins, limit): }) def document_stats(request, stats_type=None): - def build_document_stats_url(stats_type_override=Ellipsis, get_overrides=None): - if get_overrides is None: - get_overrides={} - kwargs = { - "stats_type": stats_type if stats_type_override is Ellipsis else stats_type_override, - } - - return urlreverse(document_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides) - - # the length limitation is to keep the key shorter than memcached's limit - # of 250 after django has added the key_prefix and key_version parameters - cache_key = ("stats:document_stats:%s:%s" % (stats_type, slugify(request.META.get('QUERY_STRING',''))))[:228] - data = cache.get(cache_key) - if not data: - names_limit = settings.STATS_NAMES_LIMIT - # statistics types - possible_document_stats_types = add_url_to_choices([ - ("authors", "Number of authors"), - ("pages", "Pages"), - ("words", "Words"), - ("format", "Format"), - ("formlang", "Formal languages"), - ], lambda slug: build_document_stats_url(stats_type_override=slug)) - - possible_author_stats_types = add_url_to_choices([ - ("author/documents", "Number of documents"), - ("author/affiliation", "Affiliation"), - ("author/country", "Country"), - ("author/continent", "Continent"), - ("author/citations", "Citations"), - ("author/hindex", "h-index"), - ], lambda slug: build_document_stats_url(stats_type_override=slug)) - - possible_yearly_stats_types = add_url_to_choices([ - ("yearly/affiliation", "Affiliation"), - ("yearly/country", "Country"), - ("yearly/continent", "Continent"), - ], lambda slug: build_document_stats_url(stats_type_override=slug)) - - - if not stats_type: - return HttpResponseRedirect(build_document_stats_url(stats_type_override=possible_document_stats_types[0][0])) - - - possible_document_types = add_url_to_choices([ - ("", "All"), - ("rfc", "RFCs"), - ("draft", "Internet-Drafts"), - ], lambda slug: build_document_stats_url(get_overrides={ "type": slug })) - - document_type = get_choice(request, "type", possible_document_types) or "" - - - possible_time_choices = add_url_to_choices([ - ("", "All time"), - ("5y", "Past 5 years"), - ], lambda slug: build_document_stats_url(get_overrides={ "time": slug })) - - time_choice = request.GET.get("time") or "" - - from_time = None - if "y" in time_choice: - try: - y = int(time_choice.rstrip("y")) - from_time = timezone.now() - dateutil.relativedelta.relativedelta(years=y) - except ValueError: - pass - - chart_data = [] - table_data = [] - stats_title = "" - template_name = stats_type.replace("/", "_") - bin_size = 1 - alias_data = [] - eu_countries = None - - - if any(stats_type == t[0] for t in possible_document_stats_types): - # filter documents - docalias_filters = Q(docs__type="draft") - - rfc_state = State.objects.get(type="draft", slug="rfc") - if document_type == "rfc": - docalias_filters &= Q(docs__states=rfc_state) - elif document_type == "draft": - docalias_filters &= ~Q(docs__states=rfc_state) - - if from_time: - # this is actually faster than joining in the database, - # despite the round-trip back and forth - docs_within_time_constraint = list(Document.objects.filter( - type="draft", - docevent__time__gte=from_time, - docevent__type__in=["published_rfc", "new_revision"], - ).values_list("pk")) - - docalias_filters &= Q(docs__in=docs_within_time_constraint) - - docalias_qs = DocAlias.objects.filter(docalias_filters) - - if document_type == "rfc": - doc_label = "RFC" - elif document_type == "draft": - doc_label = "draft" - else: - doc_label = "document" - - total_docs = docalias_qs.values_list("docs__name").distinct().count() - - def generate_canonical_names(values): - for doc_id, ts in itertools.groupby(values.order_by("docs__name"), lambda a: a[0]): - chosen = None - for t in ts: - if chosen is None: - chosen = t - else: - if t[1].startswith("rfc"): - chosen = t - elif t[1].startswith("draft") and not chosen[1].startswith("rfc"): - chosen = t - yield chosen - - if stats_type == "authors": - stats_title = "Number of authors for each {}".format(doc_label) - - bins = defaultdict(set) - - for name, canonical_name, author_count in generate_canonical_names(docalias_qs.values_list("docs__name", "name").annotate(Count("docs__documentauthor"))): - bins[author_count or 0].add(canonical_name) - - series_data = [] - for author_count, names in sorted(bins.items(), key=lambda t: t[0]): - percentage = len(names) * 100.0 / (total_docs or 1) - series_data.append((author_count, percentage)) - table_data.append((author_count, percentage, len(names), list(names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif stats_type == "pages": - stats_title = "Number of pages for each {}".format(doc_label) - - bins = defaultdict(set) - - for name, canonical_name, pages in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__pages")): - bins[pages or 0].add(canonical_name) - - series_data = [] - for pages, names in sorted(bins.items(), key=lambda t: t[0]): - percentage = len(names) * 100.0 / (total_docs or 1) - if pages is not None: - series_data.append((pages, len(names))) - table_data.append((pages, percentage, len(names), list(names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif stats_type == "words": - stats_title = "Number of words for each {}".format(doc_label) - - bin_size = 500 - - bins = defaultdict(set) - - for name, canonical_name, words in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__words")): - bins[put_into_bin(words, bin_size)].add(canonical_name) - - series_data = [] - for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]): - percentage = len(names) * 100.0 / (total_docs or 1) - if words is not None: - series_data.append((value, len(names))) - - table_data.append((words, percentage, len(names), list(names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif stats_type == "format": - stats_title = "Submission formats for each {}".format(doc_label) - - bins = defaultdict(set) - - # on new documents, we should have a Submission row with the file types - submission_types = {} - - for doc_name, file_types in Submission.objects.values_list("draft", "file_types").order_by("submission_date", "id"): - submission_types[doc_name] = file_types - - doc_names_with_missing_types = {} - for doc_name, canonical_name, rev in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__rev")): - types = submission_types.get(doc_name) - if types: - for dot_ext in types.split(","): - bins[dot_ext.lstrip(".").upper()].add(canonical_name) - - else: - - if canonical_name.startswith("rfc"): - filename = canonical_name - else: - filename = canonical_name + "-" + rev - - doc_names_with_missing_types[filename] = canonical_name - - # look up the remaining documents on disk - for filename in itertools.chain(os.listdir(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), os.listdir(settings.RFC_PATH)): - t = filename.split(".", 1) - if len(t) != 2: - continue - - basename, ext = t - ext = ext.lower() - if not any(ext==allowlisted_ext for allowlisted_ext in settings.DOCUMENT_FORMAT_ALLOWLIST): - continue - - canonical_name = doc_names_with_missing_types.get(basename) - - if canonical_name: - bins[ext.upper()].add(canonical_name) - - series_data = [] - for fmt, names in sorted(bins.items(), key=lambda t: t[0]): - percentage = len(names) * 100.0 / (total_docs or 1) - series_data.append((fmt, len(names))) - - table_data.append((fmt, percentage, len(names), list(names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif stats_type == "formlang": - stats_title = "Formal languages used for each {}".format(doc_label) - - bins = defaultdict(set) - - for name, canonical_name, formal_language_name in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__formal_languages__name")): - bins[formal_language_name or ""].add(canonical_name) - - series_data = [] - for formal_language, names in sorted(bins.items(), key=lambda t: t[0]): - percentage = len(names) * 100.0 / (total_docs or 1) - if formal_language is not None: - series_data.append((formal_language, len(names))) - table_data.append((formal_language, percentage, len(names), list(names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif any(stats_type == t[0] for t in possible_author_stats_types): - person_filters = Q(documentauthor__document__type="draft") - - # filter persons - rfc_state = State.objects.get(type="draft", slug="rfc") - if document_type == "rfc": - person_filters &= Q(documentauthor__document__states=rfc_state) - elif document_type == "draft": - person_filters &= ~Q(documentauthor__document__states=rfc_state) - - if from_time: - # this is actually faster than joining in the database, - # despite the round-trip back and forth - docs_within_time_constraint = set(Document.objects.filter( - type="draft", - docevent__time__gte=from_time, - docevent__type__in=["published_rfc", "new_revision"], - ).values_list("pk")) - - person_filters &= Q(documentauthor__document__in=docs_within_time_constraint) - - person_qs = Person.objects.filter(person_filters) - - if document_type == "rfc": - doc_label = "RFC" - elif document_type == "draft": - doc_label = "draft" - else: - doc_label = "document" - - if stats_type == "author/documents": - stats_title = "Number of {}s per author".format(doc_label) - - bins = defaultdict(set) - - person_qs = Person.objects.filter(person_filters) - - for name, document_count in person_qs.values_list("name").annotate(Count("documentauthor")): - bins[document_count or 0].add(name) - - total_persons = count_bins(bins) - - series_data = [] - for document_count, names in sorted(bins.items(), key=lambda t: t[0]): - percentage = len(names) * 100.0 / (total_persons or 1) - series_data.append((document_count, percentage)) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((document_count, percentage, len(plain_names), list(plain_names)[:names_limit])) - - chart_data.append({ "data": series_data }) - - elif stats_type == "author/affiliation": - stats_title = "Number of {} authors per affiliation".format(doc_label) - - bins = defaultdict(set) - - person_qs = Person.objects.filter(person_filters) - - # Since people don't write the affiliation names in the - # same way, and we don't want to go back and edit them - # either, we transform them here. - - name_affiliation_set = { - (name, affiliation) - for name, affiliation in person_qs.values_list("name", "documentauthor__affiliation") - } - - aliases = get_aliased_affiliations(affiliation for _, affiliation in name_affiliation_set) - - for name, affiliation in name_affiliation_set: - bins[aliases.get(affiliation, affiliation)].add(name) - - prune_unknown_bin_with_known(bins) - total_persons = count_bins(bins) - - series_data = [] - for affiliation, names in sorted(bins.items(), key=lambda t: t[0].lower()): - percentage = len(names) * 100.0 / (total_persons or 1) - if affiliation: - series_data.append((affiliation, len(names))) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((affiliation, percentage, len(plain_names), list(plain_names)[:names_limit])) - - series_data.sort(key=lambda t: t[1], reverse=True) - series_data = series_data[:30] - - chart_data.append({ "data": series_data }) - - for alias, name in sorted(aliases.items(), key=lambda t: t[1]): - alias_data.append((name, alias)) - - elif stats_type == "author/country": - stats_title = "Number of {} authors per country".format(doc_label) - - bins = defaultdict(set) - - person_qs = Person.objects.filter(person_filters) - - # Since people don't write the country names in the - # same way, and we don't want to go back and edit them - # either, we transform them here. - - name_country_set = { - (name, country) - for name, country in person_qs.values_list("name", "documentauthor__country") - } - - aliases = get_aliased_countries(country for _, country in name_country_set) - - countries = { c.name: c for c in CountryName.objects.all() } - eu_name = "EU" - eu_countries = { c for c in countries.values() if c.in_eu } - - for name, country in name_country_set: - country_name = aliases.get(country, country) - bins[country_name].add(name) - - c = countries.get(country_name) - if c and c.in_eu: - bins[eu_name].add(name) - - prune_unknown_bin_with_known(bins) - total_persons = count_bins(bins) - - series_data = [] - for country, names in sorted(bins.items(), key=lambda t: t[0].lower()): - percentage = len(names) * 100.0 / (total_persons or 1) - if country: - series_data.append((country, len(names))) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((country, percentage, len(plain_names), list(plain_names)[:names_limit])) - - series_data.sort(key=lambda t: t[1], reverse=True) - series_data = series_data[:30] + return HttpResponseRedirect(urlreverse("ietf.stats.views.stats_index")) - chart_data.append({ "data": series_data }) - - for alias, country_name in aliases.items(): - alias_data.append((country_name, alias, countries.get(country_name))) - - alias_data.sort() - - elif stats_type == "author/continent": - stats_title = "Number of {} authors per continent".format(doc_label) - - bins = defaultdict(set) - - person_qs = Person.objects.filter(person_filters) - - name_country_set = { - (name, country) - for name, country in person_qs.values_list("name", "documentauthor__country") - } - - aliases = get_aliased_countries(country for _, country in name_country_set) - - country_to_continent = dict(CountryName.objects.values_list("name", "continent__name")) - - for name, country in name_country_set: - country_name = aliases.get(country, country) - continent_name = country_to_continent.get(country_name, "") - bins[continent_name].add(name) - - prune_unknown_bin_with_known(bins) - total_persons = count_bins(bins) - - series_data = [] - for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()): - percentage = len(names) * 100.0 / (total_persons or 1) - if continent: - series_data.append((continent, len(names))) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((continent, percentage, len(plain_names), list(plain_names)[:names_limit])) - - series_data.sort(key=lambda t: t[1], reverse=True) - - chart_data.append({ "data": series_data }) - - elif stats_type == "author/citations": - stats_title = "Number of citations of {}s written by author".format(doc_label) - - bins = defaultdict(set) - - cite_relationships = list(DocRelationshipName.objects.filter(slug__in=['refnorm', 'refinfo', 'refunk', 'refold'])) - person_filters &= Q(documentauthor__document__docalias__relateddocument__relationship__in=cite_relationships) - - person_qs = Person.objects.filter(person_filters) - - for name, citations in person_qs.values_list("name").annotate(Count("documentauthor__document__docalias__relateddocument")): - bins[citations or 0].add(name) - - total_persons = count_bins(bins) - - series_data = [] - for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True): - percentage = len(names) * 100.0 / (total_persons or 1) - series_data.append((citations, percentage)) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((citations, percentage, len(plain_names), list(plain_names)[:names_limit])) - - chart_data.append({ "data": sorted(series_data, key=lambda t: t[0]) }) - - elif stats_type == "author/hindex": - stats_title = "h-index for {}s written by author".format(doc_label) - - bins = defaultdict(set) - - cite_relationships = list(DocRelationshipName.objects.filter(slug__in=['refnorm', 'refinfo', 'refunk', 'refold'])) - person_filters &= Q(documentauthor__document__docalias__relateddocument__relationship__in=cite_relationships) - - person_qs = Person.objects.filter(person_filters) - - values = person_qs.values_list("name", "documentauthor__document").annotate(Count("documentauthor__document__docalias__relateddocument")) - for name, ts in itertools.groupby(values.order_by("name"), key=lambda t: t[0]): - h_index = compute_hirsch_index([citations for _, document, citations in ts]) - bins[h_index or 0].add(name) - - total_persons = count_bins(bins) - - series_data = [] - for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True): - percentage = len(names) * 100.0 / (total_persons or 1) - series_data.append((citations, percentage)) - plain_names = sorted([ plain_name(n) for n in names ]) - table_data.append((citations, percentage, len(plain_names), list(plain_names)[:names_limit])) - - chart_data.append({ "data": sorted(series_data, key=lambda t: t[0]) }) - - elif any(stats_type == t[0] for t in possible_yearly_stats_types): - - person_filters = Q(documentauthor__document__type="draft") - - # filter persons - rfc_state = State.objects.get(type="draft", slug="rfc") - if document_type == "rfc": - person_filters &= Q(documentauthor__document__states=rfc_state) - elif document_type == "draft": - person_filters &= ~Q(documentauthor__document__states=rfc_state) - - doc_years = defaultdict(set) - - docevent_qs = DocEvent.objects.filter( - doc__type="draft", - type__in=["published_rfc", "new_revision"], - ).values_list("doc", "time").order_by("doc") - - for doc_id, time in docevent_qs.iterator(): - # RPC_TZINFO is used to match the timezone handling in Document.pub_date() - doc_years[doc_id].add(time.astimezone(RPC_TZINFO).year) - - person_qs = Person.objects.filter(person_filters) - - if document_type == "rfc": - doc_label = "RFC" - elif document_type == "draft": - doc_label = "draft" - else: - doc_label = "document" - - template_name = "yearly" - - years_from = from_time.year if from_time else 1 - years_to = timezone.now().year - 1 - - - if stats_type == "yearly/affiliation": - stats_title = "Number of {} authors per affiliation over the years".format(doc_label) - - person_qs = Person.objects.filter(person_filters) - - name_affiliation_doc_set = { - (name, affiliation, doc) - for name, affiliation, doc in person_qs.values_list("name", "documentauthor__affiliation", "documentauthor__document") - } - - aliases = get_aliased_affiliations(affiliation for _, affiliation, _ in name_affiliation_doc_set) - - bins = defaultdict(set) - for name, affiliation, doc in name_affiliation_doc_set: - a = aliases.get(affiliation, affiliation) - if a: - for year in doc_years.get(doc): - if years_from <= year <= years_to: - bins[(year, a)].add(name) - - add_labeled_top_series_from_bins(chart_data, bins, limit=8) - - elif stats_type == "yearly/country": - stats_title = "Number of {} authors per country over the years".format(doc_label) - - person_qs = Person.objects.filter(person_filters) - - name_country_doc_set = { - (name, country, doc) - for name, country, doc in person_qs.values_list("name", "documentauthor__country", "documentauthor__document") - } - - aliases = get_aliased_countries(country for _, country, _ in name_country_doc_set) - - countries = { c.name: c for c in CountryName.objects.all() } - eu_name = "EU" - eu_countries = { c for c in countries.values() if c.in_eu } - - bins = defaultdict(set) - - for name, country, doc in name_country_doc_set: - country_name = aliases.get(country, country) - c = countries.get(country_name) - - years = doc_years.get(doc) - if country_name and years: - for year in years: - if years_from <= year <= years_to: - bins[(year, country_name)].add(name) - - if c and c.in_eu: - bins[(year, eu_name)].add(name) - - add_labeled_top_series_from_bins(chart_data, bins, limit=8) - - - elif stats_type == "yearly/continent": - stats_title = "Number of {} authors per continent".format(doc_label) - - person_qs = Person.objects.filter(person_filters) - - name_country_doc_set = { - (name, country, doc) - for name, country, doc in person_qs.values_list("name", "documentauthor__country", "documentauthor__document") - } - - aliases = get_aliased_countries(country for _, country, _ in name_country_doc_set) - - country_to_continent = dict(CountryName.objects.values_list("name", "continent__name")) - - bins = defaultdict(set) - - for name, country, doc in name_country_doc_set: - country_name = aliases.get(country, country) - continent_name = country_to_continent.get(country_name, "") - - if continent_name: - for year in doc_years.get(doc): - if years_from <= year <= years_to: - bins[(year, continent_name)].add(name) - - add_labeled_top_series_from_bins(chart_data, bins, limit=8) - - data = { - "chart_data": mark_safe(json.dumps(chart_data)), - "table_data": table_data, - "stats_title": stats_title, - "possible_document_stats_types": possible_document_stats_types, - "possible_author_stats_types": possible_author_stats_types, - "possible_yearly_stats_types": possible_yearly_stats_types, - "stats_type": stats_type, - "possible_document_types": possible_document_types, - "document_type": document_type, - "possible_time_choices": possible_time_choices, - "time_choice": time_choice, - "doc_label": doc_label, - "bin_size": bin_size, - "show_aliases_url": build_document_stats_url(get_overrides={ "showaliases": "1" }), - "hide_aliases_url": build_document_stats_url(get_overrides={ "showaliases": None }), - "alias_data": alias_data, - "eu_countries": sorted(eu_countries or [], key=lambda c: c.name), - "content_template": "stats/document_stats_{}.html".format(template_name), - } - # Logs are full of these, but nobody is using them - # log("Cache miss for '%s'. Data size: %sk" % (cache_key, len(str(data))/1000)) - cache.set(cache_key, data, 24*60*60) - return render(request, "stats/document_stats.html", data) def known_countries_list(request, stats_type=None, acronym=None): countries = CountryName.objects.prefetch_related("countryalias_set") @@ -764,252 +137,7 @@ def known_countries_list(request, stats_type=None, acronym=None): }) def meeting_stats(request, num=None, stats_type=None): - meeting = None - if num is not None: - meeting = get_object_or_404(Meeting, number=num, type="ietf") - - def build_meeting_stats_url(number=None, stats_type_override=Ellipsis, get_overrides=None): - if get_overrides is None: - get_overrides = {} - kwargs = { - "stats_type": stats_type if stats_type_override is Ellipsis else stats_type_override, - } - - if number is not None: - kwargs["num"] = number - - return urlreverse(meeting_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides) - - cache_key = ("stats:meeting_stats:%s:%s:%s" % (num, stats_type, slugify(request.META.get('QUERY_STRING',''))))[:228] - data = cache.get(cache_key) - if not data: - names_limit = settings.STATS_NAMES_LIMIT - # statistics types - if meeting: - possible_stats_types = add_url_to_choices([ - ("country", "Country"), - ("continent", "Continent"), - ], lambda slug: build_meeting_stats_url(number=meeting.number, stats_type_override=slug)) - else: - possible_stats_types = add_url_to_choices([ - ("overview", "Overview"), - ("country", "Country"), - ("continent", "Continent"), - ], lambda slug: build_meeting_stats_url(number=None, stats_type_override=slug)) - - if not stats_type: - return HttpResponseRedirect(build_meeting_stats_url(number=num, stats_type_override=possible_stats_types[0][0])) - - chart_data = [] - piechart_data = [] - table_data = [] - stats_title = "" - template_name = stats_type - bin_size = 1 - eu_countries = None - - def get_country_mapping(attendees): - return { - alias.alias: alias.country - for alias in CountryAlias.objects.filter(alias__in=set(r.country_code for r in attendees)).select_related("country", "country__continent") - if alias.alias.isupper() - } - - def reg_name(r): - return email.utils.formataddr(((r.first_name + " " + r.last_name).strip(), r.email)) - - if meeting and any(stats_type == t[0] for t in possible_stats_types): - attendees = MeetingRegistration.objects.filter( - meeting=meeting, - reg_type__in=['onsite', 'remote'] - ).filter( - Q( attended=True) | Q( checkedin=True ) - ) - - if stats_type == "country": - stats_title = "Number of attendees for {} {} per country".format(meeting.type.name, meeting.number) - - bins = defaultdict(set) - - country_mapping = get_country_mapping(attendees) - - eu_name = "EU" - eu_countries = set(CountryName.objects.filter(in_eu=True)) - - for r in attendees: - name = reg_name(r) - c = country_mapping.get(r.country_code) - bins[c.name if c else ""].add(name) - - if c and c.in_eu: - bins[eu_name].add(name) - - prune_unknown_bin_with_known(bins) - total_attendees = count_bins(bins) - - series_data = [] - for country, names in sorted(bins.items(), key=lambda t: t[0].lower()): - percentage = len(names) * 100.0 / (total_attendees or 1) - if country: - series_data.append((country, len(names))) - table_data.append((country, percentage, len(names), list(names)[:names_limit])) - - if country and country != eu_name: - piechart_data.append({ "name": country, "y": percentage }) - - series_data.sort(key=lambda t: t[1], reverse=True) - series_data = series_data[:20] - - piechart_data.sort(key=lambda d: d["y"], reverse=True) - pie_cut_off = 8 - piechart_data = piechart_data[:pie_cut_off] + [{ "name": "Other", "y": sum(d["y"] for d in piechart_data[pie_cut_off:])}] - - chart_data.append({ "data": series_data }) - - elif stats_type == "continent": - stats_title = "Number of attendees for {} {} per continent".format(meeting.type.name, meeting.number) - - bins = defaultdict(set) - - country_mapping = get_country_mapping(attendees) - - for r in attendees: - name = reg_name(r) - c = country_mapping.get(r.country_code) - bins[c.continent.name if c else ""].add(name) - - prune_unknown_bin_with_known(bins) - total_attendees = count_bins(bins) - - series_data = [] - for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()): - percentage = len(names) * 100.0 / (total_attendees or 1) - if continent: - series_data.append((continent, len(names))) - table_data.append((continent, percentage, len(names), list(names)[:names_limit])) - - series_data.sort(key=lambda t: t[1], reverse=True) - - chart_data.append({ "data": series_data }) - - - elif not meeting and any(stats_type == t[0] for t in possible_stats_types): - template_name = "overview" - - attendees = MeetingRegistration.objects.filter( - meeting__type="ietf", - attended=True, - reg_type__in=['onsite', 'remote'] - ).filter( - Q( attended=True) | Q( checkedin=True ) - ).select_related('meeting') - - if stats_type == "overview": - stats_title = "Number of attendees per meeting" - - continents = {} - - meetings = Meeting.objects.filter(type='ietf', date__lte=date_today()).order_by('number') - for m in meetings: - country = CountryName.objects.get(slug=m.country) - continents[country.continent.name] = country.continent.name - - bins = defaultdict(set) - - for r in attendees: - meeting_number = int(r.meeting.number) - name = reg_name(r) - bins[meeting_number].add(name) - - series_data = {} - for continent in list(continents.keys()): - series_data[continent] = [] - - for m in meetings: - country = CountryName.objects.get(slug=m.country) - url = build_meeting_stats_url(number=m.number, - stats_type_override="country") - for continent in list(continents.keys()): - if continent == country.continent.name: - d = { - "name": "IETF {} - {}, {}".format(int(m.number), m.city, country), - "x": int(m.number), - "y": m.attendees, - "date": m.date.strftime("%d %b %Y"), - "url": url, - } - else: - d = { - "x": int(m.number), - "y": 0, - } - series_data[continent].append(d) - table_data.append((m, url, - m.attendees, country)) - - for continent in list(continents.keys()): -# series_data[continent].sort(key=lambda t: t[0]["x"]) - chart_data.append( { "name": continent, - "data": series_data[continent] }) - - table_data.sort(key=lambda t: int(t[0].number), reverse=True) - - elif stats_type == "country": - stats_title = "Number of attendees per country across meetings" - - country_mapping = get_country_mapping(attendees) - - eu_name = "EU" - eu_countries = set(CountryName.objects.filter(in_eu=True)) - - bins = defaultdict(set) - - for r in attendees: - meeting_number = int(r.meeting.number) - name = reg_name(r) - c = country_mapping.get(r.country_code) - - if c: - bins[(meeting_number, c.name)].add(name) - if c.in_eu: - bins[(meeting_number, eu_name)].add(name) - - add_labeled_top_series_from_bins(chart_data, bins, limit=8) - - - elif stats_type == "continent": - stats_title = "Number of attendees per continent across meetings" - - country_mapping = get_country_mapping(attendees) - - bins = defaultdict(set) - - for r in attendees: - meeting_number = int(r.meeting.number) - name = reg_name(r) - c = country_mapping.get(r.country_code) - - if c: - bins[(meeting_number, c.continent.name)].add(name) - - add_labeled_top_series_from_bins(chart_data, bins, limit=8) - data = { - "chart_data": mark_safe(json.dumps(chart_data)), - "piechart_data": mark_safe(json.dumps(piechart_data)), - "table_data": table_data, - "stats_title": stats_title, - "possible_stats_types": possible_stats_types, - "stats_type": stats_type, - "bin_size": bin_size, - "meeting": meeting, - "eu_countries": sorted(eu_countries or [], key=lambda c: c.name), - "content_template": "stats/meeting_stats_{}.html".format(template_name), - } - # Logs are full of these, but nobody is using them... - # log("Cache miss for '%s'. Data size: %sk" % (cache_key, len(str(data))/1000)) - cache.set(cache_key, data, 24*60*60) - # - return render(request, "stats/meeting_stats.html", data) + return HttpResponseRedirect(urlreverse("ietf.stats.views.stats_index")) @login_required diff --git a/ietf/secr/console/__init__.py b/ietf/status/__init__.py similarity index 100% rename from ietf/secr/console/__init__.py rename to ietf/status/__init__.py diff --git a/ietf/status/admin.py b/ietf/status/admin.py new file mode 100644 index 00000000000..f9c4e891a71 --- /dev/null +++ b/ietf/status/admin.py @@ -0,0 +1,19 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from datetime import datetime +from django.contrib import admin +from django.template.defaultfilters import slugify +from .models import Status + +class StatusAdmin(admin.ModelAdmin): + list_display = ['title', 'body', 'active', 'date', 'by', 'page'] + raw_id_fields = ['by'] + + def get_changeform_initial_data(self, request): + date = datetime.now() + return { + "slug": slugify(f"{date.year}-{date.month}-{date.day}-"), + } + +admin.site.register(Status, StatusAdmin) diff --git a/ietf/status/apps.py b/ietf/status/apps.py new file mode 100644 index 00000000000..ba64a41afce --- /dev/null +++ b/ietf/status/apps.py @@ -0,0 +1,9 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from django.apps import AppConfig + + +class StatusConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "ietf.status" diff --git a/ietf/status/migrations/0001_initial.py b/ietf/status/migrations/0001_initial.py new file mode 100644 index 00000000000..51851894967 --- /dev/null +++ b/ietf/status/migrations/0001_initial.py @@ -0,0 +1,75 @@ +# Generated by Django 4.2.13 on 2024-07-21 22:47 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ("person", "0002_alter_historicalperson_ascii_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="Status", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("date", models.DateTimeField(default=django.utils.timezone.now)), + ("slug", models.SlugField(unique=True)), + ( + "title", + models.CharField( + help_text="Your site status notification title.", + max_length=255, + verbose_name="Status title", + ), + ), + ( + "body", + models.CharField( + help_text="Your site status notification body.", + max_length=255, + verbose_name="Status body", + ), + ), + ( + "active", + models.BooleanField( + default=True, + help_text="Only active messages will be shown.", + verbose_name="Active?", + ), + ), + ( + "page", + models.TextField( + blank=True, + help_text="More detail shown after people click 'Read more'. If empty no 'read more' will be shown", + null=True, + verbose_name="More detail (markdown)", + ), + ), + ( + "by", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="person.person" + ), + ), + ], + options={ + "verbose_name_plural": "statuses", + }, + ), + ] diff --git a/ietf/secr/sreq/__init__.py b/ietf/status/migrations/__init__.py similarity index 100% rename from ietf/secr/sreq/__init__.py rename to ietf/status/migrations/__init__.py diff --git a/ietf/status/models.py b/ietf/status/models.py new file mode 100644 index 00000000000..c5519202758 --- /dev/null +++ b/ietf/status/models.py @@ -0,0 +1,23 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from django.utils import timezone +from django.db import models +from django.db.models import ForeignKey + +import debug # pyflakes:ignore + +class Status(models.Model): + + date = models.DateTimeField(default=timezone.now) + slug = models.SlugField(blank=False, null=False, unique=True) + title = models.CharField(max_length=255, verbose_name="Status title", help_text="Your site status notification title.") + body = models.CharField(max_length=255, verbose_name="Status body", help_text="Your site status notification body.", unique=False) + active = models.BooleanField(default=True, verbose_name="Active?", help_text="Only active messages will be shown.") + by = ForeignKey('person.Person', on_delete=models.CASCADE) + page = models.TextField(blank=True, null=True, verbose_name="More detail (markdown)", help_text="More detail shown after people click 'Read more'. If empty no 'read more' will be shown") + + def __str__(self): + return "{} {} {} {}".format(self.date, self.active, self.by, self.title) + class Meta: + verbose_name_plural = "statuses" diff --git a/ietf/status/tests.py b/ietf/status/tests.py new file mode 100644 index 00000000000..9c0dd9114ea --- /dev/null +++ b/ietf/status/tests.py @@ -0,0 +1,120 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +import debug # pyflakes:ignore + +from django.urls import reverse as urlreverse +from ietf.utils.test_utils import TestCase +from ietf.person.models import Person +from ietf.status.models import Status + +class StatusTests(TestCase): + def test_status_latest_html(self): + status = Status.objects.create( + title = "my title 1", + body = "my body 1", + active = True, + by = Person.objects.get(user__username='ad'), + slug = "2024-1-1-my-title-1" + ) + status.save() + + url = urlreverse('ietf.status.views.status_latest_html') + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + self.assertContains(r, 'my title 1') + self.assertContains(r, 'my body 1') + + status.delete() + + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + self.assertNotContains(r, 'my title 1') + self.assertNotContains(r, 'my body 1') + + def test_status_latest_json(self): + url = urlreverse('ietf.status.views.status_latest_json') + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + data = r.json() + self.assertFalse(data["hasMessage"]) + + status = Status.objects.create( + title = "my title 1", + body = "my body 1", + active = True, + by = Person.objects.get(user__username='ad'), + slug = "2024-1-1-my-title-1" + ) + status.save() + + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + data = r.json() + self.assertTrue(data["hasMessage"]) + self.assertEqual(data["title"], "my title 1") + self.assertEqual(data["body"], "my body 1") + self.assertEqual(data["slug"], '2024-1-1-my-title-1') + self.assertEqual(data["url"], '/status/2024-1-1-my-title-1') + + status.delete() + + def test_status_latest_redirect(self): + url = urlreverse('ietf.status.views.status_latest_redirect') + r = self.client.get(url) + # without a Status it should return Not Found + self.assertEqual(r.status_code, 404) + + status = Status.objects.create( + title = "my title 1", + body = "my body 1", + active = True, + by = Person.objects.get(user__username='ad'), + slug = "2024-1-1-my-title-1" + ) + status.save() + + r = self.client.get(url) + # with a Status it should redirect + self.assertEqual(r.status_code, 302) + self.assertEqual(r.headers["Location"], "/status/2024-1-1-my-title-1") + + status.delete() + + def test_status_page(self): + slug = "2024-1-1-my-unique-slug" + r = self.client.get(f'/status/{slug}/') + # without a Status it should return Not Found + self.assertEqual(r.status_code, 404) + + # status without `page` markdown should still 200 + status = Status.objects.create( + title = "my title 1", + body = "my body 1", + active = True, + by = Person.objects.get(user__username='ad'), + slug = slug + ) + status.save() + + r = self.client.get(f'/status/{slug}/') + self.assertEqual(r.status_code, 200) + + status.delete() + + test_string = 'a string that' + status = Status.objects.create( + title = "my title 1", + body = "my body 1", + active = True, + by = Person.objects.get(user__username='ad'), + slug = slug, + page = f"# {test_string}" + ) + status.save() + + r = self.client.get(f'/status/{slug}/') + self.assertEqual(r.status_code, 200) + self.assertContains(r, test_string) + + status.delete() diff --git a/ietf/status/urls.py b/ietf/status/urls.py new file mode 100644 index 00000000000..060c0257e53 --- /dev/null +++ b/ietf/status/urls.py @@ -0,0 +1,12 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from ietf.status import views +from ietf.utils.urls import url + +urlpatterns = [ + url(r"^$", views.status_latest_redirect), + url(r"^latest$", views.status_latest_html), + url(r"^latest.json$", views.status_latest_json), + url(r"(?P.*)", views.status_page) +] diff --git a/ietf/status/views.py b/ietf/status/views.py new file mode 100644 index 00000000000..9037d01dc2a --- /dev/null +++ b/ietf/status/views.py @@ -0,0 +1,46 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from django.urls import reverse as urlreverse +from django.http import HttpResponseRedirect, HttpResponseNotFound, JsonResponse +from ietf.utils import markdown +from django.shortcuts import render, get_object_or_404 +from ietf.status.models import Status + +import debug # pyflakes:ignore + +def get_last_active_status(): + status = Status.objects.filter(active=True).order_by("-date").first() + if status is None: + return { "hasMessage": False } + + context = { + "hasMessage": True, + "id": status.id, + "slug": status.slug, + "title": status.title, + "body": status.body, + "url": urlreverse("ietf.status.views.status_page", kwargs={ "slug": status.slug }), + "date": status.date.isoformat() + } + return context + +def status_latest_html(request): + return render(request, "status/latest.html", context=get_last_active_status()) + +def status_page(request, slug): + sanitised_slug = slug.rstrip("/") + status = get_object_or_404(Status, slug=sanitised_slug) + return render(request, "status/status.html", context={ + 'status': status, + 'status_page_html': markdown.markdown(status.page or ""), + }) + +def status_latest_json(request): + return JsonResponse(get_last_active_status()) + +def status_latest_redirect(request): + context = get_last_active_status() + if context["hasMessage"] == True: + return HttpResponseRedirect(context["url"]) + return HttpResponseNotFound() diff --git a/ietf/submit/.gitignore b/ietf/submit/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/submit/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py index 5822f155f5a..e02b6865767 100644 --- a/ietf/submit/checkers.py +++ b/ietf/submit/checkers.py @@ -4,6 +4,7 @@ import io import os +from pathlib import Path import re import shutil import sys @@ -14,10 +15,10 @@ import debug # pyflakes:ignore +from ietf.utils import tool_version from ietf.utils.log import log, assertion -from ietf.utils.models import VersionInfo from ietf.utils.pipe import pipe -from ietf.utils.test_runner import set_coverage_checking +from ietf.utils.test_runner import disable_coverage class DraftSubmissionChecker(object): name = "" @@ -177,8 +178,10 @@ def check_file_txt(self, path): model_list = list(set(model_list)) command = "xym" - cmd_version = VersionInfo.objects.get(command=command).version - message = "%s:\n%s\n\n" % (cmd_version, out.replace('\n\n','\n').strip() if code == 0 else err) + message = "{version}:\n{output}\n\n".format( + version=tool_version[command], + output=out.replace('\n\n', '\n').strip() if code == 0 else err, + ) results.append({ "name": name, @@ -209,7 +212,6 @@ def check_file_txt(self, path): # pyang cmd_template = settings.SUBMIT_PYANG_COMMAND command = [ w for w in cmd_template.split() if not '=' in w ][0] - cmd_version = VersionInfo.objects.get(command=command).version cmd = cmd_template.format(libs=modpath, model=path) venv_path = os.environ.get('VIRTUAL_ENV') or os.path.join(os.getcwd(), 'env') venv_bin = os.path.join(venv_path, 'bin') @@ -238,40 +240,55 @@ def check_file_txt(self, path): except ValueError: pass #passed = passed and code == 0 # For the submission tool. Yang checks always pass - message += "%s: %s:\n%s\n" % (cmd_version, cmd_template, out+"No validation errors\n" if (code == 0 and len(err) == 0) else out+err) + message += "{version}: {template}:\n{output}\n".format( + version=tool_version[command], + template=cmd_template, + output=out + "No validation errors\n" if (code == 0 and len(err) == 0) else out + err, + ) # yanglint - set_coverage_checking(False) # we can't count the following as it may or may not be run, depending on setup - if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY): - cmd_template = settings.SUBMIT_YANGLINT_COMMAND - command = [ w for w in cmd_template.split() if not '=' in w ][0] - cmd_version = VersionInfo.objects.get(command=command).version - cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir, - draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR, - cataloglib=settings.SUBMIT_YANG_CATALOG_MODEL_DIR, ) - code, out, err = pipe(cmd) - out = out.decode('utf-8') - err = err.decode('utf-8') - if code > 0 or len(err.strip()) > 0: - err_lines = err.splitlines() - for line in err_lines: - if line.strip(): - try: - if 'err : ' in line: - errors += 1 - if 'warn: ' in line: - warnings += 1 - except ValueError: - pass - #passed = passed and code == 0 # For the submission tool. Yang checks always pass - message += "%s: %s:\n%s\n" % (cmd_version, cmd_template, out+"No validation errors\n" if (code == 0 and len(err) == 0) else out+err) - set_coverage_checking(True) + with disable_coverage(): # pragma: no cover + if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY): + cmd_template = settings.SUBMIT_YANGLINT_COMMAND + command = [ w for w in cmd_template.split() if not '=' in w ][0] + cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir, + draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR, + cataloglib=settings.SUBMIT_YANG_CATALOG_MODEL_DIR, ) + code, out, err = pipe(cmd) + out = out.decode('utf-8') + err = err.decode('utf-8') + if code > 0 or len(err.strip()) > 0: + err_lines = err.splitlines() + for line in err_lines: + if line.strip(): + try: + if 'err : ' in line: + errors += 1 + if 'warn: ' in line: + warnings += 1 + except ValueError: + pass + #passed = passed and code == 0 # For the submission tool. Yang checks always pass + message += "{version}: {template}:\n{output}\n".format( + version=tool_version[command], + template=cmd_template, + output=out + "No validation errors\n" if (code == 0 and len(err) == 0) else out + err, + ) else: errors += 1 message += "No such file: %s\nPossible mismatch between extracted xym file name and returned module name?\n" % (path) dest = os.path.join(settings.SUBMIT_YANG_DRAFT_MODEL_DIR, model) shutil.move(path, dest) + ftp_dest = Path(settings.FTP_DIR) / "yang" / "draftmod" / model + try: + os.link(dest, ftp_dest) + except IOError as ex: + log( + "There was an error creating a hardlink at %s pointing to %s: %s" + % (ftp_dest, dest, ex) + ) + # summary result results.append({ @@ -293,4 +310,4 @@ def check_file_txt(self, path): items = [ e for res in results for e in res["items"] ] info['items'] = items info['code']['yang'] = model_list - return passed, message, errors, warnings, info \ No newline at end of file + return passed, message, errors, warnings, info diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py index b29669a0f11..183e081242e 100644 --- a/ietf/submit/forms.py +++ b/ietf/submit/forms.py @@ -1,20 +1,17 @@ -# Copyright The IETF Trust 2011-2022, All Rights Reserved +# Copyright The IETF Trust 2011-2023, All Rights Reserved # -*- coding: utf-8 -*- -import io import os import re import datetime import email import sys import tempfile -import xml2rfc from contextlib import ExitStack from email.utils import formataddr from typing import Tuple -from unidecode import unidecode from django import forms from django.conf import settings @@ -28,8 +25,7 @@ from ietf.doc.models import Document from ietf.group.models import Group from ietf.ietfauth.utils import has_role -from ietf.doc.fields import SearchableDocAliasesField -from ietf.doc.models import DocAlias +from ietf.doc.fields import SearchableDocumentsField from ietf.ipr.mail import utc_from_string from ietf.meeting.models import Meeting from ietf.message.models import Message @@ -38,11 +34,10 @@ from ietf.submit.utils import validate_submission_name, validate_submission_rev, validate_submission_document_date, remote_ip from ietf.submit.parsers.plain_parser import PlainParser from ietf.submit.parsers.xml_parser import XMLParser -from ietf.utils import log from ietf.utils.draft import PlaintextDraft -from ietf.utils.text import normalize_text +from ietf.utils.fields import ModelMultipleChoiceField from ietf.utils.timezone import date_today -from ietf.utils.xmldraft import XMLDraft, XMLParseError +from ietf.utils.xmldraft import InvalidXMLError, XMLDraft, XMLParseError class SubmissionBaseUploadForm(forms.Form): @@ -168,6 +163,11 @@ def cleanup(): # called when context exited, even in case of exception try: xml_draft = XMLDraft(tfn) + except InvalidXMLError: + raise forms.ValidationError( + "The uploaded file is not valid XML. Please make sure you are uploading the correct file.", + code="invalid_xml_error", + ) except XMLParseError as e: msgs = format_messages('xml', e, e.parser_msgs()) raise forms.ValidationError(msgs, code="xml_parse_error") @@ -366,274 +366,6 @@ def deduce_group(name): return None -class DeprecatedSubmissionBaseUploadForm(SubmissionBaseUploadForm): - def clean(self): - def format_messages(where, e, log): - out = log.write_out.getvalue().splitlines() - err = log.write_err.getvalue().splitlines() - m = str(e) - if m: - m = [ m ] - else: - import traceback - typ, val, tb = sys.exc_info() - m = traceback.format_exception(typ, val, tb) - m = [ l.replace('\n ', ':\n ') for l in m ] - msgs = [s for s in (["Error from xml2rfc (%s):" % (where,)] + m + out + err) if s] - return msgs - - if self.shutdown and not has_role(self.request.user, "Secretariat"): - raise forms.ValidationError(self.cutoff_warning) - - for ext in self.formats: - f = self.cleaned_data.get(ext, None) - if not f: - continue - self.file_types.append('.%s' % ext) - if not ('.txt' in self.file_types or '.xml' in self.file_types): - if not self.errors: - raise forms.ValidationError('Unexpected submission file types; found %s, but %s is required' % (', '.join(self.file_types), ' or '.join(self.base_formats))) - - #debug.show('self.cleaned_data["xml"]') - if self.cleaned_data.get('xml'): - #if not self.cleaned_data.get('txt'): - xml_file = self.cleaned_data.get('xml') - file_name = {} - xml2rfc.log.write_out = io.StringIO() # open(os.devnull, "w") - xml2rfc.log.write_err = io.StringIO() # open(os.devnull, "w") - tfn = None - with ExitStack() as stack: - @stack.callback - def cleanup(): # called when context exited, even in case of exception - if tfn is not None: - os.unlink(tfn) - - # We need to write the xml file to disk in order to hand it - # over to the xml parser. XXX FIXME: investigate updating - # xml2rfc to be able to work with file handles to in-memory - # files. - name, ext = os.path.splitext(os.path.basename(xml_file.name)) - with tempfile.NamedTemporaryFile(prefix=name+'-', - suffix='.xml', - mode='wb+', - delete=False) as tf: - tfn = tf.name - for chunk in xml_file.chunks(): - tf.write(chunk) - - parser = xml2rfc.XmlRfcParser(str(tfn), quiet=True) - # --- Parse the xml --- - try: - self.xmltree = parser.parse(remove_comments=False) - # If we have v2, run it through v2v3. Keep track of the submitted version, though. - self.xmlroot = self.xmltree.getroot() - self.xml_version = self.xmlroot.get('version', '2') - if self.xml_version == '2': - v2v3 = xml2rfc.V2v3XmlWriter(self.xmltree) - self.xmltree.tree = v2v3.convert2to3() - self.xmlroot = self.xmltree.getroot() # update to the new root - - draftname = self.xmlroot.attrib.get('docName') - if draftname is None: - self.add_error('xml', "No docName attribute found in the xml root element") - name_error = validate_submission_name(draftname) - if name_error: - self.add_error('xml', name_error) # This is a critical and immediate failure - do not proceed with other validation. - else: - revmatch = re.search("-[0-9][0-9]$", draftname) - if revmatch: - self.revision = draftname[-2:] - self.filename = draftname[:-3] - else: - self.revision = None - self.filename = draftname - self.title = self.xmlroot.findtext('front/title').strip() - if type(self.title) is str: - self.title = unidecode(self.title) - self.title = normalize_text(self.title) - self.abstract = (self.xmlroot.findtext('front/abstract') or '').strip() - if type(self.abstract) is str: - self.abstract = unidecode(self.abstract) - author_info = self.xmlroot.findall('front/author') - for author in author_info: - info = { - "name": author.attrib.get('fullname'), - "email": author.findtext('address/email'), - "affiliation": author.findtext('organization'), - } - elem = author.find('address/postal/country') - if elem != None: - ascii_country = elem.get('ascii', None) - info['country'] = ascii_country if ascii_country else elem.text - - for item in info: - if info[item]: - info[item] = info[item].strip() - self.authors.append(info) - - # --- Prep the xml --- - file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s%s' % (self.filename, self.revision, ext)) - try: - prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET]) - prep.options.accept_prepped = True - self.xmltree.tree = prep.prep() - if self.xmltree.tree == None: - self.add_error('xml', "Error from xml2rfc (prep): %s" % prep.errors) - except Exception as e: - msgs = format_messages('prep', e, xml2rfc.log) - self.add_error('xml', msgs) - - # --- Convert to txt --- - if not ('txt' in self.cleaned_data and self.cleaned_data['txt']): - file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (self.filename, self.revision)) - try: - writer = xml2rfc.TextWriter(self.xmltree, quiet=True) - writer.options.accept_prepped = True - writer.write(file_name['txt']) - log.log("In %s: xml2rfc %s generated %s from %s (version %s)" % - ( os.path.dirname(file_name['xml']), - xml2rfc.__version__, - os.path.basename(file_name['txt']), - os.path.basename(file_name['xml']), - self.xml_version)) - except Exception as e: - msgs = format_messages('txt', e, xml2rfc.log) - log.log('\n'.join(msgs)) - self.add_error('xml', msgs) - - # --- Convert to html --- - try: - file_name['html'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.html' % (self.filename, self.revision)) - writer = xml2rfc.HtmlWriter(self.xmltree, quiet=True) - writer.write(file_name['html']) - self.file_types.append('.html') - log.log("In %s: xml2rfc %s generated %s from %s (version %s)" % - ( os.path.dirname(file_name['xml']), - xml2rfc.__version__, - os.path.basename(file_name['html']), - os.path.basename(file_name['xml']), - self.xml_version)) - except Exception as e: - msgs = format_messages('html', e, xml2rfc.log) - self.add_error('xml', msgs) - - except Exception as e: - try: - msgs = format_messages('txt', e, xml2rfc.log) - log.log('\n'.join(msgs)) - self.add_error('xml', msgs) - except Exception: - self.add_error('xml', "An exception occurred when trying to process the XML file: %s" % e) - - # The following errors are likely noise if we have previous field - # errors: - if self.errors: - raise forms.ValidationError('') - - if self.cleaned_data.get('txt'): - # try to parse it - txt_file = self.cleaned_data['txt'] - txt_file.seek(0) - bytes = txt_file.read() - txt_file.seek(0) - try: - text = bytes.decode(self.file_info['txt'].charset) - # - self.parsed_draft = PlaintextDraft(text, txt_file.name) - if self.filename == None: - self.filename = self.parsed_draft.filename - elif self.filename != self.parsed_draft.filename: - self.add_error('txt', "Inconsistent name information: xml:%s, txt:%s" % (self.filename, self.parsed_draft.filename)) - if self.revision == None: - self.revision = self.parsed_draft.revision - elif self.revision != self.parsed_draft.revision: - self.add_error('txt', "Inconsistent revision information: xml:%s, txt:%s" % (self.revision, self.parsed_draft.revision)) - if self.title == None: - self.title = self.parsed_draft.get_title() - elif self.title != self.parsed_draft.get_title(): - self.add_error('txt', "Inconsistent title information: xml:%s, txt:%s" % (self.title, self.parsed_draft.get_title())) - except (UnicodeDecodeError, LookupError) as e: - self.add_error('txt', 'Failed decoding the uploaded file: "%s"' % str(e)) - - rev_error = validate_submission_rev(self.filename, self.revision) - if rev_error: - raise forms.ValidationError(rev_error) - - # The following errors are likely noise if we have previous field - # errors: - if self.errors: - raise forms.ValidationError('') - - if not self.filename: - raise forms.ValidationError("Could not extract a valid Internet-Draft name from the upload. " - "To fix this in a text upload, please make sure that the full Internet-Draft name including " - "revision number appears centered on its own line below the document title on the " - "first page. In an xml upload, please make sure that the top-level " - "element has a docName attribute which provides the full Internet-Draft name including " - "revision number.") - - if not self.revision: - raise forms.ValidationError("Could not extract a valid Internet-Draft revision from the upload. " - "To fix this in a text upload, please make sure that the full Internet-Draft name including " - "revision number appears centered on its own line below the document title on the " - "first page. In an xml upload, please make sure that the top-level " - "element has a docName attribute which provides the full Internet-Draft name including " - "revision number.") - - if not self.title: - raise forms.ValidationError("Could not extract a valid title from the upload") - - if self.cleaned_data.get('txt') or self.cleaned_data.get('xml'): - # check group - self.group = self.deduce_group(self.filename) - - # check existing - existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "waiting-for-draft")) - if existing: - raise forms.ValidationError(mark_safe('A submission with same name and revision is currently being processed. Check the status here.' % urlreverse("ietf.submit.views.submission_status", kwargs={ 'submission_id': existing[0].pk }))) - - # cut-off - if self.revision == '00' and self.in_first_cut_off: - raise forms.ValidationError(mark_safe(self.cutoff_warning)) - - # check thresholds - today = date_today() - - self.check_submissions_thresholds( - "for the Internet-Draft %s" % self.filename, - dict(name=self.filename, rev=self.revision, submission_date=today), - settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME, settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME_SIZE, - ) - self.check_submissions_thresholds( - "for the same submitter", - dict(remote_ip=self.remote_ip, submission_date=today), - settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER, settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER_SIZE, - ) - if self.group: - self.check_submissions_thresholds( - "for the group \"%s\"" % (self.group.acronym), - dict(group=self.group, submission_date=today), - settings.IDSUBMIT_MAX_DAILY_SAME_GROUP, settings.IDSUBMIT_MAX_DAILY_SAME_GROUP_SIZE, - ) - self.check_submissions_thresholds( - "across all submitters", - dict(submission_date=today), - settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS, settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS_SIZE, - ) - - return super().clean() - - -class DeprecatedSubmissionAutoUploadForm(DeprecatedSubmissionBaseUploadForm): - """Full-service upload form, replaced by the asynchronous version""" - user = forms.EmailField(required=True) - - def __init__(self, request, *args, **kwargs): - super(DeprecatedSubmissionAutoUploadForm, self).__init__(request, *args, **kwargs) - self.formats = ['xml', ] - self.base_formats = ['xml', ] - - class SubmissionManualUploadForm(SubmissionBaseUploadForm): txt = forms.FileField(label='.txt format', required=False) formats = SubmissionBaseUploadForm.formats + ('txt',) @@ -646,9 +378,10 @@ def __init__(self, request, *args, **kwargs): def clean_txt(self): txt_file = self._clean_file("txt", PlainParser) if txt_file is not None: + txt_file.seek(0) bytes = txt_file.read() try: - text = bytes.decode(self.file_info["txt"].charset) + text = bytes.decode(PlainParser.encoding) parsed_draft = PlaintextDraft(text, txt_file.name) self._extracted_filenames_and_revisions["txt"] = (parsed_draft.filename, parsed_draft.revision) except (UnicodeDecodeError, LookupError) as e: @@ -671,6 +404,7 @@ def clean_txt(self): ) return txt_file + class SubmissionAutoUploadForm(SubmissionBaseUploadForm): user = forms.EmailField(required=True) replaces = forms.CharField(required=False, max_length=1000, strip=True) @@ -683,9 +417,9 @@ def clean(self): if self.cleaned_data['replaces']: names_replaced = [s.strip() for s in self.cleaned_data['replaces'].split(',')] self.cleaned_data['replaces'] = ','.join(names_replaced) - aliases_replaced = DocAlias.objects.filter(name__in=names_replaced) - if len(names_replaced) != len(aliases_replaced): - known_names = aliases_replaced.values_list('name', flat=True) + documents_replaced = Document.objects.filter(name__in=names_replaced) + if len(names_replaced) != len(documents_replaced): + known_names = documents_replaced.values_list('name', flat=True) unknown_names = [n for n in names_replaced if n not in known_names] self.add_error( 'replaces', @@ -693,27 +427,27 @@ def clean(self): 'Unknown Internet-Draft name(s): ' + ', '.join(unknown_names) ), ) - for alias in aliases_replaced: - if alias.document.name == self.filename: + for doc in documents_replaced: + if doc.name == self.filename: self.add_error( 'replaces', forms.ValidationError("An Internet-Draft cannot replace itself"), ) - elif alias.document.type_id != "draft": + elif doc.type_id != "draft": self.add_error( 'replaces', forms.ValidationError("An Internet-Draft can only replace another Internet-Draft"), ) - elif alias.document.get_state_slug() == "rfc": + elif doc.get_state_slug() == "rfc": self.add_error( 'replaces', - forms.ValidationError("An Internet-Draft cannot replace an RFC"), + forms.ValidationError("An Internet-Draft cannot replace another Internet-Draft that has become an RFC"), ) - elif alias.document.get_state_slug('draft-iesg') in ('approved', 'ann', 'rfcqueue'): + elif doc.get_state_slug('draft-iesg') in ('approved', 'ann', 'rfcqueue'): self.add_error( 'replaces', forms.ValidationError( - alias.name + " is approved by the IESG and cannot be replaced" + doc.name + " is approved by the IESG and cannot be replaced" ), ) return cleaned_data @@ -753,23 +487,35 @@ def cleaned_line(self): line = formataddr((line, email)) return line + def clean_name(self): + name = super(SubmitterForm, self).clean_name() + if name.startswith('=?'): + msg = f'"{name}" appears to be a MIME-encoded string.' + try: + import email.header + text, encoding = email.header.decode_header(name)[0] + decoded_name = text.decode(encoding) + msg += f' Did you mean "{decoded_name}"?' + except: + pass + raise forms.ValidationError(msg) + return name + class ReplacesForm(forms.Form): - replaces = SearchableDocAliasesField(required=False, help_text="Any Internet-Drafts that this document replaces (approval required for replacing an Internet-Draft you are not the author of)") + replaces = SearchableDocumentsField(required=False, help_text='Do not enter anything here if you are only submitting the next version of your Internet-Draft. Only enter items here if this submission is intended to replace an I-D with a different name. A typical use of this field is to note what individual I-Ds are replaced by a new -00 Working group I-D. Note that additional approval will be required to replace an I-D for which you are not an author.') def __init__(self, *args, **kwargs): self.name = kwargs.pop("name") super(ReplacesForm, self).__init__(*args, **kwargs) def clean_replaces(self): - for alias in self.cleaned_data['replaces']: - if alias.document.name == self.name: + for doc in self.cleaned_data['replaces']: + if doc.name == self.name: raise forms.ValidationError("An Internet-Draft cannot replace itself.") - if alias.document.type_id != "draft": + if doc.type_id != "draft": raise forms.ValidationError("An Internet-Draft can only replace another Internet-Draft") - if alias.document.get_state_slug() == "rfc": - raise forms.ValidationError("An Internet-Draft cannot replace an RFC") - if alias.document.get_state_slug('draft-iesg') in ('approved','ann','rfcqueue'): - raise forms.ValidationError(alias.name+" is approved by the IESG and cannot be replaced") + if doc.get_state_slug('draft-iesg') in ('approved','ann','rfcqueue'): + raise forms.ValidationError(doc.name+" is approved by the IESG and cannot be replaced") return self.cleaned_data['replaces'] class EditSubmissionForm(forms.ModelForm): @@ -777,7 +523,7 @@ class EditSubmissionForm(forms.ModelForm): rev = forms.CharField(label='Revision', max_length=2, required=True) document_date = forms.DateField(required=True) pages = forms.IntegerField(required=True) - formal_languages = forms.ModelMultipleChoiceField(queryset=FormalLanguageName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False) + formal_languages = ModelMultipleChoiceField(queryset=FormalLanguageName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False) abstract = forms.CharField(widget=forms.Textarea, required=True, strip=False) note = forms.CharField(label=mark_safe('Comment to the Secretariat'), widget=forms.Textarea, required=False, strip=False) @@ -913,3 +659,13 @@ def __init__(self, *args, **kwargs): self.fields['frm'].label='From' self.fields['frm'].widget.attrs['readonly'] = True self.fields['reply_to'].widget.attrs['readonly'] = True + + +class SubmissionSearchForm(forms.Form): + """Form used for search_submission""" + + name = forms.CharField(max_length=255, required=True, label="I-D name") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields["name"].widget.attrs["placeholder"] = "draft-..." diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py index 93f97026cc2..d7da7e21e0c 100644 --- a/ietf/submit/mail.py +++ b/ietf/submit/mail.py @@ -1,33 +1,22 @@ # Copyright The IETF Trust 2013-2020, All Rights Reserved # -*- coding: utf-8 -*- - -import re -import email -import base64 import os -import pyzmail from django.conf import settings from django.urls import reverse as urlreverse -from django.core.exceptions import ValidationError from django.contrib.sites.models import Site from django.template.loader import render_to_string -from django.utils.encoding import force_text, force_str import debug # pyflakes:ignore -from ietf.utils.log import log from ietf.utils.mail import send_mail, send_mail_message from ietf.doc.models import Document -from ietf.ipr.mail import utc_from_string from ietf.person.models import Person -from ietf.message.models import Message, MessageAttachment +from ietf.message.models import Message from ietf.utils.accesstoken import generate_access_token -from ietf.mailtrigger.utils import gather_address_lists, get_base_submission_message_address -from ietf.submit.models import SubmissionEmailEvent, Submission +from ietf.mailtrigger.utils import gather_address_lists from ietf.submit.checkers import DraftIdnitsChecker -from ietf.utils.timezone import date_today def send_submission_confirmation(request, submission, chair_notice=False): @@ -196,181 +185,3 @@ def announce_to_authors(request, submission): 'group': group}, cc=cc) - -def get_reply_to(): - """Returns a new reply-to address for use with an outgoing message. This is an - address with "plus addressing" using a random string. Guaranteed to be unique""" - local,domain = get_base_submission_message_address().split('@') - while True: - rand = force_text(base64.urlsafe_b64encode(os.urandom(12))) - address = "{}+{}@{}".format(local,rand,domain) - q = Message.objects.filter(reply_to=address) - if not q: - return address - - -def process_response_email(msg): - """Saves an incoming message. msg=string. Message "To" field is expected to - be in the format ietf-submit+[identifier]@ietf.org. Expect to find a message with - a matching value in the reply_to field, associated to a submission. - Create a Message object for the incoming message and associate it to - the original message via new SubmissionEvent""" - message = email.message_from_string(force_str(msg)) - to = message.get('To') - - # exit if this isn't a response we're interested in (with plus addressing) - local,domain = get_base_submission_message_address().split('@') - if not re.match(r'^{}\+[a-zA-Z0-9_\-]{}@{}'.format(local,'{16}',domain),to): - return None - - try: - to_message = Message.objects.get(reply_to=to) - except Message.DoesNotExist: - log('Error finding matching message ({})'.format(to)) - return None - - try: - submission = to_message.manualevents.first().submission - except: - log('Error processing message ({})'.format(to)) - return None - - if not submission: - log('Error processing message - no submission ({})'.format(to)) - return None - - parts = pyzmail.parse.get_mail_parts(message) - body='' - for part in parts: - if part.is_body == 'text/plain' and part.disposition == None: - payload, used_charset = pyzmail.decode_text(part.get_payload(), part.charset, None) - body = body + payload + '\n' - - by = Person.objects.get(name="(System)") - msg = submit_message_from_message(message, body, by) - - desc = "Email: received message - manual post - {}-{}".format( - submission.name, - submission.rev) - - submission_email_event = SubmissionEmailEvent.objects.create( - submission = submission, - desc = desc, - msgtype = 'msgin', - by = by, - message = msg, - in_reply_to = to_message - ) - - save_submission_email_attachments(submission_email_event, parts) - - log("Received submission email from %s" % msg.frm) - return msg - - -def add_submission_email(request, remote_ip, name, rev, submission_pk, message, by, msgtype): - """Add email to submission history""" - - #in_reply_to = form.cleaned_data['in_reply_to'] - # create Message - parts = pyzmail.parse.get_mail_parts(message) - body='' - for part in parts: - if part.is_body == 'text/plain' and part.disposition == None: - payload, used_charset = pyzmail.decode_text(part.get_payload(), part.charset, None) - body = body + payload + '\n' - - msg = submit_message_from_message(message, body, by) - - if (submission_pk != None): - # Must exist - we're adding a message to an existing submission - submission = Submission.objects.get(pk=submission_pk) - else: - # Must not exist - submissions = Submission.objects.filter(name=name,rev=rev).exclude(state_id='cancel') - if submissions.count() > 0: - raise ValidationError("Submission {} already exists".format(name)) - - # create Submission using the name - try: - submission = Submission.objects.create( - state_id="waiting-for-draft", - remote_ip=remote_ip, - name=name, - rev=rev, - title=name, - note="", - submission_date=date_today(), - replaces="", - ) - from ietf.submit.utils import create_submission_event, docevent_from_submission - desc = "Submission created for rev {} in response to email".format(rev) - create_submission_event(request, - submission, - desc) - docevent_from_submission(submission, desc) - except Exception as e: - log("Exception: %s\n" % e) - raise - - if msgtype == 'msgin': - rs = "Received" - else: - rs = "Sent" - - desc = "{} message - manual post - {}-{}".format(rs, name, rev) - submission_email_event = SubmissionEmailEvent.objects.create( - desc = desc, - submission = submission, - msgtype = msgtype, - by = by, - message = msg) - #in_reply_to = in_reply_to - - save_submission_email_attachments(submission_email_event, parts) - return submission, submission_email_event - - -def submit_message_from_message(message,body,by=None): - """Returns a ietf.message.models.Message. msg=email.Message - A copy of mail.message_from_message with different body handling - """ - if not by: - by = Person.objects.get(name="(System)") - msg = Message.objects.create( - by = by, - subject = message.get('subject',''), - frm = message.get('from',''), - to = message.get('to',''), - cc = message.get('cc',''), - bcc = message.get('bcc',''), - reply_to = message.get('reply_to',''), - body = body, - time = utc_from_string(message.get('date', '')), - content_type = message.get('content_type', 'text/plain'), - ) - return msg - -def save_submission_email_attachments(submission_email_event, parts): - for part in parts: - if part.disposition != 'attachment': - continue - - if part.type == 'text/plain': - payload, used_charset = pyzmail.decode_text(part.get_payload(), - part.charset, - None) - encoding = "" - else: - # Need a better approach - for the moment we'll just handle these - # and encode as base64 - payload = base64.b64encode(part.get_payload()) - encoding = "base64" - - #name = submission_email_event.submission.name - - MessageAttachment.objects.create(message = submission_email_event.message, - content_type = part.type, - encoding = encoding, - filename=part.filename, - body=payload) diff --git a/ietf/submit/management/commands/manualpost_email.py b/ietf/submit/management/commands/manualpost_email.py deleted file mode 100644 index aaabfb39b74..00000000000 --- a/ietf/submit/management/commands/manualpost_email.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import io -import sys - -from django.core.management.base import BaseCommand, CommandError - -from ietf.submit.mail import process_response_email - -import debug # pyflakes:ignore - -class Command(BaseCommand): - help = ("Process incoming manual post email responses") - - def add_arguments(self, parser): - parser.add_argument('--email-file', dest='email', help='File containing email (default: stdin)') - - def handle(self, *args, **options): - email = options.get('email', None) - msg = None - - if not email: - msg = sys.stdin.read() - else: - msg = io.open(email, "r").read() - - try: - process_response_email(msg) - except ValueError as e: - raise CommandError(e) diff --git a/ietf/submit/migrations/0002_alter_submission_xml_version.py b/ietf/submit/migrations/0002_alter_submission_xml_version.py new file mode 100644 index 00000000000..275e6efd959 --- /dev/null +++ b/ietf/submit/migrations/0002_alter_submission_xml_version.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.23 on 2025-08-01 19:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("submit", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="submission", + name="xml_version", + field=models.CharField(blank=True, default=None, max_length=4, null=True), + ), + ] diff --git a/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py b/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py new file mode 100644 index 00000000000..2c516592048 --- /dev/null +++ b/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py @@ -0,0 +1,46 @@ +# Copyright The IETF Trust 2025, All Rights Reserved + +from django.db import migrations, models + + +def forward(apps, schema_editor): + JSON_ENCODED_NULL = r"\u0000" + NULL = "\x00" + NUL_SYMBOL = "\u2400" # Unicode single-char "NUL" symbol + + Submission = apps.get_model("submit", "Submission") + # The qs filter sees the serialized JSON string... + null_in_authors = Submission.objects.filter(authors__contains=JSON_ENCODED_NULL) + for submission in null_in_authors: + # submission.authors is now deserialized into Python objects + for author in submission.authors: + for k in author: + author[k] = author[k].replace(NULL, NUL_SYMBOL) + submission.save() + + +def reverse(apps, schema_editor): + pass # don't restore invalid data + + +class Migration(migrations.Migration): + dependencies = [ + ("submit", "0002_alter_submission_xml_version"), + ] + + operations = [ + migrations.RunPython(forward, reverse), + migrations.AlterField( + model_name="submission", + name="authors", + field=models.JSONField( + default=list, + help_text="List of authors with name, email, affiliation and country.", + ), + ), + migrations.AlterField( + model_name="submissioncheck", + name="items", + field=models.JSONField(blank=True, default=dict, null=True), + ), + ] diff --git a/ietf/submit/models.py b/ietf/submit/models.py index 0f9a86cd221..576ba3e1143 100644 --- a/ietf/submit/models.py +++ b/ietf/submit/models.py @@ -3,7 +3,6 @@ import email -import jsonfield from django.db import models from django.utils import timezone @@ -46,7 +45,9 @@ class Submission(models.Model): words = models.IntegerField(null=True, blank=True) formal_languages = models.ManyToManyField(FormalLanguageName, blank=True, help_text="Formal languages used in document") - authors = jsonfield.JSONField(default=list, help_text="List of authors with name, email, affiliation and country.") + authors = models.JSONField(default=list, help_text="List of authors with name, email, affiliation and country.") + # Schema note: authors is a list of authors. Each author is a JSON object with + # "name", "email", "affiliation", and "country" keys. All values are strings. note = models.TextField(blank=True) replaces = models.CharField(max_length=1000, blank=True) @@ -55,7 +56,7 @@ class Submission(models.Model): file_size = models.IntegerField(null=True, blank=True) document_date = models.DateField(null=True, blank=True) submission_date = models.DateField(default=date_today) - xml_version = models.CharField(null=True, max_length=4, default=None) + xml_version = models.CharField(null=True, blank=True, max_length=4, default=None) submitter = models.CharField(max_length=255, blank=True, help_text="Name and email of submitter, e.g. \"John Doe <john@example.org>\".") @@ -79,11 +80,18 @@ def existing_document(self): return Document.objects.filter(name=self.name).first() def latest_checks(self): - checks = [ self.checks.filter(checker=c).latest('time') for c in self.checks.values_list('checker', flat=True).distinct() ] - return checks + """Latest check of each type, excluding any that did not apply + + Ignores any checks where passed is None + """ + latest_for_each_checker = [ + self.checks.filter(checker=c).latest("time") + for c in self.checks.values_list("checker", flat=True).distinct() + ] + return [check for check in latest_for_each_checker if check.passed is not None] def has_yang(self): - return any ( [ c.checker=='yang validation' and c.passed is not None for c in self.latest_checks()] ) + return any(c.checker == "yang validation" for c in self.latest_checks()) @property def replaces_names(self): @@ -108,14 +116,14 @@ def revises_wg_draft(self): @property def active_wg_drafts_replaced(self): return Document.objects.filter( - docalias__name__in=self.replaces.split(','), + name__in=self.replaces.split(','), group__in=Group.objects.active_wgs() ) @property def closed_wg_drafts_replaced(self): return Document.objects.filter( - docalias__name__in=self.replaces.split(','), + name__in=self.replaces.split(','), group__in=Group.objects.closed_wgs() ) @@ -128,7 +136,7 @@ class SubmissionCheck(models.Model): message = models.TextField(null=True, blank=True) errors = models.IntegerField(null=True, blank=True, default=None) warnings = models.IntegerField(null=True, blank=True, default=None) - items = jsonfield.JSONField(null=True, blank=True, default='{}') + items = models.JSONField(null=True, blank=True, default=dict) symbol = models.CharField(max_length=64, default='') # def __str__(self): diff --git a/ietf/submit/parsers/.gitignore b/ietf/submit/parsers/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/submit/parsers/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/submit/parsers/base.py b/ietf/submit/parsers/base.py index 679798cc4e4..d38ab1d7b86 100644 --- a/ietf/submit/parsers/base.py +++ b/ietf/submit/parsers/base.py @@ -1,20 +1,19 @@ -# Copyright The IETF Trust 2011-2020, All Rights Reserved +# Copyright The IETF Trust 2011-2023, All Rights Reserved # -*- coding: utf-8 -*- import re -import debug # pyflakes:ignore +import debug # pyflakes:ignore -from typing import List, Optional # pyflakes:ignore +from typing import List, Optional # pyflakes:ignore from django.conf import settings from django.template.defaultfilters import filesizeformat -from ietf.utils.mime import get_mime_type from ietf.utils.timezone import date_today -class MetaData(object): +class MetaData: rev = None name = None group = None @@ -25,7 +24,8 @@ class MetaData(object): document_date = None authors = None -class ParseInfo(object): + +class ParseInfo: """Collect errors from a parse""" def __init__(self): @@ -46,9 +46,9 @@ def add_warning(self, warning_type, warning_str): self.warnings[warning_type] = warn_list + [warning_str] -class FileParser(object): - ext = None # type: Optional[str] - mimetypes = [] # type: List[str] +class FileParser: + ext: Optional[str] = None + encoding = "utf8" def __init__(self, fd): self.fd = fd @@ -58,35 +58,49 @@ def __init__(self, fd): # no other file parsing is recommended def critical_parse(self): self.parse_invalid_chars_in_filename() - self.parse_max_size(); + self.parse_max_size() self.parse_filename_extension() - self.parse_file_type() + self.validate_encoding() self.parsed_info.metadata.submission_date = date_today() return self.parsed_info def parse_invalid_chars_in_filename(self): name = self.fd.name - regexp = re.compile(r'&|\|\/|;|\*|\s|\$') + regexp = re.compile(r"&|\\|/|;|\*|\s|\$") chars = regexp.findall(name) if chars: - self.parsed_info.add_error('Invalid characters were found in the name of the file which was just submitted: %s' % ', '.join(set(chars))) + self.parsed_info.add_error( + "Invalid characters were found in the name of the file which was just submitted: %s" + % ", ".join(set(chars)) + ) def parse_max_size(self): max_size = settings.IDSUBMIT_MAX_DRAFT_SIZE[self.ext] if self.fd.size > max_size: - self.parsed_info.add_error('File size is larger than the permitted maximum of %s' % filesizeformat(max_size)) + self.parsed_info.add_error( + "File size is larger than the permitted maximum of %s" + % filesizeformat(max_size) + ) self.parsed_info.metadata.file_size = self.fd.size def parse_filename_extension(self): - if not self.fd.name.lower().endswith('.'+self.ext): - self.parsed_info.add_error('Expected the %s file to have extension ".%s", found the name "%s"' % (self.ext.upper(), self.ext, self.fd.name)) - - def parse_file_type(self): - self.fd.file.seek(0) - content = self.fd.file.read(64*1024) - mimetype, charset = get_mime_type(content) - if not mimetype in self.mimetypes: - self.parsed_info.add_error('Expected an %s file of type "%s", found one of type "%s"' % (self.ext.upper(), '" or "'.join(self.mimetypes), mimetype)) - self.parsed_info.mimetype = mimetype - self.parsed_info.charset = charset - \ No newline at end of file + if not self.fd.name.lower().endswith("." + self.ext): + self.parsed_info.add_error( + 'Expected the %s file to have extension ".%s", found the name "%s"' + % (self.ext.upper(), self.ext, self.fd.name) + ) + + def validate_encoding(self): + self.fd.seek(0) + bytes = self.fd.read() + try: + bytes.decode(self.encoding) + except UnicodeDecodeError as err: + invalid_bytes = bytes[err.start : err.end] + self.parsed_info.add_error( + "Invalid {} byte(s) starting at byte {}: [{}]".format( + err.encoding, + err.start + 1, + ", ".join(f"0x{b:x}" for b in invalid_bytes) + ) + ) diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py index a3338e35a39..091179d992f 100644 --- a/ietf/submit/parsers/plain_parser.py +++ b/ietf/submit/parsers/plain_parser.py @@ -10,7 +10,6 @@ class PlainParser(FileParser): ext = 'txt' - mimetypes = ['text/plain', ] def __init__(self, fd): super(PlainParser, self).__init__(fd) @@ -19,54 +18,41 @@ def __init__(self, fd): # no other file parsing is recommended def critical_parse(self): super(PlainParser, self).critical_parse() - self.check_file_charset() self.parse_name() return self.parsed_info - def check_file_charset(self): - charset = self.parsed_info.charset - if not charset in ['us-ascii', 'utf-8',]: - self.parsed_info.add_error('A plain text ASCII document is required. ' - 'Found an unexpected encoding: "%s". ' - 'You probably have one or more non-ascii characters in your file.' % charset - ) - if self.fd.charset and charset != self.fd.charset: - self.parsed_info.add_error("Unexpected charset mismatch: upload: %s, libmagic: %s" % (self.fd.charset, charset)) - - def parse_name(self): self.fd.file.seek(0) draftre = re.compile(r'(draft-\S+)') revisionre = re.compile(r'.*-(\d+)$') limit = 80 - if self.parsed_info.charset in ['us-ascii', 'utf-8']: - while limit: - limit -= 1 - try: - line = self.fd.readline().decode(self.parsed_info.charset) - except UnicodeDecodeError: - return - match = draftre.search(line) - if not match: - continue - name = match.group(1) - name = re.sub(r'^[^\w]+', '', name) - name = re.sub(r'[^\w]+$', '', name) - name = re.sub(r'\.txt$', '', name) - extra_chars = re.sub(r'[0-9a-z\-]', '', name) - if extra_chars: - if len(extra_chars) == 1: - self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) + - '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') - else: - self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) + - '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') - match_revision = revisionre.match(name) - if match_revision: - self.parsed_info.metadata.rev = match_revision.group(1) - else: - self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,)) - name = re.sub(r'-\d+$', '', name) - self.parsed_info.metadata.name = name + while limit: + limit -= 1 + try: + line = self.fd.readline().decode(self.encoding) + except UnicodeDecodeError: return + match = draftre.search(line) + if not match: + continue + name = match.group(1) + name = re.sub(r'^[^\w]+', '', name) + name = re.sub(r'[^\w]+$', '', name) + name = re.sub(r'\.txt$', '', name) + extra_chars = re.sub(r'[0-9a-z\-]', '', name) + if extra_chars: + if len(extra_chars) == 1: + self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) + + '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') + else: + self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) + + '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') + match_revision = revisionre.match(name) + if match_revision: + self.parsed_info.metadata.rev = match_revision.group(1) + else: + self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,)) + name = re.sub(r'-\d+$', '', name) + self.parsed_info.metadata.name = name + return self.parsed_info.add_error('The first page of the document does not contain a legitimate name that starts with draft-*') diff --git a/ietf/submit/parsers/tests.py b/ietf/submit/parsers/tests.py new file mode 100644 index 00000000000..9ab529a2fee --- /dev/null +++ b/ietf/submit/parsers/tests.py @@ -0,0 +1,78 @@ +# Copyright The IETF Trust 2023, All Rights Reserved + + +from django.core.files.uploadedfile import SimpleUploadedFile +from django.test.utils import override_settings + +from ietf.utils.test_utils import TestCase + +from .base import FileParser + + +@override_settings(IDSUBMIT_MAX_DRAFT_SIZE={"txt": 100}) +class FileParserTests(TestCase): + class MyParser(FileParser): + """Test parser class (FileParser is not usable on its own)""" + + ext = "txt" + + def test_invalid_encoding(self): + fp = self.MyParser( + SimpleUploadedFile( + name="valid-name.txt", + content=b"This is not valid utf-8 -> \xfe", + content_type="text/plain", + ) + ) + parse_info = fp.critical_parse() + self.assertEqual(len(parse_info.errors), 1) + self.assertIn("Invalid utf-8 byte(s)", parse_info.errors[0]) + self.assertIn("0xfe", parse_info.errors[0]) + + def test_file_too_big(self): + fp = self.MyParser( + SimpleUploadedFile( + name="valid-name.txt", + content=b"1" + b"ten chars!" * 10, # exceeds max size of 100 + content_type="text/plain", + ) + ) + parse_info = fp.critical_parse() + self.assertEqual(len(parse_info.errors), 1) + self.assertIn("File size is larger", parse_info.errors[0]) + + def test_wrong_extension(self): + fp = self.MyParser( + SimpleUploadedFile( + name="invalid-ext.xml", + content=b"This is fine", + content_type="text/plain", + ) + ) + parse_info = fp.critical_parse() + self.assertEqual(len(parse_info.errors), 1) + self.assertIn("Expected the TXT file to have extension", parse_info.errors[0]) + + def test_invalid_char_in_filename(self): + # Can't test "/" in the filename because SimpleUploadedFile treats it as a path separator + for invalid_char in r"&\;*$ ": + uploaded_file = SimpleUploadedFile( + name="invalid" + invalid_char + "name.txt", + content=b"This is fine", + content_type="text/plain", + ) + fp = self.MyParser(uploaded_file) + parse_info = fp.critical_parse() + self.assertEqual( + len(parse_info.errors), 1, f"{invalid_char} should trigger 1 error" + ) + self.assertIn( + "Invalid characters were found", + parse_info.errors[0], + f"{invalid_char} is an invalid char", + ) + self.assertIn( + f": {invalid_char}", + parse_info.errors[0], + f"{invalid_char} is the invalid char", + ) diff --git a/ietf/submit/parsers/xml_parser.py b/ietf/submit/parsers/xml_parser.py index 674646e1031..80685799267 100644 --- a/ietf/submit/parsers/xml_parser.py +++ b/ietf/submit/parsers/xml_parser.py @@ -3,7 +3,6 @@ class XMLParser(FileParser): ext = 'xml' - mimetypes = ['application/xml', 'text/xml', ] # If some error is found after this method invocation # no other file parsing is recommended diff --git a/ietf/submit/tasks.py b/ietf/submit/tasks.py index 382bff7fae4..9e279fa9f07 100644 --- a/ietf/submit/tasks.py +++ b/ietf/submit/tasks.py @@ -10,7 +10,8 @@ from ietf.submit.models import Submission from ietf.submit.utils import (cancel_submission, create_submission_event, process_uploaded_submission, - process_and_accept_uploaded_submission) + process_and_accept_uploaded_submission, run_all_yang_model_checks, + populate_yang_model_dirs) from ietf.utils import log @@ -37,20 +38,41 @@ def process_and_accept_uploaded_submission_task(submission_id): @shared_task def cancel_stale_submissions(): now = timezone.now() - stale_submissions = Submission.objects.filter( + # first check for submissions gone stale awaiting validation + stale_unvalidated_submissions = Submission.objects.filter( state_id='validating', ).annotate( submitted_at=Min('submissionevent__time'), ).filter( submitted_at__lt=now - settings.IDSUBMIT_MAX_VALIDATION_TIME, ) - for subm in stale_submissions: + for subm in stale_unvalidated_submissions: age = now - subm.submitted_at log.log(f'Canceling stale submission (id={subm.id}, age={age})') cancel_submission(subm) create_submission_event(None, subm, 'Submission canceled: validation checks took too long') + # now check for expired submissions + expired_submissions = Submission.objects.exclude( + state_id__in=["posted", "cancel"], + ).annotate( + submitted_at=Min("submissionevent__time"), + ).filter( + submitted_at__lt=now - settings.IDSUBMIT_EXPIRATION_AGE, + ) + for subm in expired_submissions: + age = now - subm.submitted_at + log.log(f'Canceling expired submission (id={subm.id}, age={age})') + cancel_submission(subm) + create_submission_event(None, subm, 'Submission canceled: expired without being posted') + + +@shared_task +def run_yang_model_checks_task(): + populate_yang_model_dirs() + run_all_yang_model_checks() + @shared_task(bind=True) def poke(self): log.log(f'Poked {self.name}, request id {self.request.id}') diff --git a/ietf/submit/templatetags/.gitignore b/ietf/submit/templatetags/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/submit/templatetags/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py index d68acd641f7..ede63d2752c 100644 --- a/ietf/submit/tests.py +++ b/ietf/submit/tests.py @@ -1,11 +1,11 @@ -# Copyright The IETF Trust 2011-2022, All Rights Reserved +# Copyright The IETF Trust 2011-2023, All Rights Reserved # -*- coding: utf-8 -*- import datetime import email import io -import mock +from unittest import mock import os import re import sys @@ -24,36 +24,38 @@ from django.test.client import RequestFactory from django.urls import reverse as urlreverse from django.utils import timezone -from django.utils.encoding import force_str, force_text +from django.utils.encoding import force_str import debug # pyflakes:ignore -from ietf.submit.utils import (expirable_submissions, expire_submission, find_submission_filenames, - post_submission, validate_submission_name, validate_submission_rev, - process_and_accept_uploaded_submission, SubmissionError, process_submission_text, - process_submission_xml, process_uploaded_submission, - process_and_validate_submission) -from ietf.doc.factories import (DocumentFactory, WgDraftFactory, IndividualDraftFactory, IndividualRfcFactory, +from ietf.doc.factories import (DocumentFactory, WgDraftFactory, IndividualDraftFactory, ReviewFactory, WgRfcFactory) -from ietf.doc.models import ( Document, DocAlias, DocEvent, State, +from ietf.doc.models import ( Document, DocEvent, State, BallotPositionDocEvent, DocumentAuthor, SubmissionDocEvent ) +from ietf.doc.storage_utils import exists_in_storage, retrieve_str, store_str from ietf.doc.utils import create_ballot_if_not_open, can_edit_docextresources, update_action_holders from ietf.group.factories import GroupFactory, RoleFactory from ietf.group.models import Group from ietf.group.utils import setup_default_community_list_for_group from ietf.meeting.models import Meeting from ietf.meeting.factories import MeetingFactory -from ietf.message.models import Message -from ietf.name.models import FormalLanguageName +from ietf.name.models import DraftSubmissionStateName, FormalLanguageName from ietf.person.models import Person -from ietf.person.factories import UserFactory, PersonFactory, EmailFactory +from ietf.person.factories import UserFactory, PersonFactory from ietf.submit.factories import SubmissionFactory, SubmissionExtResourceFactory from ietf.submit.forms import SubmissionBaseUploadForm, SubmissionAutoUploadForm from ietf.submit.models import Submission, Preapproval, SubmissionExtResource -from ietf.submit.mail import add_submission_email, process_response_email from ietf.submit.tasks import cancel_stale_submissions, process_and_accept_uploaded_submission_task -from ietf.utils.accesstoken import generate_access_token -from ietf.utils.mail import outbox, empty_outbox, get_payload_text -from ietf.utils.models import VersionInfo +from ietf.submit.utils import (expirable_submissions, expire_submission, find_submission_filenames, + post_submission, validate_submission_name, validate_submission_rev, + process_and_accept_uploaded_submission, SubmissionError, process_submission_text, + process_submission_xml, process_uploaded_submission, + process_and_validate_submission, apply_yang_checker_to_draft, + run_all_yang_model_checks) +from ietf.submit.views import access_token_is_valid, auth_token_is_valid +from ietf.utils import tool_version +from ietf.utils.accesstoken import generate_access_token, generate_random_key +from ietf.utils.mail import outbox, get_payload_text +from ietf.utils.test_runner import TestBlobstoreManager from ietf.utils.test_utils import login_testing_unauthorized, TestCase from ietf.utils.timezone import date_today from ietf.utils.draft import PlaintextDraft @@ -198,9 +200,32 @@ def create_draft_submission_with_rev_mismatch(rev='01'): return draft, sub +class ManualSubmissionTests(TestCase): + def test_manualpost_view(self): + submission = SubmissionFactory(state_id="manual") + url = urlreverse("ietf.submit.views.manualpost") + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + q = PyQuery(r.content) + self.assertIn( + urlreverse( + "ietf.submit.views.submission_status", + kwargs=dict(submission_id=submission.pk) + ), + q("#manual.submissions td a").attr("href") + ) + self.assertIn( + submission.name, + q("#manual.submissions td a").text() + ) + + def test_manualpost_cancel(self): + pass + class SubmitTests(BaseSubmitTestCase): def setUp(self): super().setUp() + (Path(settings.FTP_DIR) / "internet-drafts").mkdir() # Submit views assume there is a "next" IETF to look for cutoff dates against MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=180)) @@ -302,7 +327,7 @@ def supply_extra_metadata(self, name, status_url, submitter_name, submitter_emai submission = Submission.objects.get(name=name) self.assertEqual(submission.submitter, email.utils.formataddr((submitter_name, submitter_email))) self.assertEqual([] if submission.replaces == "" else submission.replaces.split(','), - [ d.name for d in DocAlias.objects.filter(pk__in=replaces) ]) + [ d.name for d in Document.objects.filter(pk__in=replaces) ]) self.assertCountEqual( [str(r) for r in submission.external_resources.all()], [str(r) for r in extresources] if extresources else [], @@ -333,6 +358,7 @@ def verify_bibxml_ids_creation(self, draft): def submit_new_wg(self, formats): # submit new -> supply submitter info -> approve + TestBlobstoreManager().emptyTestBlobstores() GroupFactory(type_id='wg',acronym='ames') mars = GroupFactory(type_id='wg', acronym='mars') RoleFactory(name_id='chair', group=mars, person__user__username='marschairman') @@ -355,11 +381,8 @@ def submit_new_wg(self, formats): ad=draft.ad, expires=timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), notify="aliens@example.mars", - note="", ) sug_replaced_draft.set_state(State.objects.get(used=True, type="draft", slug="active")) - sug_replaced_alias = DocAlias.objects.create(name=sug_replaced_draft.name) - sug_replaced_alias.docs.add(sug_replaced_draft) name = "draft-ietf-mars-testing-tests" rev = "00" @@ -369,9 +392,8 @@ def submit_new_wg(self, formats): # supply submitter info, then draft should be in and ready for approval mailbox_before = len(outbox) - replaced_alias = draft.docalias.first() r = self.supply_extra_metadata(name, status_url, author.ascii, author.email().address.lower(), - replaces=[str(replaced_alias.pk), str(sug_replaced_alias.pk)]) + replaces=[str(draft.pk), str(sug_replaced_draft.pk)]) self.assertEqual(r.status_code, 302) status_url = r["Location"] @@ -401,7 +423,7 @@ def submit_new_wg(self, formats): r = self.client.post(status_url, dict(action=action)) self.assertEqual(r.status_code, 302) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) new_revision = draft.latest_event(type="new_revision") self.assertEqual(draft.group.acronym, "mars") @@ -410,6 +432,13 @@ def submit_new_wg(self, formats): self.assertTrue(draft.latest_event(type="added_suggested_replaces")) self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev)))) self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev)))) + check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"] + for ext in check_ext: + basename=f"{name}-{rev}.{ext}" + extname=f"{ext}/{basename}" + self.assertFalse(exists_in_storage("staging", basename)) + self.assertTrue(exists_in_storage("active-draft", extname)) + self.assertTrue(exists_in_storage("draft", extname)) self.assertEqual(draft.type_id, "draft") self.assertEqual(draft.stream_id, "ietf") self.assertTrue(draft.expires >= timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1)) @@ -419,9 +448,9 @@ def submit_new_wg(self, formats): self.assertEqual(authors[0].person, author) self.assertEqual(set(draft.formal_languages.all()), set(FormalLanguageName.objects.filter(slug="json"))) self.assertEqual(draft.relations_that_doc("replaces").count(), 1) - self.assertTrue(draft.relations_that_doc("replaces").first().target, replaced_alias) + self.assertTrue(draft.relations_that_doc("replaces").first().target, draft) self.assertEqual(draft.relations_that_doc("possibly-replaces").count(), 1) - self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_alias) + self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_draft) self.assertEqual(len(outbox), mailbox_before + 5) self.assertIn(("I-D Action: %s" % name), outbox[-4]["Subject"]) self.assertIn(author.ascii, get_payload_text(outbox[-4])) @@ -434,7 +463,7 @@ def submit_new_wg(self, formats): # Check "Review of suggested possible replacements for..." mail self.assertIn("review", outbox[-1]["Subject"].lower()) self.assertIn(name, get_payload_text(outbox[-1])) - self.assertIn(sug_replaced_alias.name, get_payload_text(outbox[-1])) + self.assertIn(sug_replaced_draft.name, get_payload_text(outbox[-1])) self.assertIn("ames-chairs@", outbox[-1]["To"].lower()) self.assertIn("mars-chairs@", outbox[-1]["To"].lower()) # Check submission settings @@ -496,8 +525,28 @@ def test_submit_new_wg_as_author(self): self.assertEqual(r.status_code, 200) self.assertContains(r, 'The submission is pending approval by the group chairs.') + def test_submit_new_wg_as_author_bad_submitter(self): + # submit new -> supply submitter info -> approve + mars = GroupFactory(type_id='wg', acronym='mars') + draft = WgDraftFactory(group=mars) + setup_default_community_list_for_group(draft.group) + + name = "draft-ietf-mars-testing-tests" + rev = "00" + group = "mars" + + status_url, author = self.do_submission(name, rev, group) + username = author.user.email + + # supply submitter info with MIME-encoded name + self.client.login(username=username, password=username+'+password') # log in as the author + r = self.supply_extra_metadata(name, status_url, '=?utf-8?q?Peter_Christen_Asbj=C3=B8rnsen?=', author.email().address.lower(), replaces=[]) + self.assertEqual(r.status_code, 200) + self.assertContains(r, 'appears to be a MIME-encoded string') + def submit_new_concluded_wg_as_author(self, group_state_id='conclude'): """A new concluded WG submission by a logged-in author needs AD approval""" + TestBlobstoreManager().emptyTestBlobstores() mars = GroupFactory(type_id='wg', acronym='mars', state_id=group_state_id) draft = WgDraftFactory(group=mars) setup_default_community_list_for_group(draft.group) @@ -543,6 +592,7 @@ def test_submit_new_wg_with_extresources(self): def submit_existing(self, formats, change_authors=True, group_type='wg', stream_type='ietf'): # submit new revision of existing -> supply submitter info -> prev authors confirm + TestBlobstoreManager().emptyTestBlobstores() def _assert_authors_are_action_holders(draft, expect=True): for author in draft.authors(): @@ -685,7 +735,7 @@ def _assert_authors_are_action_holders(draft, expect=True): self.assertTrue('New version approved' in edescs) self.assertTrue('Uploaded new revision' in edescs) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) self.assertEqual(draft.group.acronym, name.split("-")[2]) # @@ -734,6 +784,13 @@ def inspect_docevents(docevents, event_delta, event_type, be_in_desc, by_name): self.assertTrue(os.path.exists(os.path.join(self.archive_dir, "%s-%s.txt" % (name, old_rev)))) self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev)))) self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev)))) + check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"] + for ext in check_ext: + basename=f"{name}-{rev}.{ext}" + extname=f"{ext}/{basename}" + self.assertFalse(exists_in_storage("staging", basename)) + self.assertTrue(exists_in_storage("active-draft", extname)) + self.assertTrue(exists_in_storage("draft", extname)) self.assertEqual(draft.type_id, "draft") if stream_type == 'ietf': self.assertEqual(draft.stream_id, "ietf") @@ -750,10 +807,10 @@ def inspect_docevents(docevents, event_delta, event_type, be_in_desc, by_name): self.assertTrue("New Version Notification" in outbox[-2]["Subject"]) self.assertTrue(name in get_payload_text(outbox[-2])) interesting_address = {'ietf':'mars', 'irtf':'irtf-chair', 'iab':'iab-chair', 'ise':'rfc-ise'}[draft.stream_id] - self.assertTrue(interesting_address in force_text(outbox[-2].as_string())) + self.assertTrue(interesting_address in force_str(outbox[-2].as_string())) if draft.stream_id == 'ietf': - self.assertTrue(draft.ad.role_email("ad").address in force_text(outbox[-2].as_string())) - self.assertTrue(ballot_position.balloter.role_email("ad").address in force_text(outbox[-2].as_string())) + self.assertTrue(draft.ad.role_email("ad").address in force_str(outbox[-2].as_string())) + self.assertTrue(ballot_position.balloter.role_email("ad").address in force_str(outbox[-2].as_string())) self.assertTrue("New Version Notification" in outbox[-1]["Subject"]) self.assertTrue(name in get_payload_text(outbox[-1])) r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts')) @@ -872,6 +929,7 @@ def test_submit_existing_iab_with_extresources(self): def submit_new_individual(self, formats): # submit new -> supply submitter info -> confirm + TestBlobstoreManager().emptyTestBlobstores() name = "draft-authorname-testing-tests" rev = "00" @@ -912,13 +970,37 @@ def submit_new_individual(self, formats): r = self.client.post(confirmation_url, {'action':'confirm'}) self.assertEqual(r.status_code, 302) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) new_revision = draft.latest_event() self.assertEqual(new_revision.type, "new_revision") self.assertEqual(new_revision.by.name, "Submitter Name") self.verify_bibxml_ids_creation(draft) + repository_path = Path(draft.get_file_name()) + self.assertTrue(repository_path.exists()) # Note that this doesn't check that it has the right _content_ + ftp_path = Path(settings.FTP_DIR) / "internet-drafts" / repository_path.name + self.assertTrue(repository_path.samefile(ftp_path)) + all_archive_path = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / repository_path.name + self.assertTrue(repository_path.samefile(all_archive_path)) + for ext in settings.IDSUBMIT_FILE_TYPES: + if ext == "txt": + continue + variant_path = repository_path.parent / f"{repository_path.stem}.{ext}" + if variant_path.exists(): + variant_ftp_path = Path(settings.FTP_DIR) / "internet-drafts" / variant_path.name + self.assertTrue(variant_path.samefile(variant_ftp_path)) + variant_all_archive_path = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / variant_path.name + self.assertTrue(variant_path.samefile(variant_all_archive_path)) + check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"] + for ext in check_ext: + basename=f"{name}-{rev}.{ext}" + extname=f"{ext}/{basename}" + self.assertFalse(exists_in_storage("staging", basename)) + self.assertTrue(exists_in_storage("active-draft", extname)) + self.assertTrue(exists_in_storage("draft", extname)) + + def test_submit_new_individual_txt(self): self.submit_new_individual(["txt"]) @@ -933,6 +1015,7 @@ def test_submit_new_individual_txt_xml(self): self.submit_new_individual(["txt", "xml"]) def submit_new_draft_no_org_or_address(self, formats): + TestBlobstoreManager().emptyTestBlobstores() name = 'draft-testing-no-org-or-address' author = PersonFactory() @@ -952,7 +1035,7 @@ def submit_new_draft_no_org_or_address(self, formats): action = force_post_button.parents("form").find('input[type=hidden][name="action"]').val() r = self.client.post(status_url, dict(action=action)) - doc = Document.objects.get(docalias__name=name) + doc = Document.objects.get(name=name) self.assertEqual(doc.documentauthor_set.count(), 1) docauth = doc.documentauthor_set.first() self.assertEqual(docauth.person, author) @@ -1023,6 +1106,7 @@ def _assert_extresource_change_event(self, doc, is_present=True): self.assertIsNone(event, 'External resource change event was unexpectedly created') def submit_new_draft_with_extresources(self, group): + TestBlobstoreManager().emptyTestBlobstores() name = 'draft-testing-with-extresources' status_url, author = self.do_submission(name, rev='00', group=group) @@ -1052,6 +1136,7 @@ def test_submit_new_individual_with_extresources(self): def submit_new_individual_logged_in(self, formats): # submit new -> supply submitter info -> done + TestBlobstoreManager().emptyTestBlobstores() name = "draft-authorname-testing-logged-in" rev = "00" @@ -1085,7 +1170,7 @@ def submit_new_individual_logged_in(self, formats): self.assertIn("New Version Notification", notification_email["Subject"]) self.assertIn(author.email().address.lower(), notification_email["To"]) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) self.assertEqual(draft.docextresource_set.count(), 0) new_revision = draft.latest_event() @@ -1133,7 +1218,7 @@ def test_submit_new_logged_in_with_extresources(self): self._assert_extresources_form_not_present(r) # Check that the draft itself got the resources - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertCountEqual( [str(r) for r in draft.docextresource_set.all()], [str(r) for r in resources], @@ -1142,7 +1227,7 @@ def test_submit_new_logged_in_with_extresources(self): self.verify_bibxml_ids_creation(draft) def test_submit_update_individual(self): - IndividualDraftFactory(name='draft-ietf-random-thing', states=[('draft','rfc')], other_aliases=['rfc9999',], pages=5) + IndividualDraftFactory(name='draft-ietf-random-thing', states=[('draft','active'),('draft-iesg','approved')], pages=5) ad=Person.objects.get(user__username='ad') # Group of None here does not reflect real individual submissions draft = IndividualDraftFactory(group=None, ad = ad, authors=[ad,], notify='aliens@example.mars', pages=5) @@ -1152,23 +1237,14 @@ def test_submit_update_individual(self): status_url, author = self.do_submission(name,rev) mailbox_before = len(outbox) - replaced_alias = draft.docalias.first() - r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)]) + r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(draft.pk)]) self.assertEqual(r.status_code, 200) self.assertContains(r, 'cannot replace itself') self._assert_extresources_in_table(r, []) self._assert_extresources_form(r, []) - replaced_alias = DocAlias.objects.get(name='draft-ietf-random-thing') - r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)]) - self.assertEqual(r.status_code, 200) - self.assertContains(r, 'cannot replace an RFC') - self._assert_extresources_in_table(r, []) - self._assert_extresources_form(r, []) - - replaced_alias.document.set_state(State.objects.get(type='draft-iesg',slug='approved')) - replaced_alias.document.set_state(State.objects.get(type='draft',slug='active')) - r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)]) + replaced = Document.objects.get(name='draft-ietf-random-thing') + r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced.pk)]) self.assertEqual(r.status_code, 200) self.assertContains(r, 'approved by the IESG and cannot') self._assert_extresources_in_table(r, []) @@ -1188,7 +1264,7 @@ def test_submit_update_individual(self): r = self.client.post(confirmation_url, {'action':'confirm'}) self.assertEqual(r.status_code, 302) self.assertEqual(len(outbox), mailbox_before+3) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) self.assertEqual(draft.relateddocument_set.filter(relationship_id='replaces').count(), replaces_count) self.assertEqual(draft.docextresource_set.count(), 0) @@ -1204,15 +1280,16 @@ def submit_existing_with_extresources(self, group_type, stream_type='ietf'): Unlike some other tests in this module, does not confirm draft if this would be required. """ - orig_draft = DocumentFactory( + TestBlobstoreManager().emptyTestBlobstores() + orig_draft: Document = DocumentFactory( # type: ignore[annotation-unchecked] type_id='draft', group=GroupFactory(type_id=group_type) if group_type else None, stream_id=stream_type, - ) # type: Document + ) name = orig_draft.name group = orig_draft.group new_rev = '%02d' % (int(orig_draft.rev) + 1) - author = PersonFactory() # type: Person + author: Person = PersonFactory() # type: ignore[annotation-unchecked] DocumentAuthor.objects.create(person=author, document=orig_draft) orig_draft.docextresource_set.create(name_id='faq', value='https://faq.example.com/') orig_draft.docextresource_set.create(name_id='wiki', value='https://wiki.example.com', display_name='Test Wiki') @@ -1244,6 +1321,7 @@ def test_submit_update_individual_with_extresources(self): def submit_new_individual_replacing_wg(self, logged_in=False, group_state_id='active', notify_ad=False): """Chair of an active WG should be notified if individual draft is proposed to replace a WG draft""" + TestBlobstoreManager().emptyTestBlobstores() name = "draft-authorname-testing-tests" rev = "00" group = None @@ -1262,7 +1340,7 @@ def submit_new_individual_replacing_wg(self, logged_in=False, group_state_id='ac status_url, "Submitter Name", "submitter@example.com", - replaces=[str(replaced_draft.docalias.first().pk)], + replaces=[str(replaced_draft.pk)], ) submission = Submission.objects.get(name=name, rev=rev) @@ -1306,7 +1384,7 @@ def test_submit_cancel_confirmation(self): r = self.client.post(confirmation_url, {'action':'cancel'}) self.assertEqual(r.status_code, 302) self.assertEqual(len(outbox), mailbox_before) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, old_rev) def test_submit_new_wg_with_dash(self): @@ -1370,6 +1448,7 @@ def test_cancel_submission(self): # cancel r = self.client.post(status_url, dict(action=action)) self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev)))) + self.assertFalse(exists_in_storage("staging",f"{name}-{rev}.txt")) def test_edit_submission_and_force_post(self): # submit -> edit @@ -1412,8 +1491,7 @@ def test_edit_submission_and_force_post(self): "edit-pages": "123", "submitter-name": "Some Random Test Person", "submitter-email": "random@example.com", - "replaces": [str(draft.docalias.first().pk)], - "edit-note": "no comments", + "replaces": [str(draft.pk)], "authors-0-name": "Person 1", "authors-0-email": "person1@example.com", "authors-1-name": "Person 2", @@ -1429,9 +1507,8 @@ def test_edit_submission_and_force_post(self): self.assertEqual(submission.document_date, document_date) self.assertEqual(submission.abstract, "some abstract") self.assertEqual(submission.pages, 123) - self.assertEqual(submission.note, "no comments") self.assertEqual(submission.submitter, "Some Random Test Person ") - self.assertEqual(submission.replaces, draft.docalias.first().name) + self.assertEqual(submission.replaces, draft.name) self.assertEqual(submission.state_id, "manual") authors = submission.authors @@ -1463,7 +1540,7 @@ def test_edit_submission_and_force_post(self): r = self.client.post(status_url, dict(action=action)) self.assertEqual(r.status_code, 302) - draft = Document.objects.get(docalias__name=name) + draft = Document.objects.get(name=name) self.assertEqual(draft.rev, rev) self.assertEqual(draft.docextresource_set.count(), 0) self.verify_bibxml_ids_creation(draft) @@ -1561,16 +1638,21 @@ def test_submit_all_file_types(self): self.assertEqual(Submission.objects.filter(name=name).count(), 1) self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev)))) + self.assertTrue(exists_in_storage("staging",f"{name}-{rev}.txt")) fd = io.open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))) txt_contents = fd.read() fd.close() self.assertTrue(name in txt_contents) self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev)))) + self.assertTrue(exists_in_storage("staging",f"{name}-{rev}.txt")) fd = io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))) xml_contents = fd.read() fd.close() self.assertTrue(name in xml_contents) self.assertTrue('' in xml_contents) + xml_contents = retrieve_str("staging", f"{name}-{rev}.xml") + self.assertTrue(name in xml_contents) + self.assertTrue('' in xml_contents) def test_expire_submissions(self): s = Submission.objects.create(name="draft-ietf-mars-foo", @@ -1703,7 +1785,6 @@ def test_submit_bad_file_txt(self): r, q, m = self.submit_bad_file("some name", ["txt"]) self.assertIn('Invalid characters were found in the name', m) self.assertIn('Expected the TXT file to have extension ".txt"', m) - self.assertIn('Expected an TXT file of type "text/plain"', m) self.assertIn('document does not contain a legitimate name', m) def test_submit_bad_doc_name(self): @@ -1721,7 +1802,6 @@ def test_submit_bad_file_xml(self): r, q, m = self.submit_bad_file("some name", ["xml"]) self.assertIn('Invalid characters were found in the name', m) self.assertIn('Expected the XML file to have extension ".xml"', m) - self.assertIn('Expected an XML file of type "application/xml"', m) def test_submit_file_in_archive(self): name = "draft-authorname-testing-file-exists" @@ -1809,17 +1889,17 @@ def test_submit_invalid_yang(self): r = self.client.get(status_url) q = PyQuery(r.content) # - self.assertContains(r, 'The yang validation returned 1 error') + self.assertContains(r, 'The yang validation returned 3 errors') # m = q('#yang-validation-message').text() for command in ['xym', 'pyang', 'yanglint']: - version = VersionInfo.objects.get(command=command).version + version = tool_version[command] if command != 'yanglint' or (settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY)): self.assertIn(version, m) self.assertIn("draft-yang-testing-invalid-00.txt", m) self.assertIn("error: syntax error: illegal keyword: ;", m) if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY): - self.assertIn("No validation errors", m) + self.assertIn('libyang err : Parsing module "ietf-yang-metadata" failed.', m) def submit_conflicting_submissiondocevent_rev(self, new_rev='01', existing_rev='01'): """Test submitting a rev when an equal or later SubmissionDocEvent rev exists @@ -1859,6 +1939,7 @@ def do_wg_approval_auth_test(self, state, chair_can_approve=False): Assumes approval allowed by AD and secretary and, optionally, chair of WG """ + TestBlobstoreManager().emptyTestBlobstores() class _SubmissionFactory: """Helper class to generate fresh submissions""" def __init__(self, author, state): @@ -1982,7 +2063,7 @@ def group_approve_with_extresources(self, permitted): group = GroupFactory() # someone to be notified of resource suggestion when permission not granted RoleFactory(group=group, person=PersonFactory(), name_id='chair') - submission = SubmissionFactory(state_id='grp-appr', group=group) # type: Submission + submission: Submission = SubmissionFactory(state_id='grp-appr', group=group) # type: ignore[annotation-unchecked] SubmissionExtResourceFactory(submission=submission) # use secretary user to ensure we have permission to approve @@ -2000,7 +2081,7 @@ def confirm_with_extresources(self, state, permitted): group = GroupFactory() # someone to be notified of resource suggestion when permission not granted RoleFactory(group=group, person=PersonFactory(), name_id='chair') - submission = SubmissionFactory(state_id=state, group=group) # type: Submission + submission: Submission = SubmissionFactory(state_id=state, group=group) # type: ignore[annotation-unchecked] SubmissionExtResourceFactory(submission=submission) url = urlreverse( @@ -2052,7 +2133,7 @@ def test_can_edit_docextresources(self): def test_forcepost_with_extresources(self): # state needs to be one that has 'posted' as a next state - submission = SubmissionFactory(state_id='grp-appr') # type: Submission + submission: Submission = SubmissionFactory(state_id='grp-appr') # type: ignore[annotation-unchecked] SubmissionExtResourceFactory(submission=submission) url = urlreverse( @@ -2291,454 +2372,9 @@ def test_cancel_preapproval(self): self.assertEqual(len(Preapproval.objects.filter(name=preapproval.name)), 0) -class ManualPostsTestCase(BaseSubmitTestCase): - def test_manual_posts(self): - GroupFactory(acronym='mars') - - url = urlreverse('ietf.submit.views.manualpost') - # Secretariat has access - self.client.login(username="secretary", password="secretary+password") - - Submission.objects.create(name="draft-ietf-mars-foo", - group=Group.objects.get(acronym="mars"), - submission_date=date_today(), - state_id="manual") - Submission.objects.create(name="draft-ietf-mars-bar", - group=Group.objects.get(acronym="mars"), - submission_date=date_today(), - rev="00", - state_id="grp-appr") - - # get - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - - self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-foo")')), 1) - self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-bar")')), 0) - - def test_waiting_for_draft(self): - message_string = """To: somebody@ietf.org -From: joe@test.com -Date: {} -Subject: test submission via email - -Please submit my draft at http://test.com/mydraft.txt - -Thank you -""".format(timezone.now().ctime()) - message = email.message_from_string(force_str(message_string)) - submission, submission_email_event = ( - add_submission_email(request=None, - remote_ip ="192.168.0.1", - name = "draft-my-new-draft", - rev='00', - submission_pk=None, - message = message, - by = Person.objects.get(name="(System)"), - msgtype = "msgin") ) - - url = urlreverse('ietf.submit.views.manualpost') - # Secretariat has access - self.client.login(username="secretary", password="secretary+password") - - # get - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - - self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 1) - - # Same name should raise an error - with self.assertRaises(Exception): - add_submission_email(request=None, - remote_ip ="192.168.0.1", - name = "draft-my-new-draft", - rev='00', - submission_pk=None, - message = message, - by = Person.objects.get(name="(System)"), - msgtype = "msgin") - - # Cancel this one - r = self.client.post(urlreverse("ietf.submit.views.cancel_waiting_for_draft"), { - "submission_id": submission.pk, - "access_token": submission.access_token(), - }) - self.assertEqual(r.status_code, 302) - url = r["Location"] - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 0) - - # Should now be able to add it again - submission, submission_email_event = ( - add_submission_email(request=None, - remote_ip ="192.168.0.1", - name = "draft-my-new-draft", - rev='00', - submission_pk=None, - message = message, - by = Person.objects.get(name="(System)"), - msgtype = "msgin") ) - - - def test_waiting_for_draft_with_attachment(self): - frm = "joe@test.com" - - message_string = """To: somebody@ietf.org -From: {} -Date: {} -Subject: A very important message with a small attachment -Content-Type: multipart/mixed; boundary="------------090908050800030909090207" - -This is a multi-part message in MIME format. ---------------090908050800030909090207 -Content-Type: text/plain; charset=utf-8; format=flowed -Content-Transfer-Encoding: 7bit - -The message body will probably say something about the attached document - ---------------090908050800030909090207 -Content-Type: text/plain; charset=UTF-8; name="attach.txt" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; filename="attach.txt" - -QW4gZXhhbXBsZSBhdHRhY2htZW50IHd0aG91dCB2ZXJ5IG11Y2ggaW4gaXQuCgpBIGNvdXBs -ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg== ---------------090908050800030909090207-- -""".format(frm, timezone.now().ctime()) - - message = email.message_from_string(force_str(message_string)) - submission, submission_email_event = ( - add_submission_email(request=None, - remote_ip ="192.168.0.1", - name = "draft-my-new-draft", - rev='00', - submission_pk=None, - message = message, - by = Person.objects.get(name="(System)"), - msgtype = "msgin") ) - - manualpost_page_url = urlreverse('ietf.submit.views.manualpost') - # Secretariat has access - self.client.login(username="secretary", password="secretary+password") - - self.check_manualpost_page(submission=submission, - submission_email_event=submission_email_event, - the_url=manualpost_page_url, - submission_name_fragment='draft-my-new-draft', - frm=frm, - is_secretariat=True) - - # Try the status page with no credentials - self.client.logout() - - self.check_manualpost_page(submission=submission, - submission_email_event=submission_email_event, - the_url=manualpost_page_url, - submission_name_fragment='draft-my-new-draft', - frm=frm, - is_secretariat=False) - - # Post another message to this submission using the link - message_string = """To: somebody@ietf.org -From: joe@test.com -Date: {} -Subject: A new submission message with a small attachment -Content-Type: multipart/mixed; boundary="------------090908050800030909090207" - -This is a multi-part message in MIME format. ---------------090908050800030909090207 -Content-Type: text/plain; charset=utf-8; format=flowed -Content-Transfer-Encoding: 7bit - -The message body will probably say something more about the attached document - ---------------090908050800030909090207 -Content-Type: text/plain; charset=UTF-8; name="attach.txt" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; filename="attachment.txt" - -QW4gZXhhbXBsZSBhdHRhY2htZW50IHd0aG91dCB2ZXJ5IG11Y2ggaW4gaXQuCgpBIGNvdXBs -ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg== ---------------090908050800030909090207-- -""".format(timezone.now().ctime()) - - # Back to secretariat - self.client.login(username="secretary", password="secretary+password") - - r, q = self.request_and_parse(manualpost_page_url) - - url = self.get_href(q, "a#new-submission-email:contains('New submission from email')") - - # Get the form - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - #self.assertEqual(len(q('input[name=edit-title]')), 1) - - # Post the new message - r = self.client.post(url, { - "name": "draft-my-next-new-draft-00", - "direction": "incoming", - "message": message_string, - }) - - if r.status_code != 302: - q = PyQuery(r.content) - print(q) - - self.assertEqual(r.status_code, 302) - - - #self.check_manualpost_page(submission, submission_email_event, - # url, 'draft-my-next-new-draft' - # 'Another very important message', - # true) - - def check_manualpost_page(self, submission, submission_email_event, - the_url, submission_name_fragment, - frm, - is_secretariat): - # get the page listing manual posts - r, q = self.request_and_parse(the_url) - selector = "#waiting-for-draft a#add-submission-email%s:contains('Add email')" % submission.pk - - if is_secretariat: - # Can add an email to the submission - add_email_url = self.get_href(q, selector) - else: - # No add email button button - self.assertEqual(len(q(selector)), 0) - - # Find the link for our submission in those awaiting drafts - submission_url = self.get_href(q, "#waiting-for-draft a#aw{}:contains('{}')". - format(submission.pk, submission_name_fragment)) - - # Follow the link to the status page for this submission - r, q = self.request_and_parse(submission_url) - - selector = "#history a#reply%s:contains('Reply')" % submission.pk - - if is_secretariat: - # check that reply button is visible and get the form - reply_url = self.get_href(q, selector) - - # Get the form - r = self.client.get(reply_url) - self.assertEqual(r.status_code, 200) - reply_q = PyQuery(r.content) - self.assertEqual(len(reply_q('input[name=to]')), 1) - else: - # No reply button - self.assertEqual(len(q(selector)), 0) - - if is_secretariat: - # Now try to send an email using the send email link - - selector = "a#send%s:contains('Send Email')" % submission.pk - send_url = self.get_href(q, selector) - - self.do_submission_email(the_url = send_url, - to = frm, - body = "A new message") - - # print q - # print submission.pk - # print submission_email_event.pk - - # Find the link for our message in the list - url = self.get_href(q, "#aw{}-{}:contains('{}')".format(submission.pk, - submission_email_event.message.pk, - "Received message - manual post")) - - # Page displaying message details - r, q = self.request_and_parse(url) - - if is_secretariat: - # check that reply button is visible - - reply_href = self.get_href(q, "a#reply%s:contains('Reply')" % submission.pk) - - else: - # No reply button - self.assertEqual(len(q(selector)), 0) - reply_href = None - - # check that attachment link is visible - - url = self.get_href(q, "#email-details a#attach{}:contains('attach.txt')".format(submission.pk)) - - # Fetch the attachment - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - - # Attempt a reply if we can - if reply_href == None: - return - - self.do_submission_email(the_url = reply_href, - to = frm, - body = "A reply to the message") - - # try adding an email to the submission - # Use the add email link from the manual post listing page - - if is_secretariat: - # Can add an email to the submission - # add_email_url set previously - r = self.client.get(add_email_url) - self.assertEqual(r.status_code, 200) - add_email_q = PyQuery(r.content) - self.assertEqual(len(add_email_q('input[name=submission_pk]')), 1) - - # Add a simple email - new_message_string = """To: somebody@ietf.org -From: joe@test.com -Date: {} -Subject: Another message - -About my submission - -Thank you -""".format(timezone.now().ctime()) - - r = self.client.post(add_email_url, { - "name": "{}-{}".format(submission.name, submission.rev), - "direction": "incoming", - "submission_pk": submission.pk, - "message": new_message_string, - }) - - if r.status_code != 302: - q = PyQuery(r.content) - print(q) - - self.assertEqual(r.status_code, 302) - - def request_and_parse(self, url): - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - return r, PyQuery(r.content) - - - def get_href(self, q, query): - link = q(query) - self.assertEqual(len(link), 1) - - return PyQuery(link[0]).attr('href') - - - def do_submission_email(self, the_url, to, body): - # check the page - r = self.client.get(the_url) - q = PyQuery(r.content) - post_button = q('[type=submit]:contains("Send email")') - self.assertEqual(len(post_button), 1) - subject = post_button.parents("form").find('input[name="subject"]').val() - frm = post_button.parents("form").find('input[name="frm"]').val() - cc = post_button.parents("form").find('input[name="cc"]').val() - reply_to = post_button.parents("form").find('input[name="reply_to"]').val() - empty_outbox() - - # post submitter info - r = self.client.post(the_url, { - "subject": subject, - "frm": frm, - "to": to, - "cc": cc, - "reply_to": reply_to, - "body": body, - }) - - self.assertEqual(r.status_code, 302) - - self.assertEqual(len(outbox), 1) - - outmsg = outbox[0] - self.assertTrue(to in outmsg['To']) - - reply_to = outmsg['Reply-To'] - self.assertIsNotNone(reply_to, "Expected Reply-To") - - # Build a reply - - message_string = """To: {} -From: {} -Date: {} -Subject: test -""".format(reply_to, to, timezone.now().ctime()) - - result = process_response_email(message_string) - self.assertIsInstance(result, Message) - - return r - - def do_submission(self, name, rev, group=None, formats=["txt",]): - # We're not testing the submission process - just the submission status - - # get - url = urlreverse('ietf.submit.views.upload_submission') - r = self.client.get(url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertEqual(len(q('input[type=file][name=txt]')), 1) - self.assertEqual(len(q('input[type=file][name=xml]')), 1) - - # submit - files = {} - for format in formats: - files[format], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.{format}', group, "test_submission.%s" % format) - - r = self.post_to_upload_submission(url, files) - if r.status_code != 302: - q = PyQuery(r.content) - print(q('div.invalid-feedback span.form-text div').text()) - - self.assertEqual(r.status_code, 302) - - status_url = r["Location"] - for format in formats: - self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format)))) - self.assertEqual(Submission.objects.filter(name=name).count(), 1) - submission = Submission.objects.get(name=name) - self.assertTrue(all([ c.passed!=False for c in submission.checks.all() ])) - self.assertEqual(len(submission.authors), 1) - author = submission.authors[0] - self.assertEqual(author["name"], "Author Name") - self.assertEqual(author["email"], "author@example.com") - - return status_url - - - def supply_extra_metadata(self, name, status_url, submitter_name, submitter_email): - # check the page - r = self.client.get(status_url) - q = PyQuery(r.content) - post_button = q('[type=submit]:contains("Post")') - self.assertEqual(len(post_button), 1) - action = post_button.parents("form").find('input[type=hidden][name="action"]').val() - - # post submitter info - r = self.client.post(status_url, { - "action": action, - "submitter-name": submitter_name, - "submitter-email": submitter_email, - "approvals_received": True, - }) - - if r.status_code == 302: - submission = Submission.objects.get(name=name) - self.assertEqual(submission.submitter, email.utils.formataddr((submitter_name, submitter_email))) - - return r - - -# Transaction.on_commit() requires use of TransactionTestCase, but that has a performance penalty. Replace it -# with a no-op for testing purposes. +# Transaction.on_commit() interacts badly with TestCase's transaction behavior. Replace it +# with a pass-through for testing purposes. @mock.patch.object(transaction, 'on_commit', lambda x: x()) @override_settings(IDTRACKER_BASE_URL='https://datatracker.example.com') class ApiSubmissionTests(BaseSubmitTestCase): @@ -2748,6 +2384,12 @@ def setUp(self): super().setUp() MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=60)) + def test_api_submit_tombstone(self): + """Tombstone for obsolete API endpoint should return 410 Gone""" + url = urlreverse("ietf.submit.views.api_submit_tombstone") + self.assertEqual(self.client.get(url).status_code, 410) + self.assertEqual(self.client.post(url).status_code, 410) + def test_upload_draft(self): """api_submission accepts a submission and queues it for processing""" url = urlreverse('ietf.submit.views.api_submission') @@ -2878,7 +2520,7 @@ def test_submission_status(self): self.assertEqual(r.status_code, 200) self.assertEqual( r.json(), - {'id': str(s.pk), 'state': 'validating'}, + {'id': str(s.pk), 'state': 'validating', 'state_desc': s.state.name}, ) s.state_id = 'uploaded' @@ -2887,7 +2529,7 @@ def test_submission_status(self): self.assertEqual(r.status_code, 200) self.assertEqual( r.json(), - {'id': str(s.pk), 'state': 'uploaded'}, + {'id': str(s.pk), 'state': 'uploaded', 'state_desc': s.state.name}, ) # try an invalid one @@ -3099,13 +2741,15 @@ def test_replaces_field(self): # can't replace RFC rfc = WgRfcFactory() + draft = WgDraftFactory(states=[("draft", "rfc")]) + draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc) form = SubmissionAutoUploadForm( request_factory.get('/some/url'), - data={'user': auth.user.username, 'replaces': rfc.name}, + data={'user': auth.user.username, 'replaces': draft.name}, files=files_dict, ) self.assertFalse(form.is_valid()) - self.assertIn('An Internet-Draft cannot replace an RFC', form.errors['replaces']) + self.assertIn('An Internet-Draft cannot replace another Internet-Draft that has become an RFC', form.errors['replaces']) # can't replace draft approved by iesg existing_drafts[0].set_state(State.objects.get(type='draft-iesg', slug='approved')) @@ -3126,11 +2770,26 @@ def test_replaces_field(self): ) self.assertFalse(form.is_valid()) + def test_invalid_xml(self): + """Test error message for invalid XML""" + not_xml = SimpleUploadedFile( + name="not-xml.xml", + content=b"this is not xml at all", + content_type="application/xml", + ) + form = SubmissionBaseUploadForm(RequestFactory().post('/some/url'), files={"xml": not_xml}) + self.assertFalse(form.is_valid()) + self.assertFormError( + form, + "xml", + "The uploaded file is not valid XML. Please make sure you are uploading the correct file.", + ) class AsyncSubmissionTests(BaseSubmitTestCase): """Tests of async submission-related tasks""" def test_process_and_accept_uploaded_submission(self): """process_and_accept_uploaded_submission should properly process a submission""" + TestBlobstoreManager().emptyTestBlobstores() _today = date_today() xml, author = submission_file('draft-somebody-test-00', 'draft-somebody-test-00.xml', None, 'test_submission.xml') xml_data = xml.read() @@ -3146,10 +2805,13 @@ def test_process_and_accept_uploaded_submission(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' with xml_path.open('w') as f: f.write(xml_data) + store_str("staging", "draft-somebody-test-00.xml", xml_data) txt_path = xml_path.with_suffix('.txt') self.assertFalse(txt_path.exists()) html_path = xml_path.with_suffix('.html') self.assertFalse(html_path.exists()) + for ext in ["txt", "html"]: + self.assertFalse(exists_in_storage("staging",f"draft-somebody-test-00.{ext}")) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh @@ -3165,6 +2827,8 @@ def test_process_and_accept_uploaded_submission(self): # at least test that these were created self.assertTrue(txt_path.exists()) self.assertTrue(html_path.exists()) + for ext in ["txt", "html"]: + self.assertTrue(exists_in_storage("staging", f"draft-somebody-test-00.{ext}")) self.assertEqual(submission.file_size, os.stat(txt_path).st_size) self.assertIn('Completed submission validation checks', submission.submissionevent_set.last().desc) @@ -3179,6 +2843,7 @@ def test_process_and_accept_uploaded_submission_invalid(self): txt.close() # submitter is not an author + TestBlobstoreManager().emptyTestBlobstores() submitter = PersonFactory() submission = SubmissionFactory( name='draft-somebody-test', @@ -3190,12 +2855,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' with xml_path.open('w') as f: f.write(xml_data) + store_str("staging", "draft-somebody-test-00.xml", xml_data) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('not one of the document authors', submission.submissionevent_set.last().desc) # author has no email address in XML + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='00', @@ -3206,12 +2873,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' with xml_path.open('w') as f: f.write(re.sub(r'.*', '', xml_data)) + store_str("staging", "draft-somebody-test-00.xml", re.sub(r'.*', '', xml_data)) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('Email address not found for all authors', submission.submissionevent_set.last().desc) # no title + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='00', @@ -3222,12 +2891,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' with xml_path.open('w') as f: f.write(re.sub(r'.*', '', xml_data)) + store_str("staging", "draft-somebody-test-00.xml", re.sub(r'.*', '', xml_data)) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('Could not extract a valid title', submission.submissionevent_set.last().desc) # draft name mismatch + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-different-name', rev='00', @@ -3238,12 +2909,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-different-name-00.xml' with xml_path.open('w') as f: f.write(xml_data) + store_str("staging", "draft-different-name-00.xml", xml_data) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('Submission rejected: XML Internet-Draft filename', submission.submissionevent_set.last().desc) # rev mismatch + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='01', @@ -3254,12 +2927,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-01.xml' with xml_path.open('w') as f: f.write(xml_data) + store_str("staging", "draft-somebody-test-01.xml", xml_data) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('Submission rejected: XML Internet-Draft revision', submission.submissionevent_set.last().desc) # not xml + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='00', @@ -3270,12 +2945,14 @@ def test_process_and_accept_uploaded_submission_invalid(self): txt_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.txt' with txt_path.open('w') as f: f.write(txt_data) + store_str("staging", "draft-somebody-test-00.txt", txt_data) process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh self.assertEqual(submission.state_id, 'cancel') self.assertIn('Only XML Internet-Draft submissions', submission.submissionevent_set.last().desc) # wrong state + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='00', @@ -3284,8 +2961,9 @@ def test_process_and_accept_uploaded_submission_invalid(self): state_id='uploaded', ) xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' - with xml_path.open('w') as f: + with xml_path.open('w') as f: # Why is this state being written if the thing that uses it is mocked out? f.write(xml_data) + store_str("staging", "draft-somebody-test-00.xml", xml_data) with mock.patch('ietf.submit.utils.process_submission_xml') as mock_proc_xml: process_and_accept_uploaded_submission(submission) submission = Submission.objects.get(pk=submission.pk) # refresh @@ -3293,6 +2971,7 @@ def test_process_and_accept_uploaded_submission_invalid(self): self.assertEqual(submission.state_id, 'uploaded', 'State should not be changed') # failed checker + TestBlobstoreManager().emptyTestBlobstores() submission = SubmissionFactory( name='draft-somebody-test', rev='00', @@ -3303,6 +2982,7 @@ def test_process_and_accept_uploaded_submission_invalid(self): xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml' with xml_path.open('w') as f: f.write(xml_data) + store_str("staging", "draft-somebody-test-00.xml", xml_data, allow_overwrite=True) with mock.patch( 'ietf.submit.utils.apply_checkers', side_effect = lambda _, __: submission.checks.create( @@ -3339,6 +3019,7 @@ def test_process_and_accept_uploaded_submission_task_ignores_invalid_id(self, mo self.assertEqual(mock_method.call_count, 0) def test_process_submission_xml(self): + TestBlobstoreManager().emptyTestBlobstores() xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / "draft-somebody-test-00.xml" xml, _ = submission_file( "draft-somebody-test-00", @@ -3347,14 +3028,16 @@ def test_process_submission_xml(self): "test_submission.xml", title="Correct Draft Title", ) - xml_path.write_text(xml.read()) + xml_contents = xml.read() + xml_path.write_text(xml_contents) + store_str("staging", "draft-somebody-test-00.xml", xml_contents) output = process_submission_xml("draft-somebody-test", "00") self.assertEqual(output["filename"], "draft-somebody-test") self.assertEqual(output["rev"], "00") self.assertEqual(output["title"], "Correct Draft Title") self.assertIsNone(output["abstract"]) self.assertEqual(len(output["authors"]), 1) # not checking in detail, parsing is unreliable - self.assertIsNone(output["document_date"]) + self.assertEqual(output["document_date"], date_today()) self.assertIsNone(output["pages"]) self.assertIsNone(output["words"]) self.assertIsNone(output["first_two_pages"]) @@ -3362,7 +3045,33 @@ def test_process_submission_xml(self): self.assertIsNone(output["formal_languages"]) self.assertEqual(output["xml_version"], "3") + # Should behave on missing or partial elements + TestBlobstoreManager().emptyTestBlobstores() + xml_path.write_text(re.sub(r"", "", xml_contents)) # strip entirely + store_str("staging", "draft-somebody-test-00.xml", re.sub(r"", "", xml_contents), allow_overwrite=True) + output = process_submission_xml("draft-somebody-test", "00") + self.assertEqual(output["document_date"], None) + + TestBlobstoreManager().emptyTestBlobstores() + xml_path.write_text(re.sub(r")", r"\1 day=\2", xml_contents)) # remove month + store_str("staging", "draft-somebody-test-00.xml", re.sub(r"()", r"\1 day=\2", xml_contents), allow_overwrite=True) + output = process_submission_xml("draft-somebody-test", "00") + self.assertEqual(output["document_date"], date_today()) + + TestBlobstoreManager().emptyTestBlobstores() + xml_path.write_text(re.sub(r"", r"", xml_contents)) # remove day + store_str("staging", "draft-somebody-test-00.xml", re.sub(r"", r"", xml_contents), allow_overwrite=True) + output = process_submission_xml("draft-somebody-test", "00") + self.assertEqual(output["document_date"], date_today()) + # name mismatch + TestBlobstoreManager().emptyTestBlobstores() xml, _ = submission_file( "draft-somebody-wrong-name-00", # name that appears in the file "draft-somebody-test-00.xml", @@ -3371,10 +3080,13 @@ def test_process_submission_xml(self): title="Correct Draft Title", ) xml_path.write_text(xml.read()) + xml.seek(0) + store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True) with self.assertRaisesMessage(SubmissionError, "disagrees with submission filename"): process_submission_xml("draft-somebody-test", "00") # rev mismatch + TestBlobstoreManager().emptyTestBlobstores() xml, _ = submission_file( "draft-somebody-test-01", # name that appears in the file "draft-somebody-test-00.xml", @@ -3383,10 +3095,13 @@ def test_process_submission_xml(self): title="Correct Draft Title", ) xml_path.write_text(xml.read()) + xml.seek(0) + store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True) with self.assertRaisesMessage(SubmissionError, "disagrees with submission revision"): process_submission_xml("draft-somebody-test", "00") # missing title + TestBlobstoreManager().emptyTestBlobstores() xml, _ = submission_file( "draft-somebody-test-00", # name that appears in the file "draft-somebody-test-00.xml", @@ -3395,10 +3110,13 @@ def test_process_submission_xml(self): title="", ) xml_path.write_text(xml.read()) + xml.seek(0) + store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True) with self.assertRaisesMessage(SubmissionError, "Could not extract a valid title"): process_submission_xml("draft-somebody-test", "00") def test_process_submission_text(self): + TestBlobstoreManager().emptyTestBlobstores() txt_path = Path(settings.IDSUBMIT_STAGING_PATH) / "draft-somebody-test-00.txt" txt, _ = submission_file( "draft-somebody-test-00", @@ -3408,6 +3126,8 @@ def test_process_submission_text(self): title="Correct Draft Title", ) txt_path.write_text(txt.read()) + txt.seek(0) + store_str("staging", "draft-somebody-test-00.txt", txt.read()) output = process_submission_text("draft-somebody-test", "00") self.assertEqual(output["filename"], "draft-somebody-test") self.assertEqual(output["rev"], "00") @@ -3423,6 +3143,7 @@ def test_process_submission_text(self): self.assertIsNone(output["xml_version"]) # name mismatch + TestBlobstoreManager().emptyTestBlobstores() txt, _ = submission_file( "draft-somebody-wrong-name-00", # name that appears in the file "draft-somebody-test-00.txt", @@ -3432,11 +3153,14 @@ def test_process_submission_text(self): ) with txt_path.open('w') as fd: fd.write(txt.read()) + txt.seek(0) + store_str("staging", "draft-somebody-test-00.txt", txt.read(), allow_overwrite=True) txt.close() with self.assertRaisesMessage(SubmissionError, 'disagrees with submission filename'): process_submission_text("draft-somebody-test", "00") # rev mismatch + TestBlobstoreManager().emptyTestBlobstores() txt, _ = submission_file( "draft-somebody-test-01", # name that appears in the file "draft-somebody-test-00.txt", @@ -3446,6 +3170,8 @@ def test_process_submission_text(self): ) with txt_path.open('w') as fd: fd.write(txt.read()) + txt.seek(0) + store_str("staging", "draft-somebody-test-00.txt", txt.read(), allow_overwrite=True) txt.close() with self.assertRaisesMessage(SubmissionError, 'disagrees with submission revision'): process_submission_text("draft-somebody-test", "00") @@ -3506,162 +3232,59 @@ def test_status_of_validating_submission(self): self.assertContains(r, s.name) self.assertContains(r, 'This submission is being processed and validated.', status_code=200) - @override_settings(IDSUBMIT_MAX_VALIDATION_TIME=datetime.timedelta(minutes=30)) + @override_settings( + IDSUBMIT_MAX_VALIDATION_TIME=datetime.timedelta(minutes=30), + IDSUBMIT_EXPIRATION_AGE=datetime.timedelta(minutes=90), + ) def test_cancel_stale_submissions(self): + # these will be lists of (Submission, "state_id") pairs + submissions_to_skip = [] + submissions_to_cancel = [] + + # submissions in the validating state fresh_submission = SubmissionFactory(state_id='validating') fresh_submission.submissionevent_set.create( desc='fake created event', time=timezone.now() - datetime.timedelta(minutes=15), ) + submissions_to_skip.append((fresh_submission, "validating")) + stale_submission = SubmissionFactory(state_id='validating') stale_submission.submissionevent_set.create( desc='fake created event', time=timezone.now() - datetime.timedelta(minutes=30, seconds=1), ) + submissions_to_cancel.append((stale_submission, "validating")) + + # submissions in other states + for state in DraftSubmissionStateName.objects.filter(used=True).exclude(slug="validating"): + to_skip = SubmissionFactory(state_id=state.pk) + to_skip.submissionevent_set.create( + desc="fake created event", + time=timezone.now() - datetime.timedelta(minutes=45), # would be canceled if it were "validating" + ) + submissions_to_skip.append((to_skip, state.pk)) + to_expire = SubmissionFactory(state_id=state.pk) + to_expire.submissionevent_set.create( + desc="fake created event", + time=timezone.now() - datetime.timedelta(minutes=90, seconds=1), + ) + if state.pk in ["posted", "cancel"]: + submissions_to_skip.append((to_expire, state.pk)) # these ones should not be expired regardless of age + else: + submissions_to_cancel.append(((to_expire, state.pk))) cancel_stale_submissions() - fresh_submission = Submission.objects.get(pk=fresh_submission.pk) - self.assertEqual(fresh_submission.state_id, 'validating') - self.assertEqual(fresh_submission.submissionevent_set.count(), 1) - - stale_submission = Submission.objects.get(pk=stale_submission.pk) - self.assertEqual(stale_submission.state_id, 'cancel') - self.assertEqual(stale_submission.submissionevent_set.count(), 2) - + for _subm, original_state_id in submissions_to_skip: + subm = Submission.objects.get(pk=_subm.pk) + self.assertEqual(subm.state_id, original_state_id) + self.assertEqual(subm.submissionevent_set.count(), 1) -class ApiSubmitTests(BaseSubmitTestCase): - def setUp(self): - super().setUp() - # break early in case of missing configuration - self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY)) - MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=60)) - - def do_post_submission(self, rev, author=None, name=None, group=None, email=None, title=None, year=None): - url = urlreverse('ietf.submit.views.api_submit') - if author is None: - author = PersonFactory() - if name is None: - slug = re.sub('[^a-z0-9-]+', '', author.ascii_parts()[3].lower()) - name = 'draft-%s-foo' % slug - if email is None: - email = author.user.username - # submit - data = {} - data['xml'], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.xml', group, "test_submission.xml", author=author, email=email, title=title, year=year) - data['user'] = email - r = self.client.post(url, data) - return r, author, name - - def test_api_submit_info(self): - url = urlreverse('ietf.submit.views.api_submit') - r = self.client.get(url) - expected = "A simplified Internet-Draft submission interface, intended for automation" - self.assertContains(r, expected, status_code=200) - - def test_api_submit_bad_method(self): - url = urlreverse('ietf.submit.views.api_submit') - r = self.client.put(url) - self.assertEqual(r.status_code, 405) - - def test_api_submit_ok(self): - r, author, name = self.do_post_submission('00') - expected = "Upload of %s OK, confirmation requests sent to:\n %s" % (name, author.formatted_email().replace('\n','')) - self.assertContains(r, expected, status_code=200) - - def test_api_submit_secondary_email_active(self): - person = PersonFactory() - email = EmailFactory(person=person) - r, author, name = self.do_post_submission('00', author=person, email=email.address) - for expected in [ - "Upload of %s OK, confirmation requests sent to:" % (name, ), - author.formatted_email().replace('\n',''), - ]: - self.assertContains(r, expected, status_code=200) - - def test_api_submit_secondary_email_inactive(self): - person = PersonFactory() - prim = person.email() - prim.primary = True - prim.save() - email = EmailFactory(person=person, active=False) - r, author, name = self.do_post_submission('00', author=person, email=email.address) - expected = "No such user: %s" % email.address - self.assertContains(r, expected, status_code=400) - - def test_api_submit_no_user(self): - email='nonexistant.user@example.org' - r, author, name = self.do_post_submission('00', email=email) - expected = "No such user: %s" % email - self.assertContains(r, expected, status_code=400) - - def test_api_submit_no_person(self): - user = UserFactory() - email = user.username - r, author, name = self.do_post_submission('00', email=email) - expected = "No person with username %s" % email - self.assertContains(r, expected, status_code=400) - - def test_api_submit_wrong_revision(self): - r, author, name = self.do_post_submission('01') - expected = "Invalid revision (revision 00 is expected)" - self.assertContains(r, expected, status_code=400) - - def test_api_submit_update_existing_submissiondocevent_rev(self): - draft, _ = create_draft_submission_with_rev_mismatch(rev='01') - r, _, __ = self.do_post_submission(rev='01', name=draft.name) - expected = "Submission failed" - self.assertContains(r, expected, status_code=409) - - def test_api_submit_update_later_submissiondocevent_rev(self): - draft, _ = create_draft_submission_with_rev_mismatch(rev='02') - r, _, __ = self.do_post_submission(rev='01', name=draft.name) - expected = "Submission failed" - self.assertContains(r, expected, status_code=409) - - def test_api_submit_pending_submission(self): - r, author, name = self.do_post_submission('00') - expected = "Upload of" - self.assertContains(r, expected, status_code=200) - r, author, name = self.do_post_submission('00', author=author, name=name) - expected = "A submission with same name and revision is currently being processed" - self.assertContains(r, expected, status_code=400) - - def test_api_submit_no_title(self): - r, author, name = self.do_post_submission('00', title=" ") - expected = "Could not extract a valid title from the upload" - self.assertContains(r, expected, status_code=400) - - def test_api_submit_failed_idnits(self): - r, author, name = self.do_post_submission('00', year="2010") - expected = "Document date must be within 3 days of submission date" - self.assertContains(r, expected, status_code=400) - - def test_api_submit_keeps_extresources(self): - """API submit should not disturb doc external resources - - Tests that the submission inherits the existing doc's docextresource_set. - Relies on separate testing that Submission external_resources will be - handled appropriately. - """ - draft = WgDraftFactory() - - # add an external resource - self.assertEqual(draft.docextresource_set.count(), 0) - extres = draft.docextresource_set.create( - name_id='faq', - display_name='this is a display name', - value='https://example.com/faq-for-test.html', - ) - - r, _, __ = self.do_post_submission('01', name=draft.name) - self.assertEqual(r.status_code, 200) - # draft = Document.objects.get(pk=draft.pk) # update the draft - sub = Submission.objects.get(name=draft.name) - self.assertEqual( - [str(r) for r in sub.external_resources.all()], - [str(extres)], - ) + for _subm, _ in submissions_to_cancel: + subm = Submission.objects.get(pk=_subm.pk) + self.assertEqual(subm.state_id, "cancel") + self.assertEqual(subm.submissionevent_set.count(), 2) class RefsTests(BaseSubmitTestCase): @@ -3679,30 +3302,15 @@ def test_draft_refs_identification(self): class PostSubmissionTests(BaseSubmitTestCase): - @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md')) - def test_find_submission_filenames_rfc(self): - """Posting an RFC submission should use RFC_FILE_TYPES""" - rfc = IndividualRfcFactory() - path = Path(self.staging_dir) - for ext in ['txt', 'xml', 'pdf', 'md']: - (path / f'{rfc.name}-{rfc.rev}.{ext}').touch() - files = find_submission_filenames(rfc) - self.assertCountEqual( - files, - { - 'txt': f'{path}/{rfc.name}-{rfc.rev}.txt', - 'xml': f'{path}/{rfc.name}-{rfc.rev}.xml', - # should NOT find the pdf or md - } - ) @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md')) - def test_find_submission_filenames_draft(self): + def test_find_submission_filenames(self): """Posting an I-D submission should use IDSUBMIT_FILE_TYPES""" draft = WgDraftFactory() path = Path(self.staging_dir) for ext in ['txt', 'xml', 'pdf', 'md']: (path / f'{draft.name}-{draft.rev}.{ext}').touch() + store_str("staging", f"{draft.name}-{draft.rev}.{ext}", "") files = find_submission_filenames(draft) self.assertCountEqual( files, @@ -3762,6 +3370,7 @@ def test_validate_submission_rev(self): new_wg_doc = WgDraftFactory(rev='01', relations=[('replaces',old_wg_doc)]) path = Path(self.archive_dir) / f'{new_wg_doc.name}-{new_wg_doc.rev}.txt' path.touch() + store_str("staging", f"{new_wg_doc.name}-{new_wg_doc.rev}.txt", "") bad_revs = (None, '', '2', 'aa', '00', '01', '100', '002', u'öö') for rev in bad_revs: @@ -3790,3 +3399,133 @@ def test_submit_case_conflited_name_fails(self): files["xml"], _ = submission_file("draft-something-hascapitalletters-00", "draft-something-hascapitalletters-00.xml", None, "test_submission.xml") r = self.post_to_upload_submission(url, files) self.assertContains(r,"Case-conflicting draft name found",status_code=200) + + +class SubmissionStatusTests(BaseSubmitTestCase): + """Tests of the submission_status view + + Many tests are interspersed in the monolithic tests above. We can aspire to break these + out more modularly, though. + """ + + def test_submission_checks(self): + for state_slug in ("uploaded", "cancel", "posted"): + submission = SubmissionFactory(state_id=state_slug) + url = urlreverse( + "ietf.submit.views.submission_status", + kwargs={"submission_id": submission.pk}, + ) + # No checks + r = self.client.get(url) + self.assertContains( + r, + "No submission checks were applied to your Internet-Draft.", + status_code=200, + ) + # Inapplicable check + submission.checks.create( + checker="yang validation", passed=None, message="Yang message" + ) + r = self.client.get(url) + self.assertContains( + r, + "No submission checks were applied to your Internet-Draft.", + status_code=200, + ) + # Passed check + submission.checks.create( + checker="idnits check", passed=True, message="idnits ok" + ) + r = self.client.get(url) + self.assertContains( + r, + "Your Internet-Draft has been verified to pass the submission checks.", + status_code=200, + ) + # Failed check + passed check + submission.checks.filter(checker="yang validation").update(passed=False) + r = self.client.get(url) + self.assertContains( + r, + "Your Internet-Draft failed at least one submission check.", + status_code=200, + ) + + +class YangCheckerTests(TestCase): + @mock.patch("ietf.submit.utils.apply_yang_checker_to_draft") + def test_run_all_yang_model_checks(self, mock_apply): + active_drafts = WgDraftFactory.create_batch(3) + WgDraftFactory(states=[("draft", "expired")]) + run_all_yang_model_checks() + self.assertEqual(mock_apply.call_count, 3) + self.assertCountEqual( + [args[0][1] for args in mock_apply.call_args_list], + active_drafts, + ) + + def test_apply_yang_checker_to_draft(self): + draft = WgDraftFactory() + submission = SubmissionFactory(name=draft.name, rev=draft.rev) + submission.checks.create(checker="my-checker") + checker = mock.Mock() + checker.name = "my-checker" + checker.symbol = "X" + checker.check_file_txt.return_value = (True, "whee", None, None, {}) + apply_yang_checker_to_draft(checker, draft) + self.assertEqual(checker.check_file_txt.call_args, mock.call(draft.get_file_name())) + + +@override_settings(IDSUBMIT_REPOSITORY_PATH="/some/path/", IDSUBMIT_STAGING_PATH="/some/other/path") +class SubmissionErrorTests(TestCase): + def test_sanitize_message(self): + sanitized = SubmissionError.sanitize_message( + "This refers to /some/path/with-a-file\n" + "and also /some/other/path/with-a-different-file isn't that neat?\n" + "and has /some/path//////with-slashes" + ) + self.assertEqual( + sanitized, + "This refers to **/with-a-file\n" + "and also **/with-a-different-file isn't that neat?\n" + "and has **/with-slashes" + ) + + @mock.patch.object(SubmissionError, "sanitize_message") + def test_submissionerror(self, mock_sanitize_message): + SubmissionError() + self.assertFalse(mock_sanitize_message.called) + SubmissionError("hi", "there") + self.assertTrue(mock_sanitize_message.called) + self.assertCountEqual( + mock_sanitize_message.call_args_list, + [mock.call("hi"), mock.call("there")], + ) + + +class HelperTests(TestCase): + def test_access_token_is_valid(self): + submission: Submission = SubmissionFactory() # type: ignore + valid_token = submission.access_token() + access_key = submission.access_key # accept this for backwards compat + invalid_token = "not the valid token" + self.assertTrue(access_token_is_valid(submission, valid_token)) + self.assertTrue(access_token_is_valid(submission, access_key)) + self.assertFalse(access_token_is_valid(submission, invalid_token)) + + def test_auth_token_is_valid(self): + auth_key = generate_random_key() + submission: Submission = SubmissionFactory(auth_key = auth_key) # type: ignore + valid_token = generate_access_token(submission.auth_key) + auth_key = submission.auth_key # accept this for backwards compat + invalid_token = "not the valid token" + self.assertTrue(auth_token_is_valid(submission, valid_token)) + self.assertTrue(auth_token_is_valid(submission, auth_key)) + self.assertFalse(auth_token_is_valid(submission, invalid_token)) + + submission.auth_key = "" + submission.save() + self.assertFalse(auth_token_is_valid(submission, valid_token)) + self.assertFalse(auth_token_is_valid(submission, auth_key)) + self.assertFalse(auth_token_is_valid(submission, invalid_token)) + self.assertFalse(auth_token_is_valid(submission, "")) diff --git a/ietf/submit/urls.py b/ietf/submit/urls.py index 2309ec55cdf..4f53103c2c9 100644 --- a/ietf/submit/urls.py +++ b/ietf/submit/urls.py @@ -17,15 +17,6 @@ url(r'^approvals/cancelpreapproval/(?P[a-f\d]+)/$', views.cancel_preapproval), url(r'^manualpost/$', views.manualpost), - url(r'^manualpost/addemail$', views.add_manualpost_email), - url(r'^manualpost/addemail/(?P\d+)/(?P[a-f\d]*)/$', views.add_manualpost_email), - url(r'^manualpost/attachment/(?P\d+)/(?P\d+)/(?P.*)$', views.show_submission_email_attachment), - url(r'^manualpost/cancel$', views.cancel_waiting_for_draft), - url(r'^manualpost/email/(?P\d+)/(?P\d+)/$', views.show_submission_email_message), - url(r'^manualpost/email/(?P\d+)/(?P\d+)/(?P[a-f\d]*)/$', views.show_submission_email_message), - url(r'^manualpost/replyemail/(?P\d+)/(?P\d+)/$', views.send_submission_email), - url(r'^manualpost/sendemail/(?P\d+)/$', views.send_submission_email), - # proof-of-concept for celery async tasks url(r'^async-poke/?$', views.async_poke_test), -] \ No newline at end of file +] diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py index 3f12e50c5ec..a0c7dd8511e 100644 --- a/ietf/submit/utils.py +++ b/ietf/submit/utils.py @@ -4,15 +4,22 @@ import datetime import io +import json import os import pathlib import re +import subprocess +import sys import time import traceback import xml2rfc +from pathlib import Path +from shutil import move from typing import Optional, Union # pyflakes:ignore from unidecode import unidecode +from xml2rfc import RfcWriterError +from xym import xym from django.conf import settings from django.core.exceptions import ValidationError @@ -25,10 +32,11 @@ import debug # pyflakes:ignore -from ietf.doc.models import ( Document, State, DocAlias, DocEvent, SubmissionDocEvent, +from ietf.doc.models import ( Document, State, DocEvent, SubmissionDocEvent, DocumentAuthor, AddedMessageEvent ) from ietf.doc.models import NewRevisionDocEvent from ietf.doc.models import RelatedDocument, DocRelationshipName, DocExtResource +from ietf.doc.storage_utils import remove_from_storage, retrieve_bytes, store_bytes, store_file, store_str from ietf.doc.utils import (add_state_change_event, rebuild_reference_relations, set_replaces_for_document, prettify_std_name, update_doc_extresources, can_edit_docextresources, update_documentauthors, update_action_holders, @@ -41,6 +49,7 @@ from ietf.community.utils import update_name_contains_indexes_with_new_doc from ietf.submit.mail import ( announce_to_lists, announce_new_version, announce_to_authors, send_approval_request, send_submission_confirmation, announce_new_wg_00, send_manual_post_request ) +from ietf.submit.checkers import DraftYangChecker from ietf.submit.models import ( Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName, SubmissionCheck, SubmissionExtResource ) from ietf.utils import log @@ -49,7 +58,7 @@ from ietf.utils.mail import is_valid_email from ietf.utils.text import parse_unicode, normalize_text from ietf.utils.timezone import date_today -from ietf.utils.xmldraft import XMLDraft +from ietf.utils.xmldraft import InvalidMetadataError, XMLDraft, capture_xml2rfc_output from ietf.person.name import unidecode_name @@ -165,7 +174,10 @@ def validate_submission_rev(name, rev): if rev != expected: return 'Invalid revision (revision %02d is expected)' % expected - + + # This is not really correct, though the edges that it doesn't cover are not likely. + # It might be better just to look in the combined archive to make sure we're not colliding with + # a thing that exists there already because it was included from an approved personal collection. for dirname in [settings.INTERNET_DRAFT_PATH, settings.INTERNET_DRAFT_ARCHIVE_DIR, ]: dir = pathlib.Path(dirname) pattern = '%s-%02d.*' % (name, rev) @@ -287,7 +299,7 @@ def find_submission_filenames(draft): """ path = pathlib.Path(settings.IDSUBMIT_STAGING_PATH) stem = f'{draft.name}-{draft.rev}' - allowed_types = settings.RFC_FILE_TYPES if draft.get_state_slug() == 'rfc' else settings.IDSUBMIT_FILE_TYPES + allowed_types = settings.IDSUBMIT_FILE_TYPES candidates = {ext: path / f'{stem}.{ext}' for ext in allowed_types} return {ext: str(filename) for ext, filename in candidates.items() if filename.exists()} @@ -375,10 +387,6 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc): events.append(e) log.log(f"{submission.name}: created doc events") - # update related objects - alias, __ = DocAlias.objects.get_or_create(name=submission.name) - alias.docs.add(draft) - draft.set_state(State.objects.get(used=True, type="draft", slug="active")) update_authors(draft, submission) @@ -448,6 +456,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc): from ietf.doc.expire import move_draft_files_to_archive move_draft_files_to_archive(draft, prev_rev) + submission.draft = draft move_files_to_repository(submission) submission.state = DraftSubmissionStateName.objects.get(slug="posted") log.log(f"{submission.name}: moved files") @@ -481,7 +490,6 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc): if new_possibly_replaces: send_review_possibly_replaces_request(request, draft, submitter_info) - submission.draft = draft submission.save() create_submission_event(request, submission, approved_subm_desc) @@ -491,6 +499,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc): ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (draft.name, draft.rev )) with io.open(ref_rev_file_name, "w", encoding='utf-8') as f: f.write(ref_text) + store_str("bibxml-ids", f"reference.I-D.{draft.name}-{draft.rev}.txt", ref_text) # TODO-BLOBSTORE verify with test log.log(f"{submission.name}: done") @@ -504,7 +513,7 @@ def update_replaces_from_submission(request, submission, draft): if request.user.is_authenticated: is_chair_of = list(Group.objects.filter(role__person__user=request.user, role__name="chair")) - replaces = DocAlias.objects.filter(name__in=submission.replaces.split(",")).prefetch_related("docs", "docs__group") + replaces = Document.objects.filter(name__in=submission.replaces.split(",")).prefetch_related("group") existing_replaces = list(draft.related_that_doc("replaces")) existing_suggested = set(draft.related_that_doc("possibly-replaces")) @@ -516,14 +525,12 @@ def update_replaces_from_submission(request, submission, draft): if r in existing_replaces: continue - rdoc = r.document - - if rdoc == draft: + if r == draft: continue if (is_secretariat - or (draft.group in is_chair_of and (rdoc.group.type_id == "individ" or rdoc.group in is_chair_of)) - or (submitter_email and rdoc.documentauthor_set.filter(email__address__iexact=submitter_email).exists())): + or (draft.group in is_chair_of and (r.group.type_id == "individ" or r.group in is_chair_of)) + or (submitter_email and r.documentauthor_set.filter(email__address__iexact=submitter_email).exists())): approved.append(r) else: if r not in existing_suggested: @@ -639,40 +646,51 @@ def cancel_submission(submission): submission.save() remove_submission_files(submission) + def rename_submission_files(submission, prev_rev, new_rev): + log.unreachable("2025-2-19") for ext in settings.IDSUBMIT_FILE_TYPES: - source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, prev_rev, ext)) - dest = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, new_rev, ext)) - if os.path.exists(source): - os.rename(source, dest) + staging_path = Path(settings.IDSUBMIT_STAGING_PATH) + source = staging_path / f"{submission.name}-{prev_rev}.{ext}" + dest = staging_path / f"{submission.name}-{new_rev}.{ext}" + if source.exists(): + move(source, dest) + def move_files_to_repository(submission): for ext in settings.IDSUBMIT_FILE_TYPES: - source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext)) - dest = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext)) - if os.path.exists(source): - os.rename(source, dest) - else: - if os.path.exists(dest): - log.log("Intended to move '%s' to '%s', but found source missing while destination exists.") - elif ext in submission.file_types.split(','): - raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.") - - -def remove_staging_files(name, rev, exts=None): - """Remove staging files corresponding to a submission - - exts is a list of extensions to be removed. If None, defaults to settings.IDSUBMIT_FILE_TYPES. - """ - if exts is None: - exts = [f'.{ext}' for ext in settings.IDSUBMIT_FILE_TYPES] + fname = f"{submission.name}-{submission.rev}.{ext}" + source = Path(settings.IDSUBMIT_STAGING_PATH) / fname + dest = Path(settings.IDSUBMIT_REPOSITORY_PATH) / fname + if source.exists(): + move(source, dest) + all_archive_dest = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / dest.name + ftp_dest = Path(settings.FTP_DIR) / "internet-drafts" / dest.name + os.link(dest, all_archive_dest) + os.link(dest, ftp_dest) + # Shadow what's happening to the fs in the blobstores. When the stores become + # authoritative, the source and dest checks will need to apply to the stores instead. + content_bytes = retrieve_bytes("staging", fname) + store_bytes("active-draft", f"{ext}/{fname}", content_bytes) + submission.draft.store_bytes(f"{ext}/{fname}", content_bytes) + remove_from_storage("staging", fname) + elif dest.exists(): + log.log("Intended to move '%s' to '%s', but found source missing while destination exists.") + elif f".{ext}" in submission.file_types.split(','): + raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.") + + +def remove_staging_files(name, rev): + """Remove staging files corresponding to a submission""" basename = pathlib.Path(settings.IDSUBMIT_STAGING_PATH) / f'{name}-{rev}' + exts = [f'.{ext}' for ext in settings.IDSUBMIT_FILE_TYPES] for ext in exts: basename.with_suffix(ext).unlink(missing_ok=True) + remove_from_storage("staging", basename.with_suffix(ext).name, warn_if_missing=False) def remove_submission_files(submission): - remove_staging_files(submission.name, submission.rev, submission.file_types.split(',')) + remove_staging_files(submission.name, submission.rev) def approvable_submissions_for_user(user): @@ -757,72 +775,10 @@ def save_files(form): for chunk in f.chunks(): destination.write(chunk) log.log("saved file %s" % name) + f.seek(0) + store_file("staging", f"{form.filename}-{form.revision}.{ext}", f) return file_name -def get_draft_meta(form, saved_files): - authors = [] - file_name = saved_files - - if form.cleaned_data['xml']: - # Some meta-information, such as the page-count, can only - # be retrieved from the generated text file. Provide a - # parsed draft object to get at that kind of information. - file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (form.filename, form.revision)) - file_size = os.stat(file_name['txt']).st_size - with io.open(file_name['txt']) as txt_file: - form.parsed_draft = PlaintextDraft(txt_file.read(), txt_file.name) - else: - file_size = form.cleaned_data['txt'].size - - if form.authors: - authors = form.authors - else: - # If we don't have an xml file, try to extract the - # relevant information from the text file - for author in form.parsed_draft.get_author_list(): - full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author - - name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip() - - if email: - try: - validate_email(email) - except ValidationError: - email = "" - - def turn_into_unicode(s): - if s is None: - return "" - - if isinstance(s, str): - return s - else: - try: - return s.decode("utf-8") - except UnicodeDecodeError: - try: - return s.decode("latin-1") - except UnicodeDecodeError: - return "" - - name = turn_into_unicode(name) - email = turn_into_unicode(email) - company = turn_into_unicode(company) - - authors.append({ - "name": name, - "email": email, - "affiliation": company, - "country": country - }) - - if form.abstract: - abstract = form.abstract - else: - abstract = form.parsed_draft.get_abstract() - - return authors, abstract, file_name, file_size - def get_submission(form): # See if there is a Submission in state waiting-for-draft @@ -908,8 +864,51 @@ def accept_submission_requires_group_approval(submission): class SubmissionError(Exception): - """Exception for errors during submission processing""" - pass + """Exception for errors during submission processing + + Sanitizes paths appearing in exception messages. + """ + def __init__(self, *args): + if len(args) > 0: + args = (self.sanitize_message(arg) for arg in args) + super().__init__(*args) + + @staticmethod + def sanitize_message(msg): + # Paths likely to appear in submission-related errors + paths = [ + p for p in ( + getattr(settings, "ALL_ID_DOWNLOAD_DIR", None), + getattr(settings, "BIBXML_BASE_PATH", None), + getattr(settings, "DERIVED_DIR", None), + getattr(settings, "FTP_DIR", None), + getattr(settings, "IDSUBMIT_REPOSITORY_PATH", None), + getattr(settings, "IDSUBMIT_STAGING_PATH", None), + getattr(settings, "INTERNET_ALL_DRAFTS_ARCHIVE_DIR", None), + getattr(settings, "INTERNET_DRAFT_PATH", None), + getattr(settings, "INTERNET_DRAFT_ARCHIVE_DIR", None), + getattr(settings, "INTERNET_DRAFT_PDF_PATH", None), + getattr(settings, "RFC_PATH", None), + getattr(settings, "SUBMIT_YANG_CATALOG_MODEL_DIR", None), + getattr(settings, "SUBMIT_YANG_DRAFT_MODEL_DIR", None), + getattr(settings, "SUBMIT_YANG_IANA_MODEL_DIR", None), + getattr(settings, "SUBMIT_YANG_RFC_MODEL_DIR", None), + "/tmp/", + ) if p is not None + ] + return re.sub(fr"({'|'.join(paths)})/*", "**/", msg) + + +class XmlRfcError(SubmissionError): + """SubmissionError caused by xml2rfc + + Includes the output from xml2rfc, if any, in xml2rfc_stdout / xml2rfc_stderr + """ + def __init__(self, *args, xml2rfc_stdout: str, xml2rfc_stderr: str): + super().__init__(*args) + self.xml2rfc_stderr = xml2rfc_stderr + self.xml2rfc_stdout = xml2rfc_stdout + class InconsistentRevisionError(SubmissionError): """SubmissionError caused by an inconsistent revision""" @@ -927,55 +926,103 @@ def render_missing_formats(submission): If a txt file already exists, leaves it in place. Overwrites an existing html file if there is one. """ - xml2rfc.log.write_out = io.StringIO() # open(os.devnull, "w") - xml2rfc.log.write_err = io.StringIO() # open(os.devnull, "w") - xml_path = staging_path(submission.name, submission.rev, '.xml') - parser = xml2rfc.XmlRfcParser(str(xml_path), quiet=True) - # --- Parse the xml --- - xmltree = parser.parse(remove_comments=False) - # If we have v2, run it through v2v3. Keep track of the submitted version, though. - xmlroot = xmltree.getroot() - xml_version = xmlroot.get('version', '2') - if xml_version == '2': - v2v3 = xml2rfc.V2v3XmlWriter(xmltree) - xmltree.tree = v2v3.convert2to3() - - # --- Prep the xml --- - prep = xml2rfc.PrepToolWriter(xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET]) - prep.options.accept_prepped = True - xmltree.tree = prep.prep() - if xmltree.tree == None: - raise SubmissionError(f'Error from xml2rfc (prep): {prep.errors}') - - # --- Convert to txt --- - txt_path = staging_path(submission.name, submission.rev, '.txt') - if not txt_path.exists(): - writer = xml2rfc.TextWriter(xmltree, quiet=True) - writer.options.accept_prepped = True - writer.write(txt_path) + with capture_xml2rfc_output() as xml2rfc_logs: + xml_path = staging_path(submission.name, submission.rev, '.xml') + parser = xml2rfc.XmlRfcParser(str(xml_path), quiet=True) + try: + # --- Parse the xml --- + xmltree = parser.parse(remove_comments=False) + except Exception as err: + raise XmlRfcError( + "Error parsing XML", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) from err + # If we have v2, run it through v2v3. Keep track of the submitted version, though. + xmlroot = xmltree.getroot() + xml_version = xmlroot.get('version', '2') + if xml_version == '2': + v2v3 = xml2rfc.V2v3XmlWriter(xmltree) + try: + xmltree.tree = v2v3.convert2to3() + except Exception as err: + raise XmlRfcError( + "Error converting v2 XML to v3", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) from err + + # --- Prep the xml --- + today = date_today() + prep = xml2rfc.PrepToolWriter(xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET]) + prep.options.accept_prepped = True + prep.options.date = today + try: + xmltree.tree = prep.prep() + except RfcWriterError: + raise XmlRfcError( + f"Error during xml2rfc prep: {prep.errors}", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) + except Exception as err: + raise XmlRfcError( + "Unexpected error during xml2rfc prep", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) from err + + # --- Convert to txt --- + txt_path = staging_path(submission.name, submission.rev, '.txt') + if not txt_path.exists(): + writer = xml2rfc.TextWriter(xmltree, quiet=True) + writer.options.accept_prepped = True + writer.options.date = today + try: + writer.write(txt_path) + except Exception as err: + raise XmlRfcError( + "Error generating text format from XML", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) from err + log.log( + 'In %s: xml2rfc %s generated %s from %s (version %s)' % ( + str(xml_path.parent), + xml2rfc.__version__, + txt_path.name, + xml_path.name, + xml_version, + ) + ) + # When the blobstores become autoritative - the guard at the + # containing if statement needs to be based on the store + with Path(txt_path).open("rb") as f: + store_file("staging", f"{submission.name}-{submission.rev}.txt", f) + + # --- Convert to html --- + html_path = staging_path(submission.name, submission.rev, '.html') + writer = xml2rfc.HtmlWriter(xmltree, quiet=True) + writer.options.date = today + try: + writer.write(str(html_path)) + except Exception as err: + raise XmlRfcError( + "Error generating HTML format from XML", + xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(), + xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(), + ) from err log.log( 'In %s: xml2rfc %s generated %s from %s (version %s)' % ( str(xml_path.parent), xml2rfc.__version__, - txt_path.name, + html_path.name, xml_path.name, xml_version, ) ) - - # --- Convert to html --- - html_path = staging_path(submission.name, submission.rev, '.html') - writer = xml2rfc.HtmlWriter(xmltree, quiet=True) - writer.write(str(html_path)) - log.log( - 'In %s: xml2rfc %s generated %s from %s (version %s)' % ( - str(xml_path.parent), - xml2rfc.__version__, - html_path.name, - xml_path.name, - xml_version, - ) - ) + with Path(html_path).open("rb") as f: + store_file("staging", f"{submission.name}-{submission.rev}.html", f) def accept_submission(submission: Submission, request: Optional[HttpRequest] = None, autopost=False): @@ -998,7 +1045,7 @@ def accept_submission(submission: Submission, request: Optional[HttpRequest] = N docevent_from_submission(submission, desc="Uploaded new revision", who=requester if requester_is_author else None) - replaces = DocAlias.objects.filter(name__in=submission.replaces_names) + replaces = Document.objects.filter(name__in=submission.replaces_names) pretty_replaces = '(none)' if not replaces else ( ', '.join(prettify_std_name(r.name) for r in replaces) ) @@ -1150,6 +1197,11 @@ def process_submission_xml(filename, revision): if not title: raise SubmissionError("Could not extract a valid title from the XML") + try: + document_date = xml_draft.get_creation_date() + except InvalidMetadataError as err: + raise SubmissionError(str(err)) from err + return { "filename": xml_draft.filename, "rev": xml_draft.revision, @@ -1159,7 +1211,7 @@ def process_submission_xml(filename, revision): for auth in xml_draft.get_author_list() ], "abstract": None, # not supported from XML - "document_date": None, # not supported from XML + "document_date": document_date, "pages": None, # not supported from XML "words": None, # not supported from XML "first_two_pages": None, # not supported from XML @@ -1172,8 +1224,7 @@ def process_submission_xml(filename, revision): def _turn_into_unicode(s: Optional[Union[str, bytes]]): """Decode a possibly null string-like item as a string - Copied from ietf.submit.utils.get_draft_meta(), would be nice to - ditch this. + Would be nice to ditch this. """ if s is None: return "" @@ -1213,13 +1264,11 @@ def process_submission_text(filename, revision): f"Text Internet-Draft revision ({text_draft.revision}) " f"disagrees with submission revision ({revision})" ) - title = _normalize_title(text_draft.get_title()) - if not title: - # This test doesn't work well - the text_draft parser tends to grab "Abstract" as - # the title if there's an empty title. - raise SubmissionError("Could not extract a title from the text") + title = text_draft.get_title() + if title: + title = _normalize_title(title) - # Drops \r, \n, <, >. Based on get_draft_meta() behavior + # Translation taable drops \r, \n, <, >. trans_table = str.maketrans("", "", "\r\n<>") authors = [ { @@ -1233,7 +1282,7 @@ def process_submission_text(filename, revision): return { "filename": text_draft.filename, "rev": text_draft.revision, - "title": _normalize_title(text_draft.get_title()), + "title": title, "authors": authors, "abstract": text_draft.get_abstract(), "document_date": text_draft.get_creation_date(), @@ -1251,7 +1300,7 @@ def process_submission_text(filename, revision): def process_and_validate_submission(submission): """Process and validate a submission - Raises SubmissionError if an error is encountered. + Raises SubmissionError or a subclass if an error is encountered. """ if len(set(submission.file_types.split(",")).intersection({".xml", ".txt"})) == 0: raise SubmissionError("Require XML and/or text format to process an Internet-Draft submission.") @@ -1261,11 +1310,24 @@ def process_and_validate_submission(submission): # Parse XML first, if we have it if ".xml" in submission.file_types: xml_metadata = process_submission_xml(submission.name, submission.rev) - render_missing_formats(submission) # makes HTML and text, unless text was uploaded + try: + render_missing_formats(submission) # makes HTML and text, unless text was uploaded + except XmlRfcError as err: + # log stdio/stderr + log.log( + f"xml2rfc failure when rendering missing formats for {submission.name}-{submission.rev}:\n" + f">> stdout:\n{err.xml2rfc_stdout}\n" + f">> stderr:\n{err.xml2rfc_stderr}" + ) + raise # Parse text, whether uploaded or generated from XML text_metadata = process_submission_text(submission.name, submission.rev) - if xml_metadata and xml_metadata["title"] != text_metadata["title"]: + if ( + ".txt" in submission.file_types + and xml_metadata + and xml_metadata["title"] != text_metadata["title"] + ): raise SubmissionError( f"Text Internet-Draft title ({text_metadata['title']}) " f"disagrees with XML Internet-Draft title ({xml_metadata['title']})" @@ -1275,15 +1337,24 @@ def process_and_validate_submission(submission): if xml_metadata is not None: # Items preferred / only available from XML submission.xml_version = xml_metadata["xml_version"] + submission.title = xml_metadata["title"] or "" submission.authors = xml_metadata["authors"] else: # Items to get from text only if XML not available + submission.title = text_metadata["title"] or "" submission.authors = text_metadata["authors"] + if not submission.title: + raise SubmissionError("Could not determine the title of the draft") + + # Items to get from text only when not available from XML + if xml_metadata and xml_metadata.get("document_date", None) is not None: + submission.document_date = xml_metadata["document_date"] + else: + submission.document_date = text_metadata["document_date"] + # Items always to get from text, even when XML is available - submission.title = text_metadata["title"] # verified above this agrees with XML, if present submission.abstract = text_metadata["abstract"] - submission.document_date = text_metadata["document_date"] submission.pages = text_metadata["pages"] submission.words = text_metadata["words"] submission.first_two_pages = text_metadata["first_two_pages"] @@ -1307,11 +1378,12 @@ def process_and_validate_submission(submission): raise SubmissionError('Checks failed: ' + ' / '.join(errors)) except SubmissionError: raise # pass SubmissionErrors up the stack - except Exception: + except Exception as err: + # (this is a good point to just `raise err` when diagnosing Submission test failures) # convert other exceptions into SubmissionErrors log.log(f'Unexpected exception while processing submission {submission.pk}.') log.log(traceback.format_exc()) - raise SubmissionError('A system error occurred while processing the submission.') + raise SubmissionError('A system error occurred while processing the submission.') from err def submitter_is_author(submission): @@ -1357,6 +1429,7 @@ def process_and_accept_uploaded_submission(submission): try: process_and_validate_submission(submission) except SubmissionError as err: + submission.refresh_from_db() # guard against incomplete changes in submission validation / processing cancel_submission(submission) # changes Submission.state create_submission_event(None, submission, f"Submission rejected: {err}") return @@ -1396,14 +1469,152 @@ def process_uploaded_submission(submission): try: process_and_validate_submission(submission) except InconsistentRevisionError as consistency_error: + submission.refresh_from_db() # guard against incomplete changes in submission validation / processing submission.state_id = "manual" submission.save() create_submission_event(None, submission, desc="Uploaded submission (diverted to manual process)") send_manual_post_request(None, submission, errors=dict(consistency=str(consistency_error))) except SubmissionError as err: + # something generic went wrong + submission.refresh_from_db() # guard against incomplete changes in submission validation / processing cancel_submission(submission) # changes Submission.state create_submission_event(None, submission, f"Submission rejected: {err}") else: submission.state_id = "uploaded" submission.save() create_submission_event(None, submission, desc="Completed submission validation checks") + + +def apply_yang_checker_to_draft(checker, draft): + submission = Submission.objects.filter(name=draft.name, rev=draft.rev).order_by('-id').first() + if submission: + check = submission.checks.filter(checker=checker.name).order_by('-id').first() + if check: + result = checker.check_file_txt(draft.get_file_name()) + passed, message, errors, warnings, items = result + items = json.loads(json.dumps(items)) + new_res = (passed, errors, warnings, message) + old_res = (check.passed, check.errors, check.warnings, check.message) if check else () + if new_res != old_res: + log.log(f"Saving new yang checker results for {draft.name}-{draft.rev}") + qs = submission.checks.filter(checker=checker.name).order_by('time') + submission.checks.filter(checker=checker.name).exclude(pk=qs.first().pk).delete() + submission.checks.create(submission=submission, checker=checker.name, passed=passed, + message=message, errors=errors, warnings=warnings, items=items, + symbol=checker.symbol) + else: + log.log(f"Could not run yang checker for {draft.name}-{draft.rev}: missing submission object") + + +def run_all_yang_model_checks(): + checker = DraftYangChecker() + for draft in Document.objects.filter( + type_id="draft", + states=State.objects.get(type="draft", slug="active"), + ): + apply_yang_checker_to_draft(checker, draft) + + +def populate_yang_model_dirs(): + """Update the yang model dirs + + * All yang modules from published RFCs should be extracted and be + available in an rfc-yang repository. + + * All valid yang modules from active, not replaced, Internet-Drafts + should be extracted and be available in a draft-valid-yang repository. + + * All, valid and invalid, yang modules from active, not replaced, + Internet-Drafts should be available in a draft-all-yang repository. + (Actually, given precedence ordering, it would be enough to place + non-validating modules in a draft-invalid-yang repository instead). + + * In all cases, example modules should be excluded. + + * Precedence is established by the search order of the repository as + provided to pyang. + + * As drafts expire, models should be removed in order to catch cases + where a module being worked on depends on one which has slipped out + of the work queue. + + """ + def extract_from(file, dir, strict=True): + saved_stdout = sys.stdout + saved_stderr = sys.stderr + xymerr = io.StringIO() + xymout = io.StringIO() + sys.stderr = xymerr + sys.stdout = xymout + model_list = [] + try: + model_list = xym.xym(str(file), str(file.parent), str(dir), strict=strict, debug_level=-2) + for name in model_list: + modfile = moddir / name + mtime = file.stat().st_mtime + os.utime(str(modfile), (mtime, mtime)) + if '"' in name: + name = name.replace('"', '') + modfile.rename(str(moddir / name)) + model_list = [n.replace('"', '') for n in model_list] + except Exception as e: + log.log("Error when extracting from %s: %s" % (file, str(e))) + finally: + sys.stdout = saved_stdout + sys.stderr = saved_stderr + return model_list + + # Extract from new RFCs + + rfcdir = Path(settings.RFC_PATH) + + moddir = Path(settings.SUBMIT_YANG_RFC_MODEL_DIR) + if not moddir.exists(): + moddir.mkdir(parents=True) + + latest = 0 + for item in moddir.iterdir(): + if item.stat().st_mtime > latest: + latest = item.stat().st_mtime + + log.log(f"Extracting RFC Yang models to {moddir} ...") + for item in rfcdir.iterdir(): + if item.is_file() and item.name.startswith('rfc') and item.name.endswith('.txt') and item.name[3:-4].isdigit(): + if item.stat().st_mtime > latest: + model_list = extract_from(item, moddir) + for name in model_list: + if not (name.startswith('ietf') or name.startswith('iana')): + modfile = moddir / name + modfile.unlink() + + # Extract valid modules from drafts + + six_months_ago = time.time() - 6 * 31 * 24 * 60 * 60 + + def active(dirent): + return dirent.stat().st_mtime > six_months_ago + + draftdir = Path(settings.INTERNET_DRAFT_PATH) + moddir = Path(settings.SUBMIT_YANG_DRAFT_MODEL_DIR) + if not moddir.exists(): + moddir.mkdir(parents=True) + log.log(f"Emptying {moddir} ...") + for item in moddir.iterdir(): + item.unlink() + + log.log(f"Extracting draft Yang models to {moddir} ...") + for item in draftdir.iterdir(): + try: + if item.is_file() and item.name.startswith('draft') and item.name.endswith('.txt') and active(item): + model_list = extract_from(item, moddir, strict=False) + for name in model_list: + if name.startswith('example'): + modfile = moddir / name + modfile.unlink() + except UnicodeDecodeError as e: + log.log(f"Error processing {item.name}: {e}") + + ftp_moddir = Path(settings.FTP_DIR) / "yang" / "draftmod/" + if not moddir.endswith("/"): + moddir += "/" + subprocess.call(("/usr/bin/rsync", "-aq", "--delete", moddir, ftp_moddir)) diff --git a/ietf/submit/views.py b/ietf/submit/views.py index c2fef14ba01..8329a312bb7 100644 --- a/ietf/submit/views.py +++ b/ietf/submit/views.py @@ -1,10 +1,8 @@ # Copyright The IETF Trust 2011-2020, All Rights Reserved # -*- coding: utf-8 -*- - - import re -import base64 import datetime +from secrets import compare_digest from typing import Optional, cast # pyflakes:ignore from urllib.parse import urljoin @@ -22,31 +20,58 @@ import debug # pyflakes:ignore -from ietf.doc.models import Document, DocAlias, AddedMessageEvent +from ietf.doc.models import Document from ietf.doc.forms import ExtResourceForm from ietf.group.models import Group from ietf.group.utils import group_features_group_filter from ietf.ietfauth.utils import has_role, role_required from ietf.mailtrigger.utils import gather_address_lists -from ietf.message.models import Message, MessageAttachment from ietf.person.models import Email -from ietf.submit.forms import (SubmissionAutoUploadForm, AuthorForm, SubmitterForm, EditSubmissionForm, - PreapprovalForm, ReplacesForm, SubmissionEmailForm, MessageModelForm, - DeprecatedSubmissionAutoUploadForm, SubmissionManualUploadForm) -from ietf.submit.mail import send_full_url, send_manual_post_request, add_submission_email, get_reply_to -from ietf.submit.models import (Submission, Preapproval, SubmissionExtResource, - DraftSubmissionStateName, SubmissionEmailEvent ) -from ietf.submit.tasks import process_uploaded_submission_task, process_and_accept_uploaded_submission_task, poke -from ietf.submit.utils import ( approvable_submissions_for_user, preapprovals_for_user, - recently_approved_by_user, validate_submission, create_submission_event, docevent_from_submission, - post_submission, cancel_submission, rename_submission_files, remove_submission_files, get_draft_meta, - get_submission, fill_in_submission, apply_checkers, save_files, clear_existing_files, - check_submission_revision_consistency, accept_submission, accept_submission_requires_group_approval, - accept_submission_requires_prev_auth_approval, update_submission_external_resources, remote_ip ) +from ietf.submit.forms import ( + SubmissionAutoUploadForm, + AuthorForm, + SubmitterForm, + EditSubmissionForm, + PreapprovalForm, + ReplacesForm, + SubmissionManualUploadForm, + SubmissionSearchForm, +) +from ietf.submit.mail import send_full_url, send_manual_post_request +from ietf.submit.models import ( + Submission, + Preapproval, + SubmissionExtResource, + DraftSubmissionStateName, +) +from ietf.submit.tasks import ( + process_uploaded_submission_task, + process_and_accept_uploaded_submission_task, + poke, +) +from ietf.submit.utils import ( + approvable_submissions_for_user, + preapprovals_for_user, + recently_approved_by_user, + validate_submission, + create_submission_event, + docevent_from_submission, + post_submission, + cancel_submission, + rename_submission_files, + remove_submission_files, + get_submission, + save_files, + clear_existing_files, + accept_submission, + accept_submission_requires_group_approval, + accept_submission_requires_prev_auth_approval, + update_submission_external_resources, +) from ietf.stats.utils import clean_country_name from ietf.utils.accesstoken import generate_access_token from ietf.utils.log import log -from ietf.utils.mail import parseaddr, send_mail_message +from ietf.utils.mail import parseaddr from ietf.utils.response import permission_denied from ietf.utils.timezone import date_today @@ -66,7 +91,8 @@ def upload_submission(request): clear_existing_files(form) save_files(form) create_submission_event(request, submission, desc="Uploaded submission") - # Wrap in on_commit so the delayed task cannot start until the view is done with the DB + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) transaction.on_commit( lambda: process_uploaded_submission_task.delay(submission.pk) ) @@ -142,7 +168,8 @@ def err(code, error, messages=None): save_files(form) create_submission_event(request, submission, desc="Uploaded submission through API") - # Wrap in on_commit so the delayed task cannot start until the view is done with the DB + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) transaction.on_commit( lambda: process_and_accept_uploaded_submission_task.delay(submission.pk) ) @@ -183,141 +210,102 @@ def api_submission_status(request, submission_id): { 'id': str(submission.pk), 'state': submission.state.slug, + 'state_desc': submission.state.name, } ) @csrf_exempt -def api_submit(request): - "Automated submission entrypoint" - submission = None - def err(code, text): - return HttpResponse(text, status=code, content_type='text/plain') - - if request.method == 'GET': - return render(request, 'submit/api_submit_info.html') - elif request.method == 'POST': - exception = None - try: - form = DeprecatedSubmissionAutoUploadForm(request, data=request.POST, files=request.FILES) - if form.is_valid(): - log('got valid submission form for %s' % form.filename) - username = form.cleaned_data['user'] - user = User.objects.filter(username__iexact=username) - if user.count() == 0: - # See if a secondary login was being used - email = Email.objects.filter(address=username, active=True) - # The error messages don't talk about 'email', as the field we're - # looking at is still the 'username' field. - if email.count() == 0: - return err(400, "No such user: %s" % username) - elif email.count() > 1: - return err(500, "Multiple matching accounts for %s" % username) - email = email.first() - if not hasattr(email, 'person'): - return err(400, "No person matches %s" % username) - person = email.person - if not hasattr(person, 'user'): - return err(400, "No user matches: %s" % username) - user = person.user - elif user.count() > 1: - return err(500, "Multiple matching accounts for %s" % username) - else: - user = user.first() - if not hasattr(user, 'person'): - return err(400, "No person with username %s" % username) - - saved_files = save_files(form) - authors, abstract, file_name, file_size = get_draft_meta(form, saved_files) - for a in authors: - if not a['email']: - raise ValidationError("Missing email address for author %s" % a) +def api_submit_tombstone(request): + """Tombstone for removed automated submission entrypoint""" + return render( + request, + 'submit/api_submit_info.html', + status=410, # Gone + ) - submission = get_submission(form) - fill_in_submission(form, submission, authors, abstract, file_size) - apply_checkers(submission, file_name) - create_submission_event(request, submission, desc="Uploaded submission") +def tool_instructions(request): + return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'}) - errors = validate_submission(submission) - if errors: - raise ValidationError(errors) - # must do this after validate_submission() or data needed for check may be invalid - if check_submission_revision_consistency(submission): - return err( 409, "Submission failed due to a document revision inconsistency error " - "in the database. Please contact the secretariat for assistance.") +def search_submission(request): + if request.method == "POST": + form = SubmissionSearchForm(request.POST) + if form.is_valid(): + name = form.cleaned_data["name"] + submission = Submission.objects.filter(name=name).order_by("-pk").first() + if submission: + return redirect(submission_status, submission_id=submission.pk) + else: + if re.search(r"-\d\d$", name): + submission = ( + Submission.objects.filter(name=name[:-3]) + .order_by("-pk") + .first() + ) + if submission: + return redirect(submission_status, submission_id=submission.pk) + form.add_error(None, f"No valid submission found for {name}") + else: + form = SubmissionSearchForm() + return render( + request, + "submit/search_submission.html", + {"selected": "status", "form": form}, + ) - errors = [ c.message for c in submission.checks.all() if c.passed==False ] - if errors: - raise ValidationError(errors) - if not username.lower() in [ a['email'].lower() for a in authors ]: - raise ValidationError('Submitter %s is not one of the document authors' % user.username) +def access_token_is_valid(submission: Submission, access_token: str): + """Check whether access_token is valid for submission, in constant time""" + token_matched = compare_digest(submission.access_token(), access_token) + # also compare key directly for backwards compatibility + key_matched = compare_digest(submission.access_key, access_token) + return token_matched or key_matched - submission.submitter = user.person.formatted_email() - sent_to = accept_submission(submission, request) - return HttpResponse( - "Upload of %s OK, confirmation requests sent to:\n %s" % (submission.name, ',\n '.join(sent_to)), - content_type="text/plain") - else: - raise ValidationError(form.errors) - except IOError as e: - exception = e - return err(500, "IO Error: %s" % str(e)) - except ValidationError as e: - exception = e - return err(400, "Validation Error: %s" % str(e)) - except Exception as e: - exception = e - raise - return err(500, "Exception: %s" % str(e)) - finally: - if exception and submission: - remove_submission_files(submission) - submission.delete() +def auth_token_is_valid(submission: Submission, auth_token: str): + """Check whether auth_token is valid for submission, in constant time""" + auth_key = submission.auth_key + if not auth_key: + # Make the same calls as the other branch to keep constant time, then + # return False because there is no auth key + compare_digest(generate_access_token("fake"), auth_token) + compare_digest("fake", auth_token) + return False else: - return err(405, "Method not allowed") + token_matched = compare_digest(generate_access_token(auth_key), auth_token) + # also compare key directly for backwards compatibility + key_matched = compare_digest(auth_key, auth_token) + return token_matched or key_matched -def tool_instructions(request): - return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'}) -def search_submission(request): - error = None - name = None - if request.method == 'POST': - name = request.POST.get('name', '') - submission = Submission.objects.filter(name=name).order_by('-pk').first() - if submission: - return redirect(submission_status, submission_id=submission.pk) - else: - if re.search(r'-\d\d$', name): - submission = Submission.objects.filter(name=name[:-3]).order_by('-pk').first() - if submission: - return redirect(submission_status, submission_id=submission.pk) - error = 'No valid submission found for %s' % name - return render(request, 'submit/search_submission.html', - {'selected': 'status', - 'error': error, - 'name': name}) +def can_edit_submission(user, submission: Submission, access_token: str | None): + if has_role(user, "Secretariat"): + return True + elif not access_token: + return False + return access_token_is_valid(submission, access_token) -def can_edit_submission(user, submission, access_token): - key_matched = access_token and submission.access_token() == access_token - if not key_matched: key_matched = submission.access_key == access_token # backwards-compat - return key_matched or has_role(user, "Secretariat") def submission_status(request, submission_id, access_token=None): # type: (HttpRequest, str, Optional[str]) -> HttpResponse submission = get_object_or_404(Submission, pk=submission_id) - key_matched = access_token and submission.access_token() == access_token - if not key_matched: key_matched = submission.access_key == access_token # backwards-compat - if access_token and not key_matched: - raise Http404 + if access_token: + key_matched = access_token_is_valid(submission, access_token) + if not key_matched: + raise Http404 + else: + key_matched = False - errors = validate_submission(submission) - passes_checks = all([ c.passed!=False for c in submission.checks.all() ]) + if submission.state.slug == "cancel": + errors = {} + else: + errors = validate_submission(submission) + latest_checks = submission.latest_checks() + applied_any_checks = len(latest_checks) > 0 + passes_checks = applied_any_checks and all(c.passed for c in latest_checks) is_secretariat = has_role(request.user, "Secretariat") is_chair = submission.group and submission.group.has_role(request.user, "chair") @@ -352,7 +340,21 @@ def submission_status(request, submission_id, access_token=None): message = None if submission.state_id == "cancel": - message = ('error', 'This submission has been cancelled, modification is no longer possible.') + # would be nice to have a less heuristic mechansim for reporting async processing failure + async_processing_error = submission.submissionevent_set.filter( + desc__startswith="Submission rejected: A system error occurred" + ).exists() + if async_processing_error: + message = ( + "error", + "This submission has been cancelled due to a system error during processing. " + "Modification is no longer possible.", + ) + else: + message = ( + "error", + "This submission has been cancelled, modification is no longer possible.", + ) elif submission.state_id == "auth": message = ('success', 'The submission is pending email authentication. An email has been sent to: %s' % ", ".join(confirmation_list)) elif submission.state_id == "grp-appr": @@ -409,7 +411,7 @@ def submission_status(request, submission_id, access_token=None): ) submitter_form = SubmitterForm(initial=submission.submitter_parsed(), prefix="submitter") - replaces_form = ReplacesForm(name=submission.name,initial=DocAlias.objects.filter(name__in=submission.replaces.split(","))) + replaces_form = ReplacesForm(name=submission.name,initial=Document.objects.filter(name__in=submission.replaces.split(","))) extresources_form = ExtResourceForm( initial=dict(resources=[er['res'] for er in external_resources]), extresource_model=SubmissionExtResource, @@ -529,6 +531,7 @@ def submission_status(request, submission_id, access_token=None): 'selected': 'status', 'submission': submission, 'errors': errors, + 'applied_any_checks': applied_any_checks, 'passes_checks': passes_checks, 'submitter_form': submitter_form, 'replaces_form': replaces_form, @@ -625,7 +628,7 @@ def edit_submission(request, submission_id, access_token=None): else: edit_form = EditSubmissionForm(instance=submission, prefix="edit") submitter_form = SubmitterForm(initial=submission.submitter_parsed(), prefix="submitter") - replaces_form = ReplacesForm(name=submission.name,initial=DocAlias.objects.filter(name__in=submission.replaces.split(","))) + replaces_form = ReplacesForm(name=submission.name, initial=Document.objects.filter(name__in=submission.replaces.split(","))) author_forms = [ AuthorForm(initial=author, prefix="authors-%s" % i) for i, author in enumerate(submission.authors) ] @@ -648,8 +651,7 @@ def edit_submission(request, submission_id, access_token=None): def confirm_submission(request, submission_id, auth_token): submission = get_object_or_404(Submission, pk=submission_id) - key_matched = submission.auth_key and auth_token == generate_access_token(submission.auth_key) - if not key_matched: key_matched = auth_token == submission.auth_key # backwards-compat + key_matched = submission.auth_key and auth_token_is_valid(submission, auth_token) if request.method == 'POST' and submission.state_id in ("auth", "aut-appr") and key_matched: # Set a temporary state 'confirmed' to avoid entering this code @@ -759,243 +761,14 @@ def manualpost(request): s.passes_checks = all([ c.passed!=False for c in s.checks.all() ]) s.errors = validate_submission(s) - waiting_for_draft = Submission.objects.filter(state_id = "waiting-for-draft").distinct() - - return render(request, 'submit/manual_post.html', - {'manual': manual, - 'selected': 'manual_posts', - 'waiting_for_draft': waiting_for_draft}) - - -def cancel_waiting_for_draft(request): - if request.method == 'POST': - can_cancel = has_role(request.user, "Secretariat") - - if not can_cancel: - permission_denied(request, 'You do not have permission to perform this action.') - - submission_id = request.POST.get('submission_id', '') - access_token = request.POST.get('access_token', '') - - submission = get_submission_or_404(submission_id, access_token = access_token) - cancel_submission(submission) - - create_submission_event(request, submission, "Cancelled submission") - if (submission.rev != "00"): - # Add a doc event - docevent_from_submission(submission, "Cancelled submission for rev {}".format(submission.rev)) - - return redirect("ietf.submit.views.manualpost") - - -@role_required('Secretariat',) -def add_manualpost_email(request, submission_id=None, access_token=None): - """Add email to submission history""" - - if request.method == 'POST': - try: - button_text = request.POST.get('submit', '') - if button_text == 'Cancel': - return redirect("submit/manual_post.html") - - form = SubmissionEmailForm(request.POST) - if form.is_valid(): - submission_pk = form.cleaned_data['submission_pk'] - message = form.cleaned_data['message'] - #in_reply_to = form.cleaned_data['in_reply_to'] - # create Message - - if form.cleaned_data['direction'] == 'incoming': - msgtype = 'msgin' - else: - msgtype = 'msgout' - - submission, submission_email_event = ( - add_submission_email(request=request, - remote_ip=remote_ip(request), - name = form.draft_name, - rev=form.revision, - submission_pk = submission_pk, - message = message, - by = request.user.person, - msgtype = msgtype) ) - - messages.success(request, 'Email added.') - - try: - draft = Document.objects.get(name=submission.name) - except Document.DoesNotExist: - # Assume this is revision 00 - we'll do this later - draft = None - - if (draft != None): - e = AddedMessageEvent(type="added_message", doc=draft) - e.message = submission_email_event.submissionemailevent.message - e.msgtype = submission_email_event.submissionemailevent.msgtype - e.in_reply_to = submission_email_event.submissionemailevent.in_reply_to - e.by = request.user.person - e.desc = submission_email_event.desc - e.time = submission_email_event.time - e.save() - - return redirect("ietf.submit.views.manualpost") - except ValidationError as e: - form = SubmissionEmailForm(request.POST) - form._errors = {} - form._errors["__all__"] = form.error_class(["There was a failure uploading your message. (%s)" % e.message]) - else: - initial = { - } - - if (submission_id != None): - submission = get_submission_or_404(submission_id, access_token) - initial['name'] = "{}-{}".format(submission.name, submission.rev) - initial['direction'] = 'incoming' - initial['submission_pk'] = submission.pk - else: - initial['direction'] = 'incoming' - - form = SubmissionEmailForm(initial=initial) - - return render(request, 'submit/add_submit_email.html',dict(form=form)) - - -@role_required('Secretariat',) -def send_submission_email(request, submission_id, message_id=None): - """Send an email related to a submission""" - submission = get_submission_or_404(submission_id, access_token = None) - - if request.method == 'POST': - button_text = request.POST.get('submit', '') - if button_text == 'Cancel': - return redirect('ietf.submit.views.submission_status', - submission_id=submission.id, - access_token=submission.access_token()) - - form = MessageModelForm(request.POST) - if form.is_valid(): - # create Message - msg = Message.objects.create( - by = request.user.person, - subject = form.cleaned_data['subject'], - frm = form.cleaned_data['frm'], - to = form.cleaned_data['to'], - cc = form.cleaned_data['cc'], - bcc = form.cleaned_data['bcc'], - reply_to = form.cleaned_data['reply_to'], - body = form.cleaned_data['body'] - ) - - in_reply_to_id = form.cleaned_data['in_reply_to_id'] - in_reply_to = None - rp = "" - - if in_reply_to_id: - rp = " reply" - try: - in_reply_to = Message.objects.get(id=in_reply_to_id) - except Message.DoesNotExist: - log("Unable to retrieve in_reply_to message: %s" % in_reply_to_id) - - desc = "Sent message {} - manual post - {}-{}".format(rp, - submission.name, - submission.rev) - SubmissionEmailEvent.objects.create( - submission = submission, - desc = desc, - msgtype = 'msgout', - by = request.user.person, - message = msg, - in_reply_to = in_reply_to) - - # send email - send_mail_message(None,msg) - - messages.success(request, 'Email sent.') - return redirect('ietf.submit.views.submission_status', - submission_id=submission.id, - access_token=submission.access_token()) - - else: - reply_to = get_reply_to() - msg = None - - if not message_id: - addrs = gather_address_lists('sub_confirmation_requested',submission=submission).as_strings(compact=False) - to_email = addrs.to - cc = addrs.cc - subject = 'Regarding {}'.format(submission.name) - else: - try: - submitEmail = SubmissionEmailEvent.objects.get(id=message_id) - msg = submitEmail.message - - if msg: - to_email = msg.frm - cc = msg.cc - subject = 'Re:{}'.format(msg.subject) - else: - to_email = None - cc = None - subject = 'Regarding {}'.format(submission.name) - except Message.DoesNotExist: - to_email = None - cc = None - subject = 'Regarding {}'.format(submission.name) - - initial = { - 'to': to_email, - 'cc': cc, - 'frm': settings.IDSUBMIT_FROM_EMAIL, - 'subject': subject, - 'reply_to': reply_to, + return render( + request, + 'submit/manual_post.html', + { + 'manual': manual, + 'selected': 'manual_posts' } - - if msg: - initial['in_reply_to_id'] = msg.id - - form = MessageModelForm(initial=initial) - - return render(request, "submit/email.html", { - 'submission': submission, - 'access_token': submission.access_token(), - 'form':form}) - - -def show_submission_email_message(request, submission_id, message_id, access_token=None): - submission = get_submission_or_404(submission_id, access_token) - - submitEmail = get_object_or_404(SubmissionEmailEvent, pk=message_id) - attachments = submitEmail.message.messageattachment_set.all() - - return render(request, 'submit/submission_email.html', - {'submission': submission, - 'message': submitEmail, - 'attachments': attachments}) - -def show_submission_email_attachment(request, submission_id, message_id, filename, access_token=None): - get_submission_or_404(submission_id, access_token) - - message = get_object_or_404(SubmissionEmailEvent, pk=message_id) - - attach = get_object_or_404(MessageAttachment, - message=message.message, - filename=filename) - - if attach.encoding == "base64": - body = base64.b64decode(attach.body) - else: - body = attach.body.encode('utf-8') - - if attach.content_type is None: - content_type='text/plain' - else: - content_type=attach.content_type - - response = HttpResponse(body, content_type=content_type) - response['Content-Disposition'] = 'attachment; filename=%s' % attach.filename - response['Content-Length'] = len(body) - return response + ) def get_submission_or_404(submission_id, access_token=None): @@ -1011,4 +784,7 @@ def get_submission_or_404(submission_id, access_token=None): def async_poke_test(request): result = poke.delay() - return HttpResponse(f'Poked {result}', content_type='text/plain') + return HttpResponse( + f'Poked {result}', + content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}", + ) diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py index 9993d492ab4..0d40c5337e2 100644 --- a/ietf/sync/iana.py +++ b/ietf/sync/iana.py @@ -10,11 +10,11 @@ import requests from email.utils import parsedate_to_datetime +from urllib.parse import quote as urlquote from django.conf import settings from django.utils import timezone from django.utils.encoding import smart_bytes, force_str -from django.utils.http import urlquote import debug # pyflakes:ignore @@ -45,7 +45,7 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than): updated = [] - docs = Document.objects.filter(docalias__name__in=rfc_names).exclude( + docs = Document.objects.filter(name__in=rfc_names).exclude( docevent__type="rfc_in_iana_registry").filter( # only take those that were published after cutoff since we # have a big bunch of old RFCs that we unfortunately don't have data for @@ -66,8 +66,8 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than): def fetch_changes_json(url, start, end): - url += "?start=%s&end=%s" % (urlquote(start.astimezone(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S")), - urlquote(end.astimezone(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S"))) + url += "?start=%s&end=%s" % (urlquote(start.astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S")), + urlquote(end.astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S"))) # HTTP basic auth username = "ietfsync" password = settings.IANA_SYNC_PASSWORD @@ -161,7 +161,7 @@ def update_history_with_changes(changes, send_email=True): for c in changes: docname = c['doc'] - timestamp = datetime.datetime.strptime(c["time"], "%Y-%m-%d %H:%M:%S",).replace(tzinfo=datetime.timezone.utc) + timestamp = datetime.datetime.strptime(c["time"], "%Y-%m-%d %H:%M:%S",).replace(tzinfo=datetime.UTC) if c['type'] in ("iana_state", "iana_review"): if c['type'] == "iana_state": @@ -189,7 +189,7 @@ def update_history_with_changes(changes, send_email=True): state_type=state_type, state=state) if not e: try: - doc = Document.objects.get(docalias__name=docname) + doc = Document.objects.get(name=docname) except Document.DoesNotExist: warnings.append("Document %s not found" % docname) continue @@ -247,7 +247,7 @@ def parse_review_email(text): review_time = parsedate_to_datetime(msg["Date"]) # parsedate_to_datetime() may return a naive timezone - treat as UTC if review_time.tzinfo is None or review_time.tzinfo.utcoffset(review_time) is None: - review_time = review_time.replace(tzinfo=datetime.timezone.utc) + review_time = review_time.replace(tzinfo=datetime.UTC) # by by = None @@ -304,3 +304,22 @@ def add_review_comment(doc_name, review_time, by, comment): e.by = by e.save() + + +def ingest_review_email(message: bytes): + from ietf.api.views import EmailIngestionError # avoid circular import + try: + doc_name, review_time, by, comment = parse_review_email(message) + except Exception as err: + raise EmailIngestionError("Unable to parse message as IANA review email") from err + log(f"Read IANA review email for {doc_name} at {review_time} by {by}") + if by.name == "(System)": + log("WARNING: person responsible for email does not have a IANA role") # (sic) + try: + add_review_comment(doc_name, review_time, by, comment) + except Document.DoesNotExist: + log(f"ERROR: unknown document {doc_name}") + raise EmailIngestionError(f"Unknown document {doc_name}") + except Exception as err: + raise EmailIngestionError("Error ingesting IANA review email") from err + diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py index 59356dd48ca..b3234a87e2b 100644 --- a/ietf/sync/rfceditor.py +++ b/ietf/sync/rfceditor.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2012-2020, All Rights Reserved +# Copyright The IETF Trust 2012-2025, All Rights Reserved # -*- coding: utf-8 -*- @@ -7,29 +7,33 @@ import re import requests +from typing import Iterator, Optional, Union from urllib.parse import urlencode from xml.dom import pulldom, Node from django.conf import settings +from django.db import transaction +from django.db.models import Subquery, OuterRef, F, Q from django.utils import timezone -from django.utils.encoding import smart_bytes, force_str, force_text +from django.utils.encoding import smart_bytes, force_str import debug # pyflakes:ignore -from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName, - DocTagName, DocTypeName, RelatedDocument ) +from ietf.doc.models import ( Document, State, StateType, DocEvent, DocRelationshipName, + DocTagName, RelatedDocument, RelatedDocHistory ) from ietf.doc.expire import move_draft_files_to_archive -from ietf.doc.utils import add_state_change_event, prettify_std_name, update_action_holders +from ietf.doc.utils import add_state_change_event, new_state_change_event, prettify_std_name, update_action_holders from ietf.group.models import Group +from ietf.ipr.models import IprDocRel from ietf.name.models import StdLevelName, StreamName from ietf.person.models import Person from ietf.utils.log import log from ietf.utils.mail import send_mail_text from ietf.utils.timezone import datetime_from_date, RPC_TZINFO -#QUEUE_URL = "https://www.rfc-editor.org/queue2.xml" -#INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml" -#POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php" +# QUEUE_URL = "https://www.rfc-editor.org/queue2.xml" +# INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml" +# POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php" MIN_ERRATA_RESULTS = 5000 MIN_INDEX_RESULTS = 8000 @@ -111,6 +115,8 @@ def parse_queue(response): stream = "irtf" elif name.startswith("INDEPENDENT"): stream = "ise" + elif name.startswith("Editorial Stream"): + stream = "editorial" else: stream = None warnings.append("unrecognized section " + name) @@ -155,7 +161,7 @@ def update_drafts_from_queue(drafts): names = [t[0] for t in drafts] drafts_in_db = dict((d.name, d) - for d in Document.objects.filter(type="draft", docalias__name__in=names)) + for d in Document.objects.filter(type="draft", name__in=names)) changed = set() @@ -199,11 +205,14 @@ def update_drafts_from_queue(drafts): if prev_state != next_state: d.set_state(next_state) - e = add_state_change_event(d, system, prev_state, next_state) + e = new_state_change_event(d, system, prev_state, next_state) # unsaved + if e: + if auth48: + e.desc = re.sub(r"(.*)", "\\1" % auth48, e.desc) + e.save() + events.append(e) if auth48: - e.desc = re.sub(r"(.*)", "\\1" % auth48, e.desc) - e.save() # Create or update the auth48 URL whether or not this is a state expected to have one. d.documenturl_set.update_or_create( tag_id='auth48', # look up existing based on this field @@ -212,8 +221,6 @@ def update_drafts_from_queue(drafts): else: # Remove any existing auth48 URL when an update does not have one. d.documenturl_set.filter(tag_id='auth48').delete() - if e: - events.append(e) changed.add(name) @@ -228,7 +235,7 @@ def update_drafts_from_queue(drafts): # remove tags and states for those not in the queue anymore - for d in Document.objects.exclude(docalias__name__in=names).filter(states__type="draft-rfceditor").distinct(): + for d in Document.objects.exclude(name__in=names).filter(states__type="draft-rfceditor").distinct(): d.tags.remove(*list(tag_mapping.values())) d.unset_state("draft-rfceditor") # we do not add a history entry here - most likely we already @@ -326,23 +333,28 @@ def extract_doc_list(parentNode, tagName): log("node: %s" % node) raise for d in data: - k = "RFC%04d" % d[0] + k = "RFC%d" % d[0] if k in also_list: d[9].extend(also_list[k]) return data -def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=None): +def update_docs_from_rfc_index( + index_data, errata_data, skip_older_than_date: Optional[datetime.date] = None +) -> Iterator[tuple[int, list[str], Document, bool]]: """Given parsed data from the RFC Editor index, update the documents in the database - Yields a list of change descriptions for each document, if any. + Returns an iterator that yields (rfc_number, change_list, doc, rfc_published) for the + RFC document and, if applicable, the I-D that it came from. The skip_older_than_date is a bare date, not a datetime. """ - - errata = {} + # Create dict mapping doc-id to list of errata records that apply to it + errata: dict[str, list[dict]] = {} for item in errata_data: - name = item['doc-id'] + name = item["doc-id"] + if name.upper().startswith("RFC"): + name = f"RFC{int(name[3:])}" # removes leading 0s on the rfc number if not name in errata: errata[name] = [] errata[name].append(item) @@ -357,90 +369,236 @@ def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=Non "Best Current Practice": StdLevelName.objects.get(slug="bcp"), "Historic": StdLevelName.objects.get(slug="hist"), "Unknown": StdLevelName.objects.get(slug="unkn"), - } + } stream_mapping = { "IETF": StreamName.objects.get(slug="ietf"), "INDEPENDENT": StreamName.objects.get(slug="ise"), "IRTF": StreamName.objects.get(slug="irtf"), "IAB": StreamName.objects.get(slug="iab"), + "Editorial": StreamName.objects.get(slug="editorial"), "Legacy": StreamName.objects.get(slug="legacy"), } - tag_has_errata = DocTagName.objects.get(slug='errata') - tag_has_verified_errata = DocTagName.objects.get(slug='verified-errata') + tag_has_errata = DocTagName.objects.get(slug="errata") + tag_has_verified_errata = DocTagName.objects.get(slug="verified-errata") relationship_obsoletes = DocRelationshipName.objects.get(slug="obs") relationship_updates = DocRelationshipName.objects.get(slug="updates") + rfc_published_state = State.objects.get(type_id="rfc", slug="published") system = Person.objects.get(name="(System)") - for rfc_number, title, authors, rfc_published_date, current_status, updates, updated_by, obsoletes, obsoleted_by, also, draft, has_errata, stream, wg, file_formats, pages, abstract in index_data: - + first_sync_creating_subseries = not Document.objects.filter(type_id__in=["bcp","std","fyi"]).exists() + + for ( + rfc_number, + title, + authors, + rfc_published_date, + current_status, + updates, + updated_by, + obsoletes, + obsoleted_by, + also, + draft_name, + has_errata, + stream, + wg, + file_formats, + pages, + abstract, + ) in index_data: if skip_older_than_date and rfc_published_date < skip_older_than_date: - # speed up the process by skipping old entries + # speed up the process by skipping old entries (n.b., the comparison above is a + # lexical comparison between "YYYY-MM-DD"-formatted dates) continue # we assume two things can happen: we get a new RFC, or an # attribute has been updated at the RFC Editor (RFC Editor # attributes take precedence over our local attributes) - events = [] - changes = [] + rfc_events = [] + rfc_changes = [] rfc_published = False - # make sure we got the document and alias - doc = None - name = "rfc%s" % rfc_number - a = DocAlias.objects.filter(name=name) - if a: - doc = a[0].document - else: + # Find the draft, if any + draft = None + if draft_name: + try: + draft = Document.objects.get(name=draft_name, type_id="draft") + except Document.DoesNotExist: + pass + # Logging below warning turns out to be unhelpful - there are many references + # to such things in the index: + # * all april-1 RFCs have an internal name that looks like a draft name, but there + # was never such a draft. More of these will exist in the future + # * Several documents were created with out-of-band input to the RFC-editor, for a + # variety of reasons. + # + # What this exposes is that the rfc-index needs to stop talking about these things. + # If there is no draft to point to, don't point to one, even if there was an RPC + # internal name in use (and in the RPC database). This will be a requirement on the + # reimplementation of the creation of the rfc-index. + # + # log(f"Warning: RFC index for {rfc_number} referred to unknown draft {draft_name}") + + # Find or create the RFC document + creation_args: dict[str, Optional[Union[str, int]]] = {"name": f"rfc{rfc_number}"} + if draft: + creation_args.update( + { + "title": draft.title, + "stream": draft.stream, + "group": draft.group, + "abstract": draft.abstract, + "pages": draft.pages, + "words": draft.words, + "std_level": draft.std_level, + "ad": draft.ad, + "external_url": draft.external_url, + "uploaded_filename": draft.uploaded_filename, + "note": draft.note, + } + ) + doc, created_rfc = Document.objects.get_or_create( + rfc_number=rfc_number, type_id="rfc", defaults=creation_args + ) + if created_rfc: + rfc_changes.append(f"created document {prettify_std_name(doc.name)}") + doc.set_state(rfc_published_state) if draft: - try: - doc = Document.objects.get(name=draft) - except Document.DoesNotExist: - pass - - if not doc: - changes.append("created document %s" % prettify_std_name(name)) - doc = Document.objects.create(name=name, type=DocTypeName.objects.get(slug="draft")) - - # add alias - alias, __ = DocAlias.objects.get_or_create(name=name) - alias.docs.add(doc) - changes.append("created alias %s" % prettify_std_name(name)) + doc.formal_languages.set(draft.formal_languages.all()) + for author in draft.documentauthor_set.all(): + # Copy the author but point at the new doc. + # See https://docs.djangoproject.com/en/4.2/topics/db/queries/#copying-model-instances + author.pk = None + author.id = None + author._state.adding = True + author.document = doc + author.save() + + if draft: + draft_events = [] + draft_changes = [] + + # Ensure the draft is in the "rfc" state and move its files to the archive + # if necessary. + if draft.get_state_slug() != "rfc": + draft.set_state( + State.objects.get(used=True, type="draft", slug="rfc") + ) + move_draft_files_to_archive(draft, draft.rev) + draft_changes.append(f"changed state to {draft.get_state()}") + + # Ensure the draft and rfc are linked with a "became_rfc" relationship + r, created_relateddoc = RelatedDocument.objects.get_or_create( + source=draft, target=doc, relationship_id="became_rfc" + ) + if created_relateddoc: + change = "created {rel_name} relationship between {pretty_draft_name} and {pretty_rfc_name}".format( + rel_name=r.relationship.name.lower(), + pretty_draft_name=prettify_std_name(draft_name), + pretty_rfc_name=prettify_std_name(doc.name), + ) + draft_changes.append(change) + rfc_changes.append(change) + + # Always set the "draft-iesg" state. This state should be set for all drafts, so + # log a warning if it is not set. What should happen here is that ietf stream + # RFCs come in as "rfcqueue" and are set to "pub" when they appear in the RFC index. + # Other stream documents should normally be "idexists" and be left that way. The + # code here *actually* leaves "draft-iesg" state alone if it is "idexists" or "pub", + # and changes any other state to "pub". If unset, it changes it to "idexists". + # This reflects historical behavior and should probably be updated, but a migration + # of existing drafts (and validation of the change) is needed before we change the + # handling. + prev_iesg_state = draft.get_state("draft-iesg") + if prev_iesg_state is None: + log(f'Warning while processing {doc.name}: {draft.name} has no "draft-iesg" state') + new_iesg_state = State.objects.get(type_id="draft-iesg", slug="idexists") + elif prev_iesg_state.slug not in ("pub", "idexists"): + if prev_iesg_state.slug != "rfcqueue": + log( + 'Warning while processing {}: {} is in "draft-iesg" state {} (expected "rfcqueue")'.format( + doc.name, draft.name, prev_iesg_state.slug + ) + ) + new_iesg_state = State.objects.get(type_id="draft-iesg", slug="pub") + else: + new_iesg_state = prev_iesg_state + + if new_iesg_state != prev_iesg_state: + draft.set_state(new_iesg_state) + draft_changes.append(f"changed {new_iesg_state.type.label} to {new_iesg_state}") + e = update_action_holders(draft, prev_iesg_state, new_iesg_state) + if e: + draft_events.append(e) + + # If the draft and RFC streams agree, move draft to "pub" stream state. If not, complain. + if draft.stream != doc.stream: + log("Warning while processing {}: draft {} stream is {} but RFC stream is {}".format( + doc.name, draft.name, draft.stream, doc.stream + )) + elif draft.stream.slug in ["iab", "irtf", "ise"]: + stream_slug = f"draft-stream-{draft.stream.slug}" + prev_state = draft.get_state(stream_slug) + if prev_state is not None and prev_state.slug != "pub": + new_state = State.objects.select_related("type").get(used=True, type__slug=stream_slug, slug="pub") + draft.set_state(new_state) + draft_changes.append( + f"changed {new_state.type.label} to {new_state}" + ) + e = update_action_holders(draft, prev_state, new_state) + if e: + draft_events.append(e) + if draft_changes: + draft_events.append( + DocEvent.objects.create( + doc=draft, + rev=doc.rev, + by=system, + type="sync_from_rfc_editor", + desc=f"Received changes through RFC Editor sync ({', '.join(draft_changes)})", + ) + ) + draft.save_with_history(draft_events) + yield rfc_number, draft_changes, draft, False # yield changes to the draft # check attributes + verbed = "set" if created_rfc else "changed" if title != doc.title: doc.title = title - changes.append("changed title to '%s'" % doc.title) + rfc_changes.append(f"{verbed} title to '{doc.title}'") if abstract and abstract != doc.abstract: doc.abstract = abstract - changes.append("changed abstract to '%s'" % doc.abstract) + rfc_changes.append(f"{verbed} abstract to '{doc.abstract}'") if pages and int(pages) != doc.pages: doc.pages = int(pages) - changes.append("changed pages to %s" % doc.pages) + rfc_changes.append(f"{verbed} pages to {doc.pages}") if std_level_mapping[current_status] != doc.std_level: doc.std_level = std_level_mapping[current_status] - changes.append("changed standardization level to %s" % doc.std_level) - - if doc.get_state_slug() != "rfc": - doc.set_state(State.objects.get(used=True, type="draft", slug="rfc")) - move_draft_files_to_archive(doc, doc.rev) - changes.append("changed state to %s" % doc.get_state()) + rfc_changes.append(f"{verbed} standardization level to {doc.std_level}") if doc.stream != stream_mapping[stream]: doc.stream = stream_mapping[stream] - changes.append("changed stream to %s" % doc.stream) + rfc_changes.append(f"{verbed} stream to {doc.stream}") - if not doc.group: # if we have no group assigned, check if RFC Editor has a suggestion + if doc.get_state() != rfc_published_state: + doc.set_state(rfc_published_state) + rfc_changes.append(f"{verbed} {rfc_published_state.type.label} to {rfc_published_state}") + + # if we have no group assigned, check if RFC Editor has a suggestion + if not doc.group: if wg: doc.group = Group.objects.get(acronym=wg) - changes.append("set group to %s" % doc.group) + rfc_changes.append(f"set group to {doc.group}") else: - doc.group = Group.objects.get(type="individ") # fallback for newly created doc + doc.group = Group.objects.get( + type="individ" + ) # fallback for newly created doc if not doc.latest_event(type="published_rfc"): e = DocEvent(doc=doc, rev=doc.rev, type="published_rfc") @@ -467,90 +625,195 @@ def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=Non e.by = system e.desc = "RFC published" e.save() - events.append(e) + rfc_events.append(e) - changes.append("added RFC published event at %s" % e.time.strftime("%Y-%m-%d")) + rfc_changes.append( + f"added RFC published event at {e.time.strftime('%Y-%m-%d')}" + ) rfc_published = True - for t in ("draft-iesg", "draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"): - prev_state = doc.get_state(t) - if prev_state is not None: - if prev_state.slug not in ("pub", "idexists"): - new_state = State.objects.select_related("type").get(used=True, type=t, slug="pub") - doc.set_state(new_state) - changes.append("changed %s to %s" % (new_state.type.label, new_state)) - e = update_action_holders(doc, prev_state, new_state) - if e: - events.append(e) - elif t == 'draft-iesg': - doc.set_state(State.objects.get(type_id='draft-iesg', slug='idexists')) - def parse_relation_list(l): res = [] for x in l: - if x[:3] in ("NIC", "IEN", "STD", "RTR"): - # try translating this to RFCs that we can handle - # sensibly; otherwise we'll have to ignore them - l = DocAlias.objects.filter(name__startswith="rfc", docs__docalias__name=x.lower()) - else: - l = DocAlias.objects.filter(name=x.lower()) - - for a in l: + for a in Document.objects.filter(name=x.lower(), type_id="rfc"): if a not in res: res.append(a) return res for x in parse_relation_list(obsoletes): - if not RelatedDocument.objects.filter(source=doc, target=x, relationship=relationship_obsoletes): - r = RelatedDocument.objects.create(source=doc, target=x, relationship=relationship_obsoletes) - changes.append("created %s relation between %s and %s" % (r.relationship.name.lower(), prettify_std_name(r.source.name), prettify_std_name(r.target.name))) + if not RelatedDocument.objects.filter( + source=doc, target=x, relationship=relationship_obsoletes + ): + r = RelatedDocument.objects.create( + source=doc, target=x, relationship=relationship_obsoletes + ) + rfc_changes.append( + "created {rel_name} relation between {src_name} and {tgt_name}".format( + rel_name=r.relationship.name.lower(), + src_name=prettify_std_name(r.source.name), + tgt_name=prettify_std_name(r.target.name), + ) + ) for x in parse_relation_list(updates): - if not RelatedDocument.objects.filter(source=doc, target=x, relationship=relationship_updates): - r = RelatedDocument.objects.create(source=doc, target=x, relationship=relationship_updates) - changes.append("created %s relation between %s and %s" % (r.relationship.name.lower(), prettify_std_name(r.source.name), prettify_std_name(r.target.name))) + if not RelatedDocument.objects.filter( + source=doc, target=x, relationship=relationship_updates + ): + r = RelatedDocument.objects.create( + source=doc, target=x, relationship=relationship_updates + ) + rfc_changes.append( + "created {rel_name} relation between {src_name} and {tgt_name}".format( + rel_name=r.relationship.name.lower(), + src_name=prettify_std_name(r.source.name), + tgt_name=prettify_std_name(r.target.name), + ) + ) if also: + # recondition also to have proper subseries document names: + conditioned_also = [] for a in also: a = a.lower() - if not DocAlias.objects.filter(name=a): - DocAlias.objects.create(name=a).docs.add(doc) - changes.append("created alias %s" % prettify_std_name(a)) + subseries_slug = a[:3] + if subseries_slug not in ["bcp", "std", "fyi"]: + log(f"Unexpected 'also' relationship of {a} encountered for {doc}") + continue + maybe_number = a[3:].strip() + if not maybe_number.isdigit(): + log(f"Unexpected 'also' subseries element identifier {a} encountered for {doc}") + continue + else: + subseries_number = int(maybe_number) + conditioned_also.append(f"{subseries_slug}{subseries_number}") # Note the lack of leading zeros + also = conditioned_also - doc_errata = errata.get('RFC%04d'%rfc_number, []) - all_rejected = doc_errata and all( er['errata_status_code']=='Rejected' for er in doc_errata ) + for a in also: + subseries_doc_name = a + subseries_slug=a[:3] + # Leaving most things to the default intentionally + # Of note, title and stream are left to the defaults of "" and none. + subseries_doc, created = Document.objects.get_or_create(type_id=subseries_slug, name=subseries_doc_name) + if created: + if first_sync_creating_subseries: + subseries_doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of this {subseries_slug.upper()} document is currently available in the datatracker before this point") + subseries_doc.docevent_set.create(type=f"{subseries_slug}_doc_created", by=system, desc=f"Imported {subseries_doc_name} into the datatracker via sync to the rfc-index") + else: + subseries_doc.docevent_set.create(type=f"{subseries_slug}_doc_created", by=system, desc=f"Created {subseries_doc_name} via sync to the rfc-index") + _, relationship_created = subseries_doc.relateddocument_set.get_or_create(relationship_id="contains", target=doc) + if relationship_created: + if first_sync_creating_subseries: + subseries_doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Imported membership of {doc.name} in {subseries_doc.name} via sync to the rfc-index") + rfc_events.append(doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of {subseries_doc.name.upper()} is currently available in the datatracker before this point")) + rfc_events.append(doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Imported membership of {doc.name} in {subseries_doc.name} via sync to the rfc-index")) + else: + subseries_doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Added {doc.name} to {subseries_doc.name}") + rfc_events.append(doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Added {doc.name} to {subseries_doc.name}")) + + # Delete subseries relations that are no longer current. Use a transaction + # so we are sure we iterate over the same relations that we delete! + with transaction.atomic(): + stale_subseries_relations = doc.relations_that("contains").exclude( + source__name__in=also + ) + for stale_relation in stale_subseries_relations: + stale_subseries_doc = stale_relation.source + rfc_events.append( + doc.docevent_set.create( + type="sync_from_rfc_editor", + by=system, + desc=f"Removed {doc.name} from {stale_subseries_doc.name}", + ) + ) + stale_subseries_doc.docevent_set.create( + type="sync_from_rfc_editor", + by=system, + desc=f"Removed {doc.name} from {stale_subseries_doc.name}", + ) + stale_subseries_relations.delete() + + doc_errata = errata.get(f"RFC{rfc_number}", []) + all_rejected = doc_errata and all( + er["errata_status_code"] == "Rejected" for er in doc_errata + ) if has_errata and not all_rejected: if not doc.tags.filter(pk=tag_has_errata.pk).exists(): doc.tags.add(tag_has_errata) - changes.append("added Errata tag") - has_verified_errata = any([ er['errata_status_code']=='Verified' for er in doc_errata ]) - if has_verified_errata and not doc.tags.filter(pk=tag_has_verified_errata.pk).exists(): + rfc_changes.append("added Errata tag") + has_verified_errata = any( + [er["errata_status_code"] == "Verified" for er in doc_errata] + ) + if ( + has_verified_errata + and not doc.tags.filter(pk=tag_has_verified_errata.pk).exists() + ): doc.tags.add(tag_has_verified_errata) - changes.append("added Verified Errata tag") + rfc_changes.append("added Verified Errata tag") else: if doc.tags.filter(pk=tag_has_errata.pk): doc.tags.remove(tag_has_errata) if all_rejected: - changes.append("removed Errata tag (all errata rejected)") + rfc_changes.append("removed Errata tag (all errata rejected)") else: - changes.append("removed Errata tag") + rfc_changes.append("removed Errata tag") if doc.tags.filter(pk=tag_has_verified_errata.pk): doc.tags.remove(tag_has_verified_errata) - changes.append("removed Verified Errata tag") - - if changes: - events.append(DocEvent.objects.create( - doc=doc, - rev=doc.rev, - by=system, - type="sync_from_rfc_editor", - desc="Received changes through RFC Editor sync (%s)" % ", ".join(changes), - )) - - doc.save_with_history(events) - - if changes: - yield changes, doc, rfc_published + rfc_changes.append("removed Verified Errata tag") + + if rfc_changes: + rfc_events.append( + DocEvent.objects.create( + doc=doc, + rev=doc.rev, + by=system, + type="sync_from_rfc_editor", + desc=f"Received changes through RFC Editor sync ({', '.join(rfc_changes)})", + ) + ) + doc.save_with_history(rfc_events) + yield rfc_number, rfc_changes, doc, rfc_published # yield changes to the RFC + + if first_sync_creating_subseries: + # First - create the known subseries documents that have ghosted. + # The RFC editor (as of 31 Oct 2023) claims these subseries docs do not exist. + # The datatracker, on the other hand, will say that the series doc currently contains no RFCs. + for name in ["fyi17", "std1", "bcp12", "bcp113", "bcp66"]: + # Leaving most things to the default intentionally + # Of note, title and stream are left to the defaults of "" and none. + subseries_doc, created = Document.objects.get_or_create(type_id=name[:3], name=name) + if not created: + log(f"Warning: {name} unexpectedly already exists") + else: + subseries_slug = name[:3] + subseries_doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of this {subseries_slug.upper()} document is currently available in the datatracker before this point") + + RelatedDocument.objects.filter( + Q(originaltargetaliasname__startswith="bcp") | + Q(originaltargetaliasname__startswith="std") | + Q(originaltargetaliasname__startswith="fyi") + ).annotate( + subseries_target=Subquery( + Document.objects.filter(name=OuterRef("originaltargetaliasname")).values_list("pk",flat=True)[:1] + ) + ).update(target=F("subseries_target")) + RelatedDocHistory.objects.filter( + Q(originaltargetaliasname__startswith="bcp") | + Q(originaltargetaliasname__startswith="std") | + Q(originaltargetaliasname__startswith="fyi") + ).annotate( + subseries_target=Subquery( + Document.objects.filter(name=OuterRef("originaltargetaliasname")).values_list("pk",flat=True)[:1] + ) + ).update(target=F("subseries_target")) + IprDocRel.objects.filter( + Q(originaldocumentaliasname__startswith="bcp") | + Q(originaldocumentaliasname__startswith="std") | + Q(originaldocumentaliasname__startswith="fyi") + ).annotate( + subseries_target=Subquery( + Document.objects.filter(name=OuterRef("originaldocumentaliasname")).values_list("pk",flat=True)[:1] + ) + ).update(document=F("subseries_target")) def post_approved_draft(url, name): @@ -558,6 +821,10 @@ def post_approved_draft(url, name): the data from the Datatracker and start processing it. Returns response and error (empty string if no error).""" + if settings.SERVER_MODE != "production": + log(f"In production, would have posted RFC-Editor notification of approved I-D '{name}' to '{url}'") + return "", "" + # HTTP basic auth username = "dtracksync" password = settings.RFC_EDITOR_SYNC_PASSWORD @@ -583,7 +850,7 @@ def post_approved_draft(url, name): if r.status_code != 200: raise RuntimeError("Status code is not 200 OK (it's %s)." % r.status_code) - if force_text(r.text) != "OK": + if force_str(r.text) != "OK": raise RuntimeError('Response is not "OK" (it\'s "%s").' % r.text) except Exception as e: diff --git a/ietf/sync/tasks.py b/ietf/sync/tasks.py new file mode 100644 index 00000000000..e4174d37296 --- /dev/null +++ b/ietf/sync/tasks.py @@ -0,0 +1,224 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +# +# Celery task definitions +# +import datetime +import io +import requests + +from celery import shared_task + +from django.conf import settings +from django.utils import timezone + +from ietf.doc.models import DocEvent, RelatedDocument +from ietf.sync import iana +from ietf.sync import rfceditor +from ietf.sync.rfceditor import MIN_QUEUE_RESULTS, parse_queue, update_drafts_from_queue +from ietf.utils import log +from ietf.utils.timezone import date_today + + +@shared_task +def rfc_editor_index_update_task(full_index=False): + """Update metadata from the RFC index + + Default is to examine only changes in the past 365 days. Call with full_index=True to update + the full RFC index. + + According to comments on the original script, a year's worth took about 20s on production as of + August 2022 + + The original rfc-editor-index-update script had a long-disabled provision for running the + rebuild_reference_relations scripts after the update. That has not been brought over + at all because it should be implemented as its own task if it is needed. + """ + skip_date = None if full_index else date_today() - datetime.timedelta(days=365) + log.log( + "Updating document metadata from RFC index going back to {since}, from {url}".format( + since=skip_date if skip_date is not None else "the beginning", + url=settings.RFC_EDITOR_INDEX_URL, + ) + ) + try: + response = requests.get( + settings.RFC_EDITOR_INDEX_URL, + timeout=30, # seconds + ) + except requests.Timeout as exc: + log.log(f'GET request timed out retrieving RFC editor index: {exc}') + return # failed + rfc_index_xml = response.text + index_data = rfceditor.parse_index(io.StringIO(rfc_index_xml)) + try: + response = requests.get( + settings.RFC_EDITOR_ERRATA_JSON_URL, + timeout=30, # seconds + ) + except requests.Timeout as exc: + log.log(f'GET request timed out retrieving RFC editor errata: {exc}') + return # failed + errata_data = response.json() + if len(index_data) < rfceditor.MIN_INDEX_RESULTS: + log.log("Not enough index entries, only %s" % len(index_data)) + return # failed + if len(errata_data) < rfceditor.MIN_ERRATA_RESULTS: + log.log("Not enough errata entries, only %s" % len(errata_data)) + return # failed + for rfc_number, changes, doc, rfc_published in rfceditor.update_docs_from_rfc_index( + index_data, errata_data, skip_older_than_date=skip_date + ): + for c in changes: + log.log("RFC%s, %s: %s" % (rfc_number, doc.name, c)) + + +@shared_task +def rfc_editor_queue_updates_task(): + log.log(f"Updating RFC Editor queue states from {settings.RFC_EDITOR_QUEUE_URL}") + try: + response = requests.get( + settings.RFC_EDITOR_QUEUE_URL, + timeout=30, # seconds + ) + except requests.Timeout as exc: + log.log(f"GET request timed out retrieving RFC editor queue: {exc}") + return # failed + drafts, warnings = parse_queue(io.StringIO(response.text)) + for w in warnings: + log.log(f"Warning: {w}") + + if len(drafts) < MIN_QUEUE_RESULTS: + log.log("Not enough results, only %s" % len(drafts)) + return # failed + + changed, warnings = update_drafts_from_queue(drafts) + for w in warnings: + log.log(f"Warning: {w}") + + for c in changed: + log.log(f"Updated {c}") + + +@shared_task +def iana_changes_update_task(): + # compensate to avoid we ask for something that happened now and then + # don't get it back because our request interval is slightly off + CLOCK_SKEW_COMPENSATION = 5 # seconds + + # actually the interface accepts 24 hours, but then we get into + # trouble with daylights savings - meh + MAX_INTERVAL_ACCEPTED_BY_IANA = datetime.timedelta(hours=23) + + start = ( + timezone.now() + - datetime.timedelta(hours=23) + + datetime.timedelta(seconds=CLOCK_SKEW_COMPENSATION,) + ) + end = start + datetime.timedelta(hours=23) + + t = start + while t < end: + # the IANA server doesn't allow us to fetch more than a certain + # period, so loop over the requested period and make multiple + # requests if necessary + + text = iana.fetch_changes_json( + settings.IANA_SYNC_CHANGES_URL, t, min(end, t + MAX_INTERVAL_ACCEPTED_BY_IANA) + ) + log.log(f"Retrieved the JSON: {text}") + + changes = iana.parse_changes_json(text) + added_events, warnings = iana.update_history_with_changes( + changes, send_email=True + ) + + for e in added_events: + log.log( + f"Added event for {e.doc_id} {e.time}: {e.desc} (parsed json: {e.json})" + ) + + for w in warnings: + log.log(f"WARNING: {w}") + + t += MAX_INTERVAL_ACCEPTED_BY_IANA + + +@shared_task +def iana_protocols_update_task(): + # Earliest date for which we have data suitable to update (was described as + # "this needs to be the date where this tool is first deployed" in the original + # iana-protocols-updates script)" + rfc_must_published_later_than = datetime.datetime( + 2012, + 11, + 26, + tzinfo=datetime.UTC, + ) + + try: + response = requests.get( + settings.IANA_SYNC_PROTOCOLS_URL, + timeout=30, + ) + except requests.Timeout as exc: + log.log(f'GET request timed out retrieving IANA protocols page: {exc}') + return + + rfc_numbers = iana.parse_protocol_page(response.text) + + def batched(l, n): + """Split list l up in batches of max size n. + + For Python 3.12 or later, replace this with itertools.batched() + """ + return (l[i:i + n] for i in range(0, len(l), n)) + + for batch in batched(rfc_numbers, 100): + updated = iana.update_rfc_log_from_protocol_page( + batch, + rfc_must_published_later_than, + ) + + for d in updated: + log.log("Added history entry for %s" % d.display_name()) + +@shared_task +def fix_subseries_docevents_task(): + """Repairs DocEvents related to bugs around removing docs from subseries + + Removes bogus and repairs the date of non-bogus DocEvents + about removing RFCs from subseries + + This is designed to be a one-shot task that should be removed + after running it. It is intended to be safe if it runs more than once. + """ + log.log("Repairing DocEvents related to bugs around removing docs from subseries") + bogus_event_descs = [ + "Removed rfc8499 from bcp218", + "Removed rfc7042 from bcp184", + "Removed rfc9499 from bcp238", + "Removed rfc5033 from std74", + "Removed rfc3228 from bcp55", + "Removed rfc8109 from std85", + ] + DocEvent.objects.filter( + type="sync_from_rfc_editor", desc__in=bogus_event_descs + ).delete() + needs_moment_fix = [ + "Removed rfc8499 from bcp219", + "Removed rfc7042 from bcp141", + "Removed rfc5033 from bcp133", + "Removed rfc3228 from bcp57", + ] + # Assumptions (which have been manually verified): + # 1) each of the above RFCs is obsoleted by exactly one other RFC + # 2) each of the obsoleting RFCs has exactly one published_rfc docevent + for desc in needs_moment_fix: + obsoleted_rfc_name = desc.split(" ")[1] + obsoleting_rfc = RelatedDocument.objects.get( + relationship_id="obs", target__name=obsoleted_rfc_name + ).source + obsoleting_time = obsoleting_rfc.docevent_set.get(type="published_rfc").time + DocEvent.objects.filter(type="sync_from_rfc_editor", desc=desc).update( + time=obsoleting_time + ) diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py index f245145d2b1..3432f6214ad 100644 --- a/ietf/sync/tests.py +++ b/ietf/sync/tests.py @@ -6,20 +6,33 @@ import io import json import datetime +from unittest import mock import quopri +import requests + +from dataclasses import dataclass from django.conf import settings from django.urls import reverse as urlreverse from django.utils import timezone +from django.test.utils import override_settings import debug # pyflakes:ignore -from ietf.doc.factories import WgDraftFactory -from ietf.doc.models import Document, DocAlias, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent +from ietf.api.views import EmailIngestionError +from ietf.doc.factories import ( + WgDraftFactory, + RfcFactory, + DocumentAuthorFactory, + DocEventFactory, + BcpFactory, +) +from ietf.doc.models import Document, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent from ietf.doc.utils import add_state_change_event from ietf.group.factories import GroupFactory +from ietf.person.factories import PersonFactory from ietf.person.models import Person -from ietf.sync import iana, rfceditor +from ietf.sync import iana, rfceditor, tasks from ietf.utils.mail import outbox, empty_outbox from ietf.utils.test_utils import login_testing_unauthorized from ietf.utils.test_utils import TestCase @@ -29,19 +42,20 @@ class IANASyncTests(TestCase): def test_protocol_page_sync(self): draft = WgDraftFactory() - DocAlias.objects.create(name="rfc1234").docs.add(draft) - DocEvent.objects.create(doc=draft, rev=draft.rev, type="published_rfc", by=Person.objects.get(name="(System)")) + rfc = RfcFactory(rfc_number=1234) + draft.relateddocument_set.create(relationship_id="became_rfc", target = rfc) + DocEvent.objects.create(doc=rfc, rev="", type="published_rfc", by=Person.objects.get(name="(System)")) rfc_names = iana.parse_protocol_page('RFC 1234') self.assertEqual(len(rfc_names), 1) self.assertEqual(rfc_names[0], "rfc1234") iana.update_rfc_log_from_protocol_page(rfc_names, timezone.now() - datetime.timedelta(days=1)) - self.assertEqual(DocEvent.objects.filter(doc=draft, type="rfc_in_iana_registry").count(), 1) + self.assertEqual(DocEvent.objects.filter(doc=rfc, type="rfc_in_iana_registry").count(), 1) # make sure it doesn't create duplicates iana.update_rfc_log_from_protocol_page(rfc_names, timezone.now() - datetime.timedelta(days=1)) - self.assertEqual(DocEvent.objects.filter(doc=draft, type="rfc_in_iana_registry").count(), 1) + self.assertEqual(DocEvent.objects.filter(doc=rfc, type="rfc_in_iana_registry").count(), 1) def test_changes_sync(self): draft = WgDraftFactory(ad=Person.objects.get(user__username='ad')) @@ -192,7 +206,7 @@ def test_iana_review_mail(self): doc_name, review_time, by, comment = iana.parse_review_email(msg.encode('utf-8')) self.assertEqual(doc_name, draft.name) - self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 12, 0, rtime, tzinfo=datetime.timezone.utc)) + self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 12, 0, rtime, tzinfo=datetime.UTC)) self.assertEqual(by, Person.objects.get(user__username="iana")) self.assertIn("there are no IANA Actions", comment.replace("\n", "")) @@ -208,6 +222,61 @@ def test_iana_review_mail(self): iana.add_review_comment(doc_name, review_time, by, comment) self.assertEqual(DocEvent.objects.filter(doc=draft, type="iana_review").count(), events_before+1) + @mock.patch("ietf.sync.iana.add_review_comment") + @mock.patch("ietf.sync.iana.parse_review_email") + def test_ingest_review_email(self, mock_parse_review_email, mock_add_review_comment): + mock_parse_review_email.side_effect = ValueError("ouch!") + message = b"message" + + # Error parsing mail + with self.assertRaises(EmailIngestionError) as context: + iana.ingest_review_email(message) + self.assertIsNone(context.exception.as_emailmessage()) # no email + self.assertEqual("Unable to parse message as IANA review email", str(context.exception)) + self.assertTrue(mock_parse_review_email.called) + self.assertEqual(mock_parse_review_email.call_args, mock.call(message)) + self.assertFalse(mock_add_review_comment.called) + mock_parse_review_email.reset_mock() + + args = ( + "doc-name", + datetime.datetime.now(tz=datetime.UTC), + PersonFactory(), + "yadda yadda yadda", + ) + mock_parse_review_email.side_effect = None + mock_parse_review_email.return_value = args + mock_add_review_comment.side_effect = Document.DoesNotExist + with self.assertRaises(EmailIngestionError) as context: + iana.ingest_review_email(message) + self.assertIsNone(context.exception.as_emailmessage()) # no email + self.assertEqual(str(context.exception), "Unknown document doc-name") + self.assertTrue(mock_parse_review_email.called) + self.assertEqual(mock_parse_review_email.call_args, mock.call(message)) + self.assertTrue(mock_add_review_comment.called) + self.assertEqual(mock_add_review_comment.call_args, mock.call(*args)) + mock_parse_review_email.reset_mock() + mock_add_review_comment.reset_mock() + + mock_add_review_comment.side_effect = ValueError("ouch!") + with self.assertRaises(EmailIngestionError) as context: + iana.ingest_review_email(message) + self.assertIsNone(context.exception.as_emailmessage()) # no email + self.assertEqual("Error ingesting IANA review email", str(context.exception)) + self.assertTrue(mock_parse_review_email.called) + self.assertEqual(mock_parse_review_email.call_args, mock.call(message)) + self.assertTrue(mock_add_review_comment.called) + self.assertEqual(mock_add_review_comment.call_args, mock.call(*args)) + mock_parse_review_email.reset_mock() + mock_add_review_comment.reset_mock() + + mock_add_review_comment.side_effect = None + iana.ingest_review_email(message) + self.assertTrue(mock_parse_review_email.called) + self.assertEqual(mock_parse_review_email.call_args, mock.call(message)) + self.assertTrue(mock_add_review_comment.called) + self.assertEqual(mock_add_review_comment.call_args, mock.call(*args)) + def test_notify_page(self): # check that we can get the notify page url = urlreverse("ietf.sync.views.notify", kwargs=dict(org="iana", notification="changes")) @@ -226,18 +295,17 @@ def write_draft_file(self, name, size): def test_rfc_index(self): area = GroupFactory(type_id='area') - doc = WgDraftFactory( + draft_doc = WgDraftFactory( group__parent=area, - states=[('draft-iesg','rfcqueue'),('draft-stream-ise','rfc-edit')], + states=[('draft-iesg','rfcqueue')], ad=Person.objects.get(user__username='ad'), + external_url="http://my-external-url.example.com", + note="this is a note", ) - # it's a bit strange to have draft-stream-ise set when draft-iesg is set - # too, but for testing purposes ... - doc.action_holders.add(doc.ad) # not normally set, but add to be sure it's cleared + DocumentAuthorFactory.create_batch(2, document=draft_doc) + draft_doc.action_holders.add(draft_doc.ad) # not normally set, but add to be sure it's cleared - updated_doc = Document.objects.create(name="draft-ietf-something") - DocAlias.objects.create(name=updated_doc.name).docs.add(updated_doc) - DocAlias.objects.create(name="rfc123").docs.add(updated_doc) + RfcFactory(rfc_number=123) today = date_today() @@ -260,7 +328,7 @@ def test_rfc_index(self): - STD0001 + STD0002 Test RFC1234 @@ -300,14 +368,14 @@ def test_rfc_index(self): ''' % dict(year=today.strftime("%Y"), month=today.strftime("%B"), - name=doc.name, - rev=doc.rev, - area=doc.group.parent.acronym, - group=doc.group.acronym) + name=draft_doc.name, + rev=draft_doc.rev, + area=draft_doc.group.parent.acronym, + group=draft_doc.group.acronym) errata = [{ "errata_id":1, - "doc-id":"RFC123", + "doc-id":"RFC123", # n.b. this is not the same RFC as in the above index XML! "errata_status_code":"Verified", "errata_type_code":"Editorial", "section": "4.1", @@ -323,7 +391,6 @@ def test_rfc_index(self): data = rfceditor.parse_index(io.StringIO(t)) self.assertEqual(len(data), 1) - rfc_number, title, authors, rfc_published_date, current_status, updates, updated_by, obsoletes, obsoleted_by, also, draft, has_errata, stream, wg, file_formats, pages, abstract = data[0] # currently, we only check what we actually use @@ -333,49 +400,234 @@ def test_rfc_index(self): self.assertEqual(rfc_published_date.month, today.month) self.assertEqual(current_status, "Proposed Standard") self.assertEqual(updates, ["RFC123"]) - self.assertEqual(set(also), set(["BCP1", "FYI1", "STD1"])) - self.assertEqual(draft, doc.name) - self.assertEqual(wg, doc.group.acronym) + self.assertEqual(set(also), set(["BCP1", "FYI1", "STD2"])) + self.assertEqual(draft, draft_doc.name) + self.assertEqual(wg, draft_doc.group.acronym) self.assertEqual(has_errata, True) self.assertEqual(stream, "IETF") self.assertEqual(pages, "42") self.assertEqual(abstract, "This is some interesting text.") - draft_filename = "%s-%s.txt" % (doc.name, doc.rev) + draft_filename = "%s-%s.txt" % (draft_doc.name, draft_doc.rev) self.write_draft_file(draft_filename, 5000) - changes = [] - for cs, d, rfc_published in rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30)): - changes.append(cs) - - doc = Document.objects.get(name=doc.name) + event_count_before = draft_doc.docevent_set.count() + draft_title_before = draft_doc.title + draft_abstract_before = draft_doc.abstract + draft_pages_before = draft_doc.pages - events = doc.docevent_set.all() - self.assertEqual(events[0].type, "sync_from_rfc_editor") - self.assertEqual(events[1].type, "changed_action_holders") - self.assertEqual(events[2].type, "published_rfc") - self.assertEqual(events[2].time.astimezone(RPC_TZINFO).date(), today) - self.assertTrue("errata" in doc.tags.all().values_list("slug", flat=True)) - self.assertTrue(DocAlias.objects.filter(name="rfc1234", docs=doc)) - self.assertTrue(DocAlias.objects.filter(name="bcp1", docs=doc)) - self.assertTrue(DocAlias.objects.filter(name="fyi1", docs=doc)) - self.assertTrue(DocAlias.objects.filter(name="std1", docs=doc)) - self.assertTrue(RelatedDocument.objects.filter(source=doc, target__name="rfc123", relationship="updates")) - self.assertEqual(doc.title, "A Testing RFC") - self.assertEqual(doc.abstract, "This is some interesting text.") - self.assertEqual(doc.get_state_slug(), "rfc") - self.assertEqual(doc.get_state_slug("draft-iesg"), "pub") - self.assertCountEqual(doc.action_holders.all(), []) - self.assertEqual(doc.get_state_slug("draft-stream-ise"), "pub") - self.assertEqual(doc.std_level_id, "ps") - self.assertEqual(doc.pages, 42) + changes = [] + with mock.patch("ietf.sync.rfceditor.log") as mock_log: + for rfc_number, _, d, rfc_published in rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30)): + changes.append({"doc_pk": d.pk, "rfc_published": rfc_published}) # we ignore the actual change list + self.assertEqual(rfc_number, 1234) + if rfc_published: + self.assertEqual(d.type_id, "rfc") + self.assertEqual(d.rfc_number, rfc_number) + else: + self.assertEqual(d.type_id, "draft") + self.assertIsNone(d.rfc_number) + + self.assertFalse(mock_log.called, "No log messages expected") + + draft_doc = Document.objects.get(name=draft_doc.name) + draft_events = draft_doc.docevent_set.all() + self.assertEqual(len(draft_events) - event_count_before, 2) + self.assertEqual(draft_events[0].type, "sync_from_rfc_editor") + self.assertEqual(draft_events[1].type, "changed_action_holders") + self.assertEqual(draft_doc.get_state_slug(), "rfc") + self.assertEqual(draft_doc.get_state_slug("draft-iesg"), "pub") + self.assertCountEqual(draft_doc.action_holders.all(), []) + self.assertEqual(draft_doc.title, draft_title_before) + self.assertEqual(draft_doc.abstract, draft_abstract_before) + self.assertEqual(draft_doc.pages, draft_pages_before) self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, draft_filename))) self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, draft_filename))) + rfc_doc = Document.objects.filter(rfc_number=1234, type_id="rfc").first() + self.assertIsNotNone(rfc_doc, "RFC document should have been created") + self.assertEqual(rfc_doc.authors(), draft_doc.authors()) + rfc_events = rfc_doc.docevent_set.all() + self.assertEqual(len(rfc_events), 8) + expected_events = [ + ["sync_from_rfc_editor", ""], # Not looking for exact desc match here - see detailed tests below + ["sync_from_rfc_editor", "Imported membership of rfc1234 in std2 via sync to the rfc-index"], + ["std_history_marker", "No history of STD2 is currently available in the datatracker before this point"], + ["sync_from_rfc_editor", "Imported membership of rfc1234 in fyi1 via sync to the rfc-index"], + ["fyi_history_marker", "No history of FYI1 is currently available in the datatracker before this point"], + ["sync_from_rfc_editor", "Imported membership of rfc1234 in bcp1 via sync to the rfc-index"], + ["bcp_history_marker", "No history of BCP1 is currently available in the datatracker before this point"], + ["published_rfc", "RFC published"] + ] + for index, [event_type, desc] in enumerate(expected_events): + self.assertEqual(rfc_events[index].type, event_type) + if index == 0: + self.assertIn("Received changes through RFC Editor sync (created document RFC 1234,", rfc_events[0].desc) + self.assertIn(f"created became rfc relationship between {rfc_doc.came_from_draft().name} and RFC 1234", rfc_events[0].desc) + self.assertIn("set title to 'A Testing RFC'", rfc_events[0].desc) + self.assertIn("set abstract to 'This is some interesting text.'", rfc_events[0].desc) + self.assertIn("set pages to 42", rfc_events[0].desc) + self.assertIn("set standardization level to Proposed Standard", rfc_events[0].desc) + self.assertIn(f"added RFC published event at {rfc_events[0].time.astimezone(RPC_TZINFO):%Y-%m-%d}", rfc_events[0].desc) + self.assertIn("created updates relation between RFC 1234 and RFC 123", rfc_events[0].desc) + self.assertIn("added Errata tag", rfc_events[0].desc) + else: + self.assertEqual(rfc_events[index].desc, desc) + self.assertEqual(rfc_events[7].time.astimezone(RPC_TZINFO).date(), today) + for subseries_name in ["bcp1", "fyi1", "std2"]: + sub = Document.objects.filter(type_id=subseries_name[:3],name=subseries_name).first() + self.assertIsNotNone(sub, f"{subseries_name} not created") + self.assertTrue(rfc_doc in sub.contains()) + self.assertTrue(sub in rfc_doc.part_of()) + self.assertEqual(rfc_doc.get_state_slug(), "published") + # Should have an "errata" tag because there is an errata-url in the index XML, but no "verified-errata" tag + # because there is no verified item in the errata JSON with doc-id matching the RFC document. + tag_slugs = rfc_doc.tags.values_list("slug", flat=True) + self.assertTrue("errata" in tag_slugs) + self.assertFalse("verified-errata" in tag_slugs) + # TODO: adjust these when we have subseries document types + # self.assertTrue(DocAlias.objects.filter(name="rfc1234", docs=rfc_doc)) + # self.assertTrue(DocAlias.objects.filter(name="bcp1", docs=rfc_doc)) + # self.assertTrue(DocAlias.objects.filter(name="fyi1", docs=rfc_doc)) + # self.assertTrue(DocAlias.objects.filter(name="std1", docs=rfc_doc)) + self.assertTrue(RelatedDocument.objects.filter(source=rfc_doc, target__name="rfc123", relationship="updates").exists()) + self.assertTrue(RelatedDocument.objects.filter(source=draft_doc, target=rfc_doc, relationship="became_rfc").exists()) + self.assertEqual(rfc_doc.title, "A Testing RFC") + self.assertEqual(rfc_doc.abstract, "This is some interesting text.") + self.assertEqual(rfc_doc.std_level_id, "ps") + self.assertEqual(rfc_doc.pages, 42) + self.assertEqual(rfc_doc.stream, draft_doc.stream) + self.assertEqual(rfc_doc.group, draft_doc.group) + self.assertEqual(rfc_doc.words, draft_doc.words) + self.assertEqual(rfc_doc.ad, draft_doc.ad) + self.assertEqual(rfc_doc.external_url, draft_doc.external_url) + self.assertEqual(rfc_doc.note, draft_doc.note) + + # check that we got the expected changes + self.assertEqual(len(changes), 2) + self.assertEqual(changes[0]["doc_pk"], draft_doc.pk) + self.assertEqual(changes[0]["rfc_published"], False) + self.assertEqual(changes[1]["doc_pk"], rfc_doc.pk) + self.assertEqual(changes[1]["rfc_published"], True) + # make sure we can apply it again with no changes changed = list(rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30))) self.assertEqual(len(changed), 0) + def test_rfc_index_subseries_replacement(self): + today = date_today() + author = PersonFactory(name="Some Bozo") + + # Start with two BCPs, each containing an rfc + rfc1, rfc2, rfc3 = RfcFactory.create_batch(3, authors=[author]) + bcp1 = BcpFactory(contains=[rfc1]) + bcp2 = BcpFactory(contains=[rfc2]) + + def _nameify(doc): + """Convert a name like 'rfc1' to 'RFC0001""" + return f"{doc.name[:3].upper()}{int(doc.name[3:]):04d}" + + # RFC index that replaces rfc2 with rfc3 in bcp2 + index_xml = f""" + + + {_nameify(bcp1)} + + {_nameify(rfc1)} + + + + {_nameify(bcp2)} + + {_nameify(rfc3)} + + + + {_nameify(rfc1)} + {rfc1.title} + + Some Bozo + + + {today.strftime('%B')} + {today.strftime('%Y')} + + + ASCII + + 42 + + test + +

        This is some interesting text.

         + + {_nameify(bcp1)} + + PROPOSED STANDARD + PROPOSED STANDARD + IETF +         + + {_nameify(rfc2)} + {rfc2.title} + + Some Bozo + + + {today.strftime('%B')} + {today.strftime('%Y')} + + + ASCII + + 42 + + test + +

        This is some interesting text.

         + PROPOSED STANDARD + PROPOSED STANDARD + IETF +         + + {_nameify(rfc3)} + {rfc3.title} + + Some Bozo + + + {today.strftime('%B')} + {today.strftime('%Y')} + + + ASCII + + 42 + + test + +

        This is some interesting text.

         + + {_nameify(bcp2)} + + PROPOSED STANDARD + PROPOSED STANDARD + IETF +         +        """ + data = rfceditor.parse_index(io.StringIO(index_xml)) # parse index + self.assertEqual(len(data), 3) # check that we parsed 3 RFCs + # Process the data by consuming the generator + for _ in rfceditor.update_docs_from_rfc_index(data, []): + pass + # Confirm that the expected changes were made + self.assertCountEqual(rfc1.related_that("contains"), [bcp1]) + self.assertCountEqual(rfc2.related_that("contains"), []) + self.assertCountEqual(rfc3.related_that("contains"), [bcp2]) + def _generate_rfc_queue_xml(self, draft, state, auth48_url=None): """Generate an RFC queue xml string for a draft""" t = ''' @@ -522,6 +774,29 @@ def test_update_draft_auth48_url(self): auth48_docurl = draft.documenturl_set.filter(tag_id='auth48').first() self.assertIsNone(auth48_docurl) + def test_post_approved_draft_in_production_only(self): + self.requests_mock.post("https://rfceditor.example.com/", status_code=200, text="OK") + + # be careful playing with SERVER_MODE! + with override_settings(SERVER_MODE="test"): + self.assertEqual( + rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"), + ("", "") + ) + self.assertFalse(self.requests_mock.called) + with override_settings(SERVER_MODE="development"): + self.assertEqual( + rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"), + ("", "") + ) + self.assertFalse(self.requests_mock.called) + with override_settings(SERVER_MODE="production"): + self.assertEqual( + rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"), + ("", "") + ) + self.assertTrue(self.requests_mock.called) + class DiscrepanciesTests(TestCase): def test_discrepancies(self): @@ -561,6 +836,7 @@ def test_discrepancies(self): r = self.client.get(urlreverse("ietf.sync.views.discrepancies")) self.assertContains(r, doc.name) + class RFCEditorUndoTests(TestCase): def test_rfceditor_undo(self): draft = WgDraftFactory() @@ -602,4 +878,259 @@ def test_rfceditor_undo(self): e = DeletedEvent.objects.all().order_by("-time", "-id")[0] e.content_type.model_class().objects.create(**json.loads(e.json)) - self.assertTrue(StateDocEvent.objects.filter(desc="First", doc=draft)) \ No newline at end of file + self.assertTrue(StateDocEvent.objects.filter(desc="First", doc=draft)) + + +class TaskTests(TestCase): + @override_settings( + RFC_EDITOR_INDEX_URL="https://rfc-editor.example.com/index/", + RFC_EDITOR_ERRATA_JSON_URL="https://rfc-editor.example.com/errata/", + ) + @mock.patch("ietf.sync.tasks.rfceditor.update_docs_from_rfc_index") + @mock.patch("ietf.sync.tasks.rfceditor.parse_index") + @mock.patch("ietf.sync.tasks.requests.get") + def test_rfc_editor_index_update_task( + self, requests_get_mock, parse_index_mock, update_docs_mock + ) -> None: # the annotation here prevents mypy from complaining about annotation-unchecked + """rfc_editor_index_update_task calls helpers correctly + + This tests that data flow is as expected. Assumes the individual helpers are + separately tested to function correctly. + """ + @dataclass + class MockIndexData: + """Mock index item that claims to be a specified length""" + length: int + + def __len__(self): + return self.length + + @dataclass + class MockResponse: + """Mock object that contains text and json() that claims to be a specified length""" + text: str + json_length: int = 0 + + def json(self): + return MockIndexData(length=self.json_length) + + # Response objects + index_response = MockResponse(text="this is the index") + errata_response = MockResponse( + text="these are the errata", json_length=rfceditor.MIN_ERRATA_RESULTS + ) + rfc = RfcFactory() + + # Test with full_index = False + requests_get_mock.side_effect = (index_response, errata_response) # will step through these + parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS) + update_docs_mock.return_value = ( + (rfc.rfc_number, ("something changed",), rfc, False), + ) + + tasks.rfc_editor_index_update_task(full_index=False) + + # Check parse_index() call + self.assertTrue(parse_index_mock.called) + (parse_index_args, _) = parse_index_mock.call_args + self.assertEqual( + parse_index_args[0].read(), # arg is a StringIO + "this is the index", + "parse_index is called with the index text in a StringIO", + ) + + # Check update_docs_from_rfc_index call + self.assertTrue(update_docs_mock.called) + (update_docs_args, update_docs_kwargs) = update_docs_mock.call_args + self.assertEqual( + update_docs_args, (parse_index_mock.return_value, errata_response.json()) + ) + self.assertIsNotNone(update_docs_kwargs["skip_older_than_date"]) + + # Test again with full_index = True + requests_get_mock.reset_mock() + parse_index_mock.reset_mock() + update_docs_mock.reset_mock() + requests_get_mock.side_effect = (index_response, errata_response) # will step through these + tasks.rfc_editor_index_update_task(full_index=True) + + # Check parse_index() call + self.assertTrue(parse_index_mock.called) + (parse_index_args, _) = parse_index_mock.call_args + self.assertEqual( + parse_index_args[0].read(), # arg is a StringIO + "this is the index", + "parse_index is called with the index text in a StringIO", + ) + + # Check update_docs_from_rfc_index call + self.assertTrue(update_docs_mock.called) + (update_docs_args, update_docs_kwargs) = update_docs_mock.call_args + self.assertEqual( + update_docs_args, (parse_index_mock.return_value, errata_response.json()) + ) + self.assertIsNone(update_docs_kwargs["skip_older_than_date"]) + + # Test error handling + requests_get_mock.reset_mock() + parse_index_mock.reset_mock() + update_docs_mock.reset_mock() + requests_get_mock.side_effect = requests.Timeout # timeout on every get() + tasks.rfc_editor_index_update_task(full_index=False) + self.assertFalse(parse_index_mock.called) + self.assertFalse(update_docs_mock.called) + + requests_get_mock.reset_mock() + parse_index_mock.reset_mock() + update_docs_mock.reset_mock() + requests_get_mock.side_effect = [index_response, requests.Timeout] # timeout second get() + tasks.rfc_editor_index_update_task(full_index=False) + self.assertFalse(update_docs_mock.called) + + requests_get_mock.reset_mock() + parse_index_mock.reset_mock() + update_docs_mock.reset_mock() + requests_get_mock.side_effect = [index_response, errata_response] + # feed in an index that is too short + parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS - 1) + tasks.rfc_editor_index_update_task(full_index=False) + self.assertTrue(parse_index_mock.called) + self.assertFalse(update_docs_mock.called) + + requests_get_mock.reset_mock() + parse_index_mock.reset_mock() + update_docs_mock.reset_mock() + requests_get_mock.side_effect = [index_response, errata_response] + errata_response.json_length = rfceditor.MIN_ERRATA_RESULTS - 1 # too short + parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS) + tasks.rfc_editor_index_update_task(full_index=False) + self.assertFalse(update_docs_mock.called) + + @override_settings(RFC_EDITOR_QUEUE_URL="https://rfc-editor.example.com/queue/") + @mock.patch("ietf.sync.tasks.update_drafts_from_queue") + @mock.patch("ietf.sync.tasks.parse_queue") + def test_rfc_editor_queue_updates_task(self, mock_parse, mock_update): + # test a request timeout + self.requests_mock.get("https://rfc-editor.example.com/queue/", exc=requests.exceptions.Timeout) + tasks.rfc_editor_queue_updates_task() + self.assertFalse(mock_parse.called) + self.assertFalse(mock_update.called) + + # now return a value rather than an exception + self.requests_mock.get("https://rfc-editor.example.com/queue/", text="the response") + + # mock returning < MIN_QUEUE_RESULTS values - treated as an error, so no update takes place + mock_parse.return_value = ([n for n in range(rfceditor.MIN_QUEUE_RESULTS - 1)], ["a warning"]) + tasks.rfc_editor_queue_updates_task() + self.assertEqual(mock_parse.call_count, 1) + self.assertEqual(mock_parse.call_args[0][0].read(), "the response") + self.assertFalse(mock_update.called) + mock_parse.reset_mock() + + # mock returning +. MIN_QUEUE_RESULTS - should succeed + mock_parse.return_value = ([n for n in range(rfceditor.MIN_QUEUE_RESULTS)], ["a warning"]) + mock_update.return_value = ([1,2,3], ["another warning"]) + tasks.rfc_editor_queue_updates_task() + self.assertEqual(mock_parse.call_count, 1) + self.assertEqual(mock_parse.call_args[0][0].read(), "the response") + self.assertEqual(mock_update.call_count, 1) + self.assertEqual(mock_update.call_args, mock.call([n for n in range(rfceditor.MIN_QUEUE_RESULTS)])) + + @override_settings(IANA_SYNC_CHANGES_URL="https://iana.example.com/sync/") + @mock.patch("ietf.sync.tasks.iana.update_history_with_changes") + @mock.patch("ietf.sync.tasks.iana.parse_changes_json") + @mock.patch("ietf.sync.tasks.iana.fetch_changes_json") + def test_iana_changes_update_task( + self, + fetch_changes_mock, + parse_changes_mock, + update_history_mock, + ): + # set up mocks + fetch_return_val = object() + fetch_changes_mock.return_value = fetch_return_val + parse_return_val = object() + parse_changes_mock.return_value = parse_return_val + event_with_json = DocEventFactory() + event_with_json.json = "hi I'm json" + update_history_mock.return_value = [ + [event_with_json], # events + ["oh no!"], # warnings + ] + + tasks.iana_changes_update_task() + self.assertEqual(fetch_changes_mock.call_count, 1) + self.assertEqual( + fetch_changes_mock.call_args[0][0], + "https://iana.example.com/sync/", + ) + self.assertTrue(parse_changes_mock.called) + self.assertEqual( + parse_changes_mock.call_args, + ((fetch_return_val,), {}), + ) + self.assertTrue(update_history_mock.called) + self.assertEqual( + update_history_mock.call_args, + ((parse_return_val,), {"send_email": True}), + ) + + @override_settings(IANA_SYNC_PROTOCOLS_URL="https://iana.example.com/proto/") + @mock.patch("ietf.sync.tasks.iana.update_rfc_log_from_protocol_page") + @mock.patch("ietf.sync.tasks.iana.parse_protocol_page") + @mock.patch("ietf.sync.tasks.requests.get") + def test_iana_protocols_update_task( + self, + requests_get_mock, + parse_protocols_mock, + update_rfc_log_mock, + ): + # set up mocks + requests_get_mock.return_value = mock.Mock(text="fetched response") + parse_protocols_mock.return_value = range(110) # larger than batch size of 100 + update_rfc_log_mock.return_value = [ + mock.Mock(display_name=mock.Mock(return_value="name")) + ] + + # call the task + tasks.iana_protocols_update_task() + + # check that it did the right things + self.assertTrue(requests_get_mock.called) + self.assertEqual( + requests_get_mock.call_args[0], + ("https://iana.example.com/proto/",), + ) + self.assertTrue(parse_protocols_mock.called) + self.assertEqual( + parse_protocols_mock.call_args[0], + ("fetched response",), + ) + self.assertEqual(update_rfc_log_mock.call_count, 2) + self.assertEqual( + update_rfc_log_mock.call_args_list[0][0][0], + range(100), # first batch + ) + self.assertEqual( + update_rfc_log_mock.call_args_list[1][0][0], + range(100, 110), # second batch + ) + # make sure the calls use the same later_than date and that it's the expected one + published_later_than = set( + update_rfc_log_mock.call_args_list[n][0][1] for n in (0, 1) + ) + self.assertEqual( + published_later_than, + {datetime.datetime(2012,11,26,tzinfo=datetime.UTC)} + ) + + # try with an exception + requests_get_mock.reset_mock() + parse_protocols_mock.reset_mock() + update_rfc_log_mock.reset_mock() + requests_get_mock.side_effect = requests.Timeout + + tasks.iana_protocols_update_task() + self.assertTrue(requests_get_mock.called) + self.assertFalse(parse_protocols_mock.called) + self.assertFalse(update_rfc_log_mock.called) diff --git a/ietf/sync/views.py b/ietf/sync/views.py index 431dd0a8fc8..bd539d4e186 100644 --- a/ietf/sync/views.py +++ b/ietf/sync/views.py @@ -1,15 +1,13 @@ # Copyright The IETF Trust 2012-2020, All Rights Reserved # -*- coding: utf-8 -*- - import datetime -import subprocess -import os import json from django.conf import settings from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType +from django.db import transaction from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import render from django.utils import timezone @@ -17,14 +15,13 @@ from ietf.doc.models import DeletedEvent, StateDocEvent, DocEvent from ietf.ietfauth.utils import role_required, has_role +from ietf.sync import tasks from ietf.sync.discrepancies import find_discrepancies from ietf.utils.serialize import object_as_shallow_dict from ietf.utils.log import log from ietf.utils.response import permission_denied -SYNC_BIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../bin")) - #@role_required('Secretariat', 'IANA', 'RFC Editor') def discrepancies(request): sections = find_discrepancies() @@ -53,9 +50,8 @@ def notify(request, org, notification): password = request.POST.get("password") or request.GET.get("password") if username != None and password != None: - if settings.SERVER_MODE == "production" and not request.is_secure(): - permission_denied(request, "You must use HTTPS when sending username/password.") - + # Used to reject non-https traffic here, but that's now enforced by a domain-wide upgrade + # from http to https. Django's request.is_secure() is always False now. if not user.is_authenticated: try: user = User.objects.get(username__iexact=username) @@ -79,31 +75,34 @@ def notify(request, org, notification): raise Http404 if request.method == "POST": - def runscript(name): - python = os.path.join(os.path.dirname(settings.BASE_DIR), "env", "bin", "python") - cmd = [python, os.path.join(SYNC_BIN_PATH, name)] - cmdstring = " ".join(cmd) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - out, err = p.communicate() - out = out.decode('utf-8') - err = err.decode('utf-8') - if p.returncode: - log("Subprocess error %s when running '%s': %s %s" % (p.returncode, cmd, err, out)) - raise subprocess.CalledProcessError(p.returncode, cmdstring, "\n".join([err, out])) - - log("Running sync script from notify view POST") - - if notification == "protocols": - runscript("iana-protocols-updates") - - if notification == "changes": - runscript("iana-changes-updates") - - if notification == "queue": - runscript("rfc-editor-queue-updates") - if notification == "index": - runscript("rfc-editor-index-updates") + log("Queuing RFC Editor index sync from notify view POST") + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) + transaction.on_commit( + lambda: tasks.rfc_editor_index_update_task.delay() + ) + elif notification == "queue": + log("Queuing RFC Editor queue sync from notify view POST") + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) + transaction.on_commit( + lambda: tasks.rfc_editor_queue_updates_task.delay() + ) + elif notification == "changes": + log("Queuing IANA changes sync from notify view POST") + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) + transaction.on_commit( + lambda: tasks.iana_changes_update_task.delay() + ) + elif notification == "protocols": + log("Queuing IANA protocols sync from notify view POST") + # Wrap in on_commit in case a transaction is open + # (As of 2024-11-08, this only runs in a transaction during tests) + transaction.on_commit( + lambda: tasks.iana_protocols_update_task.delay() + ) return HttpResponse("OK", content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET) diff --git a/ietf/templates/.gitignore b/ietf/templates/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/401.html b/ietf/templates/401.html index a88ce940e5f..8c06dff9e12 100644 --- a/ietf/templates/401.html +++ b/ietf/templates/401.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}401 Unauthorized{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

        Authentication Required

        diff --git a/ietf/templates/403.html b/ietf/templates/403.html index 155e4ea998c..2ea87eb3ad6 100644 --- a/ietf/templates/403.html +++ b/ietf/templates/403.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Error: Restricted Access{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

        Restricted Access

        diff --git a/ietf/templates/404.html b/ietf/templates/404.html index de247c89a1c..b21bd5d97bf 100644 --- a/ietf/templates/404.html +++ b/ietf/templates/404.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Error: Page Not Found{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

        The page you were looking for couldn't be found

        diff --git a/ietf/templates/500.html b/ietf/templates/500.html index b7ea01bddee..bd205dad6b5 100644 --- a/ietf/templates/500.html +++ b/ietf/templates/500.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}500 Internal Server Error{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

        Internal Server Error

        diff --git a/ietf/templates/admin/base.html b/ietf/templates/admin/base.html new file mode 100644 index 00000000000..d48891dfc41 --- /dev/null +++ b/ietf/templates/admin/base.html @@ -0,0 +1,28 @@ +{% extends 'admin/base.html' %} +{% load static %} +{% block extrastyle %}{{ block.super }} + {% if server_mode and server_mode != "production" %} + + {% endif %} +{% endblock %} diff --git a/ietf/templates/admin/meeting/Registration/change_list.html b/ietf/templates/admin/meeting/Registration/change_list.html new file mode 100644 index 00000000000..62784b2cb69 --- /dev/null +++ b/ietf/templates/admin/meeting/Registration/change_list.html @@ -0,0 +1,10 @@ +{% extends "admin/change_list.html" %} + +{% block search %} + {{ block.super }} {# This includes the original search form #} + {% if cl.search_fields %} {# Only show if search is enabled for the model #} +

        + Hint: Search by: {{ cl.search_fields|join:", "|capfirst }}. +

        + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/admin/meeting/RegistrationTicket/change_list.html b/ietf/templates/admin/meeting/RegistrationTicket/change_list.html new file mode 100644 index 00000000000..62784b2cb69 --- /dev/null +++ b/ietf/templates/admin/meeting/RegistrationTicket/change_list.html @@ -0,0 +1,10 @@ +{% extends "admin/change_list.html" %} + +{% block search %} + {{ block.super }} {# This includes the original search form #} + {% if cl.search_fields %} {# Only show if search is enabled for the model #} +

        + Hint: Search by: {{ cl.search_fields|join:", "|capfirst }}. +

        + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html index 8373a387f9c..e21a50101ad 100644 --- a/ietf/templates/api/index.html +++ b/ietf/templates/api/index.html @@ -9,7 +9,7 @@

        Framework API

        This section describes the autogenerated read-only API towards the database tables. See also the - Internet-Draft submission API description + Internet-Draft submission API description and the IESG ballot position API description

        diff --git a/ietf/templates/base.html b/ietf/templates/base.html index c5dd43fef5b..25ce50c4672 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -1,4 +1,4 @@ -{# Copyright The IETF Trust 2015-2022, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load analytical %} {% load ietf_filters static %} @@ -6,7 +6,7 @@ {% origin %} {% load django_bootstrap5 %} {% load django_vite %} - + {% analytical_head_top %} @@ -15,10 +15,13 @@ {% block title %}No title{% endblock %} - - + + + + {# load this in the head, to prevent flickering #} + @@ -29,27 +32,27 @@ {% analytical_head_bottom %} - {% analytical_body_top %} + {% include "base/status.html" %} -
      • @@ -241,47 +273,67 @@ {% endif %}
    • - Agenda
    • - Materials
    • - Floor plan
    • - Registration
    • - Important dates
    • - + Request a session
      • + {% if user|can_request_interim %} +
    • + + Request an interim meeting + +
      • + {% endif %}
    • - Session requests
      • + {% if user|matman_groups %} + {% if flavor == 'top' %}
      • {% endif %} +
    • Manage
      • + {% for g in user|matman_groups %} +
    • + + {{ g.acronym }} {{ g.type_id }} meetings + +
      • + {% endfor %} + {% endif %} {% if flavor == 'top' %} {% if flavor == 'top' %}
    • @@ -292,7 +344,7 @@
      • {% endif %}
    • - Upcoming meetings @@ -307,13 +359,13 @@
      • {% endif %}
    • - Past meetings
    • - Meeting proceedings @@ -339,56 +391,64 @@
      • {% endif %}
    • - IPR disclosures
    • - Liaison statements
      • + {% if user|has_role:"Secretariat,IAB,Liaison Manager,Liaison Coordinator" %} +
    • + + List of other SDO groups + +
      • + {% endif %}
    • - IESG agenda
    • - NomComs
    • - Downref registry
    • - Statistics
    • - - Tutorials - -
      • -
    • - API Help
    • - Release notes
      • +
    • + + System status + +
      • {% if flavor == 'top' %}
      • {% endif %}
    • - @@ -432,4 +492,4 @@ {% endif %} {% if flavor == 'top' %} {% include "base/menu_user.html" %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/ietf/templates/base/menu_user.html b/ietf/templates/base/menu_user.html index bb68855b6eb..fd921638a45 100644 --- a/ietf/templates/base/menu_user.html +++ b/ietf/templates/base/menu_user.html @@ -1,4 +1,4 @@ -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% origin %} {% load ietf_filters %} @@ -23,7 +23,7 @@ {% url 'django.contrib.auth.views.logout' as logout_url %} {% if request.get_full_path == logout_url %}
    • - Sign in @@ -32,14 +32,16 @@ {% else %} {% if user.is_authenticated %}
    • - - Sign out - +
      + {% csrf_token %} + +
    • - Account info @@ -47,35 +49,35 @@
      • {% if user and user.person %}
    • - Public profile page
      • {% endif %}
    • - Preferences
    • - API keys
    • - Change password
    • - Change username @@ -83,21 +85,21 @@
      • {% else %}
    • - + href="{% url 'ietf.ietfauth.views.login' %}?next={{ request.get_full_path|removeprefix:'/accounts/login/?next='|urlencode }}"> Sign in
    • - Password reset
    • - Preferences @@ -107,15 +109,46 @@ {% endif %} {% if not request.user.is_authenticated %}
    • - New account
      • {% endif %} +
    • + + List subscriptions + + +
      • {% if user|has_role:"Reviewer" %}
    • - My reviews @@ -125,31 +158,31 @@ {% if flavor == "top" %}
      • {% endif %}
    • AD dashboard
    • - My docs
    • - Next telechat
    • - Discusses
    • - Milestone review
    • - Last Call docs @@ -161,35 +194,29 @@ IETF secretariat
    • - Telechat dates
    • - Management items
    • - Milestones
    • - Sync discrepancies
      • -
    • - - Account allowlist - -
      • {% endif %} {% if user|has_role:"IANA" %} {% if flavor == "top" %} @@ -200,7 +227,7 @@ IANA
    • - Sync discrepancies @@ -215,7 +242,7 @@ RFC Editor
    • - Sync discrepancies diff --git a/ietf/templates/base/menu_wg.html b/ietf/templates/base/menu_wg.html index 3ab7ca399bf..5ca1be8a4e8 100644 --- a/ietf/templates/base/menu_wg.html +++ b/ietf/templates/base/menu_wg.html @@ -2,8 +2,11 @@ {% load origin %} {% origin %} {% for p in parents %} + {% if p.acronym == "iab" %} +
    • IESG
      • + {% endif%}
    • - {{ p.short_name }} diff --git a/ietf/templates/base/status.html b/ietf/templates/base/status.html new file mode 100644 index 00000000000..33e1abf699b --- /dev/null +++ b/ietf/templates/base/status.html @@ -0,0 +1,2 @@ + +
      \ No newline at end of file diff --git a/ietf/templates/community/atom.xml b/ietf/templates/community/atom.xml index 32e3b002923..01dcdfeee7f 100644 --- a/ietf/templates/community/atom.xml +++ b/ietf/templates/community/atom.xml @@ -3,7 +3,7 @@ {{ title }} {{ subtitle }} {{ id }} - {{ updated|date:"Y-m-d\TH:i:sO" }} + {{ updated.isoformat }} @@ -17,11 +17,11 @@ - {{ entry.id }} + urn:datatracker-ietf-org:event:{{ entry.id }} - {{ entry.time|date:"Y-m-d\TH:i:sO" }} + {{ entry.time.isoformat }} - {{ entry.time|date:"Y-m-d\TH:i:sO" }} + {{ entry.time.isoformat }} {{ entry.by }} diff --git a/ietf/templates/community/list_menu.html b/ietf/templates/community/list_menu.html index d54695775fc..009d01152d3 100644 --- a/ietf/templates/community/list_menu.html +++ b/ietf/templates/community/list_menu.html @@ -3,18 +3,18 @@
      + href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" email_or_name=email_or_name %}{% endif %}"> All changes + href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" email_or_name=email_or_name %}{% endif %}?significant=1"> Significant
      {% if clist.pk != None %} + href="{% if clist.group %}{% url "ietf.community.views.subscription" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.subscription" email_or_name=email_or_name %}{% endif %}"> {% if subscribed %} Change subscription @@ -24,7 +24,7 @@ {% endif %} + href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" email_or_name=email_or_name %}{% endif %}"> Export as CSV - \ No newline at end of file + diff --git a/ietf/templates/community/subscription.html b/ietf/templates/community/subscription.html index e8b562a47d7..4b92a610e13 100644 --- a/ietf/templates/community/subscription.html +++ b/ietf/templates/community/subscription.html @@ -32,7 +32,7 @@

      Existing subscriptions

      {% endif %}

      Add new subscription

      -

      +

      The email addresses you can choose between are those registered in your profile.

      diff --git a/ietf/templates/community/untrack_document.html b/ietf/templates/community/untrack_document.html index 985dcad89b1..fe94081a79b 100644 --- a/ietf/templates/community/untrack_document.html +++ b/ietf/templates/community/untrack_document.html @@ -1,17 +1,14 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} +{% extends "base.html" %} {% load origin %} {% origin %} -{% load django_bootstrap5 %} {% block title %}Remove tracking of document {{ name }}{% endblock %} -{% bootstrap_messages %} -
      - {% csrf_token %} -

      - Remove {{ name }} from the list? -

      - -
      +{% block content %} +
      + {% csrf_token %} +

      + Remove {{ name }} from the list? +

      + +
      +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/community/view_list.html b/ietf/templates/community/view_list.html index 17650beb101..a543eaf7cf8 100644 --- a/ietf/templates/community/view_list.html +++ b/ietf/templates/community/view_list.html @@ -12,7 +12,7 @@

      {{ clist.long_name }}

      {% bootstrap_messages %} {% if can_manage_list %} + href="{% url "ietf.community.views.manage_list" email_or_name=email_or_name %}"> Manage list @@ -22,4 +22,4 @@

      {{ clist.long_name }}

      {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/cookies/settings.html b/ietf/templates/cookies/settings.html index 5ded2f3bd63..3515491c358 100644 --- a/ietf/templates/cookies/settings.html +++ b/ietf/templates/cookies/settings.html @@ -12,7 +12,7 @@

      User settings

      cookies disabled then you will not be able to change the settings (everything still continues to work by using default settings).

      -

      How many days is considered "new"?

      +

      How many days is considered "new"?

      This setting affects how many days are considered "new enough" to get the special highlighting in the documents table. The default setting is {{ defaults.new_enough }} days.

      @@ -60,7 +60,7 @@

      How many days is considered "new"?

      90 days

      -

      How many days is considered "soon"?

      +

      How many days is considered "soon"?

      This setting tells what is considered "soon" when showing documents that are going to be expire soon. The Default setting is {{ defaults.expires_soon }} days.

      @@ -108,7 +108,7 @@

      How many days is considered "soon"?

      90 days

      -

      Show full document text by default?

      +

      Show full document text by default?

      Show the full text immediately on the document page instead of only showing beginning of it. This defaults to {{ defaults.full_draft }}.

      @@ -128,7 +128,7 @@

      Show full document text by default?

      On

      -

      Show the left-hand menu?

      +

      Show the left-hand menu?

      Show the left-hand menu on all regular pages? This defaults to {{ defaults.left_menu }}.

      @@ -148,4 +148,24 @@

      Show the left-hand menu?

      On

      + + +

      Which color mode should be used?

      +

      + Use a light, dark or automatic (as indicated by OS) color mode. +

      +

      + + + Light + + + + Dark + + + + Auto + +

      {% endblock %} \ No newline at end of file diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html index f7788e776c3..c459359d3e7 100644 --- a/ietf/templates/debug.html +++ b/ietf/templates/debug.html @@ -103,7 +103,7 @@
      • - {% endfor %} -
    - {% endif %}" - {% endif %} - {% with label.2 as up_is_good %} - {% if prev < count %} - class="bi bi-arrow-up-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-success,text-danger,text-muted' }}" - {% elif prev > count %} - class="bi bi-arrow-down-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-danger,text-success,text-muted' }}" - {% else %} - class="bi bi-arrow-right-circle text-muted" - {% endif %} - > - {% endwith %} - {% endif %} -{% endif %} \ No newline at end of file diff --git a/ietf/templates/doc/ad_list.html b/ietf/templates/doc/ad_list.html index 189754e8ac7..cac709021ea 100644 --- a/ietf/templates/doc/ad_list.html +++ b/ietf/templates/doc/ad_list.html @@ -3,42 +3,80 @@ {% load origin static %} {% load ietf_filters %} {% block pagehead %} - + + {% endblock %} -{% block title %}Area directors{% endblock %} +{% block morecss %} + table .border-bottom { border-bottom-color: var(--highcharts-neutral-color-80) !important; } + .highcharts-container .highcharts-axis-labels { + font-size: .7rem; + fill: var(--bs-body-color) + } + .highcharts-container .highcharts-graph { stroke-width: 2.5; } + .highcharts-container .highcharts-color-0 { + fill: var(--bs-body-color); + stroke: var(--bs-primary); + } + .highcharts-container .highcharts-data-label text { + font-size: 1rem; + font-weight: inherit; + fill: var(--bs-body-color) + } +{% endblock %} +{% block title %}IESG Dashboard{% endblock %} {% block content %} {% origin %} -

    Area Director Workload

    +

    IESG Dashboard

    {% if user|has_role:"Area Director,Secretariat" %}
    - {{ delta.days }}-day trend indicators + {{ delta }}-day trend graphs are only shown to logged-in Area Directors.
    {% endif %} - {% for group in workload %} -

    {{ group.group_type }} State Counts

    - +

    + Documents in IESG Processing + IESG view of Working Groups +

    + {% for dt in metadata %} +

    {{ dt.type.1 }} State Counts

    +
    - {% for g, desc, up_is_good in group.group_names %} - + {% endif %} + {% for state, state_name in dt.states %} + {% endfor %} - {% for ad, ad_data in group.counts %} + {% for ad in dt.ads %} - {% for label, count, prev, docs_delta in ad_data %} - + {% endif %} + {% for state, state_name in dt.states %} + {% endfor %} @@ -47,9 +85,19 @@

    {{ group.group_type }} Stat

    - {% for label, count, prev in group.sums %} - + {% endif %} + {% for state, state_name in dt.states %} + {% endfor %} @@ -69,4 +117,177 @@

    {{ group.group_type }} Stat }); }); + + {{ data|json_script:"data" }} + + + + + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html index 0783b2486c8..211cb380dbc 100644 --- a/ietf/templates/doc/add_comment.html +++ b/ietf/templates/doc/add_comment.html @@ -2,13 +2,14 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} -{% block title %}Add comment for {{ doc }}{% endblock %} +{% block title %}Add comment for +{% if review_req %} {{ review_req }} {% else %} {{ doc }} {% endif %} {% endblock %} {% block content %} {% origin %}

    Add comment
    - {{ doc }} + {% if review_req %} {{ review_req }} {% else %} {{ doc }} {% endif %}

    {% csrf_token %} @@ -17,7 +18,12 @@

    The comment will be added to the history trail.

    {% bootstrap_button button_type="submit" content="Submit" %} + {% if review_req %} + Back + {% else %} Back + {% endif %} {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/add_sessionpresentation.html b/ietf/templates/doc/add_sessionpresentation.html index a5bcf7096a6..0bd751a4654 100644 --- a/ietf/templates/doc/add_sessionpresentation.html +++ b/ietf/templates/doc/add_sessionpresentation.html @@ -8,7 +8,7 @@

    Add document to session
    - {{ doc.name }} + {{ doc.name }}
    {{ doc.title }}

    diff --git a/ietf/templates/doc/badge/doc-badge-draft.html b/ietf/templates/doc/badge/doc-badge-draft.html new file mode 100644 index 00000000000..f7f66b6c5e6 --- /dev/null +++ b/ietf/templates/doc/badge/doc-badge-draft.html @@ -0,0 +1,16 @@ +{% load origin %} +{% load static %} +{% load ietf_filters %} +{% load person_filters %} +{% origin %} +{# Non-RFC #} + +{% if doc.became_rfc %} + This is an older version of an Internet-Draft that was ultimately published as {{doc.became_rfc.name|prettystdname}}. +{% elif snapshot and doc.rev != latest_rev %} + This is an older version of an Internet-Draft whose latest revision state is "{{ doc.doc.get_state }}". +{% else %} + {% if snapshot and doc.rev == latest_rev %}{{ doc.doc.get_state }}{% else %}{{ doc.get_state }}{% endif %} Internet-Draft + {% if submission %}({{ submission|safe }}){% endif %} + {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %} +{% endif %} \ No newline at end of file diff --git a/ietf/templates/doc/badge/doc-badge-rfc.html b/ietf/templates/doc/badge/doc-badge-rfc.html new file mode 100644 index 00000000000..780f14a54fe --- /dev/null +++ b/ietf/templates/doc/badge/doc-badge-rfc.html @@ -0,0 +1,13 @@ +{% load origin %} +{% load static %} +{% load ietf_filters %} +{% load person_filters %} +{% origin %} + +RFC + {% if not document_html %} + - {{ doc.std_level }} + {% else %} + {{ doc.std_level }} + {% endif %} + diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html index 1b228ba3759..3cb632b8f8c 100644 --- a/ietf/templates/doc/ballot/approvaltext.html +++ b/ietf/templates/doc/ballot/approvaltext.html @@ -9,7 +9,7 @@

    Approval announcement writeup
    - {{ doc }} + {{ doc }}

    {% csrf_token %} @@ -29,7 +29,7 @@

    href="{% url 'ietf.doc.views_ballot.approve_ballot' name=doc.name %}">Approve ballot {% endif %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html index a146acf4e96..30dd05fa434 100644 --- a/ietf/templates/doc/ballot/approve_ballot.html +++ b/ietf/templates/doc/ballot/approve_ballot.html @@ -8,7 +8,7 @@

    Approve ballot
    - {{ doc }} + {{ doc }}

    {% csrf_token %} @@ -21,7 +21,7 @@

    {% endif %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/approve_downrefs.html b/ietf/templates/doc/ballot/approve_downrefs.html index 67caf992c74..ad528c67bf3 100644 --- a/ietf/templates/doc/ballot/approve_downrefs.html +++ b/ietf/templates/doc/ballot/approve_downrefs.html @@ -8,20 +8,20 @@

    Approve downward references
    - {{ doc }} + {{ doc }}

    The ballot for - {{ doc }} + {{ doc }} was just approved.

    {% if not downrefs_to_rfc %}

    No downward references for - {{ doc }} + {{ doc }}

    Back + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back {% else %}

    Add downward references to RFCs to the DOWNREF registry, if they were identified in the IETF Last Call and approved by the Sponsoring Area Director. @@ -41,7 +41,7 @@

    {% csrf_token %} {% bootstrap_form approve_downrefs_form %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Add no DOWNREF entries diff --git a/ietf/templates/doc/ballot/ballot_issued.html b/ietf/templates/doc/ballot/ballot_issued.html index 5549cd1189c..dfa03896e9f 100644 --- a/ietf/templates/doc/ballot/ballot_issued.html +++ b/ietf/templates/doc/ballot/ballot_issued.html @@ -7,11 +7,11 @@

    Ballot issued
    - {{ doc }} + {{ doc }}

    Ballot for - {{ doc }} + {{ doc }} has been sent out.

    {% if doc.telechat_date %} @@ -24,5 +24,5 @@

    {% endif %} Back + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back {% endblock %} diff --git a/ietf/templates/doc/ballot/clear_ballot.html b/ietf/templates/doc/ballot/clear_ballot.html index d1f731ba705..09e7dfef1bf 100644 --- a/ietf/templates/doc/ballot/clear_ballot.html +++ b/ietf/templates/doc/ballot/clear_ballot.html @@ -8,20 +8,20 @@

    Clear ballot
    - {{ doc }} + {{ doc }}

    {% csrf_token %}

    Clear the ballot for - {{ doc }}? + {{ doc }}?
    This will clear all ballot positions and discuss entries.

    + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/defer_ballot.html b/ietf/templates/doc/ballot/defer_ballot.html index 85f887c9ab8..ae7099e9e14 100644 --- a/ietf/templates/doc/ballot/defer_ballot.html +++ b/ietf/templates/doc/ballot/defer_ballot.html @@ -8,20 +8,20 @@

    Defer ballot
    - {{ doc }} + {{ doc }}

    {% csrf_token %}

    Defer the ballot for - {{ doc }}? + {{ doc }}?
    The ballot will then be put on the IESG agenda of {{ telechat_date }}.

    + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html index e3cada526bb..b57e9a36522 100644 --- a/ietf/templates/doc/ballot/edit_position.html +++ b/ietf/templates/doc/ballot/edit_position.html @@ -8,7 +8,7 @@

    Change position for {{ balloter.plain_name }}
    - {{ doc }} + {{ doc }}

    {% if ballot.ballot_type.question %}
    @@ -20,24 +20,48 @@

    Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}.

    {% endif %} +
    +
    + {% if form.errors or cc_select_form.errors or additional_cc_form.errors %} +
    + There were errors in the submitted form -- see below. Please correct these and resubmit. +
    + {% if form.errors %} +
    Position entry
    + {% bootstrap_form_errors form %} + {% endif %} + {% if cc_select_form.errors %} +
    CC selection
    + {% bootstrap_form_errors cc_select_form %} + {% endif %} + {% if additional_cc_form.errors %} +
    Additional Cc Addresses
    + {% bootstrap_form_errors additional_cc_form %} + {% endif %} + {% endif %}
    {% csrf_token %} {% for field in form %} {% if field.name == "discuss" %}
    {% endif %} {% bootstrap_field field %} {% if field.name == "discuss" and old_pos and old_pos.discuss_time %} -
    Last edited {{ old_pos.discuss_time }}
    +
    Last saved {{ old_pos.discuss_time }}
    {% elif field.name == "comment" and old_pos and old_pos.comment_time %} -
    Last edited {{ old_pos.comment_time }}
    +
    Last saved {{ old_pos.comment_time }}
    {% endif %} {% if field.name == "discuss" %}
    {% endif %} {% endfor %} + {% bootstrap_form cc_select_form %} + {% bootstrap_form additional_cc_form %}
    + - + {% if doc.type_id == "draft" or doc.type_id == "conflrev" %} {% if doc.stream.slug != "irtf" %} {% if ballot_deferred %} @@ -54,11 +78,28 @@

    {% endif %} {% endif %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back

    - + + + {% endblock %} {% block js %} + + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/ballot/irsg_ballot_approve.html b/ietf/templates/doc/ballot/irsg_ballot_approve.html index 8b28f04c3ab..9eb0cc80bea 100644 --- a/ietf/templates/doc/ballot/irsg_ballot_approve.html +++ b/ietf/templates/doc/ballot/irsg_ballot_approve.html @@ -12,7 +12,7 @@

    Issue ballot
    - {{ doc }} + {{ doc }}

    {{ question }} diff --git a/ietf/templates/doc/ballot/irsg_ballot_close.html b/ietf/templates/doc/ballot/irsg_ballot_close.html index ab49ec79d7b..22405df1c19 100644 --- a/ietf/templates/doc/ballot/irsg_ballot_close.html +++ b/ietf/templates/doc/ballot/irsg_ballot_close.html @@ -8,7 +8,7 @@

    Close ballot
    - {{ doc }} + {{ doc }}

    {{ question }} diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html index 5b49f6b372a..fe2b884c2b2 100644 --- a/ietf/templates/doc/ballot/lastcalltext.html +++ b/ietf/templates/doc/ballot/lastcalltext.html @@ -9,7 +9,7 @@

    Last call text
    - {{ doc }} + {{ doc }}

    {% csrf_token %} @@ -39,7 +39,7 @@

    href="{% url 'ietf.doc.views_ballot.make_last_call' name=doc.name %}">Issue last call {% endif %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/rfceditornote.html b/ietf/templates/doc/ballot/rfceditornote.html index ff6ca7078cc..8a6d57379d8 100644 --- a/ietf/templates/doc/ballot/rfceditornote.html +++ b/ietf/templates/doc/ballot/rfceditornote.html @@ -8,7 +8,7 @@

    RFC Editor Note
    - {{ doc }} + {{ doc }}

    {% bootstrap_messages %}
    @@ -31,7 +31,7 @@

    Clear + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/rsab_ballot_approve.html b/ietf/templates/doc/ballot/rsab_ballot_approve.html index 43f43eafeee..d607348722e 100644 --- a/ietf/templates/doc/ballot/rsab_ballot_approve.html +++ b/ietf/templates/doc/ballot/rsab_ballot_approve.html @@ -9,7 +9,7 @@

    Issue ballot
    - {{ doc }} + {{ doc }}

    {{ question }} diff --git a/ietf/templates/doc/ballot/rsab_ballot_close.html b/ietf/templates/doc/ballot/rsab_ballot_close.html index 2261c070b51..f6da3e052d8 100644 --- a/ietf/templates/doc/ballot/rsab_ballot_close.html +++ b/ietf/templates/doc/ballot/rsab_ballot_close.html @@ -8,7 +8,7 @@

    Close ballot
    - {{ doc }} + {{ doc }}

    {{ question }} diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html deleted file mode 100644 index 8f87bf51ad6..00000000000 --- a/ietf/templates/doc/ballot/send_ballot_comment.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} -{% load django_bootstrap5 %} -{% load ietf_filters %} -{% block title %}Send ballot position for {{ balloter }} on {{ doc }}{% endblock %} -{% block content %} - {% origin %} -

    - Send ballot position for {{ balloter }} -
    - {{ doc }} -

    -
    - {% csrf_token %} -
    - - -
    -
    - - -
    - {% bootstrap_form cc_select_form %} -
    - - -
    Separate email addresses with commas.
    -
    -
    - - -
    -
    -

    Body

    - 
    {{ body|maybewordwrap }}
    -
    - - - Back - - -{% endblock %} diff --git a/ietf/templates/doc/ballot/undefer_ballot.html b/ietf/templates/doc/ballot/undefer_ballot.html index df2217fa2ff..4e86698160c 100644 --- a/ietf/templates/doc/ballot/undefer_ballot.html +++ b/ietf/templates/doc/ballot/undefer_ballot.html @@ -8,7 +8,7 @@

    Undefer ballot
    - {{ doc }} + {{ doc }}

    {% csrf_token %} @@ -19,7 +19,7 @@

    + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html index 481e00e134b..8e985c15c79 100644 --- a/ietf/templates/doc/ballot/writeupnotes.html +++ b/ietf/templates/doc/ballot/writeupnotes.html @@ -8,18 +8,23 @@

    Ballot writeup and notes
    - {{ doc }} + {{ doc }}

    {% csrf_token %} {% bootstrap_form ballot_writeup_form %}
    - Technical summary, Working Group summary, document quality, personnel, IRTF note, IESG note, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor. - {% if ballot_issue_danger %} + Technical summary, Working Group summary, document quality, personnel, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor. + {% if warn_lc %}

    This document has not completed IETF Last Call. Please do not issue the ballot early without good reason.

    {% endif %} + {% if warn_unexpected_state %} +

    + This document is in an IESG state of "{{warn_unexpected_state}}". It would be unexpected to issue a ballot while in this state. +

    + {% endif %}
    + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html index 2a04ffab690..d2589cd54c2 100644 --- a/ietf/templates/doc/ballot_popup.html +++ b/ietf/templates/doc/ballot_popup.html @@ -27,7 +27,7 @@ {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member,RSAB Member" %} {% if user|can_ballot:doc %} + href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}?ballot_edit_return_point={{ ballot_edit_return_point|urlencode }}"> Edit position {% endif %} diff --git a/ietf/templates/doc/bofreq/bof_requests.html b/ietf/templates/doc/bofreq/bof_requests.html index 2a806b18a59..19c2e5dd133 100644 --- a/ietf/templates/doc/bofreq/bof_requests.html +++ b/ietf/templates/doc/bofreq/bof_requests.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2021 All Rights Reserved #} {% load origin %} -{% load person_filters %} +{% load person_filters ietf_filters %} {% load static %} {% block pagehead %} @@ -26,40 +26,42 @@

    BOF Requests

    {% else %} {% regroup reqs by get_state_slug as grouped_reqs %} {% for req_group in grouped_reqs %} -

    {{ req_group.grouper|capfirst }} BOF Requests

    -
    Area Director - {{ g|split:'/'|join:'/' }} + {% if dt.type.1 == "Internet-Draft" %} + Pre pubreq + + {{ state_name|split:'/'|join:'/' }} +
    {{ ad.name }} - {% include 'doc/ad_count.html' %} + {% if dt.type.1 == "Internet-Draft" %} + + {{ ad.pre_pubreq }} + +
    Sum - {% include 'doc/ad_count.html' %} + {% if dt.type.1 == "Internet-Draft" %} + +
    +     		+
    - - - - - - - - - - - {% for req in req_group.list %} + {% if req_group.grouper != "spam" or request.user|has_role:"Secretariat" %} +

    {{ req_group.grouper|capfirst }} BOF Requests

    +
    NameDateTitleResponsibleEditors
    + - - - - - + + + + + - {% endfor %} - -
    - {{ req.name }}-{{ req.rev }} - {{ req.latest_revision_event.time|date:"Y-m-d" }}{{ req.title }} - {% for person in req.responsible %} - {% person_link person %}{% if not forloop.last %},{% endif %} - {% endfor %} - - {% for person in req.editors %} - {% person_link person %}{% if not forloop.last %},{% endif %} - {% endfor %} - NameDateTitleResponsibleEditors
    + + + {% for req in req_group.list %} + + + {{ req.name }}-{{ req.rev }} + + {{ req.latest_revision_event.time|date:"Y-m-d" }} + {{ req.title }} + + {% for person in req.responsible %} + {% person_link person %}{% if not forloop.last %},{% endif %} + {% endfor %} + + + {% for person in req.editors %} + {% person_link person %}{% if not forloop.last %},{% endif %} + {% endfor %} + + + {% endfor %} + + + {% endif %} {% endfor %} {% endif %} {% endblock %} diff --git a/ietf/templates/doc/bofreq/bofreq_template.md b/ietf/templates/doc/bofreq/bofreq_template.md index 7039e4679b8..49c5e511a52 100644 --- a/ietf/templates/doc/bofreq/bofreq_template.md +++ b/ietf/templates/doc/bofreq/bofreq_template.md @@ -1,16 +1,15 @@ -# Name: Exact MPLS Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-) +# Name: EXAct MPLs Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-) ## Description Replace this with a few paragraphs describing the BOF request. Fill in the details below. Keep items in the order they appear here. ## Required Details -- Status: (not) WG Forming -- Responsible AD: name +- Status: "not WG Forming" or "WG forming" +- Responsible AD: name (or at least area(s) if you know) - BOF proponents: name , name (1-3 people - who are requesting and coordinating discussion for proposal) -- BOF chairs: TBD - Number of people expected to attend: 100 -- Length of session (1 or 2 hours): 2 hours +- Length of session (1 or usually 2 hours): 2 hours - Conflicts (whole Areas and/or WGs) - Chair Conflicts: TBD - Technology Overlap: TBD @@ -28,7 +27,7 @@ To allow evaluation of your proposal, please include the following items: - Items, Internet-Drafts, speakers, timing - Or a URL -## Links to the mailing list, draft charter if any, relevant Internet-Drafts, etc. +## Links to the mailing list, draft charter if any (for WG-forming BoF), relevant Internet-Drafts, etc. - Mailing List: https://www.ietf.org/mailman/listinfo/example - Draft charter: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='charter-ietf-EXAMPLE' %} - Relevant Internet-Drafts: diff --git a/ietf/templates/doc/bofreq/change_editors.html b/ietf/templates/doc/bofreq/change_editors.html index 546ad7179be..0c30cdecb4a 100644 --- a/ietf/templates/doc/bofreq/change_editors.html +++ b/ietf/templates/doc/bofreq/change_editors.html @@ -9,14 +9,14 @@

    Change editors
    - {{ titletext }} + {{ titletext }}

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back
    diff --git a/ietf/templates/doc/bofreq/change_responsible.html b/ietf/templates/doc/bofreq/change_responsible.html index 79ca29f22b6..8c51c6e1f42 100644 --- a/ietf/templates/doc/bofreq/change_responsible.html +++ b/ietf/templates/doc/bofreq/change_responsible.html @@ -9,14 +9,14 @@

    Change Responsible Leadership
    - {{ titletext }} + {{ titletext }}

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back
    diff --git a/ietf/templates/doc/bofreq/new_bofreq.html b/ietf/templates/doc/bofreq/new_bofreq.html index 9506d9c8e6e..c6aa0054f96 100644 --- a/ietf/templates/doc/bofreq/new_bofreq.html +++ b/ietf/templates/doc/bofreq/new_bofreq.html @@ -6,15 +6,39 @@ {% origin %}

    Start a new BOF Request

    - The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director. + BoF proponents are strongly encouraged to review the following sources before submitting requests: +

    + + {# The following block needs to be commented out after the BoF deadline and re-opened before next BoF request opening #} +
    +

    + Announcement for IETF 124: The IESG and the IAB have organized Ask Me Anything (AMA) virtual sessions + for the community to help proponents who are interested in putting up BoF proposals for IETF 124 + (see also the IETF-announce email): +

    +
      +
    • 28th of August 13:00-14:00 UTC +
      • +
    • 28th of August 19:00-20:00 UTC +
      • +
    +
    + {# End of the temporary block #} +

    + The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. + If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director.

    - Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. The title can be changed later, but the filename will not change. + Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. + The title can be changed later, but the filename will not change.

    For example, a request with a title of "A new important bit" will be saved as bofreq-{{ user.person.last_name|xslugify|slice:"64" }}-a-new-important-bit-00.md.

    -

    All the items in the template MUST be filed in.

    +

    All the items in the template MUST be filed in.

    diff --git a/ietf/templates/doc/bofreq/upload_content.html b/ietf/templates/doc/bofreq/upload_content.html index 902b2900a94..74827dd4854 100644 --- a/ietf/templates/doc/bofreq/upload_content.html +++ b/ietf/templates/doc/bofreq/upload_content.html @@ -7,7 +7,7 @@

    Upload New Revision
    - {{ doc.name }} + {{ doc.name }}

    Change responsible AD
    - {{ titletext }} + {{ titletext }} {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back
    diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html index a102ce24ee9..755bd5d316d 100644 --- a/ietf/templates/doc/change_shepherd.html +++ b/ietf/templates/doc/change_shepherd.html @@ -10,7 +10,7 @@

    Change document shepherd
    - {{ doc.name }}-{{ doc.rev }} + {{ doc.name }}-{{ doc.rev }}

    The shepherd needs to have a Datatracker account. A new account can be diff --git a/ietf/templates/doc/change_shepherd_email.html b/ietf/templates/doc/change_shepherd_email.html index 36a8b44d156..b608c2d09a1 100644 --- a/ietf/templates/doc/change_shepherd_email.html +++ b/ietf/templates/doc/change_shepherd_email.html @@ -8,7 +8,7 @@

    Change document shepherd email
    - {{ doc.name }}-{{ doc.rev }} + {{ doc.name }}-{{ doc.rev }}

    {% csrf_token %} diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html index d405e059b35..9d083e2f3ce 100644 --- a/ietf/templates/doc/change_state.html +++ b/ietf/templates/doc/change_state.html @@ -8,7 +8,7 @@

    Change state
    - {{ doc.title }} + {{ doc.title }}

    Help on states diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html index 4f419e1dd02..14d7956cfea 100644 --- a/ietf/templates/doc/change_title.html +++ b/ietf/templates/doc/change_title.html @@ -8,14 +8,14 @@

    Change title
    - {{ titletext }} + {{ titletext }}

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back
    diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html index 5722b342a15..e087b175b4b 100644 --- a/ietf/templates/doc/charter/action_announcement_text.html +++ b/ietf/templates/doc/charter/action_announcement_text.html @@ -11,7 +11,7 @@

    {{ charter.chartered_group.type.name }} action announcement writeup
    - {{ charter.chartered_group.acronym }} + {{ charter.chartered_group.acronym }}

    {% csrf_token %} @@ -21,7 +21,7 @@

    {% if user|has_role:"Secretariat" %} + href="{% url 'ietf.doc.views_charter.approve' name=charter.name %}"> Charter approval page {% endif %} diff --git a/ietf/templates/doc/charter/action_text.txt b/ietf/templates/doc/charter/action_text.txt index fbe9ed3fe1c..9a1e7152229 100644 --- a/ietf/templates/doc/charter/action_text.txt +++ b/ietf/templates/doc/charter/action_text.txt @@ -1,4 +1,4 @@ -{% load ietf_filters %}{% autoescape off %}From: The IESG +{% load ietf_filters %}{% autoescape off %}From: {% if group.type_id == "rg" %}The IRTF {% else %}The IESG {% endif %} To: {{ to }}{% if cc %} Cc: {{ cc }} {% endif %} Subject: {{ group.type.name }} Action: {{ action_type }} {{ group.name }} ({{ group.acronym }}) diff --git a/ietf/templates/doc/charter/approve.html b/ietf/templates/doc/charter/approve.html index f109da6872b..2a8654482eb 100644 --- a/ietf/templates/doc/charter/approve.html +++ b/ietf/templates/doc/charter/approve.html @@ -2,16 +2,16 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} -{% block title %}Approve {{ charter.canonical_name }}{% endblock %} +{% block title %}Approve {{ charter.name }}{% endblock %} {% block content %} {% origin %} -

    Approve {{ charter.canonical_name }}-{{ charter.rev }}

    +

    Approve {{ charter.name }}-{{ charter.rev }}

    {% csrf_token %} 
    {{ announcement }}
    + href="{% url "ietf.doc.views_charter.action_announcement_text" name=charter.name %}?next=approve"> Edit/regenerate announcement Ballot issued
    - {{ doc.name }} + {{ doc.name }}

    Ballot has been sent out. diff --git a/ietf/templates/doc/charter/ballot_writeup.txt b/ietf/templates/doc/charter/ballot_writeup.txt index 552fe65e8d1..bf753bdfaf1 100644 --- a/ietf/templates/doc/charter/ballot_writeup.txt +++ b/ietf/templates/doc/charter/ballot_writeup.txt @@ -36,14 +36,6 @@ RFC Editor Note (Insert RFC Editor Note here or remove section) -IRTF Note - - (Insert IRTF Note here or remove section) - -IESG Note - - (Insert IESG Note here or remove section) - IANA Note (Insert IANA Note here or remove section) diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html index fa4c12b6176..a202d48b763 100644 --- a/ietf/templates/doc/charter/ballot_writeupnotes.html +++ b/ietf/templates/doc/charter/ballot_writeupnotes.html @@ -8,12 +8,12 @@

    Ballot writeup and notes
    - {{ charter.chartered_group }} + {{ charter.chartered_group }}

    {% csrf_token %} {% bootstrap_form ballot_writeup_form %} -
    Working group summary, personnel, IAB note, IESG note, IANA note.
    +
    Working group summary, personnel, IANA note.
     + href="{% url "ietf.doc.views_doc.document_main" name=charter.name %}"> Back
    diff --git a/ietf/templates/doc/charter/issue_ballot_mail.txt b/ietf/templates/doc/charter/issue_ballot_mail.txt index 12fc44bbbc6..914935bb128 100644 --- a/ietf/templates/doc/charter/issue_ballot_mail.txt +++ b/ietf/templates/doc/charter/issue_ballot_mail.txt @@ -1,6 +1,6 @@ -{% load ietf_filters %}{% autoescape off %}To: {{ to }} {% if cc %} -Cc: {{ cc }} -{% endif %}From: IESG Secretary +{% load ietf_filters %}{% autoescape off %}To: {{ to }}{% if cc %} +Cc: {{ cc }}{% endif %} +From: IESG Secretary Reply-To: IESG Secretary Subject: Evaluation: {{ doc.name }} diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html index 1e2542edb47..c50f5956bfa 100644 --- a/ietf/templates/doc/charter/review_announcement_text.html +++ b/ietf/templates/doc/charter/review_announcement_text.html @@ -9,7 +9,7 @@

    WG Review announcement writeup
    - {{ charter.chartered_group.acronym }} + {{ charter.chartered_group.acronym }}

    {% csrf_token %} diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html index 54bd68a419f..d3918040712 100644 --- a/ietf/templates/doc/charter/submit.html +++ b/ietf/templates/doc/charter/submit.html @@ -39,7 +39,7 @@

    Charter submission

    State {{ group.state.name }} - {% if requested_close %}
    In the process of being closed
    {% endif %} + {% if requested_close %}
    In the process of being closed
    {% endif %} diff --git a/ietf/templates/doc/conflict_review/approval_text.txt b/ietf/templates/doc/conflict_review/approval_text.txt index 8e211e21ce0..a52ac11a719 100644 --- a/ietf/templates/doc/conflict_review/approval_text.txt +++ b/ietf/templates/doc/conflict_review/approval_text.txt @@ -1,9 +1,9 @@ {% load ietf_filters %}{% load mail_filters %}{% autoescape off %}From: The IESG To: {{ to }} Cc: {{ cc }} -Subject: Results of IETF-conflict review for {{conflictdoc.canonical_name}}-{{conflictdoc.rev}} +Subject: Results of IETF-conflict review for {{conflictdoc.name}}-{{conflictdoc.rev}} -{% filter wordwrap:78 %}The IESG has completed a review of {{conflictdoc.canonical_name}}-{{conflictdoc.rev}} consistent with RFC5742. +{% filter wordwrap:78 %}The IESG has completed a review of {{conflictdoc.name}}-{{conflictdoc.rev}} consistent with RFC5742. {% if review.get_state_slug == 'appr-reqnopub-pend' %} The IESG recommends that '{{ conflictdoc.title }}' {{ conflictdoc.file_tag|safe }} NOT be published as {{ conflictdoc|std_level_prompt_with_article }}. diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html index 5283587f072..ccbac9c4cb0 100644 --- a/ietf/templates/doc/conflict_review/approve.html +++ b/ietf/templates/doc/conflict_review/approve.html @@ -2,10 +2,10 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} -{% block title %}Approve {{ review.canonical_name }}{% endblock %} +{% block title %}Approve {{ review.name }}{% endblock %} {% block content %} {% origin %} -

    Approve {{ review.canonical_name }}

    +

    Approve {{ review.name }}

    {% csrf_token %} {% bootstrap_form form %} diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html index f1b33bc6b2f..d8abc2b8114 100644 --- a/ietf/templates/doc/conflict_review/start.html +++ b/ietf/templates/doc/conflict_review/start.html @@ -3,13 +3,13 @@ {% load origin %} {% load django_bootstrap5 %} {% load ietf_filters %} -{% block title %}Begin IETF conflict review for {{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }}{% endblock %} +{% block title %}Begin IETF conflict review for {{ doc_to_review.name }}-{{ doc_to_review.rev }}{% endblock %} {% block content %} {% origin %}

    Begin IETF conflict review
    - {{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }} + {{ doc_to_review.name }}-{{ doc_to_review.rev }}

    {% if user|has_role:"Secretariat" %}

    diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html index a95a3c57764..8259c6b12fb 100644 --- a/ietf/templates/doc/conflict_review/submit.html +++ b/ietf/templates/doc/conflict_review/submit.html @@ -2,16 +2,16 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} -{% block title %}Edit conflict review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endblock %} +{% block title %}Edit conflict review for {{ conflictdoc.name }}-{{ conflictdoc.rev }}{% endblock %} {% block content %} {% origin %}

    Edit conflict review
    - {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }} + {{ conflictdoc.name }}-{{ conflictdoc.rev }}

    - The text will be submitted as {{ review.canonical_name }}-{{ next_rev }} + The text will be submitted as {{ review.name }}-{{ next_rev }}

    {% csrf_token %} @@ -27,7 +27,7 @@

    Reset to template text + href="{% url "ietf.doc.views_doc.document_main" name=review.name %}"> Back diff --git a/ietf/templates/doc/disclaimer.html b/ietf/templates/doc/disclaimer.html new file mode 100644 index 00000000000..db4c42ed687 --- /dev/null +++ b/ietf/templates/doc/disclaimer.html @@ -0,0 +1,34 @@ +{# Copyright The IETF Trust 2016-2023, All Rights Reserved #} +{% load origin %} +{% load ietf_filters %} +{% origin %} +{% if doc.type_id == "rfc" %} + {% if doc.stream.slug != "ietf" and doc.stream.desc != "Legacy" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %} + + {% elif doc.stream.slug != "ietf" and doc.stream.desc == "Legacy" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %} + + {% endif %} +{% elif doc|is_in_stream %} + {% if doc.stream.slug != "ietf" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %} + + {% endif %} +{% else %} + +{% endif %} diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html index b2255c715a8..e0feb78bc7a 100644 --- a/ietf/templates/doc/document_ballot_content.html +++ b/ietf/templates/doc/document_ballot_content.html @@ -11,10 +11,10 @@

    {% for p in positions %}
    - {% if p.is_old_pos %}({% endif %}{% if p.comment or p.discuss %}{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}{% endif %}{% if p.is_old_pos %}){% endif %} + {% if p.is_old_pos %}({% endif %}{% if p.comment or p.discuss %}{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}{% endif %}{% if p.is_old_pos %}){% endif %}
    {% empty %} - (None) + (None) {% endfor %}
    {% endfor %} @@ -60,7 +60,7 @@ {% if user|can_ballot:doc %} + href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?ballot_edit_return_point={{ request.path|urlencode }}"> Edit position {% endif %} @@ -91,7 +91,7 @@ {{ p.balloter.plain_name }}
    - {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} + {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} {{ p.pos }} {% if user|has_role:"Secretariat" %} {% if p.pos.blocking and p.discuss %}
    -
    +
    {{ p.pos.name }} ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.discuss_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %}) @@ -179,11 +179,11 @@ {% if p.is_old_pos %}
    -
    - {{ p.balloter.plain_name }} Former IESG member +
    + {{ p.balloter.plain_name }} Former IESG member
    - {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} + {% if p.old_positions %}(was {{ p.old_positions|join:", " }}){% endif %} {{ p.pos }} {% if user|has_role:"Secretariat" %}
    +
    {% if doc.rev != latest_rev %}
    The information below is for an older version of this BOF request.
    {% endif %} @@ -21,7 +21,7 @@ {{ doc.get_state.slug|capfirst }} BOF request - {% if snapshot %}Snapshot{% endif %} + {% if snapshot %}Snapshot{% endif %} @@ -135,7 +135,7 @@ {% endif %} - {{ doc.notify|default:'(None)' }} + {{ doc.notify|default:'(None)' }} diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html index a811f26aba2..7564e1d213a 100644 --- a/ietf/templates/doc/document_charter.html +++ b/ietf/templates/doc/document_charter.html @@ -14,7 +14,7 @@ {% origin %} {{ top|safe }} {% include "doc/revisions_list.html" %} -
    +
    {% if doc.rev|charter_major_rev != latest_rev|charter_major_rev %}
    The information below is for an older @@ -59,7 +59,7 @@ {{ group.name }} {{ group.type.name }} ({{ group.acronym }}) - {% if snapshot %}Snapshot{% endif %} + {% if snapshot %}Snapshot{% endif %} @@ -94,8 +94,8 @@ {% else %} No document state {% endif %} - {% if chartering == "initial" %}Initial chartering{% endif %} - {% if chartering == "rechartering" %}Rechartering{% endif %} + {% if chartering == "initial" %}Initial chartering{% endif %} + {% if chartering == "rechartering" %}Rechartering{% endif %} @@ -152,7 +152,7 @@ {% if not telechat %} - (None) + (None) {% else %} On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat {% endif %} @@ -175,7 +175,7 @@ {% endif %} - {{ doc.notify|default:'(None)' }} + {{ doc.notify|default:'(None)' }} @@ -227,10 +227,10 @@ {% if doc.rev != "" %}
    - {{ doc.canonical_name }}-{{ doc.rev }} + {{ doc.name }}-{{ doc.rev }}
    - 
    {{ content|maybewordwrap|urlize_ietf_docs|linkify }}
    + {{ content }}
    {% endif %} diff --git a/ietf/templates/doc/document_chatlog.html b/ietf/templates/doc/document_chatlog.html index 1e88810feaa..7c97471e692 100644 --- a/ietf/templates/doc/document_chatlog.html +++ b/ietf/templates/doc/document_chatlog.html @@ -8,7 +8,7 @@ {% origin %} {{ top|safe }} {% include "doc/revisions_list.html" %} -
    +
    {% if doc.rev != latest_rev %}
    The information below is for an old version of the document.
    {% endif %} @@ -26,13 +26,13 @@ ({{ doc.group.acronym }}) {{ doc.group.type.name }} {% endif %} - {% if snapshot %}Snapshot{% endif %} + {% if snapshot %}Snapshot{% endif %} Title - {{ doc.title|default:'(None)' }} + {{ doc.title|default:'(None)' }} Session diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html index 9e9f78b6856..8a2361832b2 100644 --- a/ietf/templates/doc/document_conflict_review.html +++ b/ietf/templates/doc/document_conflict_review.html @@ -10,7 +10,7 @@ {% origin %} {{ top|safe }} {% include "doc/revisions_list.html" %} -
    +
    {% if doc.rev != latest_rev %}
    The information below is for an old version of the document.
    {% endif %} @@ -27,10 +27,10 @@ - - {% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %} - {{ conflictdoc.stream }} stream - {% if snapshot %}Snapshot{% endif %} + + {% if conflictdoc.type_id == 'rfc' %}{{ conflictdoc.name|prettystdname }}{% else %}{{ conflictdoc.name }}-{{ conflictdoc.rev }}{% endif %} + {{ conflictdoc.stream }} stream + {% if snapshot %}Snapshot{% endif %} @@ -54,11 +54,7 @@ {% endif %} - {% if "no-problem" in doc.get_state.name|slugify %} - {{ doc.get_state.name}} - {% else %} - {{ doc.get_state.name }} - {% endif %} + {{ doc.get_state.name|badgeify }} @@ -90,7 +86,7 @@ {% if not telechat %} - (None) + (None) {% else %} On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat {% if doc.returning_item %}(returning item){% endif %} @@ -149,4 +145,4 @@ -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index b38225dd4f4..6414538283d 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2016-2020, All Rights Reserved #} +{# Copyright The IETF Trust 2016-2024, All Rights Reserved #} {% load origin %} {% load static %} {% load ietf_filters %} @@ -13,11 +13,11 @@ title="Document changes" href="/feed/document-changes/{{ name }}/"> + content="{{ doc.title }} {% if doc.type_id == 'rfc' and not snapshot %}(RFC {{ rfc_number }}{% if published %}, {{ doc.pub_date|date:'F Y' }}{% endif %}{% if obsoleted_by %}; obsoleted by {% for rel in obsoleted_by %}{{ rel.source.name|prettystdname}}{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %}){% endif %}"> {% endblock %} {% block morecss %}.inline { display: inline; }{% endblock %} {% block title %} - {% if doc.get_state_slug == "rfc" and not snapshot %} + {% if doc.type_id == "rfc" and not snapshot %} RFC {{ rfc_number }} - {{ doc.title }} {% else %} {{ name }}-{{ doc.rev }} - {{ doc.title }} @@ -27,11 +27,12 @@ {% origin %} {{ top|safe }} {% include "doc/revisions_list.html" with document_html=document_html %} -
    + {% include "doc/disclaimer.html" with document_html=document_html %} +
    {% if doc.rev != latest_rev %}
    The information below is for an old version of the document.
    {% else %} - {% if doc.get_state_slug == "rfc" and snapshot %} + {% if doc.became_rfc %}
    The information below is for an old version of the document that is already published as an RFC.
    @@ -47,7 +48,7 @@ {% if doc.stream %} {% if doc.stream.slug != "legacy" %} - + {% if doc.stream_id == 'ietf' %} WG {% else %} @@ -73,7 +74,7 @@ {{ stream_state }} {% else %} - + (None) {% endif %} @@ -85,7 +86,7 @@
    {% endif %} {% if due_date %} - (Due date {{ due_date }}) + (Due date {{ due_date }}) {% endif %} {% else %} @@ -95,7 +96,7 @@ - (No stream defined) + (No stream defined) {% endif %} @@ -166,18 +167,18 @@ {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %} {% endfor %} {% else %} - + (None) {% endif %} {% endif %} - {% if doc.stream_id == 'ietf' or doc.stream_id == 'ise' or doc.stream_id == 'irtf' or doc.stream_id == 'editorial' %} + {% if doc.stream_id == 'ietf' or doc.stream_id == 'ise' or doc.stream_id == 'irtf' or doc.stream_id == 'editorial' or doc.stream_id == 'iab' %} - Document shepherd + {% if doc.stream_id == 'iab' %}IAB shepherd{% else %}Document shepherd{% endif %} {% if can_edit_stream_info and not snapshot %} @@ -196,7 +197,7 @@ {% if doc.shepherd %} {% person_link doc.shepherd.person %} {% else %} - + (None) {% endif %} @@ -224,9 +225,9 @@ href="{% url 'ietf.doc.views_doc.document_shepherd_writeup' name=doc.name %}"> Show - Last changed {{ shepherd_writeup.time|date:"Y-m-d" }} + Last changed {{ shepherd_writeup.time|date:"Y-m-d" }} {% else %} - + (None) {% endif %} @@ -251,7 +252,7 @@ {% if doc.has_rfc_editor_note %} (last changed {{ doc.has_rfc_editor_note|date:"Y-m-d" }}) {% else %} - + (None) {% endif %} @@ -267,19 +268,19 @@ {% endif %} - {% if not doc.stream_id == 'iab' %} + {% if doc.stream_id != 'iab' and doc.stream_id != 'editorial' %} IESG - + IESG state - {% if iesg_state.slug != 'idexists' and can_edit %} + {% if iesg_state.slug != 'idexists' and iesg_state.slug != 'dead' and can_edit or user|has_role:"Secretariat" %} Edit @@ -303,7 +304,7 @@ Action Holder{{ doc.documentactionholder_set.all|pluralize }} - {% if can_edit %} + {% if can_edit_action_holders %} Edit @@ -318,7 +319,7 @@ {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }}
    {% endfor %} - {% if can_edit %} + {% if can_edit_action_holders %} @@ -327,7 +328,7 @@ {% endif %} {% else %} - + (None) {% endif %} @@ -375,7 +376,7 @@ On agenda of {{ telechat.telechat_date }} IESG telechat {% if telechat.returning_item %}(returning item){% endif %} {% else %} - + (None) {% endif %} @@ -402,38 +403,25 @@ {% if doc.ad %} {% person_link doc.ad %} {% else %} - + (None) {% endif %} - {% if iesg_state.slug != 'idexists' %} - {% if doc.note or can_edit %} - - - - IESG note - - - {% if can_edit and not snapshot %} - - Edit - - {% endif %} - - - {% if doc.note %} - {{ doc.note|linebreaksbr }} - {% else %} - - (None) - - {% endif %} - - - {% endif %} + {% if iesg_state.slug != 'idexists' and doc.note %} + + + + IESG note + + + {# IESG Notes are historic and read-only now #} + + + {{ doc.notedoc.note|urlize_ietf_docs|linkify|linebreaksbr }} + + {% endif %} @@ -452,7 +440,7 @@ {% if doc.notify %} {{ doc.notify|linkify }} {% else %} - + (None) {% endif %} @@ -460,125 +448,127 @@ {% endif %} - {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %} - - {% if iana_review_state or can_edit_iana_state %} - - - IANA - - - - IANA review state - - - - {% if can_edit_iana_state and not snapshot %} - - Edit - - {% endif %} - - - {% if not iana_review_state %} - - (None) - - {% else %} - {{ iana_review_state }} - {% endif %} - - - {% endif %} - {% if iana_action_state or can_edit_iana_state %} - - - {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %} - - - - IANA action state - - - - {% if can_edit_iana_state and not snapshot %} - - Edit + {% if doc.stream_id != 'editorial' %} + {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %} + + {% if iana_review_state or can_edit_iana_state %} + + + IANA + + + + IANA review state - {% endif %} - - - {% if not iana_action_state %} - - (None) - - {% else %} - {{ iana_action_state }} - {% endif %} - - - {% endif %} - {% if iana_experts_state or can_edit_iana_state %} - - - {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %} - - - - IANA expert review state - - - - {% if can_edit_iana_state and not snapshot %} - - Edit + + + {% if can_edit_iana_state and not snapshot %} + + Edit + + {% endif %} + + + {% if not iana_review_state %} + + (None) + + {% else %} + {{ iana_review_state }} + {% endif %} + + + {% endif %} + {% if iana_action_state or can_edit_iana_state %} + + + {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %} + + + + IANA action state - {% endif %} - - - {% if not iana_experts_state %} - - (None) - - {% else %} - {{ iana_experts_state }} - {% endif %} - - - {% endif %} - {% if iana_experts_comment or can_edit_iana_state %} - - - {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %} - IANA - {% endif %} - - - IANA expert review comments - - - {% if can_edit_iana_state and not snapshot %} - - Edit + + + {% if can_edit_iana_state and not snapshot %} + + Edit + + {% endif %} + + + {% if not iana_action_state %} + + (None) + + {% else %} + {{ iana_action_state }} + {% endif %} + + + {% endif %} + {% if iana_experts_state or can_edit_iana_state %} + + + {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %} + + + + IANA expert review state - {% endif %} - - - {% if not iana_experts_comment %} - - (None) - - {% else %} - {{ iana_experts_comment }} - {% endif %} - - - {% endif %} - + + + {% if can_edit_iana_state and not snapshot %} + + Edit + + {% endif %} + + + {% if not iana_experts_state %} + + (None) + + {% else %} + {{ iana_experts_state }} + {% endif %} + + + {% endif %} + {% if iana_experts_comment or can_edit_iana_state %} + + + {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %} + IANA + {% endif %} + + + IANA expert review comments + + + {% if can_edit_iana_state and not snapshot %} + + Edit + + {% endif %} + + + {% if not iana_experts_comment %} + + (None) + + {% else %} + {{ iana_experts_comment }} + {% endif %} + + + {% endif %} + + {% endif %} {% endif %} {% if rfc_editor_state %} @@ -587,7 +577,7 @@ RFC Editor - + RFC Editor state @@ -644,20 +634,20 @@ IPR {% if doc.related_ipr %} - + {{ doc.related_ipr|length }} {% endif %} References @@ -671,70 +661,50 @@ Nits -
    - - -
    + {% if user|has_role:"Area Director" %} + {# IDNITS3 is an experimental service, so only show it to Area Directors #} + + + + Nits-v3 (Experimental) + + {% endif %} + + + + Search email archive + {% if user.is_authenticated %} - Untrack - Track {% endif %} - {% if user.review_teams %} - Remove review wishes - @@ -764,10 +734,10 @@ {% endfor %} {% endif %}
    - {% if doc.get_state_slug == "active" or doc.get_state_slug == "rfc" %} + {% if doc.get_state_slug == "active" or doc.type_id == "rfc" or doc.became_rfc %}
    - {% if doc.get_state_slug == "rfc" and not snapshot %} + {% if doc.type_id == "rfc" and not snapshot %} RFC {{ rfc_number }} {% else %} {{ name }}-{{ doc.rev }} @@ -786,7 +756,7 @@ {% endif %} {% else %}
    -
    +

    This Internet-Draft is no longer active. A copy of the expired Internet-Draft is available in these formats:

    @@ -808,7 +778,7 @@ {% if not forloop.last %}
    {% endif %} {% endfor %}

    -

    +

    (Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid.)

    @@ -820,4 +790,4 @@ - {% endblock %} \ No newline at end of file + {% endblock %} diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html index 768bf78e48a..935217367d3 100644 --- a/ietf/templates/doc/document_email.html +++ b/ietf/templates/doc/document_email.html @@ -49,8 +49,16 @@

    Recipient expansions

    {{ trigger }} - {{ to|join:', '|linkify }} - {{ cc|join:', '|linkify }} + + {% for addr in to %} + {{ addr|linkify }}{% if not forloop.last %}, {% endif %} + {% endfor %} + + + {% for addr in cc %} + {{ addr|linkify }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% endfor %} diff --git a/ietf/templates/doc/document_format_buttons.html b/ietf/templates/doc/document_format_buttons.html index efd12576600..043b9a797e0 100644 --- a/ietf/templates/doc/document_format_buttons.html +++ b/ietf/templates/doc/document_format_buttons.html @@ -4,18 +4,18 @@ {% if label != skip_format %} {% if label == 'pdf' or label == 'pdfized' %} pdf - {% elif label == 'xml' or label == 'html' %} + {% elif label == 'xml' or label == 'html' or label == 'bibxml' %} {{ label}} {% elif label == 'htmlized' %} htmlized @@ -31,5 +31,5 @@ {% endfor %}
    {% else %} - (not online) + (not online) {% endif %} \ No newline at end of file diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html index 9c76774b88d..78471e08d68 100644 --- a/ietf/templates/doc/document_history.html +++ b/ietf/templates/doc/document_history.html @@ -11,7 +11,7 @@ - + {% endblock %} {% block content %} {% origin %} @@ -20,7 +20,33 @@

    Revision differences

    {% include "doc/document_history_form.html" with doc=doc diff_revisions=diff_revisions action=rfcdiff_base_url snapshot=snapshot only %} {% endif %} + {% if ballot_doc_rev %} +

    + Your most recent ballot position was provided when the document was at version {{ ballot_doc_rev }}. +

    + {% endif %}

    Document history

    + {% if doc.came_from_draft %} +     + {% endif %} + {% if doc.became_rfc %} + + {% endif %} + {% if can_add_comment %}
    Document history

    Date - Rev. + {% if doc.type_id not in "rfc,bcp,std,fyi" %}Rev.{% endif %} By Action @@ -45,7 +71,7 @@

    Document history

    {{ e.time|date:"Y-m-d" }}
    - {{ e.rev }} + {% if doc.type_id not in "rfc,bcp,std,fyi" %}{{ e.rev }}{% endif %} {{ e.by|escape }} {{ e.desc|format_history_text }} diff --git a/ietf/templates/doc/document_history_form.html b/ietf/templates/doc/document_history_form.html index 30e0d280009..646da0038be 100644 --- a/ietf/templates/doc/document_history_form.html +++ b/ietf/templates/doc/document_history_form.html @@ -11,7 +11,6 @@
    {% endif %} -{% with prev_rev=doc.rev|add:"-1"|stringformat:"02d" %} + value="{{ mail_archive_query_data.query_value }}">
    @@ -129,7 +133,7 @@

    {% else %}
    - Mailing list does not have a recognized ietf.org archive. Auto-searching disabled. + Mailing list does not have a recognized ietf.org archive. Auto-searching disabled.
    {% endif %} @@ -146,13 +150,5 @@

    {% endblock %} {% block js %} - {% endblock %} \ No newline at end of file diff --git a/ietf/templates/doc/review/edit_request_comment.html b/ietf/templates/doc/review/edit_request_comment.html index b2196cbcb53..50afa19acba 100644 --- a/ietf/templates/doc/review/edit_request_comment.html +++ b/ietf/templates/doc/review/edit_request_comment.html @@ -7,14 +7,14 @@

    Edit review request comment
    - {{ review_req.doc.name }} + {{ review_req.doc.name }}

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.name request_id=review_req.pk %}"> Back
    diff --git a/ietf/templates/doc/review/edit_request_deadline.html b/ietf/templates/doc/review/edit_request_deadline.html index a1ae542bd5b..7706f963962 100644 --- a/ietf/templates/doc/review/edit_request_deadline.html +++ b/ietf/templates/doc/review/edit_request_deadline.html @@ -10,14 +10,14 @@

    Edit review request deadline
    - {{ review_req.doc.name }} + {{ review_req.doc.name }}

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.name request_id=review_req.pk %}"> Back
    diff --git a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html index b2e8f1af754..4bc42547856 100644 --- a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html +++ b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html @@ -7,7 +7,7 @@

    Review assignment: No-Response
    - {{ assignment.review_request.doc.name }} + {{ assignment.review_request.doc.name }}

    Mark review assignment for {% person_link assignment.reviewer.person %} as No Response. @@ -19,7 +19,7 @@

    name="action" value="noresponse">Mark assignment as no-response + href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.name request_id=assignment.review_request.pk %}"> Back diff --git a/ietf/templates/doc/review/reject_reviewer_assignment.html b/ietf/templates/doc/review/reject_reviewer_assignment.html index eca22955795..7fbde360cda 100644 --- a/ietf/templates/doc/review/reject_reviewer_assignment.html +++ b/ietf/templates/doc/review/reject_reviewer_assignment.html @@ -7,10 +7,10 @@

    Reject review assignment
    - {{ review_req.doc.name }} + {{ review_req.doc.name }}

    {% include "doc/review/request_info.html" %} - {% if not review_request_past_deadline %} + {% if allow_reject_request %}

    Do you want to reject this assignment?

    @@ -18,7 +18,7 @@

    {% csrf_token %} {% bootstrap_form form %} + href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}"> Back diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html index 55caae9fa7c..9ad126d59e2 100644 --- a/ietf/templates/doc/review/request_info.html +++ b/ietf/templates/doc/review/request_info.html @@ -1,7 +1,7 @@ {# Copyright The IETF Trust 2017, All Rights Reserved #} {% load origin django_bootstrap5 %} {% origin %} -{% load person_filters %} +{% load person_filters ietf_filters %} @@ -27,7 +27,7 @@ No specific revision {% endif %} {% if review_req.reviewed_rev != review_req.doc.rev %} - (document currently at {{ review_req.doc.rev }}) + (document currently at {{ review_req.doc.rev }}) {% endif %} @@ -96,7 +96,7 @@ {% endif %} - {% if doc.time %} + {% if review_req.doc.time %} @@ -104,7 +104,10 @@ I-D last updated {% endif %} @@ -177,6 +180,8 @@
    {% if assignment.state_id == "assigned" %} Assignment not accepted yet + {% elif assignment.state_id == "rejected" %} + Assignment rejected {% else %} Assignment accepted {% endif %} @@ -217,17 +222,29 @@ State
    - {% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" %} + {% if doc == assignment.review %} + + + + + + {% endif %} + {% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" and doc != assignment.review%} @@ -312,8 +329,8 @@ - {% endif %} @@ -339,4 +356,4 @@ Assign reviewer -{% endif %} \ No newline at end of file +{% endif %} diff --git a/ietf/templates/doc/review/request_review.html b/ietf/templates/doc/review/request_review.html index 220ca4fe904..b765871d65d 100644 --- a/ietf/templates/doc/review/request_review.html +++ b/ietf/templates/doc/review/request_review.html @@ -11,7 +11,7 @@

    Request review
    - {{ doc.name }} + {{ doc.name }}

    Submit a request to have the document reviewed. @@ -44,7 +44,7 @@

    {% bootstrap_field form.comment layout="horizontal" %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html index 6ae15b08a3c..85335aab6e8 100644 --- a/ietf/templates/doc/review/review_request.html +++ b/ietf/templates/doc/review/review_request.html @@ -10,7 +10,7 @@

    Review request
    - {{ review_req.doc.name }} + {{ review_req.doc.name }}

    {% include "doc/review/request_info.html" %} {% if can_close_request %} @@ -21,6 +21,15 @@

    {% endif %}

    History

    + {% if can_add_comment %} +
    + + + Add comment + +
    + {% endif %}
    - {{ doc.time|date:"Y-m-d" }} + {{ review_req.doc.time|date:"Y-m-d" }} + {% if review_req.doc.pub_date %} + (Latest revision {{ review_req.doc.pub_date|date:"Y-m-d" }}) + {% endif %}
    - - {{ assignment.state.name }} - + {{ assignment.state.name|badgeify }} {% if snapshot %} - + Snapshot {% endif %}
    + + Request + + + {{ review_req }} + +
    Result - {{ assignment.result.name }} + + {{ assignment.result.name|badgeify }}
    @@ -30,6 +39,7 @@

    History

    + {% for h in history %} {% if h.history_change_reason %} @@ -39,6 +49,7 @@

    History

    {% endif %} {% endfor %} +
    Description
    {% endblock %} diff --git a/ietf/templates/doc/review/review_wish_add.html b/ietf/templates/doc/review/review_wish_add.html index bd2df52ce8b..73ce549288a 100644 --- a/ietf/templates/doc/review/review_wish_add.html +++ b/ietf/templates/doc/review/review_wish_add.html @@ -7,7 +7,7 @@

    Add review wish
    - {{ doc.name }} + {{ doc.name }}

    You are a reviewer for multiple teams, and need to select a team first. diff --git a/ietf/templates/doc/review/review_wishes_remove.html b/ietf/templates/doc/review/review_wishes_remove.html index aadf3c5deb6..ee30c3cfcc6 100644 --- a/ietf/templates/doc/review/review_wishes_remove.html +++ b/ietf/templates/doc/review/review_wishes_remove.html @@ -8,7 +8,7 @@

    Remove review wish {% if doc.name %}
    - {{ doc.name }} + {{ doc.name }} {% endif %}

    diff --git a/ietf/templates/doc/review/submit_unsolicited_review.html b/ietf/templates/doc/review/submit_unsolicited_review.html index 3f52c2bc755..5db7e9cd62c 100644 --- a/ietf/templates/doc/review/submit_unsolicited_review.html +++ b/ietf/templates/doc/review/submit_unsolicited_review.html @@ -7,7 +7,7 @@

    Submit unsolicited review
    - {{ doc.name }} + {{ doc.name }}

    You are submitting an unsolicited review for this document. @@ -18,7 +18,7 @@

    {% bootstrap_form form layout="horizontal" %} + href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}"> Back diff --git a/ietf/templates/doc/review/withdraw_reviewer_assignment.html b/ietf/templates/doc/review/withdraw_reviewer_assignment.html index 6ff1f926b29..aed48ba78b4 100644 --- a/ietf/templates/doc/review/withdraw_reviewer_assignment.html +++ b/ietf/templates/doc/review/withdraw_reviewer_assignment.html @@ -7,7 +7,7 @@

    Withdraw review assignment
    - {{ assignment.review_request.doc.name }} + {{ assignment.review_request.doc.name }}

    Withdraw review assignment for {% person_link assignment.reviewer.person %}. @@ -16,7 +16,7 @@

    {% csrf_token %} + href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.name request_id=assignment.review_request.pk %}"> Back diff --git a/ietf/templates/doc/review_assignment_summary.html b/ietf/templates/doc/review_assignment_summary.html index 4685bdf1cd4..6bb42ea074e 100644 --- a/ietf/templates/doc/review_assignment_summary.html +++ b/ietf/templates/doc/review_assignment_summary.html @@ -1,3 +1,4 @@ +{% load ietf_filters %}
    {% if review_assignment.state_id == "completed" or review_assignment.state_id == "part-completed" %} @@ -10,19 +11,17 @@ -{{ review_assignment.reviewed_rev }}){% endif %} by {{ review_assignment.reviewer.person.plain_name }} {% if review_assignment.state_id == "part-completed" %} - Partially completed + Partially completed {% endif %} {% if review_assignment.result %} - - {{ review_assignment.result.name }} - + {{ review_assignment.result.name|badgeify }} {% endif %} {% else %} - - {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review - - Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }} + {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review due {{ review_assignment.review_request.deadline|date:"Y-m-d" }} + + Incomplete {% endif %}
    \ No newline at end of file diff --git a/ietf/templates/doc/review_request_summary.html b/ietf/templates/doc/review_request_summary.html new file mode 100644 index 00000000000..af4f2d5f7b6 --- /dev/null +++ b/ietf/templates/doc/review_request_summary.html @@ -0,0 +1,9 @@ +
    + + {{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review due {{ review_request.deadline|date:"Y-m-d" }} + + + Requested + +
    \ No newline at end of file diff --git a/ietf/templates/doc/revisions_list.html b/ietf/templates/doc/revisions_list.html index cde628ddae2..761d4cd04b3 100644 --- a/ietf/templates/doc/revisions_list.html +++ b/ietf/templates/doc/revisions_list.html @@ -6,31 +6,46 @@

    {{ trigger }} - {{ to|join:', '|unescape|linkify }} - {{ cc|join:', '|unescape|linkify }} + + {% for addr in to %} + {{ addr|linkify }}{% if not forloop.last %}, {% endif %} + {% endfor %} + + + {% for addr in cc %} + {{ addr|linkify }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% endfor %} diff --git a/ietf/templates/group/email_aliases.html b/ietf/templates/group/email_aliases.html index 415f9950c22..f36be7f0f31 100644 --- a/ietf/templates/group/email_aliases.html +++ b/ietf/templates/group/email_aliases.html @@ -14,7 +14,7 @@

    Group email aliases {% if group %}
    - {{ group.acronym }} + {{ group.acronym }} {% endif %}

    {% regroup aliases|dictsort:"acronym" by acronym as alias_list %} diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html index 4f72e1c80e5..64b9c2e0642 100644 --- a/ietf/templates/group/email_open_review_assignments.html +++ b/ietf/templates/group/email_open_review_assignments.html @@ -9,7 +9,7 @@

    Email summary of assigned review requests
    - {{ group.acronym }} + {{ group.acronym }}

    {% if review_assignments %} diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 0ad9813e2fc..cbc2e11536f 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -14,6 +14,7 @@ {% endblock %} {% block pagehead %} + {% endblock %} {% block group_content %} {% origin %} @@ -67,7 +68,7 @@ {{ group.state.name }} - {% if requested_close %}
    Being closed
    {% endif %} + {% if requested_close %}
    Being closed
    {% endif %} {% if group.features.has_chartering_process %} @@ -80,10 +81,10 @@ {{ group.charter.name }}-{{ group.charter.rev }} {% if group.charter.get_state.name %} - {{ group.charter.get_state.name }} + {{ group.charter.get_state.name }} {% endif %} {% else %} - (None) + (None) {% if user|has_role:"Area Director,Secretariat" %} Submit charter {% endif %} @@ -112,11 +113,11 @@ href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}"> Show - + Changed {{ status_update.time|date:"Y-m-d" }} {% else %} - + (None) {% endif %} @@ -157,7 +158,7 @@
    - Pan and zoom the dependency + Pan and zoom the dependency graph after the layout settles.
    @@ -379,8 +380,7 @@

    {% if group.state_id == "proposed" %}proposed{% endif %} {{ group.type.desc.title }}

    - {# the linebreaks filter adds

    , no surrounding

    necessary: #} - {{ group.charter_text|urlize_ietf_docs|linkify|linebreaks }} + {{ group.charter_html }} {% else %}

    {% if requested_close or group.state_id == "conclude" %}Final{% endif %} diff --git a/ietf/templates/group/group_about_rendertest.html b/ietf/templates/group/group_about_rendertest.html deleted file mode 100644 index 3f57bccc705..00000000000 --- a/ietf/templates/group/group_about_rendertest.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "group/group_base.html" %} -{# Copyright The IETF Trust 2021, All Rights Reserved #} -{% load origin %} -{% load ietf_filters %} -{% block group_content %} - {% if charter %} - {% comment %} -
    -
    Current about page rendering
    -
    Markdown rendering
    -
    -
    -
     
    -
    Constrain width
    -
    -
    -
    {{charter|linebreaks}}
    -
    {{rendered|sanitize|safe}}
    -
    - {% endcomment %} -
    -
    -
    Current about page rendering
    -
     
    -
    {{ charter|linebreaks }}
    -
    -
    -
    Markdown rendering
    -
    - - -
    -
    {{ rendered|sanitize|safe }}
    -
    -
    -{% else %} -
    Group has no charter document
    -{% endif %} -{% endblock %} -{% block js %} - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html index 3caf24ba731..19f60d67f8b 100644 --- a/ietf/templates/group/group_about_status.html +++ b/ietf/templates/group/group_about_status.html @@ -11,7 +11,7 @@

    Status update for {{ group.type.name }}
    - {{ group.acronym }} + {{ group.acronym }}

    {% if can_provide_status_update %}
    diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html index 7b6df06f504..6406e536da3 100644 --- a/ietf/templates/group/group_about_status_edit.html +++ b/ietf/templates/group/group_about_status_edit.html @@ -8,7 +8,7 @@

    Edit status update for {{ group.type.name }}
    - {{ group.acronym }} + {{ group.acronym }}

    About Status Updates

    diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html index b6c3f99bac2..f6dcc8cdd97 100644 --- a/ietf/templates/group/group_base.html +++ b/ietf/templates/group/group_base.html @@ -10,10 +10,10 @@ {% origin %}

    {% if group.state_id == "dormant" or group.state_id == "conclude" %} - Concluded {{ group.type.name }} + Concluded {{ group.type.name }} {% endif %} - {% if group.state_id == "replaced" %}Replaced {{ group.type.name }}{% endif %} - {% if group.state_id == "proposed" %}Proposed {{ group.type.name }}{% endif %} + {% if group.state_id == "replaced" %}Replaced {{ group.type.name }}{% endif %} + {% if group.state_id == "proposed" %}Proposed {{ group.type.name }}{% endif %} {{ group.name }} ({{ group.acronym }})

      diff --git a/ietf/templates/group/group_entry_with_charter.txt b/ietf/templates/group/group_entry_with_charter.txt index cfce907fbc0..846cc395b88 100644 --- a/ietf/templates/group/group_entry_with_charter.txt +++ b/ietf/templates/group/group_entry_with_charter.txt @@ -37,12 +37,12 @@ Goals and Milestones: {% for milestone in group.milestones %} {% if milestone.resolved %}{{ milestone.resolved }} {% else %}{{ milestone.due|date:"M Y" }}{% endif %} - {{ milestone.desc }} {% endfor %} Internet-Drafts: -{% for alias in group.drafts %} - {{ alias.document.title }} [{{ alias.name }}-{{ alias.document.rev }}] ({{ alias.document.pages }} pages) +{% for document in group.drafts %} - {{ document.title|clean_whitespace }} [{{ document.name }}-{{ document.rev }}] ({{ document.pages }} pages) {% endfor %} {% if group.rfcs %}Requests for Comments: -{% for alias in group.rfcs %} {{ alias.name.upper }}: {{ alias.document.title}} ({{ alias.document.pages }} pages){% for r in alias.rel %} - * {{ r.action }} {{ r.target.name|upper }}{% endfor %}{% for r in alias.invrel %} - * {% if r.relationsship == "obs" %}{{ r.inverse_action|upper }}{% else %}{{ r.action }}{% endif %} {{ r.source.canonical_name|upper }}{% endfor %} +{% for document in group.rfcs %} {{ document.name.upper }}: {{ document.title}} ({{ document.pages }} pages){% for r in document.rel %} + * {{ r.action }} {{ r.target.name|upper }}{% endfor %}{% for r in document.invrel %} + * {% if r.relationsship == "obs" %}{{ r.inverse_action|upper }}{% else %}{{ r.action }}{% endif %} {{ r.source.name|upper }}{% endfor %} {% endfor %} {% else %}No Requests for Comments{% endif %} {% endautoescape %} diff --git a/ietf/templates/group/group_leadership.html b/ietf/templates/group/group_leadership.html new file mode 100644 index 00000000000..644be3e1505 --- /dev/null +++ b/ietf/templates/group/group_leadership.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2024, All Rights Reserved #} +{% load origin static person_filters ietf_filters %} +{% block pagehead %} + +{% endblock %} +{% block title %}Group Leadership{% endblock %} +{% block content %} + {% origin %} +

      Group Leadership ({{ group_type }})

      + {% if user|has_role:"Secretariat" %} +
      + + Export as CSV + +
      + {% endif %} + + + + + + + + + {% for leader in leaders %} + + + + + {% endfor %} + +
      LeaderGroups
      {{ leader.name }}{{ leader.groups }}
      +{% endblock %} diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html index 4087ebfe8a4..609c650180c 100644 --- a/ietf/templates/group/index.html +++ b/ietf/templates/group/index.html @@ -27,7 +27,7 @@

      Other RFC streams

      {% with stream.get_chair as role %} {% person_link role.person %} - {% if role %}{{ role.name }}{% endif %} + {% if role %}{{ role.name }}{% endif %} {% endwith %} diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html index 175bfff5c98..99b23c138af 100644 --- a/ietf/templates/group/manage_review_requests.html +++ b/ietf/templates/group/manage_review_requests.html @@ -12,7 +12,7 @@

      Manage {{ assignment_status }} open review requests
      - {{ group.acronym }} + {{ group.acronym }}

      {% if newly_closed > 0 or newly_opened > 0 or newly_assigned > 0 %}

      @@ -36,7 +36,7 @@

      {{ r.type.name }} {% endif %} deadline {{ r.deadline|date:"Y-m-d" }} - {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} + {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} {{ r.doc.name }}- @@ -63,7 +63,7 @@

      {% endif %}
      {% else %} - Auto-suggested + Auto-suggested
      {% endif %} {% if r.doc.authors %} @@ -135,10 +135,10 @@

      {% endfor %} {% endif %}
      - {{ r.doc.pages }} page{{ r.doc.pages|pluralize }} - {{ r.doc.friendly_state }} + {{ r.doc.pages }} page{{ r.doc.pages|pluralize }} + {{ r.doc.friendly_state }}
      - {% if r.doc.telechat_date %}IESG telechat {{ r.doc.telechat_date }}{% endif %} + {% if r.doc.telechat_date %}IESG telechat {{ r.doc.telechat_date }}{% endif %} {% if r.comment %}
      {{ r.comment }}
      {% endif %}

    @@ -169,8 +169,8 @@

    title="Click to reassign reviewer"> {% person_link r.reviewer.person %} - {% if r.state_id == "accepted" %}Accepted{% endif %} - {% if r.reviewer_unavailable %}Unavailable{% endif %} + {% if r.state_id == "accepted" %}Accepted{% endif %} + {% if r.reviewer_unavailable %}Unavailable{% endif %} {% else %}

    {% for p in past_pres_list %} {{ p.grouper }} {% if p.list|length > 1 %} - {{ p.list|length }} sessions + {{ p.list|length }} sessions {% else %} {% for pr in p.list %} {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %} @@ -52,7 +52,7 @@

    {{ doc_type.name }}

    {% for p in meeting_pres_list %} {{ p.grouper }} {% if p.list|length > 1 %} - {{ p.list|length }} sessions + {{ p.list|length }} sessions {% else %} {% for pr in p.list %} {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %} diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html index 6dc65ab7f6b..8927eb61a26 100644 --- a/ietf/templates/group/meetings-row.html +++ b/ietf/templates/group/meetings-row.html @@ -1,7 +1,7 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} {% load origin tz %} {% origin %} {% for s in sessions %} - {% timezone s.meeting.time_zone %} {% if s.meeting.type.slug == 'ietf' %} @@ -11,28 +11,33 @@ {% endif %} - {% if s.name %}{{ s.name }}{% endif %} {% if s.current_status == "sched" %} - {{ s.time|date:"Y-m-d" }} + {% with timeslot=s.official_timeslotassignment.timeslot %} + + {% endwith %} {% else %} - {{ s.current_status_name }} +
    {{ s.current_status_name }}
    + {% if s.current_status == "canceled" %} + {% with timeslot=s.official_timeslotassignment.timeslot %} + + {% endwith %} + {% endif %} {% endif %} {% if show_request and s.meeting.type_id == 'ietf' %} {% if can_edit %}     + href="{% url 'ietf.meeting.views_session_request.view_request' num=s.meeting.number acronym=s.group.acronym %}"> Edit Session Request {% endif %} {% endif %} - {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %} + {% if s.name %}{{ s.name }}{% endif %} {% if show_ical and s.current_status == "sched" %} {% if s.meeting.type_id == 'ietf' %} - {{ s.time|date:"H:i" }} Minutes + {% if group.acronym == "iesg" %} + + Narrative Minutes + + {% endif %} {% if can_always_edit or can_edit_materials %} @@ -68,13 +79,12 @@
    {# see note in the included templates re: show_agenda parameter and required JS import #} {% if s.meeting.type.slug == 'interim' %} - {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False session=s meeting=s.meeting use_notes=s.meeting.use_notes %} + {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False session=s meeting=s.meeting %} {% else %} - {% include "meeting/session_buttons_include.html" with show_agenda=False item=s.official_timeslotassignment session=s meeting=s.meeting use_notes=s.meeting.use_notes %} + {% include "meeting/session_buttons_include.html" with show_agenda=False item=s.official_timeslotassignment session=s meeting=s.meeting %} {% endif %}
    {% endif %} - {% endtimezone %} {% endfor %} \ No newline at end of file diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html index fbbfd661f9e..30f478da131 100644 --- a/ietf/templates/group/meetings.html +++ b/ietf/templates/group/meetings.html @@ -1,6 +1,6 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} {% extends "group/group_base.html" %} -{# Copyright The IETF Trust 2015-2022, All Rights Reserved #} -{% load origin %} +{% load origin static %} {% block title %} Meetings {% if group %}for {{ group.acronym }}{% endif %} @@ -10,7 +10,7 @@     Session requests {% if can_edit or can_always_edit %} - Request a session + Request a session Request an interim meeting @@ -19,14 +19,15 @@ {% endblock %} {% block group_content %} {% origin %} + {% include "meeting/tz-display.html" with meeting_timezone=None id_suffix="" minimal=False only %} {% if in_progress %} -

    Meetings in progress

    +

    Meetings in progress

    {% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %} - - + + @@ -38,20 +39,20 @@

    Meetings in progress

    {% endwith %} {% endif %} {% if future %} -

    +

    Future Meetings - - - + {% for cal_action in cal_actions %} + + {{ cal_action.label }} + + {% endfor %}

    MeetingDateMeetingDate Materials
    - - + + @@ -64,12 +65,12 @@

    MeetingDateMeetingDate Materials
    {% endif %} {% if past or recent %} -

    Past Meetings

    +

    Past Meetings (within the last four years)

    - - + + @@ -84,8 +85,94 @@

    Past Meetings

    MeetingDateMeetingDate Materials
    {% endif %} -

    - This page shows meetings within the last four years. For earlier meetings, please see the - proceedings. -

    + {# The following is a temporary performance workaround, not long term design #} + {% if group.acronym != "iab" and group.acronym != "iesg" %} +

    + This page shows meetings within the last four years. For earlier meetings, please see the + proceedings. +

    + {% else %} + {% comment %} + Note: This block is only capable of correctly processing interim sessions. + If the view starts sending other types of meetings with a non-empty + older_sessions value, this block will need to be adjusted. + {% endcomment %} + {% if far_past %} +

    Meetings more than four years ago

    + + + + + + + + + + + {% for s in far_past %} + + + + + + + + {% endfor %} + +
    MeetingDateMaterials
    + {% if s.meeting.type.slug == 'ietf' %} + IETF {{ s.meeting.number }} + {% else %} + {{ s.meeting.number }} + {% endif %} + {% if s.current_status == "sched" %} + {{ s.time|date:"Y-m-d" }} + {% else %} + {{ s.current_status_name }} + {% endif %} + + {% if s.name %}{{ s.name }}{% endif %} + + {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %} + + {% if not s.canceled %} + + Agenda + + + Minutes + + {% if group.acronym == "iesg" %} + + Narrative Minutes + + {% endif %} + + {% if can_always_edit or can_edit_materials %} + + + {% endif %} + Materials + + {% endif %} +
    + {% endif %} + {% endif %} +{% endblock %} +{% block js %} + + + + + {% endblock %} diff --git a/ietf/templates/group/milestones.html b/ietf/templates/group/milestones.html index 8375a51e81b..51579ce80ad 100644 --- a/ietf/templates/group/milestones.html +++ b/ietf/templates/group/milestones.html @@ -7,7 +7,7 @@ {% if heading %}

    {% if milestoneset.grouper %} - {{ milestoneset.grouper }} milestones + {{ milestoneset.grouper|title }} milestones {% else %} {% if group.state_id == "proposed" %} Proposed milestones @@ -20,15 +20,15 @@

    - - - + + @@ -36,10 +36,10 @@

    diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html index 00f4917ef8e..79f26e3e368 100644 --- a/ietf/templates/group/reset_charter_milestones.html +++ b/ietf/templates/group/reset_charter_milestones.html @@ -8,7 +8,7 @@

    Reset Charter Milestones
    - {{ group.acronym }} {{ group.type.name }} + {{ group.acronym }} {{ group.type.name }}

    Select which of the current {{ group.type.name }} milestones you would like to copy to the charter: @@ -30,7 +30,7 @@

    - + {% if milestone.resolved %} {{ milestone.resolved }} {% else %} diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html index e5439078953..ce8dde1de8a 100644 --- a/ietf/templates/group/reset_next_reviewer.html +++ b/ietf/templates/group/reset_next_reviewer.html @@ -4,7 +4,7 @@ {% origin %} {% load ietf_filters static django_bootstrap5 %} {% block content %} -

    Set next reviewer in queue
    {{ group.acronym }}

    +

    Set next reviewer in queue
    {{ group.acronym }}

    {% csrf_token %} {% bootstrap_form form %} diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html index 59beb0ff845..61b93de2b66 100644 --- a/ietf/templates/group/review_requests.html +++ b/ietf/templates/group/review_requests.html @@ -2,7 +2,7 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% origin %} -{% load ietf_filters static person_filters %} +{% load ietf_filters static person_filters ietf_filters %} {% block group_subtitle %}Review requests{% endblock %} {% block pagehead %} @@ -48,13 +48,13 @@

    Unassigned and open re {% if r.pk %} {{ r.time|date:"Y-m-d" }} by {% person_link r.requested_by %} {% else %} - Auto-suggested + Auto-suggested {% endif %}

    @@ -96,14 +96,13 @@

    Unassigned and open re

    {% endfor %} @@ -242,10 +241,10 @@

    Closed review requests and assignme {% person_link a.reviewer.person %}

    {% endfor %} @@ -255,4 +254,4 @@

    Closed review requests and assignme {% block js %} - {% endblock %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/group/review_requests_history.html b/ietf/templates/group/review_requests_history.html new file mode 100644 index 00000000000..1b1fb4d2636 --- /dev/null +++ b/ietf/templates/group/review_requests_history.html @@ -0,0 +1,90 @@ +{% extends "group/group_base.html" %} +{# Copyright The IETF Trust 2015, All Rights Reserved #} +{% load origin %} +{% load tz %} +{% load ietf_filters person_filters textfilters %} +{% load static %} +{% block pagehead %} + +{% endblock %} +{% block group_content %} + {% origin %} + {% if reviewer_email %} +

    Review requests history of {{ reviewer_email }}

    + {% else %} +

    Review requests history

    + {% endif %} + +
    + + + +
    +
    + Past: +
    + {% for key, label in since_choices %} + + {% endfor %} +
    +
    + + +
    + {% if group.uses_milestone_dates %} Date {% else %} Order {% endif %} MilestoneAssociated documentsMilestoneAssociated documents
    {% if milestone.resolved %} - {{ milestone.resolved }} + {{ milestone.resolved|title }} {% else %} {% if group.uses_milestone_dates %} - {{ milestone.due|date:"M Y" }} + {{ milestone.due|date:"M Y" }} {% else %} {% if forloop.first %}Last{% endif %} {% if forloop.last %}Next{% endif %} @@ -49,7 +49,7 @@

    		{{ milestone.desc|urlize_ietf_docs }} {% for d in milestone.docs.all %} - {{ d.name }} + {% if d.became_rfc %}{{ d.became_rfc }} (was {% endif %}{{ d.name }}{% if d.became_rfc %}){% endif %}
    {% endfor %}     		{{ r.deadline|date:"Y-m-d" }} {% if r.due %} - {{ r.due }} day{{ r.due|pluralize }} {% endif %} {{ a.review_request.deadline|date:"Y-m-d" }} {% if a.due %} - {{ a.due }} day{{ a.due|pluralize }} {% endif %} {% person_link a.reviewer.person %} - {% if a.state_id == "accepted" %}Accepted{% endif %} - {% if a.reviewer_unavailable %}Unavailable{% endif %} + {{ a.state_id|badgeify }} {{ a.review_request.doc.friendly_state }} @@ -178,7 +177,7 @@

    Closed review requests and assignme {{ r.request_closed_time|date:"Y-m-d" }}

    		- {{ r.state.name }} + {{ r.state.name|badgeify }}
    - {{ a.state }} + {{ a.state|badgeify }} - {% if a.result %}{{ a.result }}{% endif %} + {% if a.result %}{{ a.result|badgeify }}{% endif %}
    + + + + + + + + + + + + {% if history %} + + {% for h in history %} + + + + + + + + + + {% endfor %} + + {% endif %} +
    Date (UTC)ByDocumentStateReviewerResultDescription
    {{ h.history_date|utc|date:"Y-m-d H:i:s" }}{% person_link h.history_user.person %}{% if h.reviewed_rev %} + + {{ h.review_request.doc.name }}-{{ h.reviewed_rev }} + + {% else %} + {{ h.review_request.doc.name }} + {% endif %} + + {{ h.state }} + + {% person_link h.reviewer.person %} + + (set as filter) + + + {% if h.review %} + {{ h.result }} + {% else %} + {{ h.result }} + {% endif %} + {{ h.history_change_reason }}
    +{% endblock %} +{% block js %} + +{% endblock %} diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index 39ba7606a9c..75bd15f1d30 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -24,7 +24,7 @@

    Reviewers

    rotation with the next reviewer in the rotation at the top. Rows with darker backgrounds have the following meaning:

    -

    +

    Has already been assigned a document within the given interval.

    @@ -44,89 +44,102 @@

    Reviewers

    {% endif %} {% if reviewers %} - +
    - + - - - + + + {% for person in reviewers %} - + + + - - + {% endfor %} diff --git a/ietf/templates/group/statements.html b/ietf/templates/group/statements.html new file mode 100644 index 00000000000..6bbe3cb3945 --- /dev/null +++ b/ietf/templates/group/statements.html @@ -0,0 +1,51 @@ +{% extends "group/group_base.html" %} +{# Copyright The IETF Trust 2023, All Rights Reserved #} +{% load origin %} +{% load ietf_filters person_filters textfilters %} +{% load static %} +{% block pagehead %} + +{% endblock %} +{% block group_content %} + {% origin %} +

    {{group.acronym|upper}} Statements

    + {% if request.user|has_role:"Secretariat" %} +
    + + Start New Statement + +
    + {% endif %} +
    NextNext ReviewerRecent historyDays since completedSettings +
    +
    Assigned
    +
    Deadline
    +
    State
    +
    Days for review
    +
    Document
    +
    +     		Days since reviewSettings
    {{ forloop.counter }} - {% person_link person %} - {% if person.settings_url %} - Edit - - {% endif %} + {% person_link person with_email=False %} + +
    + {% if person.settings_url %} + + + + {% endif %} + +
    		{% if person.latest_reqs %} - - - - - - - - - - - - {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} - - - - - - - - {% endfor %} - -
    AssignedDeadlineStateReview timeDocument
    - {{ assigned_time|date }} - - {{ deadline|date }} - - {{ state.name }} - - {% if assignment_to_closure_days != None %} - {{ assignment_to_closure_days }} day{{ assignment_to_closure_days|pluralize }} - {% endif %} - - {{ doc_name }} - {% if reviewed_rev %}-{{ reviewed_rev }}{% endif %} -
    + {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} +
    +
    + {{ assigned_time|date|split:"-"|join:"-" }} +
    +
    + {{ deadline|date|split:"-"|join:"-" }} +
    +
    + {{ state.name|badgeify }} +
    +
    + {% if assignment_to_closure_days != None %} + {{ assignment_to_closure_days }} + {% endif %} +
    +
    + {{ doc_name }}{% if reviewed_rev %}-{{ reviewed_rev }}{% endif %} +
    +
    + {% endfor %} {% endif %}     		+ + {% if person.days_since_completed_review != 9999 %} {{ person.days_since_completed_review }} {% endif %} - {% if person.settings.min_interval %} - {{ person.settings.get_min_interval_display }} -
    - {% endif %} - {% if person.settings.skip_next %} - Skip: {{ person.settings.skip_next }} -
    - {% endif %} - {% if person.settings.filter_re %} - Filter: {{ person.settings.filter_re|truncatechars:15 }} -
    - {% endif %} - {% if person.unavailable_periods %} - {% include "review/unavailable_table.html" with unavailable_periods=person.unavailable_periods %} - {% endif %} + +     		+ {% include "review/unavailable_table.html" with person=person unavailable_periods=person.unavailable_periods %} +
    + + + + + + +{% regroup statements by status as grouped_statements %} +{% for statement_group in grouped_statements %} + + + + + + + {% for statement in statement_group.list %} + + + + + {% endfor %} + +{% endfor %} +
    DateStatement
    + {{ statement_group.grouper|title }} {{"Statement"|plural:statement_group.list }} ({{ statement_group.list|length }} {{"hit"|plural:statement_group.list }}) +
    {{ statement.published|date:"Y-m-d" }}{{statement.title}} +
    +{% endblock %} +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/help/state_index.html b/ietf/templates/help/state_index.html deleted file mode 100644 index 29233cca094..00000000000 --- a/ietf/templates/help/state_index.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin static %} -{% block pagehead %} - -{% endblock %} -{% block title %}Document state index{% endblock %} -{% block content %} - {% origin %} -

    Document state index

    -

    - Document state information is available for the following document and document state groups. -

    - - - - - - - - - {% for type in types %} - {% if type.stategroups != None %} - - - - - {% endif %} - {% endfor %} - -
    DocumentState groups
    - {{ type.slug }} - - {% for group in type.stategroups %} - {# djlint:off #} - {{ group }}{% if not forloop.last %},{% endif %} - {# djlint:on #} - {% endfor %} -
    -{% endblock %} -{% block js %} - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/help/states.html b/ietf/templates/help/states.html deleted file mode 100644 index a43bc3a9f5f..00000000000 --- a/ietf/templates/help/states.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin static ietf_filters textfilters %} -%} -{% block pagehead %} - -{% endblock %} -{% block title %}{{ type.label|cut:"state"|cut:"state" }} states{% endblock %} -{% block content %} - {% origin %} -

    {{ type.label|cut:"state"|cut:"State" }} states

    - - - - - - - - - - {% for state in states %} - - - - - - {% endfor %} - -
    StateDescriptionNext states
    {{ state.name }}{{ state.desc|urlize_ietf_docs|linkify }} -
      - {% for s in state.next_states.all %} -
    • {{ s.name }}
      • - {% endfor %} -
    -
    -{% endblock %} -{% block js %} - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/idindex/.gitignore b/ietf/templates/idindex/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/idindex/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/iesg/.gitignore b/ietf/templates/iesg/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/iesg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html index 1e3361c0b07..8567d5e357c 100644 --- a/ietf/templates/iesg/agenda.html +++ b/ietf/templates/iesg/agenda.html @@ -9,7 +9,7 @@

    IESG agenda
    - {{ date }} + {{ date }}

    {% include "iesg/nav.html" with active="agenda" %} {% if user|has_role:"Secretariat" %} @@ -106,7 +106,7 @@

    {{ num }} {{ section.title|safe }} +

    (None)

    {% endfor %} diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html index 20bd23e06ff..b4124914db5 100644 --- a/ietf/templates/iesg/agenda_charter.html +++ b/ietf/templates/iesg/agenda_charter.html @@ -24,7 +24,7 @@
    Area
    - + {{ doc.group.parent.acronym|upper }} ({% person_link doc.ad %})
    diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index ceb84199cfb..316dd8e2ccc 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -1,7 +1,7 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} {% origin %} -{% load ietf_filters ballot_icon person_filters %} +{% load ietf_filters ballot_icon person_filters textfilters %}
    {% ballot_icon doc %}
    @@ -11,7 +11,7 @@
    {{ doc.title }}
    - {{ doc.canonical_name }} + {{ doc.name }}
    @@ -27,7 +27,7 @@ {% if conflictdoc.note %}
    Note
    -
    {{ conflictdoc.note|linebreaksbr }}
    +
    {{ conflictdoc.note|urlize_ietf_docs|linkify|linebreaksbr }}
    {% endif %}
    diff --git a/ietf/templates/iesg/agenda_conflict_doc.txt b/ietf/templates/iesg/agenda_conflict_doc.txt index 4ff2e3b00c3..e4fbcc32b33 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.txt +++ b/ietf/templates/iesg/agenda_conflict_doc.txt @@ -1,8 +1,7 @@ {% load ietf_filters %}{% with doc.conflictdoc as conflictdoc %} - o {{ doc.canonical_name }}-{{ doc.rev }} + o {{ doc.name }}-{{ doc.rev }} {% filter wordwrap:"68"|indent|indent %}{{ doc.title }}{% endfilter %} - {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }} + {{ conflictdoc.name }}-{{ conflictdoc.rev }} {% filter wordwrap:"66"|indent:"4" %}{{ conflictdoc.title }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }}){% endfilter %} -{% if conflictdoc.note %}{# note: note is not escaped #} {% filter wordwrap:"64"|indent:"6" %}Note: {{ conflictdoc.note|striptags }}{% endfilter %} -{% endif %} Token: {{ doc.ad }} + Token: {{ doc.ad }} {% with doc.active_defer_event as defer %}{% if defer %} Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}{% endif %}{% endwith %}{% endwith %} diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index 16b223186c7..87051fda26b 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -19,9 +19,9 @@ {% with doc.rfc_number as rfc_number %} {% endwith %} - {{ doc.canonical_name }} + {{ doc.name }} {% if doc.has_rfc_editor_note %} - + (Has RFC Editor Note) {% endif %} @@ -37,7 +37,7 @@
    Token
    {% person_link doc.ad %} - + ({{ doc.group.parent.acronym|upper }})
    diff --git a/ietf/templates/iesg/agenda_doc.txt b/ietf/templates/iesg/agenda_doc.txt index 247d456a5a8..015af32409f 100644 --- a/ietf/templates/iesg/agenda_doc.txt +++ b/ietf/templates/iesg/agenda_doc.txt @@ -1,8 +1,7 @@ {% load ietf_filters %}{% with doc.rfc_number as rfc_number %} - o {{doc.canonical_name}}{% if not rfc_number %}-{{doc.rev}}{% endif %}{% endwith %}{%if doc.has_rfc_editor_note %} (Has RFC Editor Note){% endif %}{% if doc.stream %} - {{ doc.stream }} stream{% endif %} + o {{doc.name}}{% if not rfc_number %}-{{doc.rev}}{% endif %}{% endwith %}{%if doc.has_rfc_editor_note %} (Has RFC Editor Note){% endif %}{% if doc.stream %} - {{ doc.stream }} stream{% endif %} {% filter wordwrap:"68"|indent|indent %}{{ doc.title }} ({{ doc.intended_std_level }}){% endfilter %} -{% if doc.note %}{# note: note is not escaped #} {% filter wordwrap:"68"|indent|indent %}Note: {{ doc.note|striptags }}{% endfilter %} -{% endif %} Token: {{ doc.ad }}{% if doc.iana_review_state %} + Token: {{ doc.ad }}{% if doc.iana_review_state %} IANA Review: {{ doc.iana_review_state }}{% endif %}{% if doc.consensus %} Consensus: {{ doc.consensus }}{% endif %}{% if doc.lastcall_expires %} Last call expires: {{ doc.lastcall_expires|date:"Y-m-d" }}{% endif %}{% if doc.review_assignments %} diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html index 1935c44e03f..f732672df0e 100644 --- a/ietf/templates/iesg/agenda_documents.html +++ b/ietf/templates/iesg/agenda_documents.html @@ -21,7 +21,12 @@

    Documents on future IESG telechat agendas

    IESG telechat {{ t.date }}
    - {{ t.pages }} page{{ t.pages|pluralize }} + + {{ t.pages }} page{{ t.pages|pluralize }} + {% if t.ad_pages_left_to_ballot_on %} + ({{ t.ad_pages_left_to_ballot_on }} pages left to ballot on) + {% endif %} +

    @@ -55,7 +60,7 @@

    {% for doc in section.docs %} - {% include "doc/search/search_result_row.html" with color_ad_position=True %} + {% include "doc/search/search_result_row.html" with color_ad_position=True show_ad_and_shepherd=True %} {% endfor %} diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html index 8237b162d28..ca031e2bc2c 100644 --- a/ietf/templates/iesg/discusses.html +++ b/ietf/templates/iesg/discusses.html @@ -60,7 +60,7 @@

    IESG discuss positions

    {% person_link doc.ad %} {% for p in doc.blocking_positions %} - {% if p.is_old_pos %}{% endif %} + {% if p.is_old_pos %}{% endif %} {% person_link p.balloter %} ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
    diff --git a/ietf/templates/iesg/ietf_activity_report.html b/ietf/templates/iesg/ietf_activity_report.html index 32bf9dc456d..030110026ae 100644 --- a/ietf/templates/iesg/ietf_activity_report.html +++ b/ietf/templates/iesg/ietf_activity_report.html @@ -3,7 +3,7 @@ {% block title %}IETF Activity Report{% endblock %} {% block content %}

    IETF Activity Report

    -

    {{ sdate|date:"F Y" }}

    +

    {{ sdate|date:"F Y" }}

    diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html index fb48b75be18..1a06ffa1d4e 100644 --- a/ietf/templates/iesg/moderator_doc.html +++ b/ietf/templates/iesg/moderator_doc.html @@ -93,7 +93,7 @@

    If APPROVED with caveats - The Secretariat will send a working group submission, Protocol Action Announcement that includes the - [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that + [RFC Editor Note, etc.] to be drafted by [Name that AD].

    {% endif %} @@ -103,7 +103,7 @@

    If APPROVED with caveats - The Secretariat will send an individual submission, Protocol Action Announcement that includes - the [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that + the [RFC Editor Note, etc.] to be drafted by [Name that AD].

    {% endif %} @@ -113,7 +113,7 @@

    If APPROVED with caveats - The Secretariat will send the associated status change Protocol Action Announcements that includes the - [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that + [RFC Editor Note, etc.] to be drafted by [Name that AD].

    {% endif %} @@ -123,7 +123,7 @@

    If APPROVED with caveats - The Secretariat will send a working group submission Document Action announcement that includes the [RFC - Ed. Note, IESG, note, etc.] from [Name that AD].

    + Ed. Note, etc.] from [Name that AD].

    {% endif %} {% if num|startswith:"3.2.1" or num|startswith:"3.2.2" %} @@ -132,7 +132,7 @@

    If APPROVED with caveats - The Secretariat will send an individual submission Document Action announcement that includes the - [RFC Ed. Note, IESG, note, etc.] from [Name that AD].

    + [RFC Ed. Note, etc.] from [Name that AD].

    {% endif %} {% if num|startswith:"3.3.1" or num|startswith:"3.3.2" %} @@ -141,13 +141,12 @@

    If APPROVED with caveats - The Secretariat will send the associated status change Document Action announcements that includes the [RFC - Ed. Note, IESG, note, etc.] from [Name that AD].

    + Ed. Note, etc.] from [Name that AD].

    {% endif %} {% if num|startswith:"3.4.1" or num|startswith:"3.4.2" %}

    If APPROVED - The Secretariat will send a standard no problem - message to the RFC Editor. [Name of AD] will you supply the text for - the IESG Note?

    + message to the RFC Editor.

    If APPROVED with caveats - The Secretariat will send a standard no problem message to the RFC Editor that includes the note drafted @@ -165,13 +164,13 @@ {% if downrefs %}

    If APPROVED - The Secretariat will add to the downref registry:
    {% for ref in downrefs %} - + Add {{ref.target.document.canonical_name}} - ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}}) + + Add {{ref.target.name}} + ({{ref.target.std_level}} - {{ref.target.stream.desc}}) to downref registry.
    - {% if not ref.target.document.std_level %} + {% if not ref.target.std_level %} +++ Warning: The standards level has not been set yet!!!
    {% endif %} - {% if not ref.target.document.stream %} + {% if not ref.target.stream %} +++ Warning: document stream has not been set yet!!!
    {% endif %} {% endfor %}

    diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html index 7b7fc9c449b..6698486e00d 100644 --- a/ietf/templates/iesg/moderator_package.html +++ b/ietf/templates/iesg/moderator_package.html @@ -96,9 +96,7 @@

    Are there narrative minutes to approve for today?

    - {% filter linebreaks_crlf %} - 
    {{ section.text }}
    - {% endfilter %} +     Draft minutes {% endif %} {% if num == "1.4" %} {% filter linebreaks_crlf %} diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html index 72d005d1a85..ee0a2f8288d 100644 --- a/ietf/templates/iesg/past_documents.html +++ b/ietf/templates/iesg/past_documents.html @@ -12,7 +12,7 @@

    Documents on recent agendas
    - in states + in states {% for state in states %} {{ state.name }}{% if not forloop.last %},{% endif %} {% endfor %} @@ -49,7 +49,7 @@

    {% person_link doc.ad %} {% for p in doc.blocking_positions %} - {% if p.is_old_pos %}{% endif %} + {% if p.is_old_pos %}{% endif %} {% person_link p.balloter %} ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
    diff --git a/ietf/templates/iesg/telechat_agenda_content_edit.html b/ietf/templates/iesg/telechat_agenda_content_edit.html index d748cd60a0c..f24d81df989 100644 --- a/ietf/templates/iesg/telechat_agenda_content_edit.html +++ b/ietf/templates/iesg/telechat_agenda_content_edit.html @@ -9,7 +9,7 @@

    Edit Telechat Agenda Contents
    - {{ section }} + {{ section }}

    {% csrf_token %} diff --git a/ietf/templates/iesg/working_groups.html b/ietf/templates/iesg/working_groups.html new file mode 100644 index 00000000000..b799636857f --- /dev/null +++ b/ietf/templates/iesg/working_groups.html @@ -0,0 +1,159 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load origin static %} +{% block pagehead %} + +{% endblock %} +{% block title %}IESG view of working groups{% endblock %} +{% block content %} + {% origin %} +

    IESG view of working groups

    +

    Area Size and Load

    + + + + + + + + {# (divider) #} + + + + + + {% for area in area_summary %} + + + + + + + + + {% endfor %} + + + + + + + + + + + +
    Area NameWGsI-DsPages% I-Ds% Pages
    {{area.area}}{{area.groups_in_area}}{{area.doc_count}}{{area.page_count}}{{area.doc_percent|floatformat:1}}{{area.page_percent|floatformat:1}}
    Totals{{totals.group_count}}{{totals.doc_count}}{{totals.page_count}}
    + +

    Area Director Load: Documents not yet directly assigned to AD

    +
    Typically these are pre-pubreq documents
    + + + + + + + + + {# (divider) #} + + + + + + {% for ad in noad_summary %} + + + + + + + + + + {% endfor %} + + + + + + + + + + + + +
    ADArea NameWGs for ADI-DsPages% I-Ds% Pages
    {{ad.ad}}{{ad.area}}{{ad.ad_group_count}}{{ad.doc_count}}{{ad.page_count}}{{ad.doc_percent|floatformat:1}}{{ad.page_percent|floatformat:1}}
    Totals{{noad_totals.ad_group_count}}{{noad_totals.doc_count}}{{noad_totals.page_count}}
    + +

    Area Director Load: Documents directly assigned to AD

    + + + + + + + + + {# (divider) #} + + + + + + {% for ad in ad_summary %} + + + + + + + + + + {% endfor %} + + + + + + + + + + + + +
    ADArea NameWGs for ADI-DsPages% I-Ds% Pages
    {{ad.ad}}{{ad.area}}{{ad.ad_group_count}}{{ad.doc_count}}{{ad.page_count}}{{ad.doc_percent|floatformat:1}}{{ad.page_percent|floatformat:1}}
    Totals{{ad_totals.ad_group_count}}{{ad_totals.doc_count}}{{ad_totals.page_count}}
    + +

    Working Group Summary

    + + + + + + + + + + + + + + {% for wg in wg_summary %} + + + + + + + + + + {% endfor %} + +
    WGAreaADI-DsPagesRFCsRFCs in last 2 years
    {{wg.wg}}{{wg.area}}{{wg.ad}}{{wg.doc_count}}{{wg.page_count}}{{wg.rfc_count}}{{wg.recent_rfc_count}}
    +{% endblock %} +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/ietfauth/allowlist_form.html b/ietf/templates/ietfauth/allowlist_form.html deleted file mode 100644 index c7f3981b7b1..00000000000 --- a/ietf/templates/ietfauth/allowlist_form.html +++ /dev/null @@ -1,78 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2016, All Rights Reserved #} -{% load origin %} -{% load django_bootstrap5 %} -{% block title %}Set up test email address{% endblock %} -{% block content %} - {% origin %} - {% if success %} -

    Allowlist entry creation successful

    -

    - Please ask the requestor to try the - account creation form - again, with the allowlisted email address. -

    - {% else %} -

    Add an allowlist entry for account creation.

    -

    - When an email request comes in for assistance with account creation - because the automated account creation has failed, you can add the - address to an account creation allowlist here. -

    -

    - Before you do so, please complete the following 3 verification steps: -

    -
      -
    1. - Has the person provided relevant information in his request, or has he simply - copied the text from the account creation failure message? All genuine (non-spam) - account creation requests seen between 2009 and 2016 for tools.ietf.org have - contained a reasonable request message, rather than just copy-pasting the account - creation failure message. If there's no proper request message, step 2 below can - be performed to make sure the request is bogus, but if that also fails, no further - effort should be needed. -
      2. -
    2. - Google for the person's name within the ietf.org site: "Jane Doe site:ietf.org". If - found, and the email address matches an address used in Internet-Drafts or discussions, - things are fine, and it's OK to add the address to the allowlist using this form, - and ask the person to please try the - account creation form - again. -
      3. -
    3. -

      - If google finds no trace of the person being an ietf participant, he or she could - still be somebody who is just getting involved in IETF work. A datatracker account - is probably not necessary, (no account is necessary to 'join' a WG -- the right thing - in that case is to join the right mailing list, and the person could be told so) -- - but in case this is a legitimate request, please email the person and ask: - - "Which wgs do you require a password for?" - -

      -

      - This is a bit of a trick question, because it is very unlikely that somebody who - isn't involved in IETF work will give a reasonable response, while almost any answer - from somebody who is doing IETF work will show that they have some clue. -

      -

      - Please note the exact wording. Do not ask about "working groups" -- - that will make it easier for people to google for IETF working groups. Ask the - question as given above, with lowercase "wgs". -

      -

      - If the answer to this question shows clue, then add the address to the allowlist - using this form, and ask the person to please try the - account creation form - again. -

      -
      4. -
    - - {% csrf_token %} - {% bootstrap_form form %} - - - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/ietfauth/apikeys.html b/ietf/templates/ietfauth/apikeys.html index 5ac7f6f453a..f4769d2d90a 100644 --- a/ietf/templates/ietfauth/apikeys.html +++ b/ietf/templates/ietfauth/apikeys.html @@ -12,7 +12,7 @@

    API keys
    - {{ user.username }} + {{ user.username }}

    {% csrf_token %} {% if person.apikeys.all %} diff --git a/ietf/templates/ietfauth/edit_field.html b/ietf/templates/ietfauth/edit_field.html index 4e8c5177a79..23d1b71982f 100644 --- a/ietf/templates/ietfauth/edit_field.html +++ b/ietf/templates/ietfauth/edit_field.html @@ -8,7 +8,7 @@

    {{ title }}
    - {{ person.plain_name }} + {{ person.plain_name }}

    {{ info|striptags }} diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html index 924089e3587..28c6e055993 100644 --- a/ietf/templates/ietfauth/review_overview.html +++ b/ietf/templates/ietfauth/review_overview.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015-2019, All Rights Reserved #} {% load origin %} -{% load django_bootstrap5 static %} +{% load django_bootstrap5 static ietf_filters %} {% block pagehead %} {{ review_wish_form.media.css }} @@ -12,7 +12,7 @@

    Review overview
    - {{ request.user }} + {{ request.user }}

    Assigned reviews

    {% if open_review_assignments %} @@ -51,7 +51,7 @@

    Assigned reviews

    {{ r.review_request.type.name }} {{ r.review_request.deadline|date:"Y-m-d" }} - {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} + {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} {% endfor %} @@ -98,10 +98,10 @@

    Latest closed review assignments

    {{ r.review_request.type.name }} {{ r.review_request.deadline|date:"Y-m-d" }} - {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} + {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %} - {{ r.state.name }} + {{ r.state.name|badgeify }} {% if r.result %}{{ r.result.name }}{% endif %} @@ -186,10 +186,10 @@

    - - @@ -208,7 +208,7 @@

    Skip next assignments

    diff --git a/ietf/templates/ipr/.gitignore b/ietf/templates/ipr/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/ipr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html index 7855224c433..18bc37c75ca 100644 --- a/ietf/templates/ipr/add_comment.html +++ b/ietf/templates/ipr/add_comment.html @@ -8,7 +8,7 @@

    Add comment
    - {{ ipr }} + {{ ipr }}

    The comment will be added to the history trail of the disclosure. diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html index 2d3940049a0..e7be36f73b8 100644 --- a/ietf/templates/ipr/add_email.html +++ b/ietf/templates/ipr/add_email.html @@ -8,7 +8,7 @@

    Add email
    - {{ ipr }} + {{ ipr }}

    The email will be added to the history trail of the disclosure. diff --git a/ietf/templates/ipr/admin_list.html b/ietf/templates/ipr/admin_list.html index feb6c9d2f52..23e5883eaa6 100644 --- a/ietf/templates/ipr/admin_list.html +++ b/ietf/templates/ipr/admin_list.html @@ -18,7 +18,7 @@

    IPR Admin
    - + {% for s in states %} {{ s.name }} {% if not forloop.last %}/{% endif %} diff --git a/ietf/templates/ipr/deleted.html b/ietf/templates/ipr/deleted.html new file mode 100644 index 00000000000..24f696ebca0 --- /dev/null +++ b/ietf/templates/ipr/deleted.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} +{% load ietf_filters origin %} +{% block title %}Removed IPR Disclosure{% endblock %} +{% block content %} + {% origin %} +

    Removed IPR disclosure

    +

    + {{ removed.reason }} +

    + {% if user|has_role:"Secretariat" and ipr.exists %} +

    + This disclosure has not yet been deleted and parts of its content is available through, e.g, the history view and the /api/v1 views. +

    + {% endif %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html index 7caf28f1a7d..1aadb5bb3d0 100644 --- a/ietf/templates/ipr/details_edit.html +++ b/ietf/templates/ipr/details_edit.html @@ -32,7 +32,7 @@

    The Patent Disclosure and Licensing Declaration Template for Third Party IPR regarding an IETF document or contribution when the person letting the IETF know about the patent has no relationship with the patent owners. Click - here + here if you want to disclose information about patents or patent applications where you do have a relationship to the patent owners or patent applicants. @@ -121,12 +121,11 @@

    {% endif %} {% if type != "generic" %}

    {% cycle section %}. IETF document or other contribution to which this IPR disclosure relates

    -

    +

    If an Internet-Draft or RFC includes multiple parts and it is not reasonably apparent which part of such Internet-Draft or RFC is alleged - to be covered by the patent information disclosed in Section - V(A) or V(B), please identify the sections of - the Internet-Draft or RFC that are alleged to be so + to be covered by the patent information disclosed in Section V, + please identify the sections of the Internet-Draft or RFC that are alleged to be so covered.

    {{ draft_formset.management_form }} @@ -154,6 +153,13 @@

    i.e., patents or patent applications required to be disclosed by Section 5 of RFC8179

    {% if form.patent_number %} + {% if form.is_blanket_disclosure %} +

    + This IPR disclosure must either identify a specific patent or patents in sections V(A) and V(B) + below, or be made as a blanket IPR disclosure. +

    + {% bootstrap_field form.is_blanket_disclosure layout='horizontal' %} + {% endif %}

    A. For granted patents or published pending patent applications, please provide the following information: diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html index f796901938b..11730741b47 100644 --- a/ietf/templates/ipr/details_history.html +++ b/ietf/templates/ipr/details_history.html @@ -11,7 +11,7 @@

    History for IPR disclosure
    - {{ ipr.title }} + {{ ipr.title }}

    {% include "ipr/details_tabs.html" %} {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %} @@ -51,7 +51,7 @@

    {% if administrative_list == 'pending' %} {% with ipr.get_latest_event_msgout as latest_msgout %} diff --git a/ietf/templates/ipr/notify.html b/ietf/templates/ipr/notify.html index 0ac966a5d85..7afb30add63 100644 --- a/ietf/templates/ipr/notify.html +++ b/ietf/templates/ipr/notify.html @@ -8,7 +8,7 @@

    Send Notification{{ formset|pluralize }}
    - {{ ipr }} + {{ ipr }}

    {% csrf_token %} diff --git a/ietf/templates/ipr/removed.html b/ietf/templates/ipr/removed.html index 775819df62f..96bf6ab899f 100644 --- a/ietf/templates/ipr/removed.html +++ b/ietf/templates/ipr/removed.html @@ -1,11 +1,15 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% block title %}{{ ipr.title }}{% endblock %} {% block content %} {% origin %}

    {{ ipr.title }}

    - This IPR disclosure was removed at the submitter's request. + {% if ipr.state.slug == "removed" %} + This IPR disclosure was removed at the submitter's request. + {% elif ipr.state.slug == "removed_objfalse" %} + This IPR disclosure was removed as objectively false. + {% endif %}

    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/ipr/search_doc_list.html b/ietf/templates/ipr/search_doc_list.html index 24fbfd01ba0..e67f67fecda 100644 --- a/ietf/templates/ipr/search_doc_list.html +++ b/ietf/templates/ipr/search_doc_list.html @@ -7,15 +7,15 @@

    IPR disclosures
    - Select Internet-Draft + Select Internet-Draft

    Please select one of following I-Ds:

    diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html index 5a0186c8fd7..b003a321089 100644 --- a/ietf/templates/ipr/search_doc_result.html +++ b/ietf/templates/ipr/search_doc_result.html @@ -8,7 +8,7 @@ {% endblock %} -{% block search_header %}Document IPR search results
    {{doc}}{% endblock %} +{% block search_header %}Document IPR search results
    {{doc}}{% endblock %} {% block search_result %}

    Total number of IPR disclosures found: {{ iprs|length }}.

    @@ -28,7 +28,7 @@     - @@ -54,23 +54,34 @@ - {% for doc in docs %} + {% for d in docs %} - {% with doc.iprdocrel_set.all as doc_iprs %} + {% with d.iprdocrel_set.all as doc_iprs %} {% if doc_iprs %} {% for ipr in doc_iprs %} {% if ipr.disclosure.state_id in states %} - @@ -81,7 +92,7 @@ diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html index b7a8a8b31ef..57fa17e912c 100644 --- a/ietf/templates/ipr/search_doctitle_result.html +++ b/ietf/templates/ipr/search_doctitle_result.html @@ -24,20 +24,20 @@ - {% for alias in docs %} + {% for doc in docs %} - {% if alias.document.ipr %} - {% for ipr in alias.document.ipr %} + {% if doc.ipr %} + {% for ipr in doc.ipr %} @@ -58,7 +58,7 @@ - + {% endif %} diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html index a104e45c070..449a6f7f8bc 100644 --- a/ietf/templates/ipr/search_result.html +++ b/ietf/templates/ipr/search_result.html @@ -54,7 +54,7 @@

    is related to {% for item in iprdocrels %} {% if forloop.last and forloop.counter > 1 %}and{% endif %} - {{ item.formatted_name|urlize_ietf_docs }} ("{{ item.document.document.title }}"){% if not forloop.last and forloop.counter > 1 %},{% endif %} + {{ item.formatted_name|urlize_ietf_docs }}{% if item.document.title %} ("{{ item.document.title }}"){% endif %}{% if not forloop.last and forloop.counter > 1 %},{% endif %} {% endfor %} {% endif %} {% endwith %} @@ -100,4 +100,4 @@

    {% block js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html index ae477a26999..1561e05ba30 100644 --- a/ietf/templates/ipr/search_wg_result.html +++ b/ietf/templates/ipr/search_wg_result.html @@ -20,22 +20,22 @@

    - {% for alias in docs %} + {% for doc in docs %} - {% if alias.document.ipr %} - {% for ipr in alias.document.ipr %} + {% if doc.ipr %} + {% for ipr in doc.ipr %} @@ -57,7 +57,7 @@ {% endif %} diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html index 259a007483e..0b6391a7826 100644 --- a/ietf/templates/ipr/state.html +++ b/ietf/templates/ipr/state.html @@ -8,7 +8,7 @@

    Change State
    - {{ ipr }} + {{ ipr }}

    {% csrf_token %} diff --git a/ietf/templates/liaisons/.gitignore b/ietf/templates/liaisons/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/liaisons/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/liaisons/add_comment.html b/ietf/templates/liaisons/add_comment.html index 8497d4c2f35..0bf8bb59af5 100644 --- a/ietf/templates/liaisons/add_comment.html +++ b/ietf/templates/liaisons/add_comment.html @@ -8,7 +8,7 @@

    Add comment
    - {{ liaison.title }} + {{ liaison.title }}

    The comment will be added to the history trail of the statement. diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html index 1f3ae3fc007..d46c8d1c989 100644 --- a/ietf/templates/liaisons/detail.html +++ b/ietf/templates/liaisons/detail.html @@ -11,7 +11,7 @@

    Liaison statement
    - {% include 'liaisons/liaison_title.html' %} + {% include 'liaisons/liaison_title.html' %}

    {% include "liaisons/liaison_desc.html" only %} {% include "liaisons/detail_tabs.html" %} @@ -32,7 +32,7 @@

    {% if liaison.from_contact %}

    - + {% endif %} diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html index fcb91e301f0..635466ed3ab 100644 --- a/ietf/templates/liaisons/detail_history.html +++ b/ietf/templates/liaisons/detail_history.html @@ -8,7 +8,7 @@

    History for Liaison Statement
    - {{ liaison.title }} + {{ liaison.title }}

    {% include "liaisons/detail_tabs.html" %} {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %} diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html index 2c7b4b65ba4..1684425eb2a 100644 --- a/ietf/templates/liaisons/edit.html +++ b/ietf/templates/liaisons/edit.html @@ -19,7 +19,7 @@ {% origin %}

    {% if liaison %} - Edit liaison
    {{ liaison }} + Edit liaison
    {{ liaison }} {% else %} Send Liaison Statement {% endif %} @@ -47,21 +47,43 @@

    method="post" enctype="multipart/form-data" data-edit-form="{{ form.edit }}" - data-ajax-info-url="{% url "ietf.liaisons.views.ajax_get_liaison_info" %}"> + data-ajax-info-url="{% url 'ietf.liaisons.views.ajax_get_liaison_info' %}"> {% csrf_token %} - {% for fieldset in form.fieldsets %} -

    {{ fieldset.name }}

    - {% for field in fieldset %} - {% if field.id_for_label != "id_attachments" %} - {% bootstrap_field field layout="horizontal" %} - {% else %} -
    -

    {{ field.label }}

    -
    {{ field }}
    -
    - {% endif %} - {% endfor %} - {% endfor %} +

    From

    + {% bootstrap_field form.from_groups layout="horizontal" %} + {% bootstrap_field form.from_contact layout="horizontal" %} + {% bootstrap_field form.response_contacts layout="horizontal" %} + {% if form.approved %} + {% bootstrap_field form.approved layout="horizontal" %} + {% endif %} +

    To

    + {% bootstrap_field form.to_groups layout="horizontal" %} + {% bootstrap_field form.to_contacts layout="horizontal" %} +

    Other email addresses

    + {% bootstrap_field form.technical_contacts layout="horizontal" %} + {% if form.action_holder_contacts %} + {% bootstrap_field form.action_holder_contacts layout="horizontal" %} + {% endif %} + {% bootstrap_field form.cc_contacts layout="horizontal" %} +

    Purpose

    + {% bootstrap_field form.purpose layout="horizontal" %} + {% bootstrap_field form.deadline layout="horizontal" %} +

    Reference

    + {% bootstrap_field form.other_identifiers layout="horizontal" %} + {% bootstrap_field form.related_to layout="horizontal" %} +

    Liaison Statement

    + {% bootstrap_field form.title layout="horizontal" %} + {% bootstrap_field form.submitted_date layout="horizontal" %} + {% bootstrap_field form.body layout="horizontal" %} +
    +

    {{ form.attachments.label }}

    +
    {{ form.attachments }}
    +
    +

    Add attachment

    + {% bootstrap_field form.attach_title layout="horizontal" %} + {% bootstrap_field form.attach_file layout="horizontal" %} + {% bootstrap_field form.attach_button layout="horizontal" %} + Cancel diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html index 53568d1a4a0..226c78d827d 100644 --- a/ietf/templates/liaisons/guide_from_ietf.html +++ b/ietf/templates/liaisons/guide_from_ietf.html @@ -11,7 +11,7 @@

    Liaison statements from the IETF
    - Guidelines for completing the "Cc:" field + Guidelines for completing the "Cc:" field

    The individuals copied on a liaison statement that is sent by the IETF to another Standards Development Organization (SDO) depend on the IETF entity that is sending the liaison statement. diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html index 4ff53dd6f5c..02244430310 100644 --- a/ietf/templates/liaisons/guide_to_ietf.html +++ b/ietf/templates/liaisons/guide_to_ietf.html @@ -11,7 +11,7 @@

    Liaison statements to the IETF
    - Guidelines for completing the "To:" and "Cc:" fields + Guidelines for completing the "To:" and "Cc:" fields

    The following table provides guidelines for completing the "To:" and "Cc:" fields of liaison statements that are sent to the IETF by other Standards Development Organizations (SDOs). diff --git a/ietf/templates/liaisons/liaison_desc.html b/ietf/templates/liaisons/liaison_desc.html index 1286198e22a..8fb9fbf0458 100644 --- a/ietf/templates/liaisons/liaison_desc.html +++ b/ietf/templates/liaisons/liaison_desc.html @@ -1,4 +1,6 @@

    Additional information about IETF liaison relationships is available on the + IETF webpage + and the Internet Architecture Board liaison webpage.
    \ No newline at end of file diff --git a/ietf/templates/liaisons/liaison_mail.txt b/ietf/templates/liaisons/liaison_mail.txt index c92c68ff760..18dfe610fd7 100644 --- a/ietf/templates/liaisons/liaison_mail.txt +++ b/ietf/templates/liaisons/liaison_mail.txt @@ -1,13 +1,20 @@ -{% load ietf_filters %}{% autoescape off %}Title: {{ liaison.title|clean_whitespace }} +{% load ietf_filters group_filters %}{% autoescape off %}Title: {{ liaison.title|clean_whitespace }} Submission Date: {{ liaison.submitted|date:"Y-m-d" }} URL of the IETF Web page: {{ liaison.get_absolute_url }} + +To: {% for g in liaison.to_groups.all %}{{g|name_with_conditional_acronym}}{% if not forloop.last %}, {% endif %}{% endfor %} +From: {% for g in liaison.from_groups.all %}{{g|name_with_conditional_acronym}}{% if not forloop.last %}, {% endif %}{% endfor %} +Purpose: {{ liaison.purpose.name }} {% if liaison.deadline %}Please reply by {{ liaison.deadline }}{% endif %} -From: {% if liaison.from_contact %}{{ liaison.from_contact.formatted_email }}{% endif %} + +Email Addresses +--------------- +From: {% if liaison.from_contact %}{{ liaison.from_contact }}{% endif %} To: {{ liaison.to_contacts }} Cc: {{ liaison.cc_contacts }} Response Contacts: {{ liaison.response_contacts }} Technical Contacts: {{ liaison.technical_contacts }} -Purpose: {{ liaison.purpose.name }} + {% for related in liaison.source_of_set.all %} Referenced liaison: {% if related.target.title %}{{ related.target.title }}{% else %}Liaison #{{ related.target.pk }}{% endif %} ({{ related.target.get_absolute_url }}) {% endfor %} diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html index 03c9b36b758..e74b08f21b8 100644 --- a/ietf/templates/liaisons/liaison_table.html +++ b/ietf/templates/liaisons/liaison_table.html @@ -24,9 +24,9 @@ Action needed {% endif %} diff --git a/ietf/templates/liaisons/list_other_sdo.html b/ietf/templates/liaisons/list_other_sdo.html new file mode 100644 index 00000000000..e6a567ae50f --- /dev/null +++ b/ietf/templates/liaisons/list_other_sdo.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load origin static person_filters %} +{% block pagehead %} + +{% endblock %} +{% block title %} + Other SDO groups +{% endblock %} +{% block content %} + {% origin %} + {% regroup sdos by state.name as sdos_by_state %} + {% for sdos_in_state in sdos_by_state %} +

    {{sdos_in_state.grouper|capfirst}} SDO groups

    +
    + Setting + Value
    - {{ t.reviewer_settings.skip_next }} + {{ t.reviewer_settings.skip_next|yesno }}
    {% person_link e.by %} {% if e.message %} - {% if e.response_due %}Response due {{ e.response_due|date:"Y-m-d" }}{% endif %} + {% if e.response_due %}Response due {{ e.response_due|date:"Y-m-d" }}{% endif %} {# FIXME: can't do format_history_text, because that inserts a
    into the 
    , which is illegal. Need to rework the snippeting. #}
                                 
    {{ e.message|render_message_for_history|urlize_ietf_docs|linkify }}
    
                             {% else %}
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index bdda164a629..9ba63114ae6 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, 2017. All Rights Reserved. #}
+{# Copyright The IETF Trust 2015-2023. All Rights Reserved. #}
 {% load origin %}
 {% load ietf_filters ipr_filters textfilters %}
 {% block title %}IPR Details - {{ ipr.title }}{% endblock %}
@@ -12,7 +12,7 @@
     
    
         IPR Details
         
    
-        {{ ipr.title }}
+        {{ ipr.title }}
     
    
     {% include "ipr/details_tabs.html" %}
     
    
@@ -103,6 +103,8 @@ 
    Updates
    
                             IPR Disclosure ID #{{ item.source.id }},
                             {% if item.source.state.slug == "removed" %}
                                 "{{ item.source.title }}" (which was removed at the request of the submitter)
+                            {% elif item.source.state.slug == "removed_objfalse" %}
+                                "{{ item.source.title }}" (which was removed as objectively false)
                             {% else %}
                                 "{{ item.source.title }}"
                             {% endif %}
@@ -122,6 +124,8 @@ 
    Updates
    
                             IPR Disclosure ID #{{ item.target.id }},
                             {% if item.target.state.slug == "removed" %}
                                 "{{ item.target.title }}" (which was removed at the request of the submitter)
+                            {% elif item.source.state.slug == "removed_objfalse" %}
+                                "{{ item.source.title }}" (which was removed as objectively false)
                             {% elif item.target.state.slug == "rejected" %}
                                 "{{ item.target.title }}" (which was rejected)
                             {% elif item.target.state.slug == "parked" %}
@@ -379,7 +383,8 @@ 
    
                                         {{ iprdocrel.doc_type }}:
                                     
                                     
    
-                                        {{ iprdocrel.formatted_name|urlize_ietf_docs }} ("{{ iprdocrel.document.document.title }}")
+                                        {{ iprdocrel.formatted_name|urlize_ietf_docs }}
+                                        {% if iprdocrel.document.title %}("{{ iprdocrel.document.title }}"){% endif %}
                                     
    
                                     {% if iprdocrel.revisions %}
                                         
    
@@ -388,6 +393,13 @@ 
    
                                         
    
                                             {{ iprdocrel.revisions }}
                                         
    
+                                    {% elif iprdocrel.doc_type == "Internet-Draft" %}
+                                        
    
+                                            Notice:
+                                        
    
+                                        
    
+                                            {{ iprdocrel|no_revisions_message }}
+                                        
                                     
                                     {% endif %}
                                     {% if iprdocrel.sections %}
                                         
    
@@ -418,7 +430,8 @@ 
    
                                     {{ iprdocrel.doc_type }}:
                                 
    
                                 
    
-                                    {{ iprdocrel.formatted_name|urlize_ietf_docs }} ("{{ iprdocrel.document.document.title }}")
+                                    {{ iprdocrel.formatted_name|urlize_ietf_docs }}
+                                    {% if iprdocrel.document.title %}("{{ iprdocrel.document.title }}"){% endif %}
                                 
    
                                 {% if iprdocrel.revisions %}
                                     
    
@@ -427,6 +440,13 @@ 
    
                                     
    
                                         {{ iprdocrel.revisions }}
                                     
    
+                                {% elif iprdocrel.doc_type == "Internet-Draft" %}
+                                    
    
+                                        Notice:
+                                    
    
+                                    
    
+                                        {{ iprdocrel|no_revisions_message }}
+                                    
                                  
                                 {% endif %}
                                 {% if iprdocrel.sections %}
                                     
    
@@ -455,7 +475,7 @@ 
    
         
    
             {% cycle section %}. Disclosure of Patent Information
             
    
-            i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}
+            i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}
         
    
         
    
             A. For granted patents or published pending patent applications, please provide the following information:
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 9830c731136..1291247f904 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -12,7 +12,7 @@
     
    
         Email submitter
         
    
-        {{ ipr.title }}
+        {{ ipr.title }}
     
    
     
    
         {% csrf_token %}
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
index ce3982c9873..d8247ea5875 100644
--- a/ietf/templates/ipr/ipr_table.html
+++ b/ietf/templates/ipr/ipr_table.html
@@ -39,10 +39,13 @@
                                     
                                 {% endif %}
                             {% endfor %}
-                        {% else %}
+                        {% elif ipr.state_id == 'removed' %}
                             
    {{ ipr.title }}
    
                             This IPR disclosure was removed at the request of the submitter.
-                        {% endif %}
+                        {% elif ipr.state_id == 'removed_objfalse' %}
+                            
    {{ ipr.title }}
    
+                            This IPR disclosure was removed as objectively false.
+                        {% endif %} {# Intentionally not emitting anything for any other states #}
    {{ ipr.time|date:"Y-m-d" }} {{ ipr.id }}{{ ipr.title }}{% if ipr.state_id == 'removed' %}Removed{% endif %} + {{ ipr.title }}{% if ipr.state_id == 'removed' or ipr.state_id == 'removed_objfalse' %}Removed{% endif %} {% if ipr.updates %}
    (Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
    - Results for {{ doc.name|prettystdname|urlize_ietf_docs }} ("{{ doc.document.title }}"){% if not forloop.first %}{% if doc.related %}, which was {{ doc.relation|lower }} {{ doc.related.source|prettystdname|urlize_ietf_docs }} ("{{ doc.related.source.title }}"){% endif %}{% endif %} + Results for {{ d.name|prettystdname|urlize_ietf_docs }} + ("{{ d.title }}"){% if d != doc and d.related %}, which + {% if d == d.related.source %} + {{ d.relation|lower }} + {{ d.related.target|prettystdname|urlize_ietf_docs }} + ("{{ d.related.target.title }}") + {% else %} + was {{ d.relation|lower }} + {{ d.related.source|prettystdname|urlize_ietf_docs }} + ("{{ d.related.source.title }}") + {% endif %} + {% endif %}
    {{ ipr.disclosure.time|date:"Y-m-d" }} {{ ipr.disclosure.id }}{{ ipr.disclosure.title }}{% if ipr.disclosure.state_id == 'removed' %} (Removed) {% endif %} + {{ ipr.disclosure.title }}{% if ipr.disclosure.state_id == 'removed' or ipr.disclosure.state_id == 'removed_objfalse' %} (Removed) {% endif %} {% if ipr.disclosure.updates %}
    (Updates ID#: {% for upd in ipr.disclosure.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
    - No IPR disclosures have been submitted directly on {{ doc.name|prettystdname|urlize_ietf_docs }}{% if iprs %}, + No IPR disclosures have been submitted directly on {{ d.name|prettystdname|urlize_ietf_docs }}{% if iprs %}, but there are disclosures on {% if docs|length == 2 %}a related document{% else %}related documents{% endif %}, listed on this page{% endif %}.
    Statement
    - IPR that is related to {{ alias.name|prettystdname:""|urlize_ietf_docs }} ("{{ alias.document.title }}") - {% if alias.related %} - that was {{ alias.relation|lower }} {{ alias.related.source.name|prettystdname:""|urlize_ietf_docs }} ("{{ alias.related.source.title }}") + IPR that is related to {{ doc.name|prettystdname:""|urlize_ietf_docs }} ("{{ doc.title }}") + {% if doc.related %} + that was {{ doc.relation|lower }} {{ doc.related.source.name|prettystdname:""|urlize_ietf_docs }} ("{{ doc.related.source.title }}") {% endif %}
    {{ ipr.disclosure.time|date:"Y-m-d" }} {{ ipr.disclosure.id }}
    No IPR disclosures related to {{ alias.name|prettystdname|urlize_ietf_docs }} have been submitted.No IPR disclosures related to {{ doc.name|prettystdname|urlize_ietf_docs }} have been submitted.
    Statement
    - IPR related to {{ alias.name|prettystdname|urlize_ietf_docs }} ("{{ alias.document.title }}") - {% if alias.related %} - that was {{ alias.relation|lower }} {{ alias.related.source|prettystdname|urlize_ietf_docs }} ("{{ alias.related.source.title|escape }}") + IPR related to {{ doc.name|prettystdname|urlize_ietf_docs }} ("{{ doc.title }}") + {% if doc.related %} + that was {{ doc.relation|lower }} {{ doc.related.source|prettystdname|urlize_ietf_docs }} ("{{ doc.related.source.title|escape }}") {% endif %} - {% if alias.product_of_this_wg %}, a product of the {{ q }} WG{% endif %} + {% if doc.product_of_this_wg %}, a product of the {{ q }} WG{% endif %} :
    {{ ipr.disclosure.time|date:"Y-m-d" }} {{ ipr.disclosure.id }} - No IPR disclosures related to {{ alias.name|prettystdname|urlize_ietf_docs }} have been submitted. + No IPR disclosures related to {{ doc.name|prettystdname|urlize_ietf_docs }} have been submitted.
    From Contact{% person_link liaison.from_contact.person %}{{ liaison.from_contact }}
    + + + + + + + + + {% for group in sdos_in_state.list%} + + + + + + {% endfor %} + +
    AcronymNameLiaison Managers
    {{ group.acronym }}{{ group.name }} + {% for person in group.liaison_managers %} + {% person_link person %}{% if not forloop.last %}, {% endif %} + {% endfor %} +
    + {% endfor %} +{% endblock %} +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/logo.html b/ietf/templates/logo.html new file mode 100644 index 00000000000..0de2eaeaeac --- /dev/null +++ b/ietf/templates/logo.html @@ -0,0 +1,35 @@ +{% load origin %} +{% load static %} +{% origin %} + +{{ org|upper }} Logo + +{{ org|upper }} Logo \ No newline at end of file diff --git a/ietf/templates/mailinglists/.gitignore b/ietf/templates/mailinglists/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/mailinglists/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/mailinglists/nonwg.html b/ietf/templates/mailinglists/nonwg.html index ae97323288b..bee2a8829ec 100644 --- a/ietf/templates/mailinglists/nonwg.html +++ b/ietf/templates/mailinglists/nonwg.html @@ -5,10 +5,16 @@ {% block pagehead %} {% endblock %} -{% block title %}Non-Working Group email lists{% endblock %} +{% block title %}Other (not WG) email lists{% endblock %} {% block content %} {% origin %} -

    Non-Working Group email lists

    +

    Other (not Working Group) email lists

    +

    Guidelines for these lists, including how to request a + new one to be created, can be found on the + + Non–Working Group email list guidelines + webpage. +

    {% cache 900 nonwglisttable %} diff --git a/ietf/templates/meeting/.gitignore b/ietf/templates/meeting/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/meeting/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/meeting/activity_report.html b/ietf/templates/meeting/activity_report.html index 1552bb4682d..dbfc717dab0 100644 --- a/ietf/templates/meeting/activity_report.html +++ b/ietf/templates/meeting/activity_report.html @@ -40,14 +40,14 @@

    {{ rfcs.count }} RFCs published this period

    - {% if rfcs %} + {% if rfcs|length > 0 %} {% for rfc in rfcs %} - + diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html index 00358054a3e..0dd0635d113 100644 --- a/ietf/templates/meeting/add_session_drafts.html +++ b/ietf/templates/meeting/add_session_drafts.html @@ -9,7 +9,7 @@

    Add Internet-Drafts to {{ session.meeting }} {% if session_number %}: Session {{ session_number }}{% endif %}
    - {{ session.group.acronym }} + {{ session.group.acronym }} {% if session.name %}: {{ session.name }}{% endif %}

    diff --git a/ietf/templates/meeting/add_session_recordings.html b/ietf/templates/meeting/add_session_recordings.html new file mode 100644 index 00000000000..4f21e8f4d0b --- /dev/null +++ b/ietf/templates/meeting/add_session_recordings.html @@ -0,0 +1,78 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2015, All Rights Reserved #} +{% load origin static django_bootstrap5 %} +{% block title %}Add I-Ds to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %} +{% block pagehead %}{{ form.media.css }}{% endblock %} +{% block content %} + {% origin %} +

    + Add Recordings to {{ session.meeting }} + {% if session_number %}: Session {{ session_number }}{% endif %} +
    + {{ session.group.acronym }} + {% if session.name %}: {{ session.name }}{% endif %} + +

    + {% if session.is_material_submission_cutoff %} +
    + The deadline for submission corrections has passed. This may affect published proceedings. +
    + {% endif %} + {% if already_linked|length > 0 %} +

    Recordings already linked to this session

    + + {% csrf_token %} +
    Title
    - {{ rfc.doc.canonical_name|prettystdname }} + {{ rfc.doc.name|prettystdname }} {{ rfc.doc.intended_std_level.name }}{{ rfc.doc.std_level.name }} {{ rfc.doc.group.acronym }}
    + + + + + + + + + {% for sp in already_linked %}{% with recording_doc=sp.document %} + + + + + + {% endwith %}{% endfor %} + +
    TitleURLDelete
    {{ recording_doc.title }}{{ recording_doc.external_url }} + +
    + + {% endif %} + +

    Really delete the link to (default)?

    +
    + {% csrf_token %} + + +
    +     +

    Add a recording to this session

    +
    + {% csrf_token %} + {% bootstrap_form form %} + + + Back + +
    +{% endblock %} +{% block js %} + {{ form.media.js }} + +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 4c71e7202f8..089141bde80 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -39,6 +39,10 @@ backdrop-filter: blur(10px); } +.theme-dark #app-loading { + background-color: rgba(0,0,0,.75); +} + #app-loading:before { content: ''; box-sizing: border-box; @@ -56,6 +60,10 @@ z-index: 2000000000; } +.theme-dark #app-loading:before { + border-top-color: #FFF; +} + #app-loading:after { content: 'Loading meeting {{ meetingData.meetingNumber }}...'; position: absolute; @@ -69,6 +77,10 @@ z-index: 2000000000; } +.theme-dark #app-loading:after { + color: #FFF; +} + #app-loading-footer { position: absolute; text-align: center; @@ -77,13 +89,19 @@ right: 0; z-index: 1000000000; } + +.theme-dark #app-loading-footer .btn-light { + background-color: rgba(255,255,255,.1) !important; + border-color: rgba(255,255,255,.05) !important; + color: #FFF !important; +} {% endblock %} {% block content %} {% origin %}
    {% endblock %} diff --git a/ietf/templates/meeting/agenda.ics b/ietf/templates/meeting/agenda.ics deleted file mode 100644 index 72b7ab806ca..00000000000 --- a/ietf/templates/meeting/agenda.ics +++ /dev/null @@ -1,32 +0,0 @@ -{% load humanize tz %}{% autoescape off %}{% timezone schedule.meeting.tz %}{% load ietf_filters textfilters %}{% load cache %}{% cache 1800 ietf_meeting_agenda_ics schedule.meeting.number request.path request.GET %}BEGIN:VCALENDAR -VERSION:2.0 -METHOD:PUBLISH -PRODID:-//IETF//datatracker.ietf.org ical agenda//EN -{{schedule.meeting.vtimezone}}{% for item in assignments %}BEGIN:VEVENT -UID:ietf-{{schedule.meeting.number}}-{{item.timeslot.pk}}-{{item.session.group.acronym}} -SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{{item.session.group_at_the_time.acronym|lower}} - {{item.session.group_at_the_time.name}}{%endif%}{% if item.session.agenda_note %} ({{item.session.agenda_note}}){% endif %} -{% if item.timeslot.show_location %}LOCATION:{{item.timeslot.get_location}} -{% endif %}STATUS:{{item.session.ical_status}} -CLASS:PUBLIC -DTSTART{% ics_date_time item.timeslot.local_start_time schedule.meeting.time_zone %} -DTEND{% ics_date_time item.timeslot.local_end_time schedule.meeting.time_zone %} -DTSTAMP{% ics_date_time item.timeslot.modified|utc 'utc' %}{% if item.session.agenda %} -URL:{{item.session.agenda.get_versionless_href}}{% endif %} -DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %} - Note: {{item.session.agenda_note|ics_esc}}\n{% endif %}{% if item.session.onsite_tool_url %} - \n - Onsite tool: {{ item.session.onsite_tool_url }}\n{% endif %}{% if item.session.video_stream_url %} - \n - Meetecho: {{ item.session.video_stream_url }}\n{% endif %}{% if item.timeslot.location.webex_url %} - \n - Webex: {{ item.timeslot.location.webex_url }}\n{% endif %}{% if item.session.remote_instructions %} - \n - Remote instructions: {{ item.session.remote_instructions }}\n{% endif %}{% if item.session.agenda %}{% with agenda=item.session.agenda %} - \n - {{agenda.type}} {{agenda.get_versionless_href}}\n{% endwith %}{% endif %} - \n - Session materials: {% absurl 'ietf.meeting.views.session_details' num=schedule.meeting.number acronym=item.session.group.acronym %}\n{% if schedule.meeting.get_number is not None %} - \n{# link agenda for ietf meetings #} - See in schedule: {% absurl 'agenda' num=schedule.meeting.number %}#row-{{ item.slug }}\n{% endif %} -END:VEVENT -{% endfor %}END:VCALENDAR{% endcache %}{% endtimezone %}{% endautoescape %} diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt index d00be80d145..7a49dde0c87 100644 --- a/ietf/templates/meeting/agenda.txt +++ b/ietf/templates/meeting/agenda.txt @@ -7,7 +7,9 @@ {% filter center:72 %}{{ schedule.meeting.agenda_info_note|striptags|wordwrap:72|safe }}{% endfilter %} {% endif %} {% filter center:72 %}{{ schedule.meeting.date|date:"F j" }}-{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}{{ schedule.meeting.end_date|date:"F " }}{% endif %}{{ schedule.meeting.end_date|date:"j, Y" }}{% endfilter %} +{% if updated %} {% filter center:72 %}Updated {{ updated|date:"Y-m-d H:i:s T" }}{% endfilter %} +{% endif %} {% filter center:72 %}IETF agendas are subject to change, up to and during the meeting.{% endfilter %} {% filter center:72 %}Times are shown in {% if display_timezone.lower == "utc" %}UTC{% else %}the {{ display_timezone }} time zone{% endif %}.{% endfilter %} diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html index 05d969bb8df..204473f4551 100644 --- a/ietf/templates/meeting/approve_proposed_slides.html +++ b/ietf/templates/meeting/approve_proposed_slides.html @@ -9,7 +9,7 @@

    Approve slides proposed for {{ submission.session.meeting }}
    - {{ submission.session.group.acronym }} + {{ submission.session.group.acronym }} {% if session.name %}: {{ submission.session.name }}{% endif %}

    @@ -34,6 +34,6 @@

    + value="disapprove">Decline and Delete -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/meeting/attendance.html b/ietf/templates/meeting/attendance.html new file mode 100644 index 00000000000..5a9aa2dce24 --- /dev/null +++ b/ietf/templates/meeting/attendance.html @@ -0,0 +1,44 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2024, All Rights Reserved #} +{% load origin %} +{% block title %}Bluesheet for {{session}}{% endblock %} +{% block content %} + {% origin %} +

    + Attendance for {{session}} +

    +
    + This list will be used to generate the official bluesheet for this session. + {% if can_add %} +
    If you attended this session, you can use the "I was there" button at the bottom to add yourself. + {% endif %} + {% if was_there %} +
    If the affiliation listed here needs to be updated, request the change using support@ietf.org. Note which sessions you are wanting to change in your request. + {% endif %} +
    +

    + {{ data|length }} attendees. +

    + + + + + + + + + {% for item in data %} + + + + + {% endfor %} + +
    NameAffiliation
    {{ item.name }}{{ item.affiliation }}
    + {% if can_add %} +
    + {% csrf_token %} + +
    + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/bluesheet.txt b/ietf/templates/meeting/bluesheet.txt index dd3bf36ac7c..5b3960f3aa7 100644 --- a/ietf/templates/meeting/bluesheet.txt +++ b/ietf/templates/meeting/bluesheet.txt @@ -1,7 +1,8 @@ -Bluesheet for {{session}} +{% autoescape off %}Bluesheet for {{session}} ======================================================================== {{ data|length }} attendees. {% for item in data %} {{ item.name }} {{ item.affiliation }}{% endfor %} +{% endautoescape %} diff --git a/ietf/templates/meeting/cancel_session.html b/ietf/templates/meeting/cancel_session.html index 9811e786c52..9bf80e0c495 100644 --- a/ietf/templates/meeting/cancel_session.html +++ b/ietf/templates/meeting/cancel_session.html @@ -9,7 +9,7 @@

    Cancel session
    - {{ session }} + {{ session }}

    {% csrf_token %} diff --git a/ietf/templates/meeting/delete_schedule.html b/ietf/templates/meeting/delete_schedule.html index 334479ba795..f5012d0f6be 100644 --- a/ietf/templates/meeting/delete_schedule.html +++ b/ietf/templates/meeting/delete_schedule.html @@ -12,7 +12,7 @@

    Delete IETF {{ meeting.number }} Schedule
    - {{ schedule.owner }}/{{ schedule.name }} + {{ schedule.owner }}/{{ schedule.name }}

    {% csrf_token %} diff --git a/ietf/templates/meeting/diff_schedules.html b/ietf/templates/meeting/diff_schedules.html index 50d8b84208a..67abbe5345d 100644 --- a/ietf/templates/meeting/diff_schedules.html +++ b/ietf/templates/meeting/diff_schedules.html @@ -9,7 +9,7 @@

    Differences between Meeting Agendas
    - IETF {{ meeting.number }} + IETF {{ meeting.number }}

    {% bootstrap_form form layout="horizontal" %} diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html index 91c42602221..a975c2e61a1 100644 --- a/ietf/templates/meeting/edit_meeting_schedule.html +++ b/ietf/templates/meeting/edit_meeting_schedule.html @@ -35,7 +35,7 @@

    Agenda name: {{ schedule.name }}
    - Owner: {{ schedule.owner }} + Owner: {{ schedule.owner }}

    {% if can_edit_properties %} @@ -223,6 +223,11 @@

    {{ p.acronym }} {% endfor %} + +

    {% if session_purposes|length > 1 %} diff --git a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html index 2148450355d..5f08d3d4b68 100644 --- a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html +++ b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015-2020, All Rights Reserved #} {% load origin %} -{% load staticfiles %} +{% load static %} {% load ietf_filters %} {% load django_bootstrap5 %} {% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %} @@ -12,7 +12,7 @@

    IETF {{ meeting.number }} meeting agenda
    - {{ schedule.name }} + {{ schedule.name }}

    {% origin %}
    data-day="{{ day.day.isoformat }}">
    {{ room.name }} - {% if room.capacity %}{{ room.capacity }}{% endif %} + {% if room.capacity %}{{ room.capacity }}{% endif %}
    diff --git a/ietf/templates/meeting/edit_session.html b/ietf/templates/meeting/edit_session.html index 4e4ce094cac..90139b81802 100644 --- a/ietf/templates/meeting/edit_session.html +++ b/ietf/templates/meeting/edit_session.html @@ -10,7 +10,7 @@

    Edit session
    - {{ session|describe_with_tz }} + {{ session|describe_with_tz }}

    {% csrf_token %} diff --git a/ietf/templates/meeting/edit_timeslot.html b/ietf/templates/meeting/edit_timeslot.html index a840adbc8c6..c881cad994a 100644 --- a/ietf/templates/meeting/edit_timeslot.html +++ b/ietf/templates/meeting/edit_timeslot.html @@ -9,7 +9,7 @@

    Edit {{ timeslot.meeting }} timeslot
    - {{ timeslot.name }} + {{ timeslot.name }}

    {% if sessions %}
    diff --git a/ietf/templates/meeting/edit_timeslot_type.html b/ietf/templates/meeting/edit_timeslot_type.html index d19cbaaf15c..d21e189e517 100644 --- a/ietf/templates/meeting/edit_timeslot_type.html +++ b/ietf/templates/meeting/edit_timeslot_type.html @@ -8,7 +8,7 @@

    Edit timeslot type
    - {{ timeslot }} + {{ timeslot }}

    {% if sessions %}
    diff --git a/ietf/templates/meeting/finalize.html b/ietf/templates/meeting/finalize.html index 39fcecc9a70..ba218a91ce8 100644 --- a/ietf/templates/meeting/finalize.html +++ b/ietf/templates/meeting/finalize.html @@ -8,7 +8,7 @@

    Finalize Proceedings
    - IETF {{ meeting.number }} + IETF {{ meeting.number }}

    This will make the proceedings for IETF {{ meeting.number }} final. diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html index 8cdc9fc54eb..74ed8bafca5 100644 --- a/ietf/templates/meeting/group_materials.html +++ b/ietf/templates/meeting/group_materials.html @@ -1,124 +1,100 @@ -{# Copyright The IETF Trust 2015-2019, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2024, All Rights Reserved #} {% load origin %} {% origin %} {% load ietf_filters proceedings_filters managed_groups %} {% load tz %} - {% if session.name %} -

    {{ session.name }}
    + {% if entry.name %} +
    {{ entry.name }}
    {% else %} -
    - {{ session.group.acronym }} + - {% if session.group.state.slug == "bof" %} - {{ session.group.state.slug|upper }} + {% if entry.group.state.slug == "bof" %} + {{ entry.group.state.slug|upper }} {% endif %} {% endif %} - {% if session.all_meeting_sessions_cancelled %} + {% if entry.canceled %} - Session cancelled + Session cancelled {% else %} - {% if session.all_meeting_agendas %} - {% for agenda in session.all_meeting_agendas %} - {% if session.all_meeting_agendas|length == 1 %} - {% if agenda.time > old %} - - {% endif %} - Agenda -
    - {% else %} - - Agenda {{ agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }} - -
    - {% endif %} - {% endfor %} - {% else %} - {% if show_agenda == "True" %}No agenda{% endif %} - {% endif %} + {% for agenda in entry.agendas %} + {% if entry.agendas|length == 1 and agenda.time > old %} + + {% endif %} + + Agenda {% if agenda.time %}{{agenda.time|date:"D G:i"}}{% endif %} + +
    + {% empty %} + {% if show_agenda == "True" %}No agenda{% endif %} + {% endfor %} - {% if session.all_meeting_minutes %} - {% if session.all_meeting_minutes|length == 1 %} - Minutes -
    - {% else %} - {% for minutes in session.all_meeting_minutes %} - - Minutes {{ minutes.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }} + {% for minutes in entry.minutes %} + + Minutes {% if minutes.time %}{{minutes.time|date:"D G:i"}}{% endif %} + +
    + {% empty %} + {% if show_agenda == "True" %}No minutes{% endif %} + {% endfor %} + {% if entry.session.type_id == 'regular' and show_agenda == "True" %} + {% for attendance in entry.attendances %} + {% with session=attendance.material %} + + Attendance + {% if attendance.time %}{{ attendance.time|date:"D G:i" }}{% endif %} -
    - {% endfor %} - {% endif %} - {% else %} - {% if show_agenda == "True" %}No minutes{% endif %} - {% endif %} - {% if session.type_id == 'regular' and show_agenda == "True" %} - {% if session.all_meeting_bluesheets %} - {% if session.all_meeting_bluesheets|length == 1 %} - Bluesheets -
    - {% else %} - {% for bluesheets in session.all_meeting_bluesheets %} - - Bluesheets -
    - {{ bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }} -     -
    - {% endfor %} - {% endif %} - {% else %} - No bluesheets - {% endif %} + {% endwith %} +
    + {% endfor %} {% endif %} - {% with session.all_meeting_slides as slides %} - {% for slide in slides %} + {% for slide in entry.slides %} {% if slide.time > old %} {% endif %} - {{ slide.title|clean_whitespace }} + {{ slide.material.title|clean_whitespace }}
    {% empty %} - No slides + No slides {% endfor %} - {% endwith %} - {% with session.all_meeting_drafts as drafts %} - {% for draft in drafts %} + {% for draft in entry.drafts %} {% if draft.time > old %} {% endif %} - {{ draft.name }} + + {{ draft.material.name }} +
    {% empty %} - No Internet-Drafts + No Internet-Drafts {% endfor %} - {% endwith %} - {% if session.last_update %} - {{ session.last_update|utc|date:"Y-m-d" }} + {% if entry.last_update %} + {{ entry.last_update|utc|date:"Y-m-d" }}
    - {{ session.last_update|utc|date:"H:i:s" }} UTC + {{ entry.last_update|utc|date:"H:i:s" }} UTC {% endif %} {% if user|has_role:"Secretariat" or user_groups %} - {% if user|has_role:"Secretariat" or session.group in user_groups %} -
    {% include "meeting/edit_materials_button.html" %}
    + {% if user|has_role:"Secretariat" or entry.group in user_groups %} +
    {% include "meeting/edit_materials_button.html" with session=entry.session only %}
    {% endif %} {% endif %} {% endif %} - \ No newline at end of file + diff --git a/ietf/templates/meeting/group_proceedings.html b/ietf/templates/meeting/group_proceedings.html index d0a56b5b554..496fa922634 100644 --- a/ietf/templates/meeting/group_proceedings.html +++ b/ietf/templates/meeting/group_proceedings.html @@ -1,4 +1,4 @@ -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2024, All Rights Reserved #} {% load origin %} {% origin %} {% load ietf_filters %} @@ -11,14 +11,14 @@ - {% if entry.group.state_id == "bof" %}BOF{% endif %} + {% if entry.group.state_id == "bof" %}BOF{% endif %} {% else %}

    {{ entry.group }}

    {% endif %} {% if entry.canceled %} - Session cancelled + Session cancelled {% else %} {# artifacts #} @@ -31,7 +31,7 @@

    {{ entry.group }}


    {% empty %} {% if show_agenda and not meeting.proceedings_final %} - No agenda + No agenda
    {% endif %} {% endfor %} @@ -43,14 +43,38 @@

    {{ entry.group }}


    {% empty %} {% if show_agenda and not meeting.proceedings_final %} - No minutes + No minutes
    {% endif %} {% endfor %} - {% for bs in entry.bluesheets %} - - Bluesheets - {% if bs.time %}{{ bs.time|date:"D G:i" }}{% endif %} + {% if not meeting.proceedings_final %} + {% for attendance in entry.attendances %} + {% with session=attendance.material %} + + Attendance + {% if attendance.time %}{{ attendance.time|date:"D G:i" }}{% endif %} + + {% endwith %} +
    + {% endfor %} + {% else %} + {% for bs in entry.bluesheets %} + + Bluesheets + {% if bs.time %}{{ bs.time|date:"D G:i" }}{% endif %} + +
    + {% endfor %} + {% endif %} + {% for chatlog in entry.chatlogs %} + + Chatlog + {% if chatlog.time %}{{chatlog.time|date:"D G:i"}}{% endif %} + +
    + {% empty %} + + Chatlog
    {% endfor %} @@ -64,6 +88,13 @@

    {{ entry.group }}


    {% endfor %} + {% for rec in entry.meetecho_recordings %} + + Session recording + {% if rec.time %}{{ rec.time|date:"D G:i"}}{% endif %} + +
    + {% endfor%} {# slides #} @@ -71,18 +102,18 @@

    {{ entry.group }}

    {{ slide.material.title|clean_whitespace }}
    {% empty %} - {% if not meeting.proceedings_final %}No slides{% endif %} + {% if not meeting.proceedings_final %}No slides{% endif %} {% endfor %} {# drafts #} {% for draft in entry.drafts %} - - {{ draft.material.canonical_name }} + + {{ draft.material.name }}
    {% empty %} - {% if not meeting.proceedings_final %}No Internet-Drafts{% endif %} + {% if not meeting.proceedings_final %}No Internet-Drafts{% endif %} {% endfor %} {% endif %} diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html index c7d086feceb..568276f5665 100644 --- a/ietf/templates/meeting/important-dates.html +++ b/ietf/templates/meeting/important-dates.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2017, All Rights Reserved #} {% load origin %} -{% load ietf_filters static textfilters ietf_filters %} +{% load ietf_filters static textfilters htmlfilters %} {% block pagehead %} {% endblock %} @@ -19,10 +19,10 @@

    Important Dates

    {% for meeting in meetings %} {% if meeting.show_important_dates %} -

    +

    IETF {{ meeting.number }}
    - {{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }} + {{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }}

    @@ -45,30 +45,7 @@

    {% endif %}

    {% endfor %} diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html index 977eaad3ffe..995a612b5a8 100644 --- a/ietf/templates/meeting/interim_request.html +++ b/ietf/templates/meeting/interim_request.html @@ -24,8 +24,8 @@

    Interim Meeting Request

    {% endif %} {% bootstrap_field form.meeting_type layout='horizontal' %} - {% bootstrap_field form.city layout='horizontal' %} - {% bootstrap_field form.country layout='horizontal' %} + {% bootstrap_field form.city layout='horizontal' wrapper_class='location mb-3' %} + {% bootstrap_field form.country layout='horizontal' wrapper_class='location mb-3' %} {% bootstrap_field form.time_zone layout='horizontal' %} {{ formset.management_form }} {% if formset.non_form_errors %}
    {{ formset.non_form_errors }}
    {% endif %} diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html index fa05c72346d..d54229200ac 100644 --- a/ietf/templates/meeting/interim_send_announcement.html +++ b/ietf/templates/meeting/interim_send_announcement.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% load static django_bootstrap5 widget_tweaks %} {% block title %}Announce Interim Meeting{% endblock %} @@ -11,26 +11,7 @@

    Announce Interim Meeting

    {% csrf_token %} -
    - -
    {% render_field form.to class="form-control" readonly="readonly" %}
    -
    -
    - -
    {% render_field form.cc class="form-control" %}
    -
    -
    - -
    {% render_field form.frm class="form-control" readonly="readonly" %}
    -
    -
    - -
    {% render_field form.subject class="form-control" readonly="readonly" %}
    -
    -
    - -
    {% render_field form.body class="form-control" %}
    -
    + {% bootstrap_form form layout="horizontal" %} diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index 2334ec9e88e..23263b98593 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -34,7 +34,7 @@ {% endif %} {# notes #} - {% if use_notes %} + {% if session.agenda.uses_notes %} #} + {% endif %} + {% if session.session_recording_url %} - {% elif show_empty %} - {# #} {% endif %} {% endwith %} {% endif %} -{% endwith %} \ No newline at end of file +{% endwith %} diff --git a/ietf/templates/meeting/make_schedule_official.html b/ietf/templates/meeting/make_schedule_official.html index 59bccaa967b..a35dc7c7f8e 100644 --- a/ietf/templates/meeting/make_schedule_official.html +++ b/ietf/templates/meeting/make_schedule_official.html @@ -10,7 +10,7 @@

    Make IETF {{ meeting.number }} Schedule Official
    - {{ schedule.owner }}/{{ schedule.name }} + {{ schedule.owner }}/{{ schedule.name }}

    {% csrf_token %} diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html index bd91d85b4b7..ff4964a9735 100644 --- a/ietf/templates/meeting/materials.html +++ b/ietf/templates/meeting/materials.html @@ -52,17 +52,16 @@

    Plenaries

    - {% for session in plenaries %} + {% for entry in plenaries %} {% include "meeting/group_materials.html" %} {% endfor %}
    - {{ d.name.desc|urlize_ietf_docs|linkify }}{% if d.name.desc|slice:"-1:" != "." %}.{% endif %} - {% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %} - Register here. - {% endif %} - {% if d.name.slug == 'opensched' %} - To request a Working Group session, use the - IETF Meeting Session Request Tool. - If you are working on a BOF request, it is highly recommended - to tell the IESG now by sending an email to - iesg@ietf.org - to get advance help with the request. - {% endif %} - {% if d.name.slug == 'cutoffwgreq' %} - To request a Working Group session, use the - IETF Meeting Session Request Tool. - {% endif %} - {% if d.name.slug == 'cutoffbofreq' %} - To request a BOF, please see instructions on - Requesting a BOF. - {% endif %} - {% if d.name.slug == 'idcutoff' %} - Upload using the - I-D Submission Tool. - {% endif %} + {{ d.name.desc|urlize_ietf_docs|markdown|linkify }}{% if d.name.desc|slice:"-1:" != "." %}.{% endif %} {% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %} Upload using the Meeting Materials Management Tool. diff --git a/ietf/templates/meeting/important_dates.ics b/ietf/templates/meeting/important_dates.ics deleted file mode 100644 index 35079e01eb2..00000000000 --- a/ietf/templates/meeting/important_dates.ics +++ /dev/null @@ -1,5 +0,0 @@ -{% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR -VERSION:2.0 -METHOD:PUBLISH -PRODID:-//IETF//datatracker.ietf.org ical importantdates//EN -{% for meeting in meetings %}{% include "meeting/important_dates_for_meeting.ics" %}{% endfor %}END:VCALENDAR{% endautoescape %} diff --git a/ietf/templates/meeting/important_dates_for_meeting.ics b/ietf/templates/meeting/important_dates_for_meeting.ics deleted file mode 100644 index df5fe468189..00000000000 --- a/ietf/templates/meeting/important_dates_for_meeting.ics +++ /dev/null @@ -1,23 +0,0 @@ -{% load tz ietf_filters %}{% for d in meeting.important_dates %}BEGIN:VEVENT -UID:ietf-{{ meeting.number }}-{{ d.name_id }}-{{ d.date.isoformat }} -SUMMARY:IETF {{ meeting.number }}: {{ d.name.name }} -CLASS:PUBLIC -DTSTART{% if not d.midnight_cutoff %};VALUE=DATE{% endif %}:{{ d.date|date:"Ymd" }}{% if d.midnight_cutoff %}235900Z{% endif %} -DTSTAMP{% ics_date_time meeting.cached_updated|utc 'utc' %} -TRANSP:TRANSPARENT -DESCRIPTION:{{ d.name.desc }}{% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %}\n - Register here: https://www.ietf.org/how/meetings/register/{% endif %}{% if d.name.slug == 'opensched' %}\n - To request a Working Group session, use the IETF Meeting Session Request Tool:\n - {{ request.scheme }}://{{ request.get_host}}{% url 'ietf.secr.sreq.views.main' %}\n - If you are working on a BOF request, it is highly recommended to tell the IESG\n - now by sending an email to iesg@ietf.org to get advance help with the request.{% endif %}{% if d.name.slug == 'cutoffwgreq' %}\n - To request a Working Group session, use the IETF Meeting Session Request Tool:\n - {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.secr.sreq.views.main' %}{% endif %}{% if d.name.slug == 'cutoffbofreq' %}\n - To request a BOF, please see instructions on Requesting a BOF:\n - https://www.ietf.org/how/bofs/bof-procedures/{% endif %}{% if d.name.slug == 'idcutoff' %}\n - Upload using the I-D Submission Tool:\n - {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.submit.views.upload_submission' %}{% endif %}{% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %}\n - Upload using the Meeting Materials Management Tool:\n - {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.meeting.views.materials' num=meeting.number %}{% endif %} -END:VEVENT -{% endfor %} diff --git a/ietf/templates/meeting/interim_meeting_cancellation_notice.txt b/ietf/templates/meeting/interim_meeting_cancellation_notice.txt index d4774c168c3..83f29bf1ed6 100644 --- a/ietf/templates/meeting/interim_meeting_cancellation_notice.txt +++ b/ietf/templates/meeting/interim_meeting_cancellation_notice.txt @@ -3,6 +3,6 @@ The {{ group.name }} ({{ group.acronym }}) {% if not meeting.city %}virtual {% e interim meeting for {{ meeting.date|date:"Y-m-d" }} from {{ start_time|time:"H:i" }} to {{ end_time|time:"H:i" }} {{ meeting.time_zone }} has been cancelled. -{{ meeting.session_set.0.agenda_note }} +{{ meeting.session_set.first.agenda_note }} {% endtimezone %} diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html index 7fbc4347bc0..b702f645827 100644 --- a/ietf/templates/meeting/interim_pending.html +++ b/ietf/templates/meeting/interim_pending.html @@ -31,11 +31,11 @@

    Pending Interim Meetings

    {{ meeting.number }} - {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %} + {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %}     		- {% if meeting.can_approve %}Can be approved{% endif %} + {% if meeting.can_approve %}Can be approved{% endif %}
    {% endif %} - {% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %} - {% for sessions in areas %} -

    - {{ sessions.list.0.group.parent.acronym|upper }} {{ sessions.grouper }} + {% for area, meeting_groups, not_meeting_groups in ietf_areas %} +

    + {{ area.acronym|upper }} {{ area.name }}

    @@ -79,10 +78,8 @@

    - {% for session in sessions.list|dictsort:"group.acronym" %} - {% ifchanged session.group.acronym %} - {% include "meeting/group_materials.html" %} - {% endifchanged %} + {% for entry in meeting_groups %} + {% include "meeting/group_materials.html" %} {% endfor %}
    @@ -110,11 +107,8 @@

    Training

    - {% for session in training %} - {% ifchanged %} - {# TODO: Find a better way to represent purposed sessions in both materials and proceedings #} - {% include "meeting/group_materials.html" %} - {% endifchanged %} + {% for entry in training %} + {% include "meeting/group_materials.html" %} {% endfor %} @@ -152,10 +146,8 @@

    - {% for session in iab %} - {% ifchanged session.group.acronym %} - {% include "meeting/group_materials.html" %} - {% endifchanged %} + {% for entry in iab %} + {% include "meeting/group_materials.html" %} {% endfor %} @@ -192,10 +184,44 @@

    - {% for session in irtf|dictsort:"group.acronym" %} - {% ifchanged session.group.acronym %} - {% include "meeting/group_materials.html" %} - {% endifchanged %} + {% for entry in irtf %} + {% include "meeting/group_materials.html" %} + {% endfor %} + + + {% endif %} + + {% if editorial %} +

    Editorial Stream

    + + + + + + + + + + {% if user|has_role:"Secretariat" or user_groups %} + + {% endif %} + + + + {% for entry in editorial %} + {% include "meeting/group_materials.html" %} {% endfor %}
    + Group + + Agenda + + Minutes + + Slides + + Internet-Drafts + + Updated +
    @@ -231,10 +257,8 @@

    - {% for session in other|dictsort:"group.acronym" %} - {% ifchanged session.group.acronym %} - {% include "meeting/group_materials.html" %} - {% endifchanged %} + {% for entry in other %} + {% include "meeting/group_materials.html" %} {% endfor %} @@ -245,4 +269,4 @@

    {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/meeting/materials_editable_groups.html b/ietf/templates/meeting/materials_editable_groups.html index d91e6f21410..5c8645ecff2 100644 --- a/ietf/templates/meeting/materials_editable_groups.html +++ b/ietf/templates/meeting/materials_editable_groups.html @@ -14,7 +14,7 @@

    IETF {{ meeting_num }} meeting materials that you can edit

    {% if g|has_sessions:meeting_num %} {{ g.acronym }} {% else %} - {{ g.acronym }} No session requested + {{ g.acronym }} No session requested {% endif %} {% endfor %} diff --git a/ietf/templates/meeting/new_meeting_schedule.html b/ietf/templates/meeting/new_meeting_schedule.html index c93d72b2ab5..d1b5263c531 100644 --- a/ietf/templates/meeting/new_meeting_schedule.html +++ b/ietf/templates/meeting/new_meeting_schedule.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015-2020, All Rights Reserved #} {% load origin %} -{% load staticfiles %} +{% load static %} {% load ietf_filters %} {% load django_bootstrap5 %} {% block content %} diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html index 6de44b80bab..7c8ac621fff 100644 --- a/ietf/templates/meeting/past.html +++ b/ietf/templates/meeting/past.html @@ -37,9 +37,13 @@

    Past Meetings

    {% if meeting.type_id == "interim" %} {{ meeting.number }} - {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %} + {% if meeting.interim_meeting_cancelled %}Cancelled{% endif %} {% else %} - IETF-{{ meeting.number }} + {% if meeting.get_number > 28 %} + IETF-{{ meeting.number }} + {% else %} + IETF-{{ meeting.number }} + {% endif %} {% endif %} diff --git a/ietf/templates/meeting/previously_approved_slides.html b/ietf/templates/meeting/previously_approved_slides.html index 060be438e06..95975cb63f8 100644 --- a/ietf/templates/meeting/previously_approved_slides.html +++ b/ietf/templates/meeting/previously_approved_slides.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2020, All Rights Reserved #} -{% load origin staticfiles django_bootstrap5 %} +{% load origin static django_bootstrap5 %} {% block title %} Approved Slides for {{ submission.session.meeting }} : {{ submission.session.group.acronym }} {% endblock %} @@ -11,7 +11,7 @@

    {% if submission.status.slug == 'approved' %} approved {% else %} - rejected + declined {% endif %}

    @@ -19,7 +19,7 @@

    {% if submission.status.slug == 'approved' %} approved. {% else %} - rejected. + declined. {% endif %} No further action is needed.

    @@ -33,4 +33,4 @@

    return to this meeting session .

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html index 1c81c028fae..0aa8197fe93 100644 --- a/ietf/templates/meeting/proceedings.html +++ b/ietf/templates/meeting/proceedings.html @@ -1,184 +1,160 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} -{% load ietf_filters static %} -{% block pagehead %} - -{% endblock %} -{% block title %} - IETF {{ meeting.number }} - {% if not meeting.proceedings_final %}Draft{% endif %} - Proceedings -{% endblock %} -{% block content %} - {% origin %} - {% include 'meeting/proceedings/title.html' with meeting=meeting attendance=attendance only %} - {% if user|has_role:"Secretariat" and not meeting.proceedings_final %} - - Finalize proceedings - - {% endif %} - {# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #} - {% load cache %} - {% cache 900 ietf_meeting_proceedings meeting.number cache_version %} - {% include 'meeting/proceedings/introduction.html' with meeting=meeting only %} - - {% if plenaries %} -

    Plenaries

    - - - - - - - - - - - - {% for entry in plenaries %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endfor %} - -
    GroupArtifactsRecordingsSlidesInternet-Drafts
    - {% endif %} - - {% for area, meeting_groups, not_meeting_groups in ietf_areas %} -

    - {{ area.acronym|upper }} {{ area.name }} -

    - {% if meeting_groups %} - - - - - - - - - - - - {% for entry in meeting_groups %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endfor %} - -
    GroupArtifactsRecordingsSlidesInternet-Drafts
    - {% endif %} - {% if not_meeting_groups %} -

    - {{ area.name }} groups not meeting: - {% for entry in not_meeting_groups %} - {% if entry.name == "" %}{# do not show named sessions in this list #} - - {{ entry.group.acronym }} - {% if not forloop.last %},{% endif %} - {% endif %} - {% endfor %} -

    - - - - - - - - - - - - {% for entry in not_meeting_groups %}{% if entry.has_materials %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endif %}{% endfor %} - -
    - {% endif %} - {% endfor %} - - {% if training %} -

    Training

    +{% include 'meeting/proceedings/introduction.html' with meeting=meeting only %} + +{% if plenaries %} +

    Plenaries

    + + + + + + + + + + + + {% for entry in plenaries %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endfor %} + +
    GroupArtifactsRecordingsSlidesInternet-Drafts
    +{% endif %} + +{% for area, meeting_groups, not_meeting_groups in ietf_areas %} +

    + {{ area.acronym|upper }} {{ area.name }} +

    + {% if meeting_groups %} - - - - - - - + + + + + + + - {% for entry in training %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=False only %} - {% endfor %} + {% for entry in meeting_groups %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endfor %}
    GroupArtifactsRecordingsSlidesInternet-Drafts
    GroupArtifactsRecordingsSlidesInternet-Drafts
    {% endif %} - - {% if iab %} -

    - IAB Internet Architecture Board -

    - + {% if not_meeting_groups %} +

    + {{ area.name }} groups not meeting: + {% for entry in not_meeting_groups %} + {% if entry.name == "" %}{# do not show named sessions in this list #} + + {{ entry.group.acronym }} + {% if not forloop.last %},{% endif %} + {% endif %} + {% endfor %} +

    +
    - - - - - - - + + + + + + + - {% for entry in iab %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endfor %} + {% for entry in not_meeting_groups %}{% if entry.has_materials %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endif %}{% endfor %}
    - Group - - Artifacts - - Recordings - - Slides - - Internet-Drafts -
    {% endif %} - - {% if irtf.meeting_groups %} -

    - IRTF Internet Research Task Force -

    - - - - - - - - - - - - {% for entry in irtf.meeting_groups %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endfor %} - -
    - Group - - Artifacts - - Recordings - - Slides - - Internet-Drafts -
    - {% if irtf.not_meeting_groups %} +{% endfor %} + +{% if training %} +

    Training

    + + + + + + + + + + + + {% for entry in training %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=False only %} + {% endfor %} + +
    GroupArtifactsRecordingsSlidesInternet-Drafts
    +{% endif %} + +{% if iab %} +

    + IAB Internet Architecture Board +

    + + + + + + + + + + + + {% for entry in iab %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endfor %} + +
    + Group + + Artifacts + + Recordings + + Slides + + Internet-Drafts +
    +{% endif %} + +{% if irtf.meeting_groups %} +

    + IRTF Internet Research Task Force +

    + + + + + + + + + + + + {% for entry in irtf.meeting_groups %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endfor %} + +
    + Group + + Artifacts + + Recordings + + Slides + + Internet-Drafts +
    + {% if irtf.not_meeting_groups %}

    IRTF groups not meeting: {% for entry in irtf.not_meeting_groups %} @@ -191,25 +167,49 @@

    - - - - - - - + + + + + + + - {% for entry in irtf.not_meeting %}{% if entry.has_materials %} - {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} - {% endif %}{% endfor %} + {% for entry in irtf.not_meeting %}{% if entry.has_materials %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endif %}{% endfor %}
    {% endif %} + + {% if editorial %} +

    Editorial Stream

    + + + + + + + + + + + + {% for entry in editorial %} + {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} + {% endfor %} + +
    + Group + + Artifacts + + Recordings + + Slides + + Internet-Drafts +
    {% endif %} -{% endcache %} -{% endblock %} -{% block js %} - -{% endblock %} \ No newline at end of file +{% endif %} diff --git a/ietf/templates/meeting/proceedings/edit_material_base.html b/ietf/templates/meeting/proceedings/edit_material_base.html index 173e1d2360b..be66fa3305e 100644 --- a/ietf/templates/meeting/proceedings/edit_material_base.html +++ b/ietf/templates/meeting/proceedings/edit_material_base.html @@ -9,7 +9,7 @@

    {% block content_header %} Edit Proceedings Material
    - {{ meeting }} {{ material_type.name }} + {{ meeting }} {{ material_type.name }} {% endblock %}

    {% if meeting.proceedings_final %} diff --git a/ietf/templates/meeting/proceedings/edit_meetinghosts.html b/ietf/templates/meeting/proceedings/edit_meetinghosts.html index 89e3eb25f3b..68c684a2fa5 100644 --- a/ietf/templates/meeting/proceedings/edit_meetinghosts.html +++ b/ietf/templates/meeting/proceedings/edit_meetinghosts.html @@ -8,7 +8,7 @@

    Edit Meeting Hosts
    - {{ meeting }} + {{ meeting }}

    {% if meeting.proceedings_final %}
    The proceedings for this meeting have already been finalized.
    diff --git a/ietf/templates/meeting/proceedings/material_details.html b/ietf/templates/meeting/proceedings/material_details.html index 0b5f048c99a..aa2c45fde3b 100644 --- a/ietf/templates/meeting/proceedings/material_details.html +++ b/ietf/templates/meeting/proceedings/material_details.html @@ -7,7 +7,7 @@

    {{ meeting }}
    - Proceedings Materials + Proceedings Materials

    {% if meeting.proceedings_final %}
    The proceedings have been finalized for this meeting.
    @@ -43,7 +43,7 @@

    {% with timestamp=mat.document.time|utc %} {{ timestamp|date:"Y-m-d" }}
    - {{ timestamp|date:"H:i:s" }} UTC + {{ timestamp|date:"H:i:s" }} UTC {% endwith %} {% else %} diff --git a/ietf/templates/meeting/proceedings/materials_table.html b/ietf/templates/meeting/proceedings/materials_table.html index 25a17252259..d18f2ce8d7d 100644 --- a/ietf/templates/meeting/proceedings/materials_table.html +++ b/ietf/templates/meeting/proceedings/materials_table.html @@ -26,7 +26,7 @@

    Proceedings Materials

    {% with timestamp=material.document.time|utc %} {{ timestamp|date:"Y-m-d" }}
    - {{ timestamp|date:"H:i:s" }} UTC + {{ timestamp|date:"H:i:s" }} UTC {% endwith %} {% else %} diff --git a/ietf/templates/meeting/proceedings/upload_material.html b/ietf/templates/meeting/proceedings/upload_material.html index a581b987f04..4c97d5b3666 100644 --- a/ietf/templates/meeting/proceedings/upload_material.html +++ b/ietf/templates/meeting/proceedings/upload_material.html @@ -6,7 +6,7 @@ {% block content_header %} Upload Proceedings Material
    - {{ meeting }} {{ material_type.name }} + {{ meeting }} {{ material_type.name }} {% endblock %} {% block intro %}

    diff --git a/ietf/templates/meeting/proceedings_attendees.html b/ietf/templates/meeting/proceedings_attendees.html index 5d2742863fc..390ce00cadd 100644 --- a/ietf/templates/meeting/proceedings_attendees.html +++ b/ietf/templates/meeting/proceedings_attendees.html @@ -1,6 +1,9 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin markup_tags %} +{% load origin markup_tags static %} +{% block pagehead %} + +{% endblock %} {% block title %}IETF {{ meeting.number }} proceedings{% endblock %} {% block content %} {% origin %} @@ -11,5 +14,34 @@

    Attendee list of IETF {{ meeting.number }} meeting

    - {{ template|safe }} + + {% if template %} + {{template|safe}} + {% else %} + + + + + + + + + + + + {% for reg in registrations %} + + + + + + + + {% endfor %} + +
    Last NameFirst NameOrganizationCountryRegistration Type
    {{ reg.last_name }}{{ reg.first_name }}{{ reg.affiliation }}{{ reg.country_code }}{{ reg.attendance_type }}
    + {% endif %} +{% endblock %} +{% block js %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/proceedings_attendees_table.html b/ietf/templates/meeting/proceedings_attendees_table.html deleted file mode 100644 index 9ac1fda2acf..00000000000 --- a/ietf/templates/meeting/proceedings_attendees_table.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - {% for attendee in attendees %} - - - - - - - {% endfor %} - -
    Last nameFirst nameOrganizationCountry
    {{ attendee.LastName }}{{ attendee.FirstName }}{{ attendee.Company }}{{ attendee.Country }}
    \ No newline at end of file diff --git a/ietf/templates/meeting/proceedings_wrapper.html b/ietf/templates/meeting/proceedings_wrapper.html new file mode 100644 index 00000000000..a20291a6930 --- /dev/null +++ b/ietf/templates/meeting/proceedings_wrapper.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2015, All Rights Reserved #} +{% load origin %} +{% load ietf_filters static %} +{% block pagehead %} + +{% endblock %} +{% block title %} + IETF {{ meeting.number }} + {% if not meeting.proceedings_final %}Draft{% endif %} + Proceedings +{% endblock %} +{% block content %} + {% origin %} + {% include 'meeting/proceedings/title.html' with meeting=meeting attendance=attendance only %} + {% if user|has_role:"Secretariat" and not meeting.proceedings_final %} + + Finalize proceedings + + {% endif %} + {{ proceedings_content }} +{% endblock %} +{% block js %} + +{% endblock %} diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html index a6b6fc477f1..57172d86c80 100644 --- a/ietf/templates/meeting/properties_edit.html +++ b/ietf/templates/meeting/properties_edit.html @@ -7,7 +7,7 @@ {% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %} {% block content %} {% origin %} -

    IETF {{ meeting.number }} Schedule
    +

    IETF {{ meeting.number }} Schedule
    {{ schedule.owner }}/{{ schedule.name }} ({{ schedule.official_token }})

    {% if not schedule.is_official %} diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html deleted file mode 100644 index caa3a49af1f..00000000000 --- a/ietf/templates/meeting/propose_session_slides.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin static django_bootstrap5 tz %} -{% block title %}Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %} -{% block content %} - {% origin %} -

    - Propose Slides for {{ session.meeting }} -
    - {{ session.group.acronym }} - {% if session.name %}: {{ session.name }}{% endif %} - -

    - {% if session_number %} -

    - Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }} -

    - {% endif %} -

    - This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval. -

    - - {% csrf_token %} - {% bootstrap_form form %} - - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/request_minutes.html b/ietf/templates/meeting/request_minutes.html index fc39c034f95..4231b8d12dd 100644 --- a/ietf/templates/meeting/request_minutes.html +++ b/ietf/templates/meeting/request_minutes.html @@ -9,7 +9,7 @@

    Request Minutes
    - IETF {{ meeting.number }} + IETF {{ meeting.number }}
    {{ meeting.city }}, {{ meeting.country }} – {{ meeting.venue_name }}

    diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html index 482b590483c..0abee95887b 100644 --- a/ietf/templates/meeting/requests.html +++ b/ietf/templates/meeting/requests.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2025, All Rights Reserved #} {% load origin %} {% load ietf_filters static person_filters textfilters %} {% block pagehead %} @@ -11,69 +11,104 @@

    IETF {{ meeting.number }} timeslot requests
    - {{ meeting.city }}, {{ meeting.country }} + {{ meeting.city }}, {{ meeting.country }} {% if meeting.venue_name %}– {{ meeting.venue_name }}{% endif %}

    Requests Summary

    -
    - - - {% for row in summary_by_area %} - - {% if forloop.first %} - {% for col in row %} - - {% endfor %} - {% else %} - {% for col in row %} - - {% endfor %} - {% endif %} - - {% endfor %} - -
    {{ col }}{{ col }}
    -
    -
    -
    - - - {% for row in summary_by_group_type %} - - {% if forloop.first %} +

    This summary section focuses on sessions that have conflict lists to manage. It excludes requests from groups of type "team", such as those for the hackathon or for tutorials.

    +
    +
    + {% for row in summary_by_area %} + {% if forloop.first %} + + {% for col in row %} - + {% endfor %} - {% else %} + + + + {% elif forloop.last %} + + + {% for col in row %} - + {% endfor %} + {# last line is missing two columns? #} + + + + {% else %} + + {% for col in row %} + {% if forloop.first %} + + {% else %} + {% endif %} - {% endfor %} - -
    {{ col }}{{ col }}
    {{ col }}{{ col }}
    {{ col }}{{ col }}
    -
    + + {% endif %} + {% endfor %} + +
    +
    - - - {% for row in summary_by_purpose %} - - {% if forloop.first %} +
    + {% for row in summary_by_group_type %} + {% if forloop.first %} + + + {% for col in row %} + + {% endfor %} + + + + {% else %} + {% for col in row %} - + {% if forloop.first %} + + {% else %} + + {% endif %} {% endfor %} - {% else %} + + {% endif %} + {% endfor %} + +
    {{ col }}
    {{ col }}{{ col }}{{ col }}
    +
    +
    + + {% for row in summary_by_purpose %} + {% if forloop.first %} + + + {% for col in row %} + + {% endfor %} + + + + {% else %} + {% for col in row %} - + {% if forloop.first %} + + {% else %} + + {% endif %} {% endfor %} - {% endif %} - - {% endfor %} + + {% endif %} + {% endfor %} -
    {{ col }}
    {{ col }}{{ col }}{{ col }}
    +
    @@ -81,7 +116,7 @@

    Requests Summary

    {% for area in area_sessions %}

    {% if area.grouper is not None %} - {{ area.grouper.acronym|upper }} {{ area.grouper.name }} + {{ area.grouper.acronym|upper }} {{ area.grouper.name }} {% else %} Other Groups {% endif %} @@ -98,7 +133,6 @@

    Group Length Size - Purpose Requester AD Constraints @@ -110,16 +144,19 @@

    {% if not forloop.first %}{% endif %} - {{ session.current_status_name|capfirst }} + {{ session.current_status_name|capfirst }} {% endifchanged %} - + {{ session.group.acronym }} + {% if session.purpose_id != "regular" and session.purpose_id != "none" %} +
    {{session.purpose}} + {% endif %} {% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %} {% if session.requested_duration %}
    @@ -132,14 +169,13 @@

    {% endif %} {% if session.group.state.slug != "active" %} -
    {{ session.group.state.name }} +
    {{ session.group.state.name }} {% endif %} {% if session.requested_duration %}{{ session.requested_duration|stringformat:"s"|slice:"0:4" }}{% endif %} {{ session.attendees|default:"" }} - {% if session.purpose_id != "regular" %}{{session.purpose}}{% endif %} {% person_link session.requested_by_person with_email=False %} {% if session.group.ad_role %} diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html index 2a1a829db22..1de121a6b1e 100644 --- a/ietf/templates/meeting/schedule_list.html +++ b/ietf/templates/meeting/schedule_list.html @@ -9,7 +9,7 @@

    Possible Meeting Agendas
    - IETF {{ meeting.number }} + IETF {{ meeting.number }}

    {% if can_edit_timeslots %} {{ label }}

    {{ schedule.notes|linebreaksbr }} {% if schedule.visible %} -
    Visible
    +
    Visible
    {% else %} -
    Hidden
    +
    Hidden
    {% endif %} {% if schedule.public %} -
    Public
    +
    Public
    {% else %} -
    Private
    +
    Private
    {% endif %} diff --git a/ietf/templates/meeting/session_approval_notification.txt b/ietf/templates/meeting/session_approval_notification.txt new file mode 100644 index 00000000000..74eca09bd8b --- /dev/null +++ b/ietf/templates/meeting/session_approval_notification.txt @@ -0,0 +1,16 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +Dear {{ group.parent }} Director(s): + +{{ header }} meeting session request has just been +submitted by {{ requester }}. +The third session requires your approval. + +To approve the session go to the session request view here: +{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.meeting.views_session_request.view_request" acronym=group.acronym %} +and click "Approve Third Session". + +Regards, + +The IETF Secretariat. + +{% include "meeting/session_request_info.txt" %} diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index b69413238c6..b1fd92ba5be 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -2,7 +2,8 @@ {% load origin %} {% load static %} {% load textfilters tz %} -{% load ietf_filters %} +{% load ietf_filters session_filters %} + {% origin %} {% if item and item|should_show_agenda_session_buttons %} {% with slug=item.slug session=item.session timeslot=item.timeslot %} @@ -41,7 +42,7 @@     {% endif %} {# Notes #} - {% if use_notes %} + {% if meeting.uses_notes %} {% else %} {# chat logs #} - {% if meeting.number|add:"0" >= 60 %} + {% if meeting.has_chat_logs and session.chatlog %} {% endif %} {# Recordings #} - {% if meeting.number|add:"0" >= 80 %} + {% if meeting.has_recordings %} {% with session.recordings as recordings %} {% if recordings %} {# There's no guaranteed order, so this is a bit messy: #} @@ -181,7 +182,7 @@ {% if session.video_stream_url %} @@ -229,7 +230,7 @@ {% endif %} {# Notes #} - {% if use_notes %} + {% if meeting.uses_notes %}
  • Notepad for note-takers @@ -303,16 +304,16 @@
    • {% else %} {# chat logs #} - {% if meeting.number|add:"0" >= 60 %} + {% if meeting.has_chat_logs and session.chatlog %}
  • + href="/doc/{{ session.chatlog.document.name }}"> Chat logs
    • {% endif %} {# Recordings #} - {% if meeting.number|add:"0" >= 80 %} + {% if meeting.has_recordings %} {% with session.recordings as recordings %} {% if recordings %} {# There's no guaranteed order, so this is a bit messy: #} @@ -351,7 +352,7 @@ {% if session.video_stream_url %}
  • + href="{{ session.session_recording_url }}"> Session recording
    • diff --git a/ietf/templates/meeting/session_cancel_notification.txt b/ietf/templates/meeting/session_cancel_notification.txt new file mode 100644 index 00000000000..3de67fc8f48 --- /dev/null +++ b/ietf/templates/meeting/session_cancel_notification.txt @@ -0,0 +1,4 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% autoescape off %}{% load ams_filters %} + +A request to cancel a meeting session has just been submitted by {{ requester }}.{% endautoescape %} diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html index 7f1a825c42a..55fa3d38571 100644 --- a/ietf/templates/meeting/session_details.html +++ b/ietf/templates/meeting/session_details.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin ietf_filters static %} -{% block title %}{{ meeting }} : {{ acronym }}{% endblock %} +{% block title %}{{ meeting }} : {{ group.acronym }}{% endblock %} {% block morecss %} .drag-handle { cursor: move; @@ -12,13 +12,13 @@

    {{ meeting }}
    - {{ acronym }} + {{ group.acronym }}: {{ group.name }}

    {% if meeting.start_datetime >= thisweek %} + title="icalendar entry for {{ group.acronym }}@{{ meeting.number }}" + aria-label="icalendar entry for {{ group.acronym }}@{{ meeting.number }}" + href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=group.acronym %}"> {% endif %} @@ -31,32 +31,41 @@

    Scheduled Sessions

    {% include 'meeting/session_details_panel.html' with sessions=scheduled_sessions %}

    Unscheduled Sessions

    {% include 'meeting/session_details_panel.html' with sessions=unscheduled_sessions %} - {% if pending_suggestions %} -

    + {% for s in pending_suggestions %} + {% if forloop.first %}

    {% if can_manage_materials %} Proposed slides awaiting your approval {% else %} Your proposed slides awaiting chair approval {% endif %}

    -
    - {% for s in pending_suggestions %} - {% if can_manage_materials %} -

    - - {{ s.submitter }} - {{ s.title }} ({{ s.time }}) - -

    - {% else %} -

    - {{ s.title }} ({{ s.time }}) -

    - {% endif %} - {% endfor %} -
    - {% endif %} +
    {% endif %} + {% if can_manage_materials %} +

    + + {{ s.submitter }} - {{ s.title }} ({{ s.time }}) + +

    + {% else %} +

    + {{ s.title }} ({{ s.time }}) +

    + {% endif %} + {% if forloop.last %}
    {% endif %} + {% endfor %} {% endblock %} {% block js %} + + + + + {% if can_manage_materials %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_form.html b/ietf/templates/meeting/session_request_form.html new file mode 100644 index 00000000000..ecf5cb7268c --- /dev/null +++ b/ietf/templates/meeting/session_request_form.html @@ -0,0 +1,206 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static ietf_filters django_bootstrap5 %} +{% block title %}{% if is_create %}New {% else %}Edit {% endif %}Session Request{% endblock %} +{% block morecss %}{{ block.super }} + .hidden {display: none !important;} + div.form-group {display: inline;} +{% endblock %} +{% block content %} +

    {% if is_create %}New {% else %}Edit {% endif %}Session Request

    + + {% if is_create %} +
    + Send a notification that the group does not plan to hold a session at IETF {{ meeting.number }} + Retrieve all information from previous meeting +
    + {% endif %} + +
    + +
    + {% csrf_token %} + {{ form.session_forms.management_form }} + {% if form.non_field_errors %} +
    {{ form.non_field_errors }}
    + {% endif %} + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + {% bootstrap_field form.num_session layout="horizontal" %} + + {% if group.features.acts_like_wg %} + +
    +
    Session 1
    +
    + {% include 'meeting/session_details_form.html' with form=form.session_forms.0 hide_onsite_tool_prompt=True only %} +
    +
    + +
    +
    Session 2
    +
    + {% include 'meeting/session_details_form.html' with form=form.session_forms.1 hide_onsite_tool_prompt=True only %} +
    +
    + + {% if not is_virtual %} + {% bootstrap_field form.session_time_relation layout="horizontal" %} + {% endif %} + +
    +
    Additional Session Request
    +
    +
    + {{ form.third_session }} + +
    Additional slot may be available after agenda scheduling has closed and with the approval of an Area Director.
    +
    + +
    +
    + +
    +
    Third session request
    +
    + {% include 'meeting/session_details_form.html' with form=form.session_forms.2 hide_onsite_tool_prompt=True only %} +
    +
    + + {% else %}{# else not group.features.acts_like_wg #} + {% for session_form in form.session_forms %} +
    +
    Session {{ forloop.counter }}
    +
    + {% include 'meeting/session_details_form.html' with form=session_form only %} +
    +
    + {% endfor %} + {% endif %} + + {% bootstrap_field form.attendees layout="horizontal" %} + + {% bootstrap_field form.bethere layout="horizontal" %} + +
    +
    Conflicts to avoid
    +
    +
    +
    Other WGs that included {{ group.acronym }} in their conflict lists
    +
    {{ session_conflicts.inbound|default:"None" }}
    +
    +
    +
    WG Sessions
    You may select multiple WGs within each category
    +
    + {% for cname, cfield, cselector in form.wg_constraint_fields %} +
    +
    +
    +
    +
    + {{ cselector }} +
    +
    + +
    +
    +
    +
    + {{ cfield.errors }}{{ cfield }} +
    +
    +
    +
    + {% empty %}{# shown if there are no constraint fields #} +
    +
    No constraints are enabled for this meeting.
    + {% endfor %} +
    +
    + + {% if form.inactive_wg_constraint_count %} +
    +
    Disabled for this meeting
    +
    + {% for cname, value, field in form.inactive_wg_constraints %} +
    +
    {{ cname|title }}
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + {% endfor %} +
    +
    + {% endif %} + +
    +
    BOF Sessions
    +
    If the sessions can not be found in the fields above, please enter free form requests in the Special Requests field below.
    +
    +
    +
    + + {% if not is_virtual %} + + {% bootstrap_field form.resources layout="horizontal" %} + + {% bootstrap_field form.timeranges layout="horizontal" %} + + {% bootstrap_field form.adjacent_with_wg layout="horizontal" %} + +
    +
    Joint session with: (To request one session for multiple WGs together)
    +
    To request a joint session with another group, please contact the secretariat.
    +
    + + {% endif %} + + {% bootstrap_field form.comments layout="horizontal" %} + + {% if form.notifications_optional %} +
    + +
    +
    + + +
    +
    +
    + {% endif %} + + + Cancel +
    + +{% endblock %} +{% block js %} + + {{ form.media }} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_info.txt b/ietf/templates/meeting/session_request_info.txt new file mode 100644 index 00000000000..2e96efb31f1 --- /dev/null +++ b/ietf/templates/meeting/session_request_info.txt @@ -0,0 +1,26 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load ams_filters %} +--------------------------------------------------------- +Working Group Name: {{ group.name }} +Area Name: {{ group.parent }} +Session Requester: {{ login }} +{% if session.joint_with_groups %}{{ session.joint_for_session_display }} joint with: {{ session.joint_with_groups }}{% endif %} + +Number of Sessions: {{ session.num_session }} +Length of Session(s): {% for session_length in session_lengths %}{{ session_length.total_seconds|display_duration }}{% if not forloop.last %}, {% endif %}{% endfor %} +Number of Attendees: {{ session.attendees }} +Conflicts to Avoid: +{% for line in session.outbound_conflicts %} {{line}} +{% endfor %}{% if session.session_time_relation_display %} {{ session.session_time_relation_display }}{% endif %} +{% if session.adjacent_with_wg %} Adjacent with WG: {{ session.adjacent_with_wg }}{% endif %} +{% if session.timeranges_display %} Can't meet: {{ session.timeranges_display|join:", " }}{% endif %} + +Participants who must be present: +{% for person in session.bethere %} {{ person.ascii_name }} +{% endfor %} +Resources Requested: +{% for resource in session.resources %} {{ resource.desc }} +{% endfor %} +Special Requests: + {{ session.comments }} +--------------------------------------------------------- diff --git a/ietf/templates/meeting/session_request_list.html b/ietf/templates/meeting/session_request_list.html new file mode 100644 index 00000000000..789b7006e5d --- /dev/null +++ b/ietf/templates/meeting/session_request_list.html @@ -0,0 +1,65 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static %} +{% load ietf_filters %} +{% load django_bootstrap5 %} +{% block title %}Session Requests{% endblock %} +{% block content %} +

    Session Requests IETF {{ meeting.number }}

    + +
    + Instructions + + View list of timeslot requests + {% if user|has_role:"Secretariat" %} + {% if is_locked %} + Unlock Tool + {% else %} + Lock Tool + {% endif %} + {% endif %} +
    + +
    +
    + Request New Session +
    +
    +

    The list below includes those working groups that you currently chair which do not already have a session scheduled. You can click on an acronym to complete a request for a new session at the upcoming IETF meeting. Click "Group will not meet" to send a notification that the group does not plan to meet.

    +
      + {% for group in unscheduled_groups %} +
    • + {{ group.acronym }} + {% if group.not_meeting %} + (Currently, this group does not plan to hold a session at IETF {{ meeting.number }}) + {% endif %} +
      • + {% empty %} +
    • NONE
      • + {% endfor %} +
    +
    +
    + + +
    +
    + Edit / Cancel Previously Requested Sessions +
    +
    +

    The list below includes those working groups for which you or your co-chair has requested sessions at the upcoming IETF meeting. You can click on an acronym to initiate changes to a session, or cancel a session.

    + +
    +
    + +{% endblock %} + +{% block footer-extras %} + {% include "includes/sessions_footer.html" %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_locked.html b/ietf/templates/meeting/session_request_locked.html new file mode 100644 index 00000000000..15c023ce332 --- /dev/null +++ b/ietf/templates/meeting/session_request_locked.html @@ -0,0 +1,21 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static ietf_filters django_bootstrap5 %} +{% block title %}Session Request{% endblock %} + +{% block content %} +

    Session Request - IETF {{ meeting.number }}

    + + View list of timeslot requests + +
    + +
    +

    {{ message }}

    + +
    + +
    +
    + +{% endblock %} diff --git a/ietf/templates/meeting/session_request_notification.txt b/ietf/templates/meeting/session_request_notification.txt new file mode 100644 index 00000000000..49dbbfc42ca --- /dev/null +++ b/ietf/templates/meeting/session_request_notification.txt @@ -0,0 +1,6 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% autoescape off %}{% load ams_filters %} + +{% filter wordwrap:78 %}{{ header }} meeting session request has just been submitted by {{ requester }}.{% endfilter %} + +{% include "meeting/session_request_info.txt" %}{% endautoescape %} diff --git a/ietf/templates/meeting/session_request_status.html b/ietf/templates/meeting/session_request_status.html new file mode 100644 index 00000000000..65e98d6d238 --- /dev/null +++ b/ietf/templates/meeting/session_request_status.html @@ -0,0 +1,28 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static %} +{% load ietf_filters %} +{% load django_bootstrap5 %} +{% block title %}Session Request Status{% endblock %} +{% block content %} +

    Session Request Status

    + +
    +
    + Session Request Status +
    +
    +

    Enter the message that you would like displayed to the WG Chair when this tool is locked.

    +
    {% csrf_token %} + {% bootstrap_form form %} + {% if is_locked %} + + {% else %} + + {% endif %} + +
    +
    +
    + +{% endblock %} diff --git a/ietf/templates/meeting/session_request_view.html b/ietf/templates/meeting/session_request_view.html new file mode 100644 index 00000000000..3db16f56cbf --- /dev/null +++ b/ietf/templates/meeting/session_request_view.html @@ -0,0 +1,59 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% extends "base.html" %} +{% load static ietf_filters django_bootstrap5 %} +{% block title %}Session Request{% endblock %} + +{% block content %} +

    Session Request - IETF {{ meeting.number }}

    + +
    + Instructions +
    + +
    + +
    + + {% include "meeting/session_request_view_table.html" %} + +
    + +

    Activities Log

    +
    + + + + + + + + + + + {% for entry in activities %} + + + + + + + {% endfor %} + +
    DateTimeActionName
    {{ entry.act_date }}{{ entry.act_time }}{{ entry.activity }}{{ entry.act_by }}
    +
    + + + + {% if show_approve_button %} + Approve Third Session + {% endif %} + + Back + +
    + +{% endblock %} + +{% block js %} + +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_view_formset.html b/ietf/templates/meeting/session_request_view_formset.html new file mode 100644 index 00000000000..72811b8c2c4 --- /dev/null +++ b/ietf/templates/meeting/session_request_view_formset.html @@ -0,0 +1,49 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load ams_filters %}{# keep this in sync with sessions_request_view_session_set.html #} +{% for sess_form in formset %} + {% if sess_form.cleaned_data and not sess_form.cleaned_data.DELETE %} +
    +
    + Session {{ forloop.counter }} +
    +
    +
    +
    Length
    +
    {{ sess_form.cleaned_data.requested_duration.total_seconds|display_duration }}
    +
    + {% if sess_form.cleaned_data.name %} +
    +
    Name
    +
    {{ sess_form.cleaned_data.name }}
    +
    + {% endif %} + {% if sess_form.cleaned_data.purpose.slug != 'regular' %} +
    +
    Purpose
    +
    + {{ sess_form.cleaned_data.purpose }} + {% if sess_form.cleaned_data.purpose.timeslot_types|length > 1 %}({{ sess_form.cleaned_data.type }} + ){% endif %} +
    +
    +
    +
    Onsite tool?
    +
    {{ sess_form.cleaned_data.has_onsite_tool|yesno }}
    +
    + {% endif %} +
    +
    + + {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %} +
    +
    + Time between sessions +
    +
    + {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No + preference{% endif %} +
    +
    + {% endif %} + {% endif %} +{% endfor %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_view_session_set.html b/ietf/templates/meeting/session_request_view_session_set.html new file mode 100644 index 00000000000..0b8412b04f3 --- /dev/null +++ b/ietf/templates/meeting/session_request_view_session_set.html @@ -0,0 +1,47 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load ams_filters %}{# keep this in sync with sessions_request_view_formset.html #} +{% for sess in session_set %} +
    +
    + Session {{ forloop.counter }} +
    +
    +
    +
    Length
    +
    {{ sess.requested_duration.total_seconds|display_duration }}
    +
    + {% if sess.name %} +
    +
    Name
    +
    {{ sess.name }}
    +
    + {% endif %} + {% if sess.purpose.slug != 'regular' %} +
    +
    Purpose
    +
    + {{ sess.purpose }} + {% if sess.purpose.timeslot_types|length > 1 %}({{ sess.type }}){% endif %} +
    +
    +
    +
    Onsite tool?
    +
    {{ sess.has_onsite_tool|yesno }}
    +
    + {% endif %} +
    +
    + +{% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %} +
    +
    + Time between sessions +
    +
    + {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No + preference{% endif %} +
    +
    +{% endif %} + +{% endfor %} \ No newline at end of file diff --git a/ietf/templates/meeting/session_request_view_table.html b/ietf/templates/meeting/session_request_view_table.html new file mode 100644 index 00000000000..a5cb85c2520 --- /dev/null +++ b/ietf/templates/meeting/session_request_view_table.html @@ -0,0 +1,146 @@ +{# Copyright The IETF Trust 2025, All Rights Reserved #} +{% load ams_filters %} + +
    +
    + Working Group Name +
    +
    + {{ group.name }} ({{ group.acronym }}) +
    +
    + +
    +
    + Area Name +
    +
    + {{ group.parent }} +
    +
    + +
    +
    + Number of Sessions Requested +
    +
    + {% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %} +
    +
    + +{% if form %} + {% include 'meeting/session_request_view_formset.html' with formset=form.session_forms group=group session=session only %} +{% else %} + {% include 'meeting/session_request_view_session_set.html' with session_set=sessions group=group session=session only %} +{% endif %} + + +
    +
    + Number of Attendees +
    +
    + {{ session.attendees }} +
    +
    + +
    +
    + Conflicts to Avoid +
    +
    + {% if session_conflicts.outbound %} + {% for conflict in session_conflicts.outbound %} +
    +
    + {{ conflict.name|title }} +
    +
    + {{ conflict.groups }} +
    +
    + {% endfor %} + {% else %}None{% endif %} +
    +
    + +
    +
    + Other WGs that included {{ group }} in their conflict list +
    +
    + {% if session_conflicts.inbound %}{{ session_conflicts.inbound }}{% else %}None so far{% endif %} +
    +
    + +{% if not is_virtual %} +
    +
    + Resources requested +
    +
    + {% if session.resources %}
      {% for resource in session.resources %}
    • {{ resource.desc }}
      • {% endfor %}
    {% else %}None so far{% endif %} +
    +
    +{% endif %} + +
    +
    + Participants who must be present +
    +
    + {% if session.bethere %}
      {% for person in session.bethere %}
    • {{ person }}
      • {% endfor %}
    {% else %}None{% endif %} +
    +
    + +
    +
    + Can not meet on +
    +
    + {% if session.timeranges_display %}{{ session.timeranges_display|join:', ' }}{% else %}No constraints{% endif %} +
    +
    + +{% if not is_virtual %} +
    +
    + Adjacent with WG +
    +
    + {{ session.adjacent_with_wg|default:'No preference' }} +
    +
    +
    +
    + Joint session +
    +
    + {% if session.joint_with_groups %} + {{ session.joint_for_session_display }} with: {{ session.joint_with_groups }} + {% else %} + Not a joint session + {% endif %} +
    +
    +{% endif %} + +
    +
    + Special Requests +
    +
    + {{ session.comments }} +
    +
    + +{% if form and form.notifications_optional %} +
    +
    + {{ form.send_notifications.label}} +
    +
    + {% if form.cleaned_data.send_notifications %}Yes{% else %}No{% endif %} +
    +
    +{% endif %} diff --git a/ietf/templates/meeting/slides_approved.txt b/ietf/templates/meeting/slides_approved.txt new file mode 100644 index 00000000000..61ffafcd18e --- /dev/null +++ b/ietf/templates/meeting/slides_approved.txt @@ -0,0 +1,5 @@ +{% load ietf_filters %}{% autoescape off %}Your proposed slides have been approved for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}{% if submission.session.name %} : {{submission.session.name}}{% endif %} by {{approver}} + +Title: {{submission.title}} + +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html index 8f161a3bb1f..3259dba9daf 100644 --- a/ietf/templates/meeting/timeslot_edit.html +++ b/ietf/templates/meeting/timeslot_edit.html @@ -11,27 +11,29 @@ {% endcomment %} .timeslot-edit { overflow: auto; height: max(30rem, calc(100vh - 25rem));} .tstable { width: 100%; border-collapse: separate; } {# "separate" to ensure sticky cells keep their borders #} -.tstable thead { position: sticky; top: 0; z-index: 3; background-color: white;} -.tstable th:first-child, .tstable td:first-child { - background-color: white; {# needs to match the lighter of the striped-table colors! #} -position: sticky; -left: 0; - z-index: 2; {# render above other cells / borders but below thead (z-index 3, above) #} -} -.tstable tbody > tr:nth-of-type(odd) > th:first-child { - background-color: rgb(249, 249, 249); {# needs to match the darker of the striped-table colors! #} -} -.tstable th { white-space: nowrap;} -.tstable td { white-space: nowrap;} -.capacity { font-size:80%; font-weight: normal;} -a.new-timeslot-link { color: lightgray; font-size: large;} + .tstable tr th:first-child { min-width: 25rem; max-width: 25rem; overflow: hidden; } + .tstable thead { position: sticky; top: 0; z-index: 3; background-color: white;} + .tstable thead th span.day { position: sticky; left: 25.5rem; } + .tstable th:first-child, .tstable td:first-child { + background-color: white; {# needs to match the lighter of the striped-table colors! #} + position: sticky; + left: 0; + z-index: 2; {# render above other cells / borders but below thead (z-index 3, above) #} + } + .tstable tbody > tr:nth-of-type(odd) > th:first-child { + background-color: rgb(249, 249, 249); {# needs to match the darker of the striped-table colors! #} + } + .tstable th { white-space: nowrap;} + .tstable td { white-space: nowrap;} + .capacity { font-size:80%; font-weight: normal;} + a.new-timeslot-link { color: lightgray; font-size: large;} {% endblock %} {% block content %} {% origin %}

    IETF {{ meeting.number }} Meeting Agenda
    - Timeslots and Room Availability + Timeslots and Room Availability

    {% for day in time_slices %} - {{ day|date:'D' }} ({{ day }}) - - + + {{ day|date:'D' }} ({{ day }}) + + + {% endfor %} {% endif %} @@ -121,6 +125,7 @@

    {{ room.name }} + {% if room.functional_name and room.name != room.functional_name %} - {{ room.functional_name }}{% endif %} {% if room.capacity %}({{ room.capacity }}){% endif %} diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html index 16bc35ef389..2d11c6633ce 100644 --- a/ietf/templates/meeting/tz-display.html +++ b/ietf/templates/meeting/tz-display.html @@ -12,8 +12,8 @@ {% load origin %} {% origin %} {% firstof id_suffix "" as suffix %} -
    - {% if not minimal %}{% endif %} + + {% if not minimal %}{% endif %} {% if meeting_timezone is not None %} {% endif %} -
    \ No newline at end of file + \ No newline at end of file diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html index 815698dbfd9..13a27ed9102 100644 --- a/ietf/templates/meeting/upcoming.html +++ b/ietf/templates/meeting/upcoming.html @@ -86,15 +86,15 @@

    Upcoming Meetings

    {% if session.current_status == 'canceled' %} - Cancelled + Cancelled {% else %} - {% include "meeting/interim_session_buttons.html" with show_agenda=True use_notes=meeting.uses_notes %} + {% include "meeting/interim_session_buttons.html" with show_agenda=True %} {% endif %} {% endwith %} {% else %} - Unexpected entry type: {{ entry|classname }} + Unexpected entry type: {{ entry|classname }} diff --git a/ietf/templates/meeting/upcoming.ics b/ietf/templates/meeting/upcoming.ics deleted file mode 100644 index fb5b37d7725..00000000000 --- a/ietf/templates/meeting/upcoming.ics +++ /dev/null @@ -1,32 +0,0 @@ -{% load humanize tz %}{% autoescape off %}{% load ietf_filters textfilters %}BEGIN:VCALENDAR -VERSION:2.0 -METHOD:PUBLISH -PRODID:-//IETF//datatracker.ietf.org ical upcoming//EN -{{vtimezones}}{% for item in assignments %}BEGIN:VEVENT -UID:ietf-{{item.session.meeting.number}}-{{item.timeslot.pk}} -SUMMARY:{% if item.session.name %}{{item.session.group.acronym|lower}} - {{item.session.name|ics_esc}}{% else %}{{item.session.group.acronym|lower}} - {{item.session.group.name}}{%endif%} -{% if item.schedule.meeting.city %}LOCATION:{{item.schedule.meeting.city}},{{item.schedule.meeting.country}} -{% endif %}STATUS:{{item.session.ical_status}} -CLASS:PUBLIC -DTSTART{% ics_date_time item.timeslot.local_start_time item.schedule.meeting.time_zone %} -DTEND{% ics_date_time item.timeslot.local_end_time item.schedule.meeting.time_zone %} -DTSTAMP{% ics_date_time item.timeslot.modified|utc 'utc' %}{% if item.session.agenda %} -URL:{{item.session.agenda.get_href}}{% endif %} -DESCRIPTION:{% if item.timeslot.name %}{{item.timeslot.name|ics_esc}}\n{% endif %}{% if item.session.agenda_note %} - Note: {{item.session.agenda_note|ics_esc}}\n{% endif %}{% for material in item.session.materials.all %} - \n{{material.type}}{% if material.type.name != "Agenda" %} - ({{material.title|ics_esc}}){% endif %}: - {{material.get_href}}\n{% endfor %}{% if item.session.remote_instructions %} - Remote instructions: {{ item.session.remote_instructions }}\n{% endif %} -END:VEVENT -{% endfor %}{% for meeting in ietfs %}BEGIN:VEVENT -UID:ietf-{{ meeting.number }} -SUMMARY:IETF {{ meeting.number }}{% if meeting.city %} -LOCATION:{{ meeting.city }},{{ meeting.country }}{% endif %} -CLASS:PUBLIC -DTSTART;VALUE=DATE{% if meeting.time_zone %};TZID={{ meeting.time_zone|ics_esc }}{% endif %}:{{ meeting.date|date:"Ymd" }} -DTEND;VALUE=DATE{% if meeting.time_zone %};TZID={{ meeting.time_zone|ics_esc }}{% endif %}:{{ meeting.end_date|date:"Ymd" }} -DTSTAMP{% ics_date_time meeting.cached_updated|utc 'utc' %} -URL:{{ request.scheme }}://{{ request.get_host }}{% url 'agenda' num=meeting.number %} -END:VEVENT -{% endfor %}END:VCALENDAR{% endautoescape %} diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html index 67a6bf79b8e..57cba6b53c6 100644 --- a/ietf/templates/meeting/upload_session_agenda.html +++ b/ietf/templates/meeting/upload_session_agenda.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin static django_bootstrap5 tz %} {% block title %} {% if agenda_sp %} @@ -19,7 +19,7 @@

    {% endif %} Agenda for {{ session.meeting }}
    - {{ session.group.acronym }} + {{ session.group.acronym }} {% if session.name %}: {{ session.name }}{% endif %}

    @@ -29,6 +29,9 @@

    Session {{ session_number }} : {{ session.official_timeslotassignment.timesl
    {% csrf_token %} {% bootstrap_form form %} - +
    +{% endblock %} +{% block js %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/upload_session_bluesheets.html b/ietf/templates/meeting/upload_session_bluesheets.html index c7993465293..19af4847ad0 100644 --- a/ietf/templates/meeting/upload_session_bluesheets.html +++ b/ietf/templates/meeting/upload_session_bluesheets.html @@ -19,7 +19,7 @@

    {% endif %} Bluesheets for {{ session.meeting }}
    - {{ session.group.acronym }} + {{ session.group.acronym }} {% if session.name %}: {{ session.name }}{% endif %}

    diff --git a/ietf/templates/meeting/upload_session_minutes.html b/ietf/templates/meeting/upload_session_minutes.html index fa6f7c15e27..324440681f9 100644 --- a/ietf/templates/meeting/upload_session_minutes.html +++ b/ietf/templates/meeting/upload_session_minutes.html @@ -19,13 +19,18 @@

    {% endif %} Minutes for {{ session.meeting }}
    - {{ session.group.acronym }} + {{ session.group.acronym }} {% if session.name %}: {{ session.name }}{% endif %}

    {% if session_number %}

    Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}

    {% endif %} + {% if future %} +

    + Caution: Session has not ended yet +

    + {% endif %}
    {% csrf_token %} {% bootstrap_form form %} diff --git a/ietf/templates/meeting/upload_session_narrativeminutes.html b/ietf/templates/meeting/upload_session_narrativeminutes.html new file mode 100644 index 00000000000..d990985510e --- /dev/null +++ b/ietf/templates/meeting/upload_session_narrativeminutes.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2024, All Rights Reserved #} +{% load origin static django_bootstrap5 tz %} +{% block title %} + {% if narrativeminutes_sp %} + Revise + {% else %} + Upload + {% endif %} + Narrative Minutes for {{ session.meeting }} : {{ session.group.acronym }} +{% endblock %} +{% block content %} + {% origin %} +

    + {% if narrativeminutes_sp %} + Revise + {% else %} + Upload + {% endif %} + Narrative Minutes for {{ session.meeting }} +
    + {{ session.group.acronym }} + {% if session.name %}: {{ session.name }}{% endif %} + +

    + {% if session_number %} +

    Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}

    + {% endif %} + + {% csrf_token %} + {% bootstrap_form form %} + +
    +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/meeting/upload_session_slides.html b/ietf/templates/meeting/upload_session_slides.html index 61b2422e428..059ffae16f9 100644 --- a/ietf/templates/meeting/upload_session_slides.html +++ b/ietf/templates/meeting/upload_session_slides.html @@ -17,15 +17,21 @@

    {% else %} Upload new {% endif %} - slides for {{ session.meeting }} -
    - + slides for {{ session.meeting }}
    + {{ session.group.acronym }} {% if session.name %}: {{ session.name }}{% endif %}

    {% if session_number %} -

    Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}

    +

    + Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }} +

    + {% endif %} + {% if not manage %} +

    + This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval. +

    {% endif %} {% if slides_sp %}

    {{ slides_sp.document.name }}

    {% endif %}
    diff --git a/ietf/templates/message/message.html b/ietf/templates/message/message.html index fba7ba43928..01d72e96384 100644 --- a/ietf/templates/message/message.html +++ b/ietf/templates/message/message.html @@ -8,7 +8,7 @@

    {{ message.subject }}
    - {{ message.time|date:"F j, Y" }} + {{ message.time|date:"F j, Y" }}

    diff --git a/ietf/templates/minimal.html b/ietf/templates/minimal.html new file mode 100644 index 00000000000..15c432505ef --- /dev/null +++ b/ietf/templates/minimal.html @@ -0,0 +1,21 @@ +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} + +{% load static %} +{% load origin %} +{% origin %} + + + + + {{ title }} + + + + + {# load this in the head, to prevent flickering #} + + + + {{ content }} + + \ No newline at end of file diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html index aa67fbb68e0..771f2b4fb01 100644 --- a/ietf/templates/nomcom/announcements.html +++ b/ietf/templates/nomcom/announcements.html @@ -15,7 +15,7 @@

    NomCom

    {% for regime in regimes %}

    - Messages from {{ regime.group.start_year }}/{{ regime.group.end_year }} + Messages from {{ regime.group.start_year }} NomCom

    {# use person email address here rather than the generic nomcom-chair@ietf.org #}

    @@ -56,9 +56,14 @@

    References

  • - IAB, IESG, IETF Trust, and IETF LLC Selection, Confirmation, and Recall Process: Operation of the IETF Nominating and Recall Committees (RFC 8713) (Also BCP10) + IAB, IESG, IETF Trust, and IETF LLC Selection, Confirmation, and Recall Process: Operation of the IETF Nominating and Recall Committees (RFC 8713)
    • +
  • + + Nominating Committee Eligibility (RFC 9389) + +
  • Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797) diff --git a/ietf/templates/nomcom/download_questionnaire.txt b/ietf/templates/nomcom/download_questionnaire.txt new file mode 100644 index 00000000000..71514095c8e --- /dev/null +++ b/ietf/templates/nomcom/download_questionnaire.txt @@ -0,0 +1,9 @@ +{# Copyright The IETF Trust 2023, All Rights Reserved #}{% autoescape off %}{% load nomcom_tags %}Questionnaire response from {{ nominee.person.name }} + +From: {{ feedback.author|formatted_email|default:"Anonymous" }} +Date: {{ feedback.time|date:"Y-m-d" }} +Positions: {{ positions }}{% if feedback.subject %} +Subject: {{ feedback.subject }}{% endif %} + +{% decrypt feedback.comments request year 1 %} +{% endautoescape %} \ No newline at end of file diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html index aa9f6a80464..7f20e204bb0 100644 --- a/ietf/templates/nomcom/edit_nominee.html +++ b/ietf/templates/nomcom/edit_nominee.html @@ -9,7 +9,7 @@

    Edit email
    - {{ nominee }} + {{ nominee }}

    {% csrf_token %} diff --git a/ietf/templates/nomcom/edit_position.html b/ietf/templates/nomcom/edit_position.html index 3dfa62fe1c8..fd01a2c4fa9 100644 --- a/ietf/templates/nomcom/edit_position.html +++ b/ietf/templates/nomcom/edit_position.html @@ -31,5 +31,14 @@

    {% if position %}Save{% else %}Add{% endif %} Back + {% if position.name %} +

    + Templates +

    + {% for template in position.get_templates %} + {{ template }} +
    + {% endfor %} + {% endif %} {% endblock %} -{% block content_end %}{{ form.media.js }}{% endblock %} \ No newline at end of file +{% block content_end %}{{ form.media.js }}{% endblock %} diff --git a/ietf/templates/nomcom/edit_template.html b/ietf/templates/nomcom/edit_template.html index 5c6ba618df1..b901104cf0a 100644 --- a/ietf/templates/nomcom/edit_template.html +++ b/ietf/templates/nomcom/edit_template.html @@ -8,7 +8,7 @@

    Template
    - {{ template }} + {{ template }}

    diff --git a/ietf/templates/nomcom/eligible.html b/ietf/templates/nomcom/eligible.html index fcf06e6e514..f5cfc2e2dcd 100644 --- a/ietf/templates/nomcom/eligible.html +++ b/ietf/templates/nomcom/eligible.html @@ -4,9 +4,6 @@ {% load django_bootstrap5 textfilters person_filters %} {% load static %} {% block subtitle %}- Eligible People{% endblock %} -{% block pagehead %} - -{% endblock %} {% block nomcom_content %} {% origin %}

    Eligible People for {{ nomcom.group }}

    @@ -41,7 +38,4 @@

    Eligible People for {{ nomcom.group }}

    {% endif %} } -{% endblock %} -{% block js %} - {% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/extract_email_lists.html b/ietf/templates/nomcom/extract_email_lists.html index b2a5fec493d..b80119cf01a 100644 --- a/ietf/templates/nomcom/extract_email_lists.html +++ b/ietf/templates/nomcom/extract_email_lists.html @@ -8,7 +8,7 @@

    Email lists
    - {{ nomcom.group }} + {{ nomcom.group }}

    {% with title='Nominees Pending Acceptance' list=pending heading="h3" %} {% include 'nomcom/email_list_panel.html' %} diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html index 6a7239118f4..8c9e8c824f9 100644 --- a/ietf/templates/nomcom/feedback.html +++ b/ietf/templates/nomcom/feedback.html @@ -9,13 +9,20 @@

    {% if nomcom.group.state_id == 'conclude' %} Feedback to this NomCom is closed. + {% elif positions|length != 0 and topics|length != 0 %} + Select a nominee or topic from the list on the right to obtain a new feedback form. + {% elif positions|length != 0 %} + Select a nominee from the list on the right to obtain a new feedback form. + {% elif topics|length != 0 %} + Select a topic from the list on the right to obtain a new feedback form. {% else %} - Select a nominee from the list of nominees on the right to obtain a new feedback form. + This NomCom is not accepting feedback at this time. {% endif %}

    {% if nomcom|has_publickey %}
    {% if form %} @@ -68,17 +78,17 @@

    Topics

    Provide feedback
    - {{ form.nominee.email.person.name }} for {{ form.position.name }} + {{ form.nominee.email.person.name }} for {{ form.position.name }}

    - Provide feedback about {% person_link form.nominee.person %} + Provide feedback about {% person_link form.nominee.person with_email=False %} for the {{ form.position.name }} position.

    {% elif form.topic %}

    Provide feedback
    - {{ form.topic.subject }} + {{ form.topic.subject }}

    Description: {{ form.topic.subject }}
    @@ -87,8 +97,8 @@

    {% endif %}

    This feedback will only be available to - NomCom {{ year }}. - You may have the feedback mailed back to you by selecting the option below. + the current NomCom. + You can have the feedback mailed back to you by selecting the option below.

    {% csrf_token %} diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html index 74e7efff7b8..8262876b11b 100644 --- a/ietf/templates/nomcom/history.html +++ b/ietf/templates/nomcom/history.html @@ -11,7 +11,7 @@

    NomCom Membership History

    Note: The data for concluded NomComs is occasionally incorrect.

    {% for regime in regimes %} -

    {{ regime.label }}

    +

    {{ regime.year }} NomCom

    {% for slug, label, roles in regime.nomcom.personnel %}
    @@ -25,7 +25,7 @@

    {{ regime.label }}

    {% endfor %}
    {% endfor %} -

    2012/2013

    +

    2012 NomCom

    Chair @@ -58,13 +58,13 @@

    2012/2013

    Liaison Members
    - Marc Blanchet (IAB Liaison), - Scott Bradner (IAOC Liaison), - Sean Turner (IESG Liaison), - Rudi Vansnick (ISOC Liaison) + Marc Blanchet (IAB Liaison), + Scott Bradner (IAOC Liaison), + Sean Turner (IESG Liaison), + Rudi Vansnick (ISOC Liaison)
    -

    2011/2012

    +

    2011 NomCom

    Chair @@ -77,7 +77,7 @@

    2011/2012

    Tom Walsh, - Henrik Levkowetz (Tools Advisor) + Henrik Levkowetz (Tools Advisor)
    Members @@ -98,13 +98,13 @@

    2011/2012

    Liaison Members
    - Dave Thaler (IAB Liaison), - Dave Crocker (IAOC Liaison), - Ralph Droms (IESG Liaison), - Jason Livingood (ISOC Liaison) + Dave Thaler (IAB Liaison), + Dave Crocker (IAOC Liaison), + Ralph Droms (IESG Liaison), + Jason Livingood (ISOC Liaison)
    -

    2010/2011

    +

    2010 NomCom

    Chair @@ -117,7 +117,7 @@

    2010/2011

    Mary Barnes, - Henrik Levkowetz (Tools Advisor) + Henrik Levkowetz (Tools Advisor)
    Members @@ -137,13 +137,13 @@

    2010/2011

    Liaison Members
    - Spencer Dawkins (IAB Liaison), - Ole Jacobsen (IAOC Liaison), - Dan Romascanu (IESG Liaison), - Eric Burger (ISOC Liaison) + Spencer Dawkins (IAB Liaison), + Ole Jacobsen (IAOC Liaison), + Dan Romascanu (IESG Liaison), + Eric Burger (ISOC Liaison)
    -

    2009/2010

    +

    2009 NomCom

    Chair @@ -156,7 +156,7 @@

    2009/2010

    Joel Halpern, - Henrik Levkowetz (Tools Advisor) + Henrik Levkowetz (Tools Advisor)
    Members @@ -177,14 +177,14 @@

    2009/2010

    Liaison Members
    - Jon Peterson (IAB Liaison), - Tim Polk (IESG Liaison), - Henk Uijterwall (IAOC liaison), - TBA (ISOC Liaison) + Jon Peterson (IAB Liaison), + Tim Polk (IESG Liaison), + Henk Uijterwall (IAOC liaison), + TBA (ISOC Liaison)

    - 2008/2009 + 2008 NomCom

    @@ -218,13 +218,13 @@

    Liaison Members

    - Dave Oran (IAB Liaison), - Ross Callon (IESG Liaison), - Bert Wijnen (ISOC Liaison) + Dave Oran (IAB Liaison), + Ross Callon (IESG Liaison), + Bert Wijnen (ISOC Liaison)

    - 2007/2008 + 2007 NomCom

    @@ -258,13 +258,13 @@

    Liaison Members

    - Danny McPherson (IAB Liaison), - Lars Eggert (IESG Liaison), - Fred Baker (ISOC Liaison) + Danny McPherson (IAB Liaison), + Lars Eggert (IESG Liaison), + Fred Baker (ISOC Liaison)

    - 2006/2007 + 2006 NomCom

    @@ -277,7 +277,7 @@

    Advisor

    - Ralph Droms (Previous Chair) + Ralph Droms (Previous Chair)
    Members @@ -298,13 +298,13 @@

    Liaison Members

    - Olaf Kolkman (IAB Liaison), - Cullen Jennings (IESG Liaison), - Fred Baker (ISOC Liaison) + Olaf Kolkman (IAB Liaison), + Cullen Jennings (IESG Liaison), + Fred Baker (ISOC Liaison)

    - 2005/2006 + 2005 NomCom

    @@ -317,7 +317,7 @@

    Advisor

    - Danny McPherson (Previous Chair) + Danny McPherson (Previous Chair)
    Members @@ -338,13 +338,13 @@

    Liaison Members

    - David Meyer (IAB Liaison), - Russ Housley (IESG Liaison), - Steve Crocker (ISOC Liaison) + David Meyer (IAB Liaison), + Russ Housley (IESG Liaison), + Steve Crocker (ISOC Liaison)

    - 2004/2005 + 2004 NomCom

    @@ -357,7 +357,7 @@

    Advisor

    - Richard Draves (Previous Chair) + Richard Draves (Previous Chair)
    Members @@ -378,14 +378,14 @@

    Liaison Members

    - Eric Rescorla (IAB Liaison), - Alex Zinin (IESG Liaison), - Steve Crocker (ISOC Liaison), - Richard Draves (Previous Chair/Advisor) + Eric Rescorla (IAB Liaison), + Alex Zinin (IESG Liaison), + Steve Crocker (ISOC Liaison), + Richard Draves (Previous Chair/Advisor)

    - 2003/2004 + 2003 NomCom

    @@ -398,7 +398,7 @@

    Advisor

    - Phil Roberts (Previous Chair) + Phil Roberts (Previous Chair)
    Members @@ -419,12 +419,12 @@

    Liaison Members

    - Geoff Huston (IAB Liaison), - Bill Fenner (IESG liaison) + Geoff Huston (IAB Liaison), + Bill Fenner (IESG liaison)

    - 2002/2003 + 2002 NomCom

    @@ -437,7 +437,7 @@

    Advisor

    - Theodore Ts'o (Previous Chair) + Theodore Ts'o (Previous Chair)
    Members @@ -458,12 +458,12 @@

    Liaison Members

    - Eric Rescorla (IAB liaison), - Allison Mankin (IETF liaison) + Eric Rescorla (IAB liaison), + Allison Mankin (IETF liaison)

    - 2001/2002 + 2001 NomCom

    @@ -476,7 +476,7 @@

    Advisor

    - Bernard Aboba (Previous Chair) + Bernard Aboba (Previous Chair)
    Members @@ -497,12 +497,12 @@

    Liaison Members

    - Fred Baker (IAB liaison), - Thomas Narten (IESG Liaison) + Fred Baker (IAB liaison), + Thomas Narten (IESG Liaison)

    - 2000/2001 + 2000 NomCom

    @@ -515,7 +515,7 @@

    Advisor

    - Avri Doria (Previous Chair) + Avri Doria (Previous Chair)
    Members @@ -536,12 +536,12 @@

    Liaison Members

    - Leslie Daigle (IAB Liaison), - Allison Mankin (IESG Liaison) + Leslie Daigle (IAB Liaison), + Allison Mankin (IESG Liaison)

    - 1999/2000 + 1999 NomCom

    @@ -554,7 +554,7 @@

    Advisor

    - Donald E. Eastlake (Previous Chair) + Donald E. Eastlake (Previous Chair)
    Members @@ -575,12 +575,12 @@

    Liaison Members

    - Geoff Huston (IAB Liaison), - Thomas Narten (IESG Liaison) + Geoff Huston (IAB Liaison), + Thomas Narten (IESG Liaison)

    - 1998/1999 + 1998 NomCom

    @@ -593,7 +593,7 @@

    Advisor

    - Michael St Johns (Previous Chair) + Michael St Johns (Previous Chair)
    Members @@ -614,13 +614,13 @@

    Liaison Members

    - Steven Bellovin (IAB Liaison), - Bert Wijnen (IESG Liaison), - Michael St Johns (Previous Chair) + Steven Bellovin (IAB Liaison), + Bert Wijnen (IESG Liaison), + Michael St Johns (Previous Chair)

    - 1997/1998 + 1997 NomCom

    @@ -633,7 +633,7 @@

    Advisor

    - Geoff Huston (Previous Chair) + Geoff Huston (Previous Chair)
    Members @@ -654,12 +654,12 @@

    Liaison Members

    - Tony Hain (IAB Liaison), - Scott Bradner (IESG Liaison), + Tony Hain (IAB Liaison), + Scott Bradner (IESG Liaison),

    - 1996/1997 + 1996 NomCom

    @@ -672,7 +672,7 @@

    Advisor

    - Guy Almes (Previous Chair) + Guy Almes (Previous Chair)
    Members @@ -693,14 +693,14 @@

    Liaison Members

    - Radia Perlman (IAB Liaison), - Joyce Reynolds (IESG Liaison), - Christian Huitema (ISOC Liaison), - Guy Almes (Previous Chair), + Radia Perlman (IAB Liaison), + Joyce Reynolds (IESG Liaison), + Christian Huitema (ISOC Liaison), + Guy Almes (Previous Chair),

    - 1995/1996 + 1995 NomCom

    @@ -713,7 +713,7 @@

    Advisor

    - John Curran (Previous Chair) + John Curran (Previous Chair)
    Members @@ -734,12 +734,12 @@

    Liaison Members

    - Bob Moskowitz (IAB Liaison), - Harald Alvestrand (IESG Liaison), + Bob Moskowitz (IAB Liaison), + Harald Alvestrand (IESG Liaison),

    - 1994/1995 + 1994 NomCom

    @@ -752,7 +752,7 @@

    Advisor

    - Fred Baker (Previous Chair) + Fred Baker (Previous Chair)
    Members @@ -771,7 +771,7 @@

    - 1993/1994 + 1993 NomCom

    @@ -796,13 +796,13 @@

    Liaison Members

    - Bob Braden (IAB Liaison), - Stev Knowles (IESG Liaison), - Jon Postel (IRSG Liaison), + Bob Braden (IAB Liaison), + Stev Knowles (IESG Liaison), + Jon Postel (IRSG Liaison),

    - 1992/1993 + 1992 NomCom

    @@ -821,10 +821,10 @@

    Liaison Members

    - Barry Leiner (IAB Liaison), - Erik Huizer (IESG Liaison), - Jon Postel (IRSG Liaison), - Geoff Huston (ISOC Liaison), + Barry Leiner (IAB Liaison), + Erik Huizer (IESG Liaison), + Jon Postel (IRSG Liaison), + Geoff Huston (ISOC Liaison),
    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html index 91f63f74ebc..e765dd7c2ea 100644 --- a/ietf/templates/nomcom/index.html +++ b/ietf/templates/nomcom/index.html @@ -12,7 +12,7 @@

    NomComs

    - + diff --git a/ietf/templates/nomcom/list_positions.html b/ietf/templates/nomcom/list_positions.html index e2affefb813..59e549fc3d3 100644 --- a/ietf/templates/nomcom/list_positions.html +++ b/ietf/templates/nomcom/list_positions.html @@ -1,6 +1,6 @@ {% extends "nomcom/nomcom_private_base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} +{% load origin static %} {% block subtitle %}- Positions{% endblock %} {% block nomcom_content %} {% origin %} @@ -13,51 +13,122 @@

    Positions in {{ nomcom.group }}

    Configuration Hints.

    {% endif %} + + {% if nomcom.group.state_id == 'active' %} + + {% csrf_token %} + {% endif %} {% if positions %} - {% regroup positions by is_open as posgroups %} - {% for group in posgroups %} -

    {{ group.grouper| yesno:"Open Positions,Closed Positions" }}

    - {% for position in group.list %} -

    - {{ position.name }} - {% if position.is_iesg_position %}(IESG){% endif %} -

    - {% if group.grouper %} -
    -
    - Accepting -
    -
    - {% if position.accepting_nominations %}Nominations{% endif %} - {% if position.accepting_nominations and position.accepting_feedback %}and{% endif %} - {% if position.accepting_feedback %}Feedback{% endif %} -
    -
    - {% endif %} -
    -
    - Templates -
    -
    - {% for template in position.get_templates %} - {{ template }} -
    - {% endfor %} -
    +
    YearYear Convened Chair
    + + {% if nomcom.group.state_id == 'active' %} -
    - Actions -
    -
    - Edit - Remove -
    + + {% endif %} - - {% endfor %} - {% endfor %} + + + + + + + + + + {% for position in positions %} + + {% if nomcom.group.state_id == 'active' %} + + + {% endif %} + + + + + + + {% endfor %} + +
    + ✓ + + Position + + IESG + + Open + + Accepting Nominations + + Accepting Feedback +
    + + + + Edit + + + Remove + + + {{ position.name }} + + {{ position.is_iesg_position|yesno:"✓," }} + + {{ position.is_open|yesno:"✓," }} + + {{ position.accepting_nominations|yesno:"✓," }} + + {{ position.accepting_feedback|yesno:"✓," }} +
    + {% if nomcom.group.state_id == 'active' %} +
    + + +
    + +
    + {% endif %} {% else %}

    There are no positions defined. diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html index 2a0495fbe6c..6b12f513697 100644 --- a/ietf/templates/nomcom/nomcom_private_base.html +++ b/ietf/templates/nomcom/nomcom_private_base.html @@ -1,147 +1,162 @@ {% extends "base.html" %} {# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} +{% load origin static %} {% load nomcom_tags %} {% load ietf_filters %} +{% block pagehead %} + +{% endblock %} {% block title %} NomCom {{ year }} Private {% block subtitle %}{% endblock %} {% endblock %} {% block content %} {% origin %} + {% with selected=request.path|split:'/'|slice:'4:-1'|join:'-' %}

    NomCom {{ year }} - {% if nomcom.group.state_id == 'conclude' %}Concluded{% endif %} + {% if nomcom.group.state_id == 'conclude' %}Concluded{% endif %}
    - Private area + Private area {% if is_chair_task %}- Chair/Advisors only{% endif %}

    {% block nomcom_content %}{% endblock %} + {% endwith %} {% endblock %} {% block js %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html index 084c1ee8d61..5320eb2acfc 100644 --- a/ietf/templates/nomcom/public_nominate.html +++ b/ietf/templates/nomcom/public_nominate.html @@ -24,7 +24,7 @@

    Nominate Candidate

    Nominees
    - who accepted nominations + who accepted nominations

    {% for p in positions %} {% if p.nomineeposition_set.accepted.not_duplicated %} diff --git a/ietf/templates/nomcom/reclassify_feedback_item.html b/ietf/templates/nomcom/reclassify_feedback_item.html new file mode 100644 index 00000000000..fb967493cfe --- /dev/null +++ b/ietf/templates/nomcom/reclassify_feedback_item.html @@ -0,0 +1,103 @@ +{# Copyright The IETF Trust 2023, All Rights Reserved #} +{% load nomcom_tags textfilters %} +

    Reclassify feedback item

    +
    + {% csrf_token %} + + + + + + + + + + + + + {% for ft in feedback_types %} + + + + + {% endfor %} + +
    CodeExplanation
    UUnclassified
    {{ ft.legend }}{{ ft.name }}
    + + + + + + {% for ft in feedback_types %} + + {% endfor %} + + + + + + + + + + + {% for ft in feedback_types %} + + {% endfor %} + + + + + +
    DateU{{ ft.legend }}AuthorSubject
    {{ reclassify_feedback.time|date:"r" }} + + + + {{ reclassify_feedback.author }}{{ reclassify_feedback.subject }} + + +
    + + +
    diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html index 9215d3c82c7..93d61b7f420 100644 --- a/ietf/templates/nomcom/view_feedback.html +++ b/ietf/templates/nomcom/view_feedback.html @@ -1,11 +1,8 @@ {% extends "nomcom/nomcom_private_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin static %} {% load nomcom_tags %} {% block subtitle %}- View feedback{% endblock %} -{% block pagehead %} - -{% endblock %} {% block nomcom_content %} {% origin %}

    Feedback related to nominees

    @@ -47,13 +44,25 @@

    Declined each nominated position

    {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %} - {% if fbtype_newflag %}New{% endif %} + {% if fbtype_newflag %}New{% endif %} {{ fbtype_count }} {% endfor %} {% endfor %} + + + Totals + + + {% for fbtype_count in staterank.list|feedback_totals %} + + {{ fbtype_count }} + + {% endfor %} + + {% endfor %}

    Feedback related to topics

    @@ -74,7 +83,7 @@

    Feedback related to topics

    {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %} - {% if fbtype_newflag %}New{% endif %} + {% if fbtype_newflag %}New{% endif %} {{ fbtype_count }} {% endfor %} @@ -101,7 +110,4 @@

    Feedback not related to Nominees

    {% endif %} -{% endblock %} -{% block js %} - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html index b26595f0c95..9194ee84bf1 100644 --- a/ietf/templates/nomcom/view_feedback_nominee.html +++ b/ietf/templates/nomcom/view_feedback_nominee.html @@ -1,10 +1,13 @@ {% extends "nomcom/nomcom_private_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% load nomcom_tags textfilters %} {% block subtitle %}- View feedback about {{ nominee.email.person.name }}{% endblock %} {% block nomcom_content %} - {% origin %} +{% origin %} +{% if reclassify_feedback %} + {% include "nomcom/reclassify_feedback_item.html" %} +{% else %}

    Feedback about {{ nominee }}

      {% for ft in feedback_types %} @@ -26,13 +29,13 @@

      Feedback about {{ nominee }}

      {% if feedback.type.slug == ft.slug %}
      - {% if feedback.time > last_seen_time %}New{% endif %} + {% if feedback.time > last_seen_time %}New{% endif %} From
      {{ feedback.author|formatted_email|default:"Anonymous"|linkify }} {% if ft.slug == "nomina" and feedback.nomination_set.first.share_nominator %} - OK to share name with nominee + OK to share name with nominee {% endif %}
      @@ -78,9 +81,27 @@

      Feedback about {{ nominee }}

      Feedback
      - 
      -                                {% decrypt feedback.comments request year 1 %}
-
      +
      + 
      {% decrypt feedback.comments request year 1 %}
      +
      + {% if user|is_chair_or_advisor:year %} +
      +
      + {% csrf_token %} + + {% if ft.slug == "questio" %} +

      + {% endif %} + +
      +
      +
      +
      + {% endif %}
      {% if not forloop.last %}
      {% endif %} {% endif %} @@ -90,6 +111,7 @@

      Feedback about {{ nominee }}

    Back +{% endif %} {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html index 890bf0d7598..5681ca5d70f 100644 --- a/ietf/templates/nomcom/view_feedback_pending.html +++ b/ietf/templates/nomcom/view_feedback_pending.html @@ -1,5 +1,5 @@ {% extends "nomcom/nomcom_private_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} {% load static %} @@ -42,7 +42,7 @@

    Feedback pending from email list

    Type
    - {{ form.feedback_type }} + {{ form.feedback_type }}
    Feedback @@ -73,13 +73,9 @@

    Feedback pending from email list

    - - U - Unclassified - - {% for legend, t in type_dict.items %} + {% for t in types %} - {{ legend }} + {{ t.legend }} {{ t.name }} {% endfor %} @@ -89,8 +85,7 @@

    Feedback pending from email list

    Date - U - {% for legend, t in type_dict.items %}{{ legend }}{% endfor %} + {% for t in types %}{{ t.legend }}{% endfor %} Author Subject @@ -118,7 +113,7 @@

    Feedback pending from email list

    title="{{ choice.1 }}"> {% endfor %} - {% person_link form.instance.author %} + {{ form.instance.author }} {{ form.instance.subject }}

      • {% for ft in feedback_types %} @@ -26,7 +29,7 @@

      Feedback about {{ topic.subject }}

      {% if feedback.type.slug == ft.slug %}
      - {% if feedback.time > last_seen_time %}New{% endif %} + {% if feedback.time > last_seen_time %}New{% endif %} From
      @@ -41,9 +44,22 @@

      Feedback about {{ topic.subject }}

      Feedback
      - 
      -                                {% decrypt feedback.comments request year 1 %}
-
      +
      + 
      {% decrypt feedback.comments request year 1 %}
      +
      + {% if user|is_chair_or_advisor:year %} +
      +
      + {% csrf_token %} + + +
      +
      +
      +
      + {% endif %}
      {% if not forloop.last %}
      {% endif %} {% endif %} @@ -53,6 +69,7 @@

      Feedback about {{ topic.subject }}

    Back +{% endif %} {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html index 013affe6d87..0e749e748f9 100644 --- a/ietf/templates/nomcom/view_feedback_unrelated.html +++ b/ietf/templates/nomcom/view_feedback_unrelated.html @@ -1,10 +1,13 @@ {% extends "nomcom/nomcom_private_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% load nomcom_tags textfilters %} {% block subtitle %}- View unrelated feedback{% endblock %} {% block nomcom_content %} - {% origin %} +{% origin %} +{% if reclassify_feedback %} + {% include "nomcom/reclassify_feedback_item.html" %} +{% else %}

    Feedback not related to nominees

      {% for ft in feedback_types %} @@ -42,9 +45,22 @@

      Feedback not related to nominees

      Feedback
      - 
      -                            {% decrypt feedback.comments request year 1 %}
-
      +
      + 
      {% decrypt feedback.comments request year 1 %}
      +
      + {% if user|is_chair_or_advisor:year %} +
      +
      + {% csrf_token %} + + +
      +
      +
      +
      + {% endif %} {% endfor %}
    @@ -54,6 +70,7 @@

    Feedback not related to nominees

    Back

    +{% endif %} {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html index 764a055b1bc..008951c44e2 100644 --- a/ietf/templates/nomcom/volunteers.html +++ b/ietf/templates/nomcom/volunteers.html @@ -1,12 +1,9 @@ {% extends public|yesno:"nomcom/nomcom_public_base.html,nomcom/nomcom_private_base.html" %} {# Copyright The IETF Trust 2021, All Rights Reserved #} {% load origin %} -{% load django_bootstrap5 textfilters person_filters %} +{% load django_bootstrap5 textfilters person_filters ietf_filters%} {% load static %} {% block subtitle %}- Volunteers{% endblock %} -{% block pagehead %} - -{% endblock %} {% block nomcom_content %} {% origin %}

    Volunteers for {{ nomcom.group }}

    @@ -34,7 +31,7 @@

    {{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}< {% for v in eligibility_group.list %} {{ forloop.counter }} - {{ v.person.last_name }} + {{ v.person.last_name|split:'+'|join:'+' }} {{ v.person.first_name }} {{ v.person.ascii_name }} {% person_link v.person %} @@ -46,7 +43,4 @@

    {{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}< {% endfor %} -{% endblock %} -{% block js %} - {% endblock %} \ No newline at end of file diff --git a/ietf/templates/nomcom/year_index.html b/ietf/templates/nomcom/year_index.html index 43a03d94597..74a8cda9a0d 100644 --- a/ietf/templates/nomcom/year_index.html +++ b/ietf/templates/nomcom/year_index.html @@ -1,7 +1,13 @@ {% extends "nomcom/nomcom_public_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2024, All Rights Reserved #} {% load origin %} {% block subtitle %}- Home{% endblock %} +{% block nomcom_announce %} +

    + Announcements from this nomcom are available + here +

    +{% endblock %} {% block nomcom_content %} {% origin %} diff --git a/ietf/templates/oidc_provider/error.html b/ietf/templates/oidc_provider/error.html index db41e639508..0499c750ea9 100644 --- a/ietf/templates/oidc_provider/error.html +++ b/ietf/templates/oidc_provider/error.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Permission Error{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

    {{ error }}

    diff --git a/ietf/templates/person/person_info.html b/ietf/templates/person/person_info.html index a9e11462b20..5d3994db7e1 100644 --- a/ietf/templates/person/person_info.html +++ b/ietf/templates/person/person_info.html @@ -11,7 +11,7 @@
    {% if person.user %} - {{ person.user }} Last login + {{ person.user }} Last login {% if person.user.last_login %} {{ person.user.last_login|date:"Y-m-d" }} {% else %} diff --git a/ietf/templates/person/person_link.html b/ietf/templates/person/person_link.html index 32506501b57..f3f7e1a5b7a 100644 --- a/ietf/templates/person/person_link.html +++ b/ietf/templates/person/person_link.html @@ -1,8 +1,8 @@ -{% if email and email == "system@datatracker.ietf.org" or name and name == "(System)" %}(System){% else %}(System){% else %}{% if email or name %}{{ name }}{% if email and with_email %} - {% endif %}{% else %}(None){% endif %}{% endif %} \ No newline at end of file + aria-label="Compose email to {{ email }}" + title="Compose email to {{ email }}"> + {% endif %}{% else %}(None){% endif %}{% endif %} \ No newline at end of file diff --git a/ietf/templates/person/photo.html b/ietf/templates/person/photo.html index 4cea8ccb1fc..62c1ed991c3 100644 --- a/ietf/templates/person/photo.html +++ b/ietf/templates/person/photo.html @@ -2,7 +2,7 @@ {% load origin static person_filters %}
    {% if name or email %} - {% endif %} {% if person.photo_thumb %} diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html index f443debd9e1..a78a90412f7 100644 --- a/ietf/templates/person/profile.html +++ b/ietf/templates/person/profile.html @@ -7,6 +7,7 @@ {% load group_filters %} {% block pagehead %} + {% endblock %} {% block title %}Profile for {{ persons.0 }}{% endblock %} {% block content %} @@ -22,11 +23,11 @@

    {{ person.name }} {% if person.ascii != person.name %}
    - ({{ person.ascii }}) + ({{ person.ascii }}) {% endif %} {% if person.pronouns %}
    - Pronouns: {{person.pronouns}} + Pronouns: {{person.pronouns}} {% endif %}

    @@ -49,7 +50,11 @@

    Roles

    {% for role in person.role_set.all|active_roles %} - {{ role.name.name }} + {{ role.name.name }} + {% if role.name.name == 'Reviewer' %} + (    See reviews) + {% endif %} + {{ role.group.name }} ({{ role.group.acronym }}) @@ -87,7 +92,7 @@

    External Resources

    {% endif %}

    - RFCs ({{ person.rfcs|length }}) + RFCs ({{ person.rfcs|length }})

    {% if person.rfcs %} @@ -105,13 +110,13 @@

    - +
    RFC {{ doc.rfc_number }} {{ doc.pub_date|date:"b Y"|title }}{{ doc.pub_date|date:"b Y"|title }} {{ doc.title|urlize_ietf_docs }} - {% with doc.referenced_by_rfcs.count as refbycount %} + {% with doc.referenced_by_rfcs_as_rfc_or_draft.count as refbycount %} {% if refbycount %} {{ refbycount }} RFC{{ refbycount|pluralize }} @@ -126,13 +131,13 @@

    {{ person.first_name }} has no RFCs as of {{ today|date:"Y-m-d" }}. {% endif %}

    - Active Internet-Drafts ({{ person.active_drafts|length }}) + Active Internet-Drafts ({{ person.active_drafts|length }})

    {% if person.active_drafts.exists %} @@ -140,7 +145,7 @@

    {{ person.first_name }} has no active Internet-Drafts as of {{ today|date:"Y-m-d" }}. {% endif %}

    - Expired Internet-Drafts ({{ person.expired_drafts|length }}) + Expired Internet-Drafts ({{ person.expired_drafts|length }})

    {% if person.expired_drafts.exists %}
      @@ -148,7 +153,7 @@

      {% if not doc.replaced_by %}
    • - {{ doc.canonical_name }} + {{ doc.name }}
      • {% endif %} diff --git a/ietf/templates/registration/.gitignore b/ietf/templates/registration/.gitignore deleted file mode 100644 index a74b07aee47..00000000000 --- a/ietf/templates/registration/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.pyc diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html index 1df189031d1..58bc2d25875 100644 --- a/ietf/templates/registration/change_password.html +++ b/ietf/templates/registration/change_password.html @@ -6,8 +6,7 @@ {% block title %}Change password{% endblock %} {% block js %} {{ block.super }} - - + {{ form.media.js }} {% endblock %} {% block content %} {% origin %} @@ -35,11 +34,14 @@

      Change password

      - Online attack: This password form uses the + Password strength requirements: + You must choose a password at least 12 characters long that scores at least a 3 according to the zxcvbn - password strength estimator to give an indication of password strength. - The crack time estimate given above assume online attack without rate - limiting, at a rate of 10 attempts per second. + password strength estimator. A warning will appear if your password does not meet this standard. +
      + Online attack: + The crack time estimate given above assumes an online attack at a rate of 10 attempts per second. + It is only a very rough guideline.
      Offline cracking: The datatracker currently uses the {{ hasher.algorithm }} diff --git a/ietf/templates/registration/confirm_account.html b/ietf/templates/registration/confirm_account.html index b419b5f34c3..d6639d8e770 100644 --- a/ietf/templates/registration/confirm_account.html +++ b/ietf/templates/registration/confirm_account.html @@ -6,8 +6,7 @@ {% block title %}Complete account creation{% endblock %} {% block js %} {{ block.super }} - - + {{ form.media.js }} {% endblock %} {% block content %} {% origin %} diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html index e16f32daa4c..1e4ab169e1b 100644 --- a/ietf/templates/registration/edit_profile.html +++ b/ietf/templates/registration/edit_profile.html @@ -32,12 +32,19 @@

      Your account

      Change password
      - {% if person.photo %} + {% if person.photo or person.role_set.exists %}
      -
      {% include "person/photo.html" with person=person %}
      +
      + {% if person.photo %} + {% include "person/photo.html" with person=person %} + {% endif %} + {% if person.role_set.exists %} +

      Email support@ietf.org + to update your photo.

      + {% endif %}
      {% endif %}
      @@ -76,7 +83,7 @@

      Your account

      RFC 8713 for eligibility requirements. For the 2021 and 2022 NomComs, see also - RFC 8989. + RFC 9389.

      {% endif %}
      @@ -229,7 +236,7 @@

      Your account

      $('') .appendTo(container) .trigger("focus"); - $('
      Remember to submit the form for the new email challenge to be sent.
      ') + $('
      Remember to submit the form for the new email challenge to be sent.
      ') .appendTo(container); }) }); diff --git a/ietf/templates/registration/login.html b/ietf/templates/registration/login.html index a3ec86a3555..01949e0f309 100644 --- a/ietf/templates/registration/login.html +++ b/ietf/templates/registration/login.html @@ -1,12 +1,13 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% extends "base.html" %} +{% load static %} {% load origin %} {% load django_bootstrap5 %} {% block title %}Sign in{% endblock %} {% block content %} {% origin %}

      Sign in

      -
      + {% csrf_token %} {% bootstrap_form form %}
      @@ -16,4 +17,7 @@

      Sign in

      Don't have an account? Create an account.
      +{% endblock %} +{% block js %} + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/release/about.html b/ietf/templates/release/about.html index 9d30bdb5093..85a74bb6d95 100644 --- a/ietf/templates/release/about.html +++ b/ietf/templates/release/about.html @@ -23,6 +23,8 @@

      About the IETF Datatracker

      moments. For the nitty-gritty week-to-week code changes, please check the release notes or the commit log.

      +

      Version 12.0.0: RFCs and Subseries as Document types

      +

      Version 11.0.0: Django 4

      Version 10.0.0: Migration to PostgreSQL as the backend database engine

      Version 9.0.0: Timezone Aware Data

      All timestamps in the database are now stored as UTC. Values reported through the API for several diff --git a/ietf/templates/review/completed_review.txt b/ietf/templates/review/completed_review.txt index bdbe321ca1f..7d10d8bf130 100644 --- a/ietf/templates/review/completed_review.txt +++ b/ietf/templates/review/completed_review.txt @@ -1,7 +1,9 @@ {% load ietf_filters %}{% autoescape off %}{% filter maybewordwrap:80 %}{% if assignment.state_id == "part-completed" %} Review is partially done. Another assignment may be needed to complete it. -{% endif %}Reviewer: {{ assignment.reviewer.person }} +{% endif %}Document: {{ assignment.review_request.doc.name }} +Title: {{ assignment.review_request.doc.title }} +Reviewer: {{ assignment.reviewer.person }} Review result: {{ assignment.result.name }} {{ content }} diff --git a/ietf/templates/review/unavailable_table.html b/ietf/templates/review/unavailable_table.html index ea34bf2cbeb..573f1c3ff4d 100644 --- a/ietf/templates/review/unavailable_table.html +++ b/ietf/templates/review/unavailable_table.html @@ -1,25 +1,54 @@ - +{% load origin %} +{% origin %} +
      + + + + + + + {% if person %} + {% if person.settings.min_interval %} + + + + + {% endif %} + {% if person.settings.skip_next %} + + + + + {% endif %} + {% if person.settings.filter_re %} + + + + + {% endif %} + {% endif %} {% for p in unavailable_periods %} - - + + - - + - - + + + {% if p.reason %} - - + + + {% endif %} {% endfor %}
      Can review:{{ person.settings.get_min_interval_display }}
      Skip next:{{ person.settings.skip_next|yesno }}
      Filter:{{ person.settings.filter_re }}
      Period:{{ p.state }}Period:{{ p.state }}
      Dates: - {% if p.start_date or p.end_date %}{{ p.start_date|default:"∞" }} -{% endif %} - {{ p.end_date|default:"∞" }} + Dates: + {% if p.start_date or p.end_date %}{{ p.start_date|default:"∞" }}-{% endif %}{{ p.end_date|default:"∞" }}
      Availability:{{ p.get_availability_display }}Available:{{ p.get_availability_display }}
      Reason:{{ p.reason }}Reason:{{ p.reason }}
      \ No newline at end of file diff --git a/ietf/templates/stats/document_stats.html b/ietf/templates/stats/document_stats.html deleted file mode 100644 index efd0dd3b6bb..00000000000 --- a/ietf/templates/stats/document_stats.html +++ /dev/null @@ -1,85 +0,0 @@ -{% extends "base.html" %} -{% load origin %} -{% load ietf_filters static %} -{% block title %}{{ stats_title }}{% endblock %} -{% block pagehead %} - -{% endblock %} -{% block content %} - {% origin %} -

      Internet-Draft and RFC statistics

      -
      - -
      - {% for slug, label, url in possible_document_stats_types %} - {{ label }} - {% endfor %} -
      -
      -
      - -
      - {% for slug, label, url in possible_author_stats_types %} - {{ label }} - {% endfor %} -
      -
      -
      - -
      - {% for slug, label, url in possible_yearly_stats_types %} - {{ label }} - {% endfor %} -
      -
      -

      Options

      -
      - -
      - {% for slug, label, url in possible_document_types %} - {{ label }} - {% endfor %} -
      -
      -
      - -
      - {% for slug, label, url in possible_time_choices %} - {{ label }} - {% endfor %} -
      -
      -
      - Please Note: The author information in the datatracker about RFCs - with numbers lower than about 1300 and Internet-Drafts from before 2001 is - unreliable and in many cases absent. For this reason, statistics on these - pages does not show correct author stats for corpus selections that involve such - documents. -
      - {% include content_template %} -{% endblock %} -{% block js %} - - - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_author_affiliation.html b/ietf/templates/stats/document_stats_author_affiliation.html deleted file mode 100644 index 9c798cb9240..00000000000 --- a/ietf/templates/stats/document_stats_author_affiliation.html +++ /dev/null @@ -1,113 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for affiliation, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      AffiliationPercentage of authorsAuthors
      {{ affiliation|default:"(unknown)" }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      -

      - The statistics are based entirely on the author affiliation - provided with each Internet-Draft. Since this may vary across documents, an - author may be counted with more than one affiliation, making the - total sum more than 100%. -

      -

      Affiliation Aliases

      -

      - In generating the above statistics, some heuristics have been - applied to determine the affiliations of each author. -

      -{% if request.GET.showaliases %} -

      - Hide generated aliases -

      - {% if request.user.is_staff %} -

      - Note: since you're an admin, you can - add an extra known alias - or see the - existing known aliases - and - generally ignored endings. -

      - {% endif %} - {% if alias_data %} - - - - - - - - {% if alias_data %} - - {% for name, alias in alias_data %} - - - - - {% endfor %} - - {% endif %} -
      AffiliationAlias
      {{ name|default:"(unknown)" }}{{ alias }}
      - {% endif %} -{% else %} -

      - Show generated aliases -

      -{% endif %} \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_author_citations.html b/ietf/templates/stats/document_stats_author_citations.html deleted file mode 100644 index ae89335fae4..00000000000 --- a/ietf/templates/stats/document_stats_author_citations.html +++ /dev/null @@ -1,72 +0,0 @@ -{% load origin %}{% origin %} -
      - - - -

      Data

      - - - - - - - - - - {% if table_data %} - - {% for citations, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      CitationsPercentage of authorsAuthors
      {{ citations }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}
      - -

      Note that the citation counts do not exclude self-references.

      diff --git a/ietf/templates/stats/document_stats_author_continent.html b/ietf/templates/stats/document_stats_author_continent.html deleted file mode 100644 index 5554ac341ee..00000000000 --- a/ietf/templates/stats/document_stats_author_continent.html +++ /dev/null @@ -1,69 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for continent, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      ContinentPercentage of authorsAuthors
      {{ continent|default:"(unknown)" }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      -

      - The statistics are based entirely on the author addresses provided - with each Internet-Draft. Since this varies across documents, a traveling - author may be counted in more than country, making the total sum - more than 100%. -

      \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_author_country.html b/ietf/templates/stats/document_stats_author_country.html deleted file mode 100644 index 72299cc3972..00000000000 --- a/ietf/templates/stats/document_stats_author_country.html +++ /dev/null @@ -1,136 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for country, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      CountryPercentage of authorsAuthors
      {{ country|default:"(unknown)" }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      -

      - The statistics are based entirely on the author addresses provided - with each Internet-Draft. Since this varies across documents, a traveling - author may be counted in more than country, making the total sum - more than 100%. -

      -

      - In case no country information is found for an author in the time - period, the author is counted as (unknown). -

      -

      - EU (European Union) is not a country, but has been added for reference, as the sum of - all current EU member countries: - {% for c in eu_countries %} - {{ c.name }}{% if not forloop.last %},{% endif %} - {% endfor %} - . -

      -

      Country Aliases

      -

      - In generating the above statistics, some heuristics have been - applied to figure out which country each author is from. -

      -{% if request.GET.showaliases %} -

      - Hide generated aliases -

      - {% if request.user.is_staff %} -

      - Note: since you're an admin, some extra links are visible. You - can either correct a document author entry directly in case the - information is obviously missing or add an alias if an unknown - country name - is being used. -

      - {% endif %} - {% if alias_data %} - - - - - - {% if alias_data %} - - {% for name, alias, country in alias_data %} - - - - - {% endfor %} - - {% endif %} -
      CountryAlias
      - {% if country and request.user.is_staff %} - {{ name|default:"(unknown)" }} - {% else %} - {{ name|default:"(unknown)" }} - {% endif %} - - {{ alias }} - {% if request.user.is_staff and name != "EU" %} - - Matching authors - - {% endif %} -
      - {% endif %} -{% else %} -

      - Show generated aliases -

      -{% endif %} \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_author_documents.html b/ietf/templates/stats/document_stats_author_documents.html deleted file mode 100644 index 28e33e67372..00000000000 --- a/ietf/templates/stats/document_stats_author_documents.html +++ /dev/null @@ -1,69 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for document_count, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      DocumentsPercentage of authorsAuthors
      {{ document_count }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}
      diff --git a/ietf/templates/stats/document_stats_author_hindex.html b/ietf/templates/stats/document_stats_author_hindex.html deleted file mode 100644 index ab3215d355b..00000000000 --- a/ietf/templates/stats/document_stats_author_hindex.html +++ /dev/null @@ -1,83 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for h_index, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      h-indexPercentage of authorsAuthors
      {{ h_index }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" with content_limit=25 %}
      -

      - Hirsch index or h-index is a - - measure of the - productivity and impact of the publications of an author - . - An - author with an h-index of 5 has had 5 publications each cited at - least 5 times - to increase the index to 6, the 5 publications plus - 1 more would have to have been cited at least 6 times, each. Thus a - high h-index requires many highly-cited publications. -

      -

      - Note that the h-index calculations do not exclude self-references. -

      diff --git a/ietf/templates/stats/document_stats_authors.html b/ietf/templates/stats/document_stats_authors.html deleted file mode 100644 index 5c1bbbdf4c0..00000000000 --- a/ietf/templates/stats/document_stats_authors.html +++ /dev/null @@ -1,68 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for author_count, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      AuthorsPercentage of {{ doc_label }}s{{ doc_label|capfirst }}s
      {{ author_count }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      diff --git a/ietf/templates/stats/document_stats_format.html b/ietf/templates/stats/document_stats_format.html deleted file mode 100644 index 32c25fe3787..00000000000 --- a/ietf/templates/stats/document_stats_format.html +++ /dev/null @@ -1,63 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for pages, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      FormatPercentage of {{ doc_label }}s{{ doc_label|capfirst }}s
      {{ pages }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_formlang.html b/ietf/templates/stats/document_stats_formlang.html deleted file mode 100644 index 217d79e3ef0..00000000000 --- a/ietf/templates/stats/document_stats_formlang.html +++ /dev/null @@ -1,63 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for formal_language, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      Formal languagePercentage of {{ doc_label }}s{{ doc_label|capfirst }}s
      {{ formal_language }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_pages.html b/ietf/templates/stats/document_stats_pages.html deleted file mode 100644 index 73231b0e902..00000000000 --- a/ietf/templates/stats/document_stats_pages.html +++ /dev/null @@ -1,62 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for pages, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      PagesPercentage of {{ doc_label }}s{{ doc_label|capfirst }}s
      {{ pages }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      diff --git a/ietf/templates/stats/document_stats_words.html b/ietf/templates/stats/document_stats_words.html deleted file mode 100644 index 4e8c15e9378..00000000000 --- a/ietf/templates/stats/document_stats_words.html +++ /dev/null @@ -1,62 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - {% if table_data %} - - {% for pages, percentage, count, names in table_data %} - - - - - - {% endfor %} - - {% endif %} -
      WordsPercentage of {{ doc_label }}s{{ doc_label|capfirst }}s
      {{ pages }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      diff --git a/ietf/templates/stats/document_stats_yearly.html b/ietf/templates/stats/document_stats_yearly.html deleted file mode 100644 index b819255ced1..00000000000 --- a/ietf/templates/stats/document_stats_yearly.html +++ /dev/null @@ -1,52 +0,0 @@ -{% load origin %} -{% origin %} -
      - \ No newline at end of file diff --git a/ietf/templates/stats/includes/number_with_details_cell.html b/ietf/templates/stats/includes/number_with_details_cell.html deleted file mode 100644 index a5e88113ca0..00000000000 --- a/ietf/templates/stats/includes/number_with_details_cell.html +++ /dev/null @@ -1,15 +0,0 @@ -{% load person_filters %} -{% if content_limit and count <= content_limit %} - {% for n in names %} - {% with n|person_by_name as person %} - {% if person %} - {% person_link person %} - {% else %} - {{ n }} - {% endif %} -
      - {% endwith %} - {% endfor %} -{% else %} - {{ count }} -{% endif %} \ No newline at end of file diff --git a/ietf/templates/stats/index.html b/ietf/templates/stats/index.html index 1c5026013c1..2000168525d 100644 --- a/ietf/templates/stats/index.html +++ b/ietf/templates/stats/index.html @@ -10,15 +10,12 @@

      Statistics on...

      +

      + Statistics on meetings and authorship are not currently available. +

      {% endblock %} \ No newline at end of file diff --git a/ietf/templates/stats/meeting_stats.html b/ietf/templates/stats/meeting_stats.html deleted file mode 100644 index 5206159927e..00000000000 --- a/ietf/templates/stats/meeting_stats.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "base.html" %} -{% load origin %} -{% load ietf_filters static django_bootstrap5 %} -{% block title %}{{ stats_title }}{% endblock %} -{% block pagehead %} - -{% endblock %} -{% block content %} - {% origin %} -

      Meeting Statistics

      - {% if meeting %} -

      - « Back to overview -

      - {% endif %} -
      - -
      - {% for slug, label, url in possible_stats_types %} - {{ label }} - {% endfor %} -
      -
      -
      {% include content_template %}
      -{% endblock %} -{% block js %} - - - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/stats/meeting_stats_continent.html b/ietf/templates/stats/meeting_stats_continent.html deleted file mode 100644 index 42ca03a4091..00000000000 --- a/ietf/templates/stats/meeting_stats_continent.html +++ /dev/null @@ -1,61 +0,0 @@ -{% load origin %} -{% origin %} -
      - -

      Data

      - - - - - - - - - - {% for continent, percentage, count, names in table_data %} - - - - - - {% endfor %} - -
      ContinentPercentage of attendeesAttendees
      {{ continent|default:"(unknown)" }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      diff --git a/ietf/templates/stats/meeting_stats_country.html b/ietf/templates/stats/meeting_stats_country.html deleted file mode 100644 index cebbad3c9fe..00000000000 --- a/ietf/templates/stats/meeting_stats_country.html +++ /dev/null @@ -1,97 +0,0 @@ -{% load origin %} -{% origin %} -
      - -
      - -

      Data

      - - - - - - - - - - {% for country, percentage, count, names in table_data %} - - - - - - {% endfor %} - -
      CountryPercentage of attendeesAttendees
      {{ country|default:"(unknown)" }}{{ percentage|floatformat:2 }}%{% include "stats/includes/number_with_details_cell.html" %}
      -

      - EU (European Union) is not a country, but has been added for reference, as the sum of - all current EU member countries: - {% for c in eu_countries %} - {{ c.name }}{% if not forloop.last %},{% endif %} - {% endfor %} - . -

      \ No newline at end of file diff --git a/ietf/templates/stats/meeting_stats_overview.html b/ietf/templates/stats/meeting_stats_overview.html deleted file mode 100644 index 1136e458b88..00000000000 --- a/ietf/templates/stats/meeting_stats_overview.html +++ /dev/null @@ -1,160 +0,0 @@ -{% load origin %} -{% origin %} -
      - -{% if table_data %} -

      Data

      - - - - - - - - - - - - - {% for meeting, url, count, country in table_data %} - - {% if meeting.get_number > 71 %} - - - - - - - {% else %} - - - - - - - {% endif %} - - {% endfor %} - -
      MeetingDateCityCountryContinentAttendees
      - {{ meeting.number }} - {{ meeting.date }} - {{ meeting.city }} - {{ country.name }}{{ country.continent }}{% include "stats/includes/number_with_details_cell.html" %}{{ meeting.number }}{{ meeting.date }}{{ meeting.city }}{{ country.name }}{{ country.continent }}{% include "stats/includes/number_with_details_cell.html" %}
      -{% endif %} diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html index 0dbbcd835e0..2741f165182 100644 --- a/ietf/templates/stats/review_stats.html +++ b/ietf/templates/stats/review_stats.html @@ -5,6 +5,7 @@ {% block pagehead %} + {% endblock %} {% block content %} {% origin %} @@ -297,7 +298,7 @@

      {% endif %} {% if stats_type != "time" %} -

      +

      Note: {% if level == "team" %} teams diff --git a/ietf/templates/status/latest.html b/ietf/templates/status/latest.html new file mode 100644 index 00000000000..3ad54c9dc3f --- /dev/null +++ b/ietf/templates/status/latest.html @@ -0,0 +1,18 @@ +{% load origin %} +{% load ietf_filters static %} +{% origin %} + + + +{% if title %} +

      {{ title }}

      +

      {{ body }} read more
      {{ date }}

      +{% else %} +

      No site status message.

      +{% endif %} diff --git a/ietf/templates/status/status.html b/ietf/templates/status/status.html new file mode 100644 index 00000000000..18f64c49a86 --- /dev/null +++ b/ietf/templates/status/status.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load origin %} +{% load ietf_filters static %} +{% block content %} + {% origin %} +

      + {% block title %} {{ status.title }} {% endblock %} + {% if status.active == False %} + inactive + {% endif %} +

      +
      + {{ status_page_html }} +
      +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/add_submit_email.html b/ietf/templates/submit/add_submit_email.html deleted file mode 100644 index 9ca07ec7fe0..00000000000 --- a/ietf/templates/submit/add_submit_email.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} -{% load django_bootstrap5 %} -{% block title %} - {% if submission == None %} - Add new submission request email - {% else %} - Add submission request email to {{ submission.name }} - {% endif %} -{% endblock %} -{% block content %} - {% origin %} -

      Add email

      -

      - {% if submission == None %} - A new submission request will be created for the given name and revision. The - name must take the form draft-xxx-nn where xxx is lowercase letters, digits or dashes - and nn is the revision number, 00 for the initial revision. For example, - draft-my-spec-00. - {% else %} - The email will be added to the submission history for {{ submission.name }}. - {% endif %} -

      -
      - {% csrf_token %} - {% bootstrap_form form %} - - Back -
      -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt index 7622cb96916..e3359bb60f0 100644 --- a/ietf/templates/submit/announce_to_authors.txt +++ b/ietf/templates/submit/announce_to_authors.txt @@ -1,24 +1,23 @@ -{% autoescape off %} -A new version of I-D, {{ submission.name }}-{{ submission.rev }}.txt -has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the -IETF repository. +{% autoescape off %}{% filter wordwrap:78 %}A new version of Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the +IETF repository.{% endfilter %} -Name: {{ submission.name }} -Revision: {{ submission.rev }} -Title: {{ submission.title }} -Document date: {{ submission.document_date|date:"Y-m-d" }} -Group: {{ group }} -Pages: {{ submission.pages }} -URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt -Status: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %} -Html: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %} -Htmlized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %} -{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} +Name: {{ submission.name }} +Revision: {{ submission.rev }} +Title: {{ submission.title }} +Date: {{ submission.document_date|date:"Y-m-d" }} +Group: {{ group }} +Pages: {{ submission.pages }} +URL: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt +Status: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %} +HTML: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %} +HTMLized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %} +{% if submission.rev != "00" %}Diff: {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %} Abstract: -{{ submission.abstract }} - -{{ submission.note|default:"" }} + +{{ submission.abstract.rstrip }} + +{{ submission.note.rstrip|default:"" }} The IETF Secretariat {% endautoescape %} diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt index b45c4a1eb2b..cf1c8b325b5 100644 --- a/ietf/templates/submit/announce_to_lists.txt +++ b/ietf/templates/submit/announce_to_lists.txt @@ -1,14 +1,14 @@ -{% autoescape off %} -{% filter wordwrap:78 %}A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group %} This Internet-Draft is a work item of the {{ submission.group.name }} ({{ submission.group.acronym|upper }}){% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}{% endfilter %} +{% autoescape off %}{% filter wordwrap:78 %}Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt is now available.{% if submission.group %} It is a work item of the {{ submission.group.name }} ({{ submission.group.acronym|upper }}){% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}{% endfilter %} - Title : {{ submission.title }} - Author{{ submission.authors|pluralize:" ,s" }} : {% for author in submission.authors %}{{ author.name }}{% if not forloop.last %} - {% endif %}{% endfor %} - Filename : {{ submission.name }}-{{ submission.rev }}.txt - Pages : {{ submission.pages }} - Date : {{ submission.submission_date|date:"Y-m-d" }} + Title: {{ submission.title }} + Author{{ submission.authors|pluralize:",s" }}: {% if submission.authors|length == 1 %} {% endif %}{% for author in submission.authors %}{% firstof author.name author.affiliation "Unknown" %}{% if not forloop.last %} + {% endif %}{% endfor %} + Name: {{ submission.name }}-{{ submission.rev }}.txt + Pages: {{ submission.pages }} + Dates: {{ submission.submission_date|date:"Y-m-d" }} Abstract: + {{ submission.abstract.rstrip }} The IETF datatracker status page for this Internet-Draft is: @@ -16,11 +16,12 @@ The IETF datatracker status page for this Internet-Draft is: {% if submission.xml_version == "3" %} There is also an HTML version available at: {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %} -There is also an htmlized version available at: +There is also an HTMLized version available at: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name rev=submission.rev %}{% endif %} {% if submission.rev != "00" %} A diff from the previous version is available at: {{settings.RFCDIFF_BASE_URL}}?url2={{ submission.name }}-{{ submission.rev }} {% endif %} -Internet-Drafts are also available by rsync at rsync.ietf.org::internet-drafts +Internet-Drafts are also available by rsync at: +rsync.ietf.org::internet-drafts {% endautoescape %} diff --git a/ietf/templates/submit/api_submission_info.html b/ietf/templates/submit/api_submission_info.html index 3153d4257c0..c49b8baa4b3 100644 --- a/ietf/templates/submit/api_submission_info.html +++ b/ietf/templates/submit/api_submission_info.html @@ -21,7 +21,6 @@

      Internet-Draft submission API instructions

      • Only XML-only uploads are supported, not text or combined.
        • -
      • Document replacement information cannot be supplied.
      • The server expects multipart/form-data, supported by curl but not by wget.
        • diff --git a/ietf/templates/submit/api_submit_info.html b/ietf/templates/submit/api_submit_info.html index cd0d52410bc..75fc1abfc21 100644 --- a/ietf/templates/submit/api_submit_info.html +++ b/ietf/templates/submit/api_submit_info.html @@ -1,56 +1,13 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015-2022, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2024, All Rights Reserved #} {% load origin ietf_filters %} -{% block title %}I-D submission API instructions{% endblock %} +{% block title %}Obsolete I-D submission API notice{% endblock %} {% block content %} {% origin %} -

        Internet-Draft submission API instructions

        +

        Obsolete Internet-Draft submission API notice

        - Note: API endpoint described here is known to have a slow response time or to fail - due to timeout for some Internet-Draft submissions, particularly those with large file sizes. - It is recommended to use the new API endpoint - instead for increased reliability. + The API endpoint previously available here is obsolete and is no longer supported. + Please use the new API endpoint + instead.

        -

        - A simplified Internet-Draft submission interface, intended for automation, - is available at {% absurl 'ietf.submit.views.api_submit' %}. -

        -

        - The interface accepts only XML uploads that can be processed on the server, and - requires the user to have a datatracker account. A successful submit still requires - the same email confirmation round-trip as submissions done through the regular - submission tool. -

        -

        - This interface does not provide all the options which the regular submission tool does. - Some limitations: -

        -
          -
        • Only XML-only uploads are supported, not text or combined.
          • -
        • Document replacement information cannot be supplied.
          • -
        • - The server expects multipart/form-data, supported by curl but not by wget. -
          • -
        -

        - It takes two parameters: -

        -
          -
        • - user which is the user login -
          • -
        • - xml, which is the submitted file -
          • -
        -

        - It returns an appropriate http result code, and a brief explanatory text message. -

        -

        - Here is an example: -

        - 
        -$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" {% absurl 'ietf.submit.views.api_submit' %}
-Upload of draft-user-example OK, confirmation requests sent to:
-User Name <user.name@example.com>
        -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/submit/approval_request.txt b/ietf/templates/submit/approval_request.txt index 9186e556fcd..7b9609a1297 100644 --- a/ietf/templates/submit/approval_request.txt +++ b/ietf/templates/submit/approval_request.txt @@ -24,7 +24,7 @@ To approve the Internet-Draft, go to this URL (note: you need to login to be abl Authors: -{% for author in submission.authors %} {{ author.name }}{% if author.email %} <{{ author.email }}>{% endif%} +{% for author in submission.authors %} {% if author.name or author.affiliation %}{% firstof author.name author.affiliation %} {% endif %}{% if author.email %}<{{ author.email }}>{% endif %} {% endfor %} {% endautoescape %} diff --git a/ietf/templates/submit/email.html b/ietf/templates/submit/email.html deleted file mode 100644 index 44f27290589..00000000000 --- a/ietf/templates/submit/email.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin %} -{% load static %} -{% load django_bootstrap5 %} -{% block title %}Email related to{{ submission.name }}{% endblock %} -{% block pagehead %} - -{% endblock %} -{% block content %} - {% origin %} -

        - Email related to -
        - {{ submission.name }} -

        -
        - {% csrf_token %} - {% bootstrap_form form %} - -
        -{% endblock %} -{% block js %} - -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html index 1f74af4a613..6e4a2ba42ac 100644 --- a/ietf/templates/submit/manual_post.html +++ b/ietf/templates/submit/manual_post.html @@ -58,76 +58,6 @@

        Submissions needing manual posting
    {% endif %} -

    Submissions awaiting Internet-Draft upload

    - {% if not waiting_for_draft %} -

    - There are no submissions awaiting Internet-Draft upload. -

    - {% else %} - - - - - - - - - - - {% for s in waiting_for_draft %} - - {% if user.is_authenticated %} - - {% else %} - - {% endif %} - - - - - {% endfor %} - -
    NameRevSubmitted
    - - {{ s.name }} - - - {{ s.name }} - {{ s.rev }}{{ s.submission_date }} - {% if user|has_role:"Secretariat" %} -
    - {% csrf_token %} - - - -
    - {% endif %} - {% if user|has_role:"Secretariat" %} - - Add email - - {% endif %} -
    - {% endif %} - {% if user|has_role:"Secretariat" %} - - New submission from email - - {% endif %} {% endblock %} {% block js %} diff --git a/ietf/templates/submit/manual_post_request.txt b/ietf/templates/submit/manual_post_request.txt index 49ecb793aa6..7fe19e9a238 100644 --- a/ietf/templates/submit/manual_post_request.txt +++ b/ietf/templates/submit/manual_post_request.txt @@ -2,6 +2,8 @@ Hi, Manual posting has been requested for the following Internet-Draft. +The IETF Secretariat will handle this request; no further action is +required at this time. {% if errors %}The problems found during automated submission were: {% for err in errors.values %} - {{ err }}{% endfor %} @@ -31,7 +33,7 @@ I-D Submission Tool URL: Authors: -{% for author in submission.authors %} {{ author.name }}{% if author.email %} <{{ author.email }}>{% endif%} +{% for author in submission.authors %} {% if author.name or author.affiliation %}{% firstof author.name author.affiliation %} {% endif %}{% if author.email %}<{{ author.email }}>{% endif %} {% endfor %} Comment to the secretariat: diff --git a/ietf/templates/submit/search_submission.html b/ietf/templates/submit/search_submission.html index 3f827abbeac..807d6d7d865 100644 --- a/ietf/templates/submit/search_submission.html +++ b/ietf/templates/submit/search_submission.html @@ -12,14 +12,8 @@
    {% csrf_token %}
    - - + {% bootstrap_form form %}
    - {% if error %} -

    - {{ error }} -

    - {% endif %}
    {% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/submission_email.html b/ietf/templates/submit/submission_email.html deleted file mode 100644 index 801ace3b9b2..00000000000 --- a/ietf/templates/submit/submission_email.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "submit/submit_base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} -{% load origin static textfilters ietf_filters %} -{% block title %}Submission email{% endblock %} -{% load ietf_filters %} -{% block submit_content %} - {% origin %} -

    Email for {{ submission.name }}

    -
    -
    - Uploaded -
    -
    - {{ message.time }} -
    -
    - Date -
    -
    - {{ message.message.time }} -
    -
    - From -
    -
    - {{ message.message.frm|linkify }} -
    -
    - Subject -
    -
    - {{ message.message.subject }} -
    -
    - Message -
    -
    - 
    {{ message.message.body|urlize_ietf_docs|linkify|linebreaksbr }}
    -
    -
    - Attachment -
    -
    - {% for a in attachments %} - - {{ a.filename }} - -
    - {% endfor %} -
    -
    - {% if user|has_role:"Secretariat" %} - - Reply - - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html index fba1023c5da..cdc5dd4007e 100644 --- a/ietf/templates/submit/submission_status.html +++ b/ietf/templates/submit/submission_status.html @@ -40,8 +40,10 @@

    Submission checks

    {% if passes_checks %} Your Internet-Draft has been verified to pass the submission checks. + {% elif applied_any_checks %} + Your Internet-Draft failed at least one submission check. {% else %} - Your Internet-Draft has NOT been verified to pass the submission checks. + No submission checks were applied to your Internet-Draft. {% endif %}

    {% if submission.authors|length > 5 %} @@ -70,41 +72,39 @@

    Submission checks

    {% endif %} {% endfor %} {% for check in submission.latest_checks %} - {% if check.passed != None %} - -

    Notice: The Internet-Draft submission process has changed as of Datatracker version 10.3.0. Your Internet-Draft is currently being processed and validated asynchronously. Results will be displayed at this URL when they are available. If JavaScript is enabled in your - browser, this page will refreshed automatically. If JavaScript is not enabled, or if you - disable the automatic refresh with the toggle below, please reload this page in a few - minutes to see the results. + browser, this page will refreshed automatically. If JavaScript is not enabled, + please reload this page in a few minutes to see the results.
    -
    - This submission is being processed and validated. This normally takes a few minutes after - submission. +
    + This submission is being processed and validated. This usually takes a few seconds but may + take a few minutes for complex drafts or during periods of heavy load. {% with earliest_event=submission.submissionevent_set.last %} {% if earliest_event %} - Your draft was uploaded at {{ earliest_event.time }} - ({{ earliest_event.time|timesince }} ago). + Your draft was uploaded at {{ earliest_event.time }}. {% endif %} {% endwith %} Please contact the secretariat for assistance if it has been more than an hour. - -
    {# hide with d-none unless javascript makes it visible #} - - -
    - {% else %} + {% else %}

    Meta-data from the submission

    - {% if errors %} + {% if submission.state.slug == "cancel" %} +
    + Note: The meta-data shown for a cancelled draft may be incorrect or incomplete. +
    + {% elif errors %}

    Meta-Data errors found! @@ -286,7 +285,7 @@

    Meta-data from the submission

    Author {{ forloop.counter }} - {{ author.name }} + {% if author.name %}{{ author.name }}{% endif %} {% if author.email %}<{{ author.email|linkify }}>{% endif %}
    {% if author.affiliation %} @@ -298,7 +297,7 @@

    Meta-data from the submission

    {% if author.country %} {{ author.country }} {% if author.cleaned_country and author.country != author.cleaned_country %} - (understood to be {{ author.cleaned_country }}) + (understood to be {{ author.cleaned_country }}) {% endif %} {% else %} unknown country @@ -378,7 +377,7 @@

    Meta-data from the submission

    {{ res.name.name }}: {{ res.value }} {% if res.display_name %}(as "{{ res.display_name }}"){% endif %} - {% if external_resources.show_changes and added %}New{% endif %} + {% if external_resources.show_changes and added %}New{% endif %}
    {% endwith %} {% empty %} @@ -397,7 +396,7 @@

    Meta-data from the submission

    {{ res.name.name }}: {{ res.value }} {% if res.display_name %}(as "{{ res.display_name }}"){% endif %} - {% if removed %}Removed{% endif %} + {% if removed %}Removed{% endif %}
    {% endwith %} {% empty %} @@ -521,14 +520,6 @@

    {% endif %} - {% if user|has_role:"Secretariat" %} - - Send Email - - {% endif %} {% if show_send_full_url %}

    @@ -585,39 +576,10 @@

    {% endif %} - {% if e.desc|startswith:"Received message" or e.desc|startswith:"Sent message" %} - {% with m=e.submissionemailevent.message %} - {% if user.is_authenticated %} - - {% if e.desc|startswith:"Received message" and user|has_role:"Secretariat" %} - - Reply - - {% endif %} - Email: - - {{ e.desc }} - - - {% else %} - - Email: - - {{ e.desc }} - - - {% endif %} - {% endwith %} - {% else %} - - {{ e.desc|urlize_ietf_docs|linkify }} - - {% endif %} + + + {{ e.desc|urlize_ietf_docs|linkify }} + {% endfor %} diff --git a/ietf/templates/submit/submit_base.html b/ietf/templates/submit/submit_base.html index 0613cf5d6a1..a2c7be1a3be 100644 --- a/ietf/templates/submit/submit_base.html +++ b/ietf/templates/submit/submit_base.html @@ -4,7 +4,7 @@ {% block pagehead %}{{ block.super }}{% endblock %} {% block content %} {% origin %} -

    Internet-Draft submission

    +

    Submit an Internet-Draft

    {% load ietf_filters %} {% for author in submission.authors %} - + {% if author.name %} + + {% endif %} {% endfor %} {% bootstrap_form_errors submitter_form %} {% bootstrap_field submitter_form.name %} diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html index 9d726b21d5d..08265f52977 100644 --- a/ietf/templates/submit/tool_instructions.html +++ b/ietf/templates/submit/tool_instructions.html @@ -204,4 +204,4 @@

    {% include "submit/problem-reports-footer.html" %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html index 7313d8f000b..b8b1aca29c9 100644 --- a/ietf/templates/submit/upload_submission.html +++ b/ietf/templates/submit/upload_submission.html @@ -73,6 +73,11 @@ $(document).ready(function() { if ($("#checkbox").is(':checked')) $("#other-formats").collapse('show') + + $("form").one('submit', function() { + $("button").attr('disabled', 'disabled'); + return true; + }) }); {% endblock %} diff --git a/ietf/templates/sync/discrepancies.html b/ietf/templates/sync/discrepancies.html index 9e50fd9bfc1..7561e39a200 100644 --- a/ietf/templates/sync/discrepancies.html +++ b/ietf/templates/sync/discrepancies.html @@ -34,7 +34,7 @@

    {{ title }}

    {% else %} -

    +

    (None)

    {% endif %} diff --git a/ietf/urls.py b/ietf/urls.py index 972e06cb302..e822b2042ef 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -1,28 +1,25 @@ # Copyright The IETF Trust 2007-2022, All Rights Reserved from django.conf import settings -from django.conf.urls import include from django.conf.urls.static import static as static_url from django.contrib import admin from django.contrib.sitemaps import views as sitemap_views from django.contrib.staticfiles.urls import staticfiles_urlpatterns +from django.http import HttpResponse +from django.urls import include, path from django.views import static as static_view from django.views.generic import TemplateView from django.views.defaults import server_error -from django.urls import path import debug # pyflakes:ignore from ietf.doc import views_search from ietf.group.urls import group_urls, grouptype_urls, stream_urls -from ietf.help import views as help_views from ietf.ipr.sitemaps import IPRMap from ietf.liaisons.sitemaps import LiaisonMap from ietf.utils.urls import url -admin.autodiscover() - # sometimes, this code gets called more than once, which is an # that seems impossible to work around. try: @@ -37,6 +34,7 @@ urlpatterns = [ url(r'^$', views_search.frontpage), + url(r'^health/', lambda _: HttpResponse()), url(r'^accounts/', include('ietf.ietfauth.urls')), url(r'^admin/', admin.site.urls), url(r'^admin/docs/', include('django.contrib.admindocs.urls')), @@ -63,11 +61,12 @@ url(r'^sitemap-(?P
    .+).xml$', sitemap_views.sitemap, {'sitemaps': sitemaps}), url(r'^sitemap.xml$', sitemap_views.index, { 'sitemaps': sitemaps}), url(r'^stats/', include('ietf.stats.urls')), + url(r'^status/', include('ietf.status.urls')), url(r'^stream/', include(stream_urls)), url(r'^submit/', include('ietf.submit.urls')), url(r'^sync/', include('ietf.sync.urls')), url(r'^templates/', include('ietf.dbtemplate.urls')), - url(r'^(?P(wg|rg|ag|rag|team|dir|review|area|program|iabasg|adhoc|ise|adm|rfcedtyp|edwg|edappr))/', include(grouptype_urls)), + url(r'^(?P(wg|rg|ag|rag|team|dir|review|area|program|iabasg|iabworkshop|adhoc|ise|adm|rfcedtyp|edwg|edappr))/', include(grouptype_urls)), # Redirects url(r'^(?Ppublic)/', include('ietf.redirects.urls')), @@ -86,7 +85,6 @@ urlpatterns += staticfiles_urlpatterns() urlpatterns += [ url(r'^_test500/$', server_error), #utils_views.exception), - url(r'^environment/$', help_views.environment), ## maybe preserve some static legacy URLs ? url(r'^(?P(?:images|css|js)/.*)$', static_view.serve, {'document_root': settings.STATIC_ROOT+'ietf/'}), ] diff --git a/ietf/utils/.gitignore b/ietf/utils/.gitignore deleted file mode 100644 index ba8bdb3afc4..00000000000 --- a/ietf/utils/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.pyc -/*.swp diff --git a/ietf/utils/__init__.py b/ietf/utils/__init__.py index 7f1df976025..fbe55eb0434 100644 --- a/ietf/utils/__init__.py +++ b/ietf/utils/__init__.py @@ -1 +1,29 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2024, All Rights Reserved +import subprocess + + +class _ToolVersionManager: + _known = [ + "pyang", + "xml2rfc", + "xym", + "yanglint", + ] + _versions: dict[str, str] = dict() + + def __getitem__(self, item): + if item not in self._known: + return "Unknown" + elif item not in self._versions: + try: + self._versions[item] = subprocess.run( + [item, "--version"], + capture_output=True, + check=True, + ).stdout.decode().strip() + except subprocess.CalledProcessError: + return "Unknown" + return self._versions[item] + + +tool_version = _ToolVersionManager() diff --git a/ietf/utils/accesstoken.py b/ietf/utils/accesstoken.py index b2a93f77d4c..243d3f24ddb 100644 --- a/ietf/utils/accesstoken.py +++ b/ietf/utils/accesstoken.py @@ -5,7 +5,7 @@ import time, random, hashlib from django.conf import settings -from django.utils.encoding import force_bytes, force_text +from django.utils.encoding import force_bytes, force_str def generate_random_key(max_length=32): @@ -18,4 +18,4 @@ def generate_access_token(key, max_length=32): # we hash it with the private key to make sure only we can # generate and use the final token - so storing the key in the # database is safe - return force_text(hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length]) + return force_str(hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length]) diff --git a/ietf/utils/admin.py b/ietf/utils/admin.py index 3e562c2bc1b..6c1c8726e10 100644 --- a/ietf/utils/admin.py +++ b/ietf/utils/admin.py @@ -3,9 +3,7 @@ from django.contrib import admin -from django.utils.encoding import force_text - -from ietf.utils.models import VersionInfo +from django.utils.encoding import force_str def name(obj): if hasattr(obj, 'abbrev'): @@ -14,7 +12,7 @@ def name(obj): if callable(obj.name): name = obj.name() else: - name = force_text(obj.name) + name = force_str(obj.name) if name: return name return str(obj) @@ -58,8 +56,3 @@ class DumpInfoAdmin(admin.ModelAdmin): list_display = ['date', 'host', 'tz'] list_filter = ['date'] admin.site.register(DumpInfo, DumpInfoAdmin) - -class VersionInfoAdmin(admin.ModelAdmin): - list_display = ['command', 'switch', 'version', 'time', ] -admin.site.register(VersionInfo, VersionInfoAdmin) - diff --git a/ietf/utils/aiosmtpd.py b/ietf/utils/aiosmtpd.py new file mode 100644 index 00000000000..3e4cd65dd99 --- /dev/null +++ b/ietf/utils/aiosmtpd.py @@ -0,0 +1,73 @@ +# Copyright The IETF Trust 2014-2025, All Rights Reserved +"""aiosmtpd-related utilities + +These are for testing / dev use. If you're using this for production code, think very +hard about the choices you're making... +""" +from aiosmtpd import handlers +from aiosmtpd.controller import Controller +from aiosmtpd.smtp import SMTP +from email.utils import parseaddr +from typing import Optional, TextIO + + +class SMTPTestHandler: + + def __init__(self, inbox: list): + self.inbox = inbox + + async def handle_DATA(self, server, session, envelope): + """Handle the DATA command and 'deliver' the message""" + + self.inbox.append(envelope.content) + # Per RFC2033: https://datatracker.ietf.org/doc/html/rfc2033.html#section-4.2 + # ...after the final ".", the server returns one reply + # for each previously successful RCPT command in the mail transaction, + # in the order that the RCPT commands were issued. Even if there were + # multiple successful RCPT commands giving the same forward-path, there + # must be one reply for each successful RCPT command. + return "\n".join("250 OK" for _ in envelope.rcpt_tos) + + async def handle_RCPT(self, server, session, envelope, address, rcpt_options): + """Handle an RCPT command and add the address to the envelope if it is acceptable""" + _, address = parseaddr(address) + if address == "": + return "501 Syntax: RCPT TO:
    " + if "poison" in address: + return "550 Error: Not touching that" + # At this point the address is acceptable + envelope.rcpt_tos.append(address) + return "250 OK" + + +class SMTPTestServerDriver: + + def __init__(self, address: str, port: int, inbox: Optional[list] = None): + # Allow longer lines than the 1001 that RFC 5321 requires. As of 2025-04-16 the + # datatracker emits some non-compliant messages. + # See https://aiosmtpd.aio-libs.org/en/latest/smtp.html + SMTP.line_length_limit = 4000 # tests start failing between 3000 and 4000 + self.controller = Controller( + hostname=address, + port=port, + handler=SMTPTestHandler(inbox=[] if inbox is None else inbox), + ) + + def start(self): + self.controller.start() + + def stop(self): + self.controller.stop() + + +class DevDebuggingHandler(handlers.Debugging): + """Debugging handler for use in dev ONLY""" + def __init__(self, stream: Optional[TextIO] = None): + # Allow longer lines than the 1001 that RFC 5321 requires. As of 2025-04-16 the + # datatracker emits some non-compliant messages. + # See https://aiosmtpd.aio-libs.org/en/latest/smtp.html + # Doing this in a handler class is a huge hack. Tests all pass with this set + # to 4000, but make the limit longer for dev just in case. + SMTP.line_length_limit = 10000 + super().__init__(stream) + diff --git a/ietf/utils/aliases.py b/ietf/utils/aliases.py deleted file mode 100644 index 9f9aebc0b9a..00000000000 --- a/ietf/utils/aliases.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env python -# Copyright The IETF Trust 2013-2020, All Rights Reserved -# -*- coding: utf-8 -*- -# -*- Python -*- -# -# $Id: aliasutil.py $ -# -# Author: Markus Stenberg -# - - -""" - -Mailing list alias dumping utilities - -""" - - -from django.conf import settings -from ietf.utils.log import log - -import debug # pyflakes:ignore - -def rewrite_email_address(email): - """ Prettify the email address (and if it's empty, skip it by - returning None). """ - if not email: - return - email = email.strip() - if not email: - return - if email[0]=='<' and email[-1] == '>': - email = email[1:-1] - # If it doesn't look like email, skip - if '@' not in email and '?' not in email: - return - return email - -def rewrite_address_list(l): - """ This utility function makes sure there is exactly one instance - of an address within the result list, and preserves order - (although it may not be relevant to start with) """ - h = {} - for address in l: - #address = address.strip() - if address in h: continue - h[address] = True - yield address - -def dump_sublist(afile, vfile, alias, adomains, vdomain, emails): - if not emails: - return emails - # Nones in the list should be skipped - emails = [_f for _f in emails if _f] - - # Make sure emails are sane and eliminate the Nones again for - # non-sane ones - emails = [rewrite_email_address(e) for e in emails] - emails = [_f for _f in emails if _f] - - # And we'll eliminate the duplicates too but preserve order - emails = list(rewrite_address_list(emails)) - if not emails: - return emails - try: - filtername = 'xfilter-%s' % (alias, ) # in aliases, --> | expandname - expandname = 'expand-%s' % (alias, ) # in virtual, --> email list - - for domain in adomains: - aliasaddr = '%s@%s' % (alias, domain) # in virtual, --> filtername - vfile.write('%-64s %s\n' % (aliasaddr, filtername)) - afile.write('%-64s "|%s filter %s %s"\n' % (filtername+':', settings.POSTCONFIRM_PATH, expandname, vdomain)) - vfile.write('%-64s %s\n' % ("%s@%s"%(expandname, vdomain), ', '.join(emails))) - - except UnicodeEncodeError: - # If there's unicode in email address, something is badly - # wrong and we just silently punt - # XXX - is there better approach? - log('Error encoding email address for an %s alias: %s' % (alias, repr(emails))) - return [] - return emails - diff --git a/ietf/utils/cache.py b/ietf/utils/cache.py new file mode 100644 index 00000000000..0baa56da2da --- /dev/null +++ b/ietf/utils/cache.py @@ -0,0 +1,20 @@ +# Copyright The IETF Trust 2023, All Rights Reserved +# -*- coding: utf-8 -*- + +from django.core.cache.backends.base import DEFAULT_TIMEOUT +from django.core.cache.backends.memcached import PyMemcacheCache +from pymemcache.exceptions import MemcacheServerError + +from .log import log + + +class LenientMemcacheCache(PyMemcacheCache): + """PyMemcacheCache backend that tolerates failed inserts due to object size""" + def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): + try: + super().set(key, value, timeout, version) + except MemcacheServerError as err: + if "object too large for cache" in str(err): + log(f"Memcache failed to cache large object for {key}") + else: + raise diff --git a/ietf/utils/coverage.py b/ietf/utils/coverage.py new file mode 100644 index 00000000000..bd205ce5867 --- /dev/null +++ b/ietf/utils/coverage.py @@ -0,0 +1,90 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +from coverage import Coverage, CoverageData, FileReporter +from coverage.control import override_config as override_coverage_config +from coverage.results import Numbers +from coverage.report_core import get_analysis_to_report +from coverage.results import Analysis +from django.conf import settings + + +class CoverageManager: + checker: Coverage | None = None + started = False + + def start(self): + if settings.SERVER_MODE != "production" and not self.started: + self.checker = Coverage( + source=[settings.BASE_DIR], + cover_pylib=False, + omit=settings.TEST_CODE_COVERAGE_EXCLUDE_FILES, + ) + for exclude_regex in getattr( + settings, + "TEST_CODE_COVERAGE_EXCLUDE_LINES", + [], + ): + self.checker.exclude(exclude_regex) + self.checker.start() + self.started = True + + def stop(self): + if self.checker is not None: + self.checker.stop() + + def save(self): + if self.checker is not None: + self.checker.save() + + def report(self, include: list[str] | None = None): + if self.checker is None: + return None + reporter = CustomDictReporter() + with override_coverage_config( + self.checker, + report_include=include, + ): + return reporter.report(self.checker) + + +class CustomDictReporter: # pragma: no cover + total = Numbers() + + def report(self, coverage): + coverage_data = coverage.get_data() + coverage_data.set_query_contexts(None) + measured_files = {} + for file_reporter, analysis in get_analysis_to_report(coverage, None): + measured_files[file_reporter.relative_filename()] = self.report_one_file( + coverage_data, + analysis, + file_reporter, + ) + tot_numer, tot_denom = self.total.ratio_covered + return { + "coverage": 1 if tot_denom == 0 else tot_numer / tot_denom, + "covered": measured_files, + "format": 5, + } + + def report_one_file( + self, + coverage_data: CoverageData, + analysis: Analysis, + file_reporter: FileReporter, + ): + """Extract the relevant report data for a single file.""" + nums = analysis.numbers + self.total += nums + n_statements = nums.n_statements + numer, denom = nums.ratio_covered + fraction_covered = 1 if denom == 0 else numer / denom + missing_line_nums = sorted(analysis.missing) + # Extract missing lines from source files + source_lines = file_reporter.source().splitlines() + missing_lines = [source_lines[num - 1] for num in missing_line_nums] + return ( + n_statements, + fraction_covered, + missing_line_nums, + missing_lines, + ) diff --git a/ietf/utils/crawlurls.txt b/ietf/utils/crawlurls.txt deleted file mode 100644 index 30a1d038b9e..00000000000 --- a/ietf/utils/crawlurls.txt +++ /dev/null @@ -1,18 +0,0 @@ -# List of starting points for the test crawler (see -# bin/run-real-data-tests). Add URLs that have no link from inside the -# project. - -/ -/doc/all/ -/doc/iesg/last-call/ -/doc/in-last-call/ -/iesg/decisions/ -/iesg/agenda/documents.txt -/iesg/agenda/agenda.json -/wg/1wg-summary.txt -/wg/1wg-summary-by-acronym.txt -/wg/1wg-charters.txt -/wg/1wg-charters-by-acronym.txt -/sitemap.xml -/sitemap-ipr.xml -/sitemap-liaison.xml \ No newline at end of file diff --git a/ietf/utils/db.py b/ietf/utils/db.py index d451f6cfd86..49c89da13ac 100644 --- a/ietf/utils/db.py +++ b/ietf/utils/db.py @@ -1,28 +1,67 @@ -# Copyright The IETF Trust 2021, All Rights Reserved -# -*- coding: utf-8 -*- - -# Taken from/inspired by -# https://stackoverflow.com/questions/55147169/django-admin-jsonfield-default-empty-dict-wont-save-in-admin -# -# JSONField should recognize {}, (), and [] as valid, non-empty JSON -# values. However, the base Field class excludes them +# Copyright The IETF Trust 2021-2025, All Rights Reserved + import jsonfield +from django.db import models + +from ietf.utils.fields import ( + IETFJSONField as FormIETFJSONField, + EmptyAwareJSONField as FormEmptyAwareJSONField, +) + + +class EmptyAwareJSONField(models.JSONField): + """JSONField that allows empty JSON values when model specifies empty=False + + Taken from/inspired by + https://stackoverflow.com/questions/55147169/django-admin-jsonfield-default-empty-dict-wont-save-in-admin + + JSONField should recognize {}, (), and [] as valid, non-empty JSON values. -from ietf.utils.fields import IETFJSONField as FormIETFJSONField + If customizing the formfield, the field must accept the `empty_values` argument. + """ + + def __init__( + self, + *args, + empty_values=FormEmptyAwareJSONField.empty_values, + accepted_empty_values=None, + **kwargs, + ): + if accepted_empty_values is None: + accepted_empty_values = [] + self.empty_values = [x for x in empty_values if x not in accepted_empty_values] + super().__init__(*args, **kwargs) + + def formfield(self, **kwargs): + defaults = { + "form_class": FormEmptyAwareJSONField, + "empty_values": self.empty_values, + } + defaults.update(kwargs) + return super().formfield(**defaults) -class IETFJSONField(jsonfield.JSONField): +class IETFJSONField(jsonfield.JSONField): # pragma: no cover + # Deprecated - use EmptyAwareJSONField instead (different base class requires a + # new field name) + # Remove this class when migrations are squashed and it is no longer referenced form_class = FormIETFJSONField - def __init__(self, *args, empty_values=FormIETFJSONField.empty_values, accepted_empty_values=None, **kwargs): + def __init__( + self, + *args, + empty_values=FormIETFJSONField.empty_values, + accepted_empty_values=None, + **kwargs, + ): if accepted_empty_values is None: accepted_empty_values = [] - self.empty_values = [x - for x in empty_values - if x not in accepted_empty_values] + self.empty_values = [x for x in empty_values if x not in accepted_empty_values] super().__init__(*args, **kwargs) def formfield(self, **kwargs): - if 'form_class' not in kwargs or issubclass(kwargs['form_class'], FormIETFJSONField): - kwargs.setdefault('empty_values', self.empty_values) + if "form_class" not in kwargs or issubclass( + kwargs["form_class"], FormIETFJSONField + ): + kwargs.setdefault("empty_values", self.empty_values) return super().formfield(**{**kwargs}) diff --git a/ietf/utils/decorators.py b/ietf/utils/decorators.py index d37d255a32c..b50e0e7f96d 100644 --- a/ietf/utils/decorators.py +++ b/ietf/utils/decorators.py @@ -4,7 +4,7 @@ import datetime -from decorator import decorator, decorate +from functools import wraps from django.conf import settings from django.contrib.auth import login @@ -15,99 +15,122 @@ import debug # pyflakes:ignore -from ietf.utils.test_runner import set_coverage_checking from ietf.person.models import Person, PersonalApiKey, PersonApiKeyEvent from ietf.utils import log -@decorator -def skip_coverage(f, *args, **kwargs): - if settings.TEST_CODE_COVERAGE_CHECKER: - set_coverage_checking(False) - result = f(*args, **kwargs) - set_coverage_checking(True) - return result - else: - return f(*args, **kwargs) - -@decorator -def person_required(f, request, *args, **kwargs): - if not request.user.is_authenticated: - raise ValueError("The @person_required decorator should be called after @login_required.") - try: - request.user.person - except Person.DoesNotExist: - return render(request, 'registration/missing_person.html') - return f(request, *args, **kwargs) - -@decorator -def require_api_key(f, request, *args, **kwargs): - - def err(code, text): - return HttpResponse(text, status=code, content_type='text/plain') - # Check method and get hash - if request.method == 'POST': - hash = request.POST.get('apikey') - elif request.method == 'GET': - hash = request.GET.get('apikey') - else: - return err(405, "Method not allowed") - if not hash: - return err(400, "Missing apikey parameter") - # Check hash - key = PersonalApiKey.validate_key(force_bytes(hash)) - if not key: - return err(403, "Invalid apikey") - # Check endpoint - urlpath = request.META.get('PATH_INFO') - if not (urlpath and urlpath == key.endpoint): - return err(400, "Apikey endpoint mismatch") - # Check time since regular login - person = key.person - last_login = person.user.last_login - if not person.user.is_staff: - time_limit = (timezone.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS)) - if last_login == None or last_login < time_limit: - return err(400, "Too long since last regular login") - # Log in - login(request, person.user) - # restore the user.last_login field, so it reflects only gui logins - person.user.last_login = last_login - person.user.save() - # Update stats - key.count += 1 - key.latest = timezone.now() - key.save() - PersonApiKeyEvent.objects.create(person=person, type='apikey_login', key=key, desc="Logged in with key ID %s, endpoint %s" % (key.id, key.endpoint)) - # Execute decorated function - try: - ret = f(request, *args, **kwargs) - except AttributeError as e: - log.log("Bad API call: args: %s, kwargs: %s, exception: %s" % (args, kwargs, e)) - return err(400, "Bad or missing parameters") - return ret - - -def _memoize(func, self, *args, **kwargs): - ''''Memoize wrapper for instance methouds. Use @lru_cache for functions.''' - if kwargs: # frozenset is used to ensure hashability - key = args, frozenset(list(kwargs.items())) - else: - key = args - # instance method, set up cache if needed - if not hasattr(self, '_cache'): - self._cache = {} - if not func in self._cache: - self._cache[func] = {} - # - cache = self._cache[func] - if key not in cache: - cache[key] = func(self, *args, **kwargs) - return cache[key] + +def person_required(f): + @wraps(f) + def _wrapper(request, *args, **kwargs): + if not request.user.is_authenticated: + raise ValueError("The @person_required decorator should be called after @login_required.") + try: + request.user.person + except Person.DoesNotExist: + return render(request, 'registration/missing_person.html') + return f(request, *args, **kwargs) + return _wrapper + + +def require_api_key(f): + @wraps(f) + def _wrapper(request, *args, **kwargs): + def err(code, text): + return HttpResponse(text, status=code, content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}") + # Check method and get hash + if request.method == 'POST': + hash = request.POST.get('apikey') + elif request.method == 'GET': + hash = request.GET.get('apikey') + else: + return err(405, "Method not allowed") + if not hash: + return err(400, "Missing apikey parameter") + # Check hash + key = PersonalApiKey.validate_key(force_bytes(hash)) + if not key: + return err(403, "Invalid apikey") + # Check endpoint + urlpath = request.META.get('PATH_INFO') + if not (urlpath and urlpath == key.endpoint): + return err(400, "Apikey endpoint mismatch") + # Check time since regular login + person = key.person + last_login = person.user.last_login + if not person.user.is_staff: + time_limit = (timezone.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS)) + if last_login == None or last_login < time_limit: + return err(400, "Too long since last regular login") + # Log in + login(request, person.user) + # restore the user.last_login field, so it reflects only gui logins + person.user.last_login = last_login + person.user.save() + # Update stats + key.count += 1 + key.latest = timezone.now() + key.save() + PersonApiKeyEvent.objects.create(person=person, type='apikey_login', key=key, desc="Logged in with key ID %s, endpoint %s" % (key.id, key.endpoint)) + # Execute decorated function + try: + ret = f(request, *args, **kwargs) + except AttributeError as e: + log.log("Bad API call: args: %s, kwargs: %s, exception: %s" % (args, kwargs, e)) + return err(400, "Bad or missing parameters") + return ret + return _wrapper + + def memoize(func): + @wraps(func) + def _memoize(self, *args, **kwargs): + '''Memoize wrapper for instance methods. Use @lru_cache for functions.''' + if kwargs: # frozenset is used to ensure hashability + key = args, frozenset(list(kwargs.items())) + else: + key = args + # instance method, set up cache if needed + if not hasattr(self, '_cache'): + self._cache = {} + if not func in self._cache: + self._cache[func] = {} + # + cache = self._cache[func] + if key not in cache: + cache[key] = func(self, *args, **kwargs) + return cache[key] + if not hasattr(func, '__class__'): raise NotImplementedError("Use @lru_cache instead of memoize() for functions.") # For methods, we want the cache on the object, not on the class, in order # to not having to think about cache bloat and content becoming stale, so # we cannot set up the cache here. - return decorate(func, _memoize) + return _memoize + + +def ignore_view_kwargs(*args): + """Ignore the specified kwargs if they are present + + Usage: + @ignore_view_kwargs("ignore_arg1", "ignore_arg2") + def my_view(request, good_arg): + ... + + This will allow my_view() to be used in url() paths that have zero, one, or both of + ignore_arg1 and ignore_arg2 captured. These will be ignored, while good_arg will still + be captured as usual. + """ + kwargs_to_ignore = args + + def decorate(view): + @wraps(view) + def wrapped(*args, **kwargs): + for kwarg in kwargs_to_ignore: + kwargs.pop(kwarg, None) + return view(*args, **kwargs) + + return wrapped + + return decorate + diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py index 82fec27f111..53d3d40811c 100755 --- a/ietf/utils/draft.py +++ b/ietf/utils/draft.py @@ -65,7 +65,6 @@ opt_debug = False opt_timestamp = False opt_trace = False -opt_authorinfo = False opt_attributes = False # Don't forget to add the option variable to the globals list in _main below @@ -131,6 +130,24 @@ def acronym_match(s, l): #_debug(" s:%s; l:%s => %s; %s" % (s, l, acronym, s==acronym)) return s == acronym +def get_status_from_draft_text(text): + + # Take prefix to shortcut work over very large drafts + # 5000 is conservatively much more than a full page of characters and we + # only want the first 10 lines. + text = text.strip()[:5000] # Take prefix to shortcut work over very large drafts + text = re.sub(".\x08", "", text) # Get rid of inkribbon backspace-emphasis + text = text.replace("\r\n", "\n") # Convert DOS to unix + text = text.replace("\r", "\n") # Convert MAC to unix + lines = text.split("\n")[:10] + status = None + for line in lines: + status_match = re.search(r"^\s*Intended [Ss]tatus:\s*(.*?) ", line) + if status_match: + status = status_match.group(1) + break + return status + class Draft: """Base class for drafts @@ -189,7 +206,7 @@ def get_title(self): def get_wordcount(self): raise NotImplementedError - + # ---------------------------------------------------------------------- class PlaintextDraft(Draft): @@ -203,7 +220,7 @@ def __init__(self, text, source, name_from_source=False): """ super().__init__() assert isinstance(text, str) - self.source = source + self.source = str(source) self.rawtext = text self.name_from_source = name_from_source @@ -1314,8 +1331,6 @@ def getmeta(fn): # ---------------------------------------------------------------------- def _output(docname, fields, outfile=sys.stdout): - global company_domain - if opt_attributes: def outputkey(key, fields): field = fields[key] @@ -1355,9 +1370,8 @@ def _printmeta(fn, outfile=sys.stdout): # Main # ---------------------------------------------------------------------- -company_domain = {} # type: Dict[str, str] def _main(outfile=sys.stdout): - global opt_debug, opt_timestamp, opt_trace, opt_authorinfo, files, company_domain, opt_attributes + global opt_debug, opt_timestamp, opt_trace, files, opt_attributes # set default values, if any # ---------------------------------------------------------------------- # Option processing @@ -1405,8 +1419,6 @@ def _main(outfile=sys.stdout): elif opt in ["-T", "--trace"]: # Emit trace information while working opt_trace = True - company_domain = {} - if not files: files = [ "-" ] diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py index 95d8a2aa7e0..ba3fecebc6f 100644 --- a/ietf/utils/fields.py +++ b/ietf/utils/fields.py @@ -6,15 +6,13 @@ import json import re -import jsonfield - import debug # pyflakes:ignore from typing import Optional, Type # pyflakes:ignore from django import forms from django.db import models # pyflakes:ignore -from django.core.validators import validate_email +from django.core.validators import ProhibitNullCharactersValidator, validate_email from django.core.exceptions import ValidationError from django.utils.dateparse import parse_duration @@ -328,8 +326,21 @@ def has_changed(self, initial, data): return super().has_changed(initial, data) -class IETFJSONField(jsonfield.fields.forms.JSONField): - def __init__(self, *args, empty_values=jsonfield.fields.forms.JSONField.empty_values, +class IETFJSONField(forms.JSONField): # pragma: no cover + # Deprecated - use EmptyAwareJSONField instead + def __init__(self, *args, empty_values=forms.JSONField.empty_values, + accepted_empty_values=None, **kwargs): + if accepted_empty_values is None: + accepted_empty_values = [] + self.empty_values = [x + for x in empty_values + if x not in accepted_empty_values] + + super().__init__(*args, **kwargs) + + +class EmptyAwareJSONField(forms.JSONField): + def __init__(self, *args, empty_values=forms.JSONField.empty_values, accepted_empty_values=None, **kwargs): if accepted_empty_values is None: accepted_empty_values = [] @@ -353,3 +364,20 @@ def update_dimension_fields(self, *args, **kwargs): super().update_dimension_fields(*args, **kwargs) except FileNotFoundError: pass # don't do anything if the file has gone missing + + +class ModelMultipleChoiceField(forms.ModelMultipleChoiceField): + """ModelMultipleChoiceField that rejects null characters cleanly""" + validate_no_nulls = ProhibitNullCharactersValidator() + + def clean(self, value): + try: + for item in value: + self.validate_no_nulls(item) + except TypeError: + # A TypeError probably means value is not iterable, which most commonly comes up + # with None as a value. If it's something more exotic, we don't know how to test + # for null characters anyway. Either way, trust the superclass clean() method to + # handle it. + pass + return super().clean(value) diff --git a/ietf/utils/html.py b/ietf/utils/html.py index 9d0cd7c84fa..3f3efe2f371 100644 --- a/ietf/utils/html.py +++ b/ietf/utils/html.py @@ -5,11 +5,7 @@ import bleach -import copy import html2text -import lxml.etree -import lxml.html -import lxml.html.clean import debug # pyflakes:ignore @@ -17,62 +13,66 @@ from django.utils.functional import keep_lazy from ietf.utils.mime import get_mime_type -from ietf.utils.text import bleach_cleaner, tags as acceptable_tags -acceptable_protocols = ['http', 'https', 'mailto', 'xmpp', ] -def unescape(text): - """ - Returns the given text with ampersands, quotes and angle brackets decoded - for use in URLs. +# Allow the protocols/tags/attributes we specifically want, plus anything that bleach declares +# to be safe. As of 2025-01-27, the explicit lists for protocols and tags are a strict superset +# of bleach's defaults. +acceptable_protocols = bleach.sanitizer.ALLOWED_PROTOCOLS.union( + {"http", "https", "mailto", "ftp", "xmpp"} +) +acceptable_tags = bleach.sanitizer.ALLOWED_TAGS.union( + { + # fmt: off + "a", "abbr", "acronym", "address", "b", "big", + "blockquote", "body", "br", "caption", "center", "cite", "code", "col", + "colgroup", "dd", "del", "dfn", "dir", "div", "dl", "dt", "em", "font", + "h1", "h2", "h3", "h4", "h5", "h6", "head", "hr", "html", "i", "ins", "kbd", + "li", "ol", "p", "pre", "q", "s", "samp", "small", "span", "strike", "style", + "strong", "sub", "sup", "table", "title", "tbody", "td", "tfoot", "th", "thead", + "tr", "tt", "u", "ul", "var" + # fmt: on + } +) +acceptable_attributes = bleach.sanitizer.ALLOWED_ATTRIBUTES | { + "*": ["id"], + "ol": ["start"], +} + + +# Instantiate sanitizer classes +_bleach_cleaner = bleach.sanitizer.Cleaner( + tags=acceptable_tags, + attributes=acceptable_attributes, + protocols=acceptable_protocols, + strip=True, +) + + +_liberal_bleach_cleaner = bleach.sanitizer.Cleaner( + tags=acceptable_tags.union({"img", "figure", "figcaption"}), + attributes=acceptable_attributes | {"img": ["src", "alt"]}, + protocols=acceptable_protocols, + strip=True, +) + + +def clean_html(text: str): + """Clean the HTML in a string""" + return _bleach_cleaner.clean(text) + + +def liberal_clean_html(text: str): + """More permissively clean the HTML in a string""" + return _liberal_bleach_cleaner.clean(text) - This function undoes what django.utils.html.escape() does - """ - return text.replace('&', '&').replace(''', "'").replace('"', '"').replace('>', '>').replace('<', '<' ) @keep_lazy(str) def remove_tags(html, tags): """Returns the given HTML sanitized, and with the given tags removed.""" - allowed = set(acceptable_tags) - set([ t.lower() for t in tags ]) + allowed = acceptable_tags - set(t.lower() for t in tags) return bleach.clean(html, tags=allowed, strip=True) -# ---------------------------------------------------------------------- -# Html fragment cleaning - -def sanitize_fragment(html): - return bleach_cleaner.clean(html) - -# ---------------------------------------------------------------------- -# Page cleaning - - -class Cleaner(lxml.html.clean.Cleaner): - charset = 'utf-8' - def __init__(self, charset='utf-8', **kw): - self.charset = charset - super(Cleaner, self).__init__(**kw) - - # Copied from lxml 4.2.0 and modified to insert charset meta: - def clean_html(self, html): - result_type = type(html) - if isinstance(html, (str, bytes)): - doc = lxml.html.fromstring(html) - else: - doc = copy.deepcopy(html) - self(doc) - head = doc.find('head') - if head != None: - meta = lxml.etree.Element('meta', charset=self.charset) - meta.tail = '\n' - head.insert(0, meta) - return lxml.html._transform_result(result_type, doc) - -# We will be saving as utf-8 later, so set that in the meta tag. -lxml_cleaner = Cleaner(allow_tags=acceptable_tags, remove_unknown_tags=None, style=False, page_structure=False, charset='utf-8') - -def sanitize_document(html): - return lxml_cleaner.clean_html(html) - # ---------------------------------------------------------------------- # Text field cleaning @@ -86,4 +86,15 @@ def clean_text_field(text): else: raise forms.ValidationError("Unexpected text field mime type: %s" % mime_type) return text - + + +def unescape(text): + """ + Returns the given text with ampersands, quotes and angle brackets decoded + for use in URLs. + + This function undoes what django.utils.html.escape() does + """ + return text.replace('&', '&').replace(''', "'").replace('"', '"').replace('>', '>').replace('<', '<' ) + + diff --git a/ietf/utils/http.py b/ietf/utils/http.py new file mode 100644 index 00000000000..cda51680ab9 --- /dev/null +++ b/ietf/utils/http.py @@ -0,0 +1,34 @@ +# Copyright The IETF Trust 2023-2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from django.urls import resolve as urlresolve, Resolver404 + +def is_ajax(request): + """Checks whether a request was an AJAX call + + See https://docs.djangoproject.com/en/3.1/releases/3.1/#id2 - this implements the + exact reproduction of the deprecated method suggested there. + """ + return request.headers.get("x-requested-with") == "XMLHttpRequest" + +def validate_return_to_path(path, get_default_path, allowed_path_handlers): + if path is None: + path = get_default_path() + + # we need to ensure the path isn't used for attacks (eg phishing). + # `path` can be used in HttpResponseRedirect() which could redirect to Datatracker or offsite. + # Eg http://datatracker.ietf.org/...?ballot_edit_return_point=https://example.com/phish + # offsite links could be phishing attempts so let's reject them all, and require valid Datatracker + # routes + try: + # urlresolve will throw if the url doesn't match a route known to Django + match = urlresolve(path) + # further restrict by whether it's in the list of valid routes to prevent + # (eg) redirecting to logout + if match.url_name not in allowed_path_handlers: + raise ValueError("Invalid return to path not among valid matches") + pass + except Resolver404: + raise ValueError("Invalid return to path doesn't match a route") + + return path diff --git a/ietf/utils/jsonlogger.py b/ietf/utils/jsonlogger.py new file mode 100644 index 00000000000..589132977d8 --- /dev/null +++ b/ietf/utils/jsonlogger.py @@ -0,0 +1,34 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +from pythonjsonlogger.json import JsonFormatter +import time + + +class DatatrackerJsonFormatter(JsonFormatter): + converter = time.gmtime # use UTC + default_msec_format = "%s.%03d" # '.' instead of ',' + + +class GunicornRequestJsonFormatter(DatatrackerJsonFormatter): + """Only works with Gunicorn's logging""" + def add_fields(self, log_record, record, message_dict): + super().add_fields(log_record, record, message_dict) + log_record.setdefault("method", record.args["m"]) + log_record.setdefault("proto", record.args["H"]) + log_record.setdefault("remote_ip", record.args["h"]) + path = record.args["U"] # URL path + if record.args["q"]: # URL query string + path = "?".join([path, record.args["q"]]) + log_record.setdefault("path", path) + log_record.setdefault("status", record.args["s"]) + log_record.setdefault("referer", record.args["f"]) + log_record.setdefault("user_agent", record.args["a"]) + log_record.setdefault("len_bytes", record.args["B"]) + log_record.setdefault("duration_s", record.args["L"]) # decimal seconds + log_record.setdefault("host", record.args["{host}i"]) + log_record.setdefault("x_request_start", record.args["{x-request-start}i"]) + log_record.setdefault("x_forwarded_for", record.args["{x-forwarded-for}i"]) + log_record.setdefault("x_forwarded_proto", record.args["{x-forwarded-proto}i"]) + log_record.setdefault("cf_connecting_ip", record.args["{cf-connecting-ip}i"]) + log_record.setdefault("cf_ray", record.args["{cf-ray}i"]) + log_record.setdefault("asn", record.args["{x-ip-src-asnum}i"]) + log_record.setdefault("is_authenticated", record.args["{x-datatracker-is-authenticated}o"]) diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index 722b4058103..cf242fc4eb9 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -1,7 +1,10 @@ # Copyright The IETF Trust 2014-2021, All Rights Reserved # -*- coding: utf-8 -*- +import os + from django.conf import settings +from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.urls import reverse as urlreverse from unittest import skipIf @@ -9,19 +12,24 @@ skip_message = "" try: from selenium import webdriver - from selenium.webdriver.chrome.service import Service - from selenium.webdriver.chrome.options import Options + from selenium.webdriver.firefox.service import Service + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions from selenium.webdriver.common.by import By - from selenium.webdriver.common.desired_capabilities import DesiredCapabilities except ImportError as e: skip_selenium = True skip_message = "Skipping selenium tests: %s" % e from ietf.utils.pipe import pipe -from ietf.utils.test_runner import IetfLiveServerTestCase +from ietf.utils.test_runner import ( + set_template_coverage, + set_url_coverage, + load_and_run_fixtures, +) -executable_name = 'chromedriver' +executable_name = 'geckodriver' code, out, err = pipe('{} --version'.format(executable_name)) if code != 0: skip_selenium = True @@ -30,20 +38,11 @@ print(" "+skip_message) def start_web_driver(): - service = Service(executable_path="chromedriver", - log_path=settings.TEST_GHOSTDRIVER_LOG_PATH) - service.start() + service = Service(executable_path=f"/usr/bin/{executable_name}", log_output=f"{executable_name}.log", service_args=['--log-no-truncate']) options = Options() - options.add_argument("headless") - options.add_argument("disable-extensions") - options.add_argument("disable-gpu") # headless needs this - options.add_argument("no-sandbox") # docker needs this - dc = DesiredCapabilities.CHROME - dc["goog:loggingPrefs"] = {"browser": "ALL"} - # For selenium 3: - return webdriver.Chrome("chromedriver", options=options, desired_capabilities=dc) - # For selenium 4: - # return webdriver.Chrome(service=service, options=options, desired_capabilities=dc) + options.add_argument("--headless") + os.environ["MOZ_REMOTE_SETTINGS_DEVTOOLS"] = "1" + return webdriver.Firefox(service=service, options=options) def selenium_enabled(): @@ -56,17 +55,44 @@ def ifSeleniumEnabled(func): return skipIf(skip_selenium, skip_message)(func) -class IetfSeleniumTestCase(IetfLiveServerTestCase): +class IetfSeleniumTestCase(StaticLiveServerTestCase): # pragma: no cover login_view = 'ietf.ietfauth.views.login' + @classmethod + def setUpClass(cls): + set_template_coverage(False) + set_url_coverage(False) + super().setUpClass() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + set_template_coverage(True) + set_url_coverage(True) + def setUp(self): - super(IetfSeleniumTestCase, self).setUp() + super().setUp() + # LiveServerTestCase uses TransactionTestCase which seems to + # somehow interfere with the fixture loading process in + # IetfTestRunner when running multiple tests (the first test + # is fine, in the next ones the fixtures have been wiped) - + # this is no doubt solvable somehow, but until then we simply + # recreate them here + from ietf.person.models import Person + if not Person.objects.exists(): + load_and_run_fixtures(verbosity=0) + self.replaced_settings = dict() + if hasattr(settings, 'IDTRACKER_BASE_URL'): + self.replaced_settings['IDTRACKER_BASE_URL'] = settings.IDTRACKER_BASE_URL + settings.IDTRACKER_BASE_URL = self.live_server_url self.driver = start_web_driver() self.driver.set_window_size(1024,768) def tearDown(self): - super(IetfSeleniumTestCase, self).tearDown() self.driver.close() + for k, v in self.replaced_settings.items(): + setattr(settings, k, v) + super().tearDown() def absreverse(self,*args,**kwargs): return '%s%s'%(self.live_server_url, urlreverse(*args, **kwargs)) @@ -81,7 +107,7 @@ def login(self, username='plain'): self.driver.get(url) self.driver.find_element(By.NAME, 'username').send_keys(username) self.driver.find_element(By.NAME, 'password').send_keys(password) - self.driver.find_element(By.XPATH, '//button[@type="submit"]').click() + self.driver.find_element(By.XPATH, '//*[@id="content"]//button[@type="submit"]').click() def scroll_to_element(self, element): """Scroll an element into view""" @@ -96,6 +122,48 @@ def scroll_to_element(self, element): # actions = ActionChains(self.driver) # actions.move_to_element(element).perform() + def scroll_and_click(self, element_locator, timeout_seconds=5): + """ + Selenium has restrictions around clicking elements outside the viewport, so + this wrapper encapsulates the boilerplate of forcing scrolling and clicking. + + :param element_locator: A two item tuple of a Selenium locator eg `(By.CSS_SELECTOR, '#something')` + """ + + # so that we can restore the state of the webpage after clicking + original_html_scroll_behaviour_to_restore = self.driver.execute_script('return document.documentElement.style.scrollBehavior') + original_html_overflow_to_restore = self.driver.execute_script('return document.documentElement.style.overflow') + + original_body_scroll_behaviour_to_restore = self.driver.execute_script('return document.body.style.scrollBehavior') + original_body_overflow_to_restore = self.driver.execute_script('return document.body.style.overflow') + + self.driver.execute_script('document.documentElement.style.scrollBehavior = "auto"') + self.driver.execute_script('document.documentElement.style.overflow = "auto"') + + self.driver.execute_script('document.body.style.scrollBehavior = "auto"') + self.driver.execute_script('document.body.style.overflow = "auto"') + + element = self.driver.find_element(element_locator[0], element_locator[1]) + self.scroll_to_element(element) + + # Note that Selenium itself seems to have multiple definitions of 'clickable'. + # You might expect that the following wait for the 'element_to_be_clickable' + # would confirm that the following .click() would succeed but it doesn't. + # That's why the preceeding code attempts to force scrolling to bring the + # element into the viewport to allow clicking. + WebDriverWait(self.driver, timeout_seconds).until(expected_conditions.element_to_be_clickable(element_locator)) + + element.click() + + if original_html_scroll_behaviour_to_restore: + self.driver.execute_script(f'document.documentElement.style.scrollBehavior = "{original_html_scroll_behaviour_to_restore}"') + if original_html_overflow_to_restore: + self.driver.execute_script(f'document.documentElement.style.overflow = "{original_html_overflow_to_restore}"') + + if original_body_scroll_behaviour_to_restore: + self.driver.execute_script(f'document.body.style.scrollBehavior = "{original_body_scroll_behaviour_to_restore}"') + if original_body_overflow_to_restore: + self.driver.execute_script(f'document.body.style.overflow = "{original_body_overflow_to_restore}"') class presence_of_element_child_by_css_selector: """Wait for presence of a child of a WebElement matching a CSS selector @@ -108,4 +176,4 @@ def __init__(self, element, child_selector): def __call__(self, driver): child = self.element.find_element(By.CSS_SELECTOR, self.child_selector) - return child if child is not None else False \ No newline at end of file + return child if child is not None else False diff --git a/ietf/utils/log.py b/ietf/utils/log.py index d5a54e55168..2a068ade9af 100644 --- a/ietf/utils/log.py +++ b/ietf/utils/log.py @@ -9,37 +9,10 @@ import os.path import traceback -from typing import Callable # pyflakes:ignore - -try: - import syslog - logfunc = syslog.syslog # type: Callable -except ImportError: # import syslog will fail on Windows boxes - logging.basicConfig(filename='tracker.log',level=logging.INFO) - logfunc = logging.info - pass - from django.conf import settings import debug # pyflakes:ignore -formatter = logging.Formatter('{levelname}: {name}:{lineno}: {message}', style='{') -for name, level in settings.UTILS_LOGGER_LEVELS.items(): - logger = logging.getLogger(name) - if not logger.hasHandlers(): - debug.say(' Adding handlers to logger %s' % logger.name) - - handlers = [ - logging.StreamHandler(), - logging.handlers.SysLogHandler(address='/dev/log', - facility=logging.handlers.SysLogHandler.LOG_USER), - ] - for h in handlers: - h.setFormatter(formatter) - h.setLevel(level) - logger.addHandler(h) - debug.say(" Setting %s logging level to %s" % (logger.name, level)) - logger.setLevel(level) def getclass(frame): cls = None @@ -56,20 +29,9 @@ def getcaller(): return (pmodule, pclass, pfunction, pfile, pline) def log(msg, e=None): - "Uses syslog by preference. Logs the given calling point and message." - global logfunc - def _flushfunc(): - pass - _logfunc = logfunc - if settings.SERVER_MODE == 'test': - if getattr(settings, 'show_logging', False) is True: - _logfunc = debug.say - _flushfunc = sys.stdout.flush # pyflakes:ignore (intentional redefinition) - else: + "Logs the given calling point and message to the logging framework's datatracker handler at severity INFO" + if settings.SERVER_MODE == 'test' and not getattr(settings, 'show_logging',False): return - elif settings.DEBUG == True: - _logfunc = debug.say - _flushfunc = sys.stdout.flush # pyflakes:ignore (intentional redefinition) if not isinstance(msg, str): msg = msg.encode('unicode_escape') try: @@ -82,11 +44,8 @@ def _flushfunc(): where = " in " + func + "()" except IndexError: file, line, where = "/", 0, "" - _flushfunc() - _logfunc("ietf%s(%d)%s: %s" % (file, line, where, msg)) - -logger = logging.getLogger('django') + logging.getLogger("datatracker").info(msg=msg, extra = {"file":file, "line":line, "where":where}) def exc_parts(): @@ -124,6 +83,7 @@ def assertion(statement, state=True, note=None): This acts like an assertion. It uses the django logger in order to send the failed assertion and a backtrace as for an internal server error. """ + logger = logging.getLogger("django") # Note this is a change - before this would have gone to "django" frame = inspect.currentframe().f_back value = eval(statement, frame.f_globals, frame.f_locals) if bool(value) != bool(state): @@ -148,6 +108,7 @@ def assertion(statement, state=True, note=None): def unreachable(date="(unknown)"): "Raises an assertion or sends traceback to admins if executed." + logger = logging.getLogger("django") frame = inspect.currentframe().f_back if settings.DEBUG is True or settings.SERVER_MODE == 'test': raise AssertionError("Arrived at code in %s() which was marked unreachable on %s." % (frame.f_code.co_name, date)) diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py index b2b9f0b9dc2..54171614511 100644 --- a/ietf/utils/mail.py +++ b/ietf/utils/mail.py @@ -19,15 +19,17 @@ from email.header import Header, decode_header from email import message_from_bytes, message_from_string from email import charset as Charset +from typing import Optional from django.conf import settings from django.contrib import messages from django.core.exceptions import ImproperlyConfigured, ValidationError from django.core.validators import validate_email +from django.http import HttpRequest from django.template.loader import render_to_string from django.template import Context,RequestContext from django.utils import timezone -from django.utils.encoding import force_text, force_str, force_bytes +from django.utils.encoding import force_str, force_bytes import debug # pyflakes:ignore @@ -64,6 +66,18 @@ def add_headers(msg): msg['From'] = settings.DEFAULT_FROM_EMAIL return msg + +def decode_header_value(value: str) -> str: + """Decode a header value + + Easier-to-use wrapper around email.message.decode_header() + """ + return "".join( + part.decode(charset if charset else "utf-8") if isinstance(part, bytes) else part + for part, charset in decode_header(value) + ) + + class SMTPSomeRefusedRecipients(smtplib.SMTPException): def __init__(self, message, original_msg, refusals): @@ -92,7 +106,17 @@ def send_smtp(msg, bcc=None): ''' mark = time.time() add_headers(msg) - (fname, frm) = parseaddr(msg.get('From')) + # N.B. We have a disconnect with most of this code assuming a From header value will only + # have one address. + # The frm computed here is only used as the envelope from. + # Previous code simply ran `parseaddr(msg.get('From'))`, getting lucky if the string returned + # from the get had more than one address in it. Python 3.9.20 changes the behavior of parseaddr + # and that erroneous use of the function no longer gets lucky. + # For the short term, to match behavior to date as closely as possible, if we get a message + # that has multiple addresses in the From header, we will use the first for the envelope from + from_tuples = getaddresses(msg.get_all('From', [settings.DEFAULT_FROM_EMAIL])) + assertion('len(from_tuples)==1', note=f"send_smtp received multiple From addresses: {from_tuples}") + _ , frm = from_tuples[0] addrlist = msg.get_all('To') + msg.get_all('Cc', []) if bcc: addrlist += [bcc] @@ -137,7 +161,7 @@ def send_smtp(msg, bcc=None): server.quit() except smtplib.SMTPServerDisconnected: pass - subj = force_text(msg.get('Subject', '[no subject]')) + subj = force_str(msg.get('Subject', '[no subject]')) tau = time.time() - mark log("sent email (%.3fs) from '%s' to %s id %s subject '%s'" % (tau, frm, to, msg.get('Message-ID', ''), subj)) @@ -166,7 +190,7 @@ def copy_email(msg, to, toUser=False, originalBcc=None): # Overwrite the From: header, so that the copy from a development or # test server doesn't look like spam. new['From'] = settings.DEFAULT_FROM_EMAIL - new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, force_text(msg.get('Subject', '[no subject]'))) + new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, force_str(msg.get('Subject', '[no subject]'))) new['To'] = to send_smtp(new) @@ -241,8 +265,7 @@ def parseaddr(addr): """ - addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, bytes) else s for (s,m) in decode_header(addr) ] ) - name, addr = simple_parseaddr(addr) + name, addr = simple_parseaddr(decode_header_value(addr)) return name, addr def excludeaddrs(addrlist, exlist): @@ -320,23 +343,50 @@ def condition_message(to, frm, subject, msg, cc, extra): msg['Message-ID'] = make_msgid() -def show_that_mail_was_sent(request,leadline,msg,bcc): - if request and request.user: - from ietf.ietfauth.utils import has_role - if has_role(request.user,['Area Director','Secretariat','IANA','RFC Editor','ISE','IAD','IRTF Chair','WG Chair','RG Chair','WG Secretary','RG Secretary']): - info = "%s at %s %s\n" % (leadline,timezone.now().strftime("%Y-%m-%d %H:%M:%S"),settings.TIME_ZONE) - info += "Subject: %s\n" % force_text(msg.get('Subject','[no subject]')) - info += "To: %s\n" % msg.get('To','[no to]') - if msg.get('Cc'): - info += "Cc: %s\n" % msg.get('Cc') - if bcc: - info += "Bcc: %s\n" % bcc - messages.info(request,info,extra_tags='preformatted',fail_silently=True) +def show_that_mail_was_sent(request: HttpRequest, leadline: str, msg: Message, bcc: Optional[str]): + if request and request.user: + from ietf.ietfauth.utils import has_role + + if has_role( + request.user, + [ + "Area Director", + "Secretariat", + "IANA", + "RFC Editor", + "ISE", + "IAD", + "IRTF Chair", + "WG Chair", + "RG Chair", + "WG Secretary", + "RG Secretary", + ], + ): + subject = decode_header_value(msg.get("Subject", "[no subject]")) + _to = decode_header_value(msg.get("To", "[no to]")) + info_lines = [ + f"{leadline} at {timezone.now():%Y-%m-%d %H:%M:%S %Z}", + f"Subject: {subject}", + f"To: {_to}", + ] + cc = msg.get("Cc", None) + if cc: + info_lines.append(f"Cc: {decode_header_value(cc)}") + if bcc: + info_lines.append(f"Bcc: {decode_header_value(bcc)}") + messages.info( + request, + "\n".join(info_lines), + extra_tags="preformatted", + fail_silently=True, + ) + def save_as_message(request, msg, bcc): by = ((request and request.user and not request.user.is_anonymous and request.user.person) or ietf.person.models.Person.objects.get(name="(System)")) - headers, body = force_text(str(msg)).split('\n\n', 1) + headers, body = force_str(str(msg)).split('\n\n', 1) kwargs = {'by': by, 'body': body, 'content_type': msg.get_content_type(), 'bcc': bcc or '' } for (arg, field) in [ ('cc', 'Cc'), @@ -446,6 +496,8 @@ def parse_preformatted(preformatted, extra=None, override=None): values = msg.get_all(key, []) if values: values = getaddresses(values) + if key=='From': + assertion('len(values)<2', note=f'parse_preformatted is constructing a From with multiple values: {values}') del msg[key] msg[key] = ',\n '.join(formataddr(v) for v in values) for key in ['Subject', ]: diff --git a/ietf/utils/management/commands/check_draft_event_revision_integrity.py b/ietf/utils/management/commands/check_draft_event_revision_integrity.py index c8d2cbd21a8..c2d42727823 100644 --- a/ietf/utils/management/commands/check_draft_event_revision_integrity.py +++ b/ietf/utils/management/commands/check_draft_event_revision_integrity.py @@ -54,7 +54,7 @@ def to_dict(instance): doc = getattr(obj, docattr) time = getattr(obj, timeattr) if not obj.rev: - if not doc.is_rfc(): + if doc.type_id != "rfc": self.stdout.write("Bad revision number: %-52s: '%s'" % (doc.name, obj.rev)) continue rev = int(obj.rev.lstrip('0') or '0') diff --git a/ietf/utils/management/commands/dumprelated.py b/ietf/utils/management/commands/dumprelated.py deleted file mode 100644 index 66fbb33bf1d..00000000000 --- a/ietf/utils/management/commands/dumprelated.py +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright The IETF Trust 2018-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import io -import warnings -from collections import OrderedDict - -from django.apps import apps -from django.contrib.admin.utils import NestedObjects -from django.core import serializers -from django.core.management.base import BaseCommand, CommandError -from django.core.management.utils import parse_apps_and_model_labels -from django.db import DEFAULT_DB_ALIAS, router - -import debug # pyflakes:ignore -debug.debug = True - -class ProxyModelWarning(Warning): - pass - - -class Command(BaseCommand): - help = ( - "Output a database object and its related objects as a fixture of the given format " - ) - - def add_arguments(self, parser): - parser.add_argument( - 'args', metavar='app_label.ModelName', nargs=1, - help='Specifies the app_label.ModelName for which to dump objects given by --pks', - ) - parser.add_argument( - '--format', default='json', dest='format', - help='Specifies the output serialization format for fixtures.', - ) - parser.add_argument( - '--indent', default=None, dest='indent', type=int, - help='Specifies the indent level to use when pretty-printing output.', - ) - parser.add_argument( - '--database', action='store', dest='database', - default=DEFAULT_DB_ALIAS, - help='Nominates a specific database to dump fixtures from. ' - 'Defaults to the "default" database.', - ) - parser.add_argument( - '-e', '--exclude', dest='exclude', action='append', default=[], - help='An app_label or app_label.ModelName to exclude ' - '(use multiple --exclude to exclude multiple apps/models).', - ) - parser.add_argument( - '--natural-foreign', action='store_true', dest='use_natural_foreign_keys', default=False, - help='Use natural foreign keys if they are available.', - ) - parser.add_argument( - '--natural-primary', action='store_true', dest='use_natural_primary_keys', default=False, - help='Use natural primary keys if they are available.', - ) - parser.add_argument( - '-o', '--output', default=None, dest='output', - help='Specifies file to which the output is written.' - ) - parser.add_argument( - '--pks', dest='primary_keys', required=True, - help="Only dump objects with given primary keys. Accepts a comma-separated " - "list of keys. This option only works when you specify one model.", - ) - - def handle(self, *app_labels, **options): - format = options['format'] - indent = options['indent'] - using = options['database'] - excludes = options['exclude'] - output = options['output'] - show_traceback = options['traceback'] - use_natural_foreign_keys = options['use_natural_foreign_keys'] - use_natural_primary_keys = options['use_natural_primary_keys'] - pks = options['primary_keys'] - - if pks: - primary_keys = [pk.strip() for pk in pks.split(',')] - else: - primary_keys = [] - - excluded_models, excluded_apps = parse_apps_and_model_labels(excludes) - - if len(app_labels) == 0: - if primary_keys: - raise CommandError("You can only use --pks option with one model") - app_list = OrderedDict( - (app_config, None) for app_config in apps.get_app_configs() - if app_config.models_module is not None and app_config not in excluded_apps - ) - else: - if len(app_labels) > 1 and primary_keys: - raise CommandError("You can only use --pks option with one model") - app_list = OrderedDict() - for label in app_labels: - try: - app_label, model_label = label.split('.') - try: - app_config = apps.get_app_config(app_label) - except LookupError as e: - raise CommandError(str(e)) - if app_config.models_module is None or app_config in excluded_apps: - continue - try: - model = app_config.get_model(model_label) - except LookupError: - raise CommandError("Unknown model: %s.%s" % (app_label, model_label)) - - app_list_value = app_list.setdefault(app_config, []) - - # We may have previously seen a "all-models" request for - # this app (no model qualifier was given). In this case - # there is no need adding specific models to the list. - if app_list_value is not None: - if model not in app_list_value: - app_list_value.append(model) - except ValueError: - if primary_keys: - raise CommandError("You can only use --pks option with one model") - # This is just an app - no model qualifier - app_label = label - try: - app_config = apps.get_app_config(app_label) - except LookupError as e: - raise CommandError(str(e)) - if app_config.models_module is None or app_config in excluded_apps: - continue - app_list[app_config] = None - - # Check that the serialization format exists; this is a shortcut to - # avoid collating all the objects and _then_ failing. - if format not in serializers.get_public_serializer_formats(): - try: - serializers.get_serializer(format) - except serializers.SerializerDoesNotExist: - pass - - raise CommandError("Unknown serialization format: %s" % format) - - def flatten(l): - if isinstance(l, list): - for el in l: - if isinstance(el, list): - for sub in flatten(el): - yield sub - else: - yield el - else: - yield l - - def get_objects(count_only=False): - """ - Collate the objects to be serialized. If count_only is True, just - count the number of objects to be serialized. - """ - models = serializers.sort_dependencies(list(app_list.items())) - for model in models: - if model in excluded_models: - continue - if model._meta.proxy and model._meta.proxy_for_model not in models: - warnings.warn( - "%s is a proxy model and won't be serialized." % model._meta.label, - category=ProxyModelWarning, - ) - if not model._meta.proxy and router.allow_migrate_model(using, model): - objects = model._default_manager - - queryset = objects.using(using).order_by(model._meta.pk.name) - if primary_keys: - queryset = queryset.filter(pk__in=primary_keys) - if count_only: - yield queryset.order_by().count() - else: - for obj in queryset.iterator(): - collector = NestedObjects(using=using) - collector.collect([obj,]) - object_list = list(flatten(collector.nested())) - object_list.reverse() - for o in object_list: - yield o - - try: - self.stdout.ending = None - progress_output = None - object_count = 0 - # If dumpdata is outputting to stdout, there is no way to display progress - if (output and self.stdout.isatty() and options['verbosity'] > 0): - progress_output = self.stdout - object_count = sum(get_objects(count_only=True)) - stream = io.open(output, 'w') if output else None - try: - serializers.serialize( - format, get_objects(), indent=indent, - use_natural_foreign_keys=use_natural_foreign_keys, - use_natural_primary_keys=use_natural_primary_keys, - stream=stream or self.stdout, progress_output=progress_output, - object_count=object_count, - ) - finally: - if stream: - stream.close() - except Exception as e: - if show_traceback: - raise - raise CommandError("Unable to serialize database: %s" % e) diff --git a/ietf/utils/management/commands/import_htpasswd.py b/ietf/utils/management/commands/import_htpasswd.py deleted file mode 100644 index c33a46b7272..00000000000 --- a/ietf/utils/management/commands/import_htpasswd.py +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright The IETF Trust 2014-2020, All Rights Reserved -import io -import sys - -from textwrap import dedent - -from django.contrib.auth.models import User -from django.core.management.base import BaseCommand - -def import_htpasswd_file(filename, verbosity=1, overwrite=False): - with io.open(filename) as file: - for line in file: - if not ':' in line: - raise ValueError('Found a line without colon separator in the htpassword file %s:' - ' "%s"' % (file.name, line)) - username, password = line.strip().split(':', 1) - try: - user = User.objects.get(username__iexact=username) - if overwrite == True or not user.password: - if password.startswith('{SHA}'): - user.password = "sha1$$%s" % password[len('{SHA}'):] - elif password.startswith('$apr1$'): - user.password = "md5$%s" % password[len('$apr1$'):] - else: # Assume crypt - user.password = "crypt$$%s" % password - user.save() - if verbosity > 0: - sys.stderr.write('.') - if verbosity > 1: - sys.stderr.write(' %s\n' % username) - except User.DoesNotExist: - if verbosity > 1: - sys.stderr.write('\nNo such user: %s\n' % username) - -class Command(BaseCommand): - """ - Import passwords from one or more htpasswd files to Django's auth_user table. - - This command only imports passwords; it does not import usernames, as that - would leave usernames without associated Person records in the database, - something which is undesirable. - - By default the command won't overwrite existing password entries, but - given the --force switch, it will overwrite existing entries too. Without - the --force switch, the command is safe to run repeatedly. - """ - - help = dedent(__doc__).strip() - - def add_arguments(self, parser): - parser.add_argument('--force', - action='store_true', dest='overwrite', default=False, - help='Overwrite existing passwords in the auth_user table.') - - - args = '[path [path [...]]]' - - def handle(self, *filenames, **options): - overwrite = options.get('overwrite', False) - verbosity = int(options.get('verbosity')) - for fn in filenames: - import_htpasswd_file(fn, verbosity=verbosity, overwrite=overwrite) - diff --git a/ietf/utils/management/commands/loadrelated.py b/ietf/utils/management/commands/loadrelated.py deleted file mode 100644 index e3d84990c99..00000000000 --- a/ietf/utils/management/commands/loadrelated.py +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright The IETF Trust 2018-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import gzip -import os -#import sys -import tqdm -import zipfile - -try: - import bz2 - has_bz2 = True -except ImportError: - has_bz2 = False - -from django.core.exceptions import ObjectDoesNotExist -from django.core import serializers -from django.db import DEFAULT_DB_ALIAS, DatabaseError, IntegrityError, connections -from django.db.models.signals import post_save -from django.utils.encoding import force_text -import django.core.management.commands.loaddata as loaddata - -import debug # pyflakes:ignore - -from ietf.community.models import notify_events - -class Command(loaddata.Command): - help = (""" - - Load a fixture of related objects to the database. The fixture is expected - to contain a set of related objects, created with the 'dumprelated' management - command. It differs from the 'loaddata' command in that it silently ignores - attempts to load duplicate entries, and continues loading subsequent entries. - - """) - - def add_arguments(self, parser): - parser.add_argument('args', metavar='fixture', nargs='+', help='Fixture files.') - parser.add_argument( - '--database', action='store', dest='database', default=DEFAULT_DB_ALIAS, - help='Nominates a specific database to load fixtures into. Defaults to the "default" database.', - ) - parser.add_argument( - '--ignorenonexistent', '-i', action='store_true', dest='ignore', default=False, - help='Ignores entries in the serialized data for fields that do not ' - 'currently exist on the model.', - ) - - def handle(self, *args, **options): - self.ignore = options['ignore'] - self.using = options['database'] - self.verbosity = options['verbosity'] - # - self.compression_formats = { - None: (open, 'rb'), - 'gz': (gzip.GzipFile, 'rb'), - 'zip': (SingleZipReader, 'r'), - } - if has_bz2: - self.compression_formats['bz2'] = (bz2.BZ2File, 'r') - # - self.serialization_formats = serializers.get_public_serializer_formats() - # - post_save.disconnect(notify_events) - # - connection = connections[self.using] - self.fixture_count = 0 - self.loaded_object_count = 0 - self.fixture_object_count = 0 - # - for arg in args: - fixture_file = arg - self.stdout.write("Loading objects from %s" % fixture_file) - _, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file)) - open_method, mode = self.compression_formats[cmp_fmt] - fixture = open_method(fixture_file, mode) - objects_in_fixture = 0 - self.stdout.write("Getting object count...\b\b\b", ending='') - self.stdout.flush() - for o in serializers.deserialize(ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore,): - objects_in_fixture += 1 - self.stdout.write(" %d" % objects_in_fixture) - # - fixture = open_method(fixture_file, mode) - self.fixture_count += 1 - objects = serializers.deserialize(ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore,) - with connection.constraint_checks_disabled(): - for obj in tqdm.tqdm(objects, total=objects_in_fixture): - try: - obj.save(using=self.using) - self.loaded_object_count += 1 - except (DatabaseError, IntegrityError, ObjectDoesNotExist, AttributeError) as e: - error_msg = force_text(e) - if "Duplicate entry" in error_msg: - pass - else: - self.stderr.write("Could not load %(app_label)s.%(object_name)s(pk=%(pk)s): %(error_msg)s" % { - 'app_label': obj.object._meta.app_label, - 'object_name': obj.object._meta.object_name, - 'pk': obj.object.pk, - 'error_msg': error_msg, - }, ) - self.fixture_object_count += objects_in_fixture - - if self.verbosity >= 1: - if self.fixture_object_count == self.loaded_object_count: - self.stdout.write( - "Installed %d object(s) from %d fixture(s)" - % (self.loaded_object_count, self.fixture_count) - ) - else: - self.stdout.write( - "Installed %d object(s) (of %d) from %d fixture(s)" - % (self.loaded_object_count, self.fixture_object_count, self.fixture_count) - ) - - -class SingleZipReader(zipfile.ZipFile): - - def __init__(self, *args, **kwargs): - zipfile.ZipFile.__init__(self, *args, **kwargs) - if len(self.namelist()) != 1: - raise ValueError("Zip-compressed fixtures must contain one file.") - - def read(self): - return zipfile.ZipFile.read(self, self.namelist()[0]) - - diff --git a/ietf/utils/management/commands/mergedata.py b/ietf/utils/management/commands/mergedata.py index 86197348278..e73014c789f 100644 --- a/ietf/utils/management/commands/mergedata.py +++ b/ietf/utils/management/commands/mergedata.py @@ -15,7 +15,7 @@ from django.core.management.commands.loaddata import Command as LoadCommand, humanize from django.db import DatabaseError, IntegrityError, router, transaction from django.db.models import ManyToManyField -from django.utils.encoding import force_text +from django.utils.encoding import force_str from ietf.utils.models import ForeignKey @@ -234,7 +234,7 @@ def get_unique_field(obj): 'object_name': obj.object._meta.object_name, 'pk': obj.object.pk, 'data': obj_to_dict(obj.object), - 'error_msg': force_text(e) + 'error_msg': force_str(e) },) raise if objects and show_progress: diff --git a/ietf/utils/management/commands/patch_libraries.py b/ietf/utils/management/commands/patch_libraries.py new file mode 100644 index 00000000000..d9ae11097be --- /dev/null +++ b/ietf/utils/management/commands/patch_libraries.py @@ -0,0 +1,31 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +import django + +from django.conf import settings +from django.core.management.base import BaseCommand, CommandError +from pathlib import Path + +from ietf.utils import patch + + +class Command(BaseCommand): + """Apply IETF patches to libraries""" + requires_system_checks = tuple() + + def handle(self, *args, **options): + library_path = Path(django.__file__).parent.parent + top_dir = Path(settings.BASE_DIR).parent + + # All patches in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY must have a + # relative file path starting from the site-packages dir, e.g. + # 'django/db/models/fields/__init__.py' + for patch_file in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY: + patch_set = patch.fromfile(top_dir / Path(patch_file)) + if not patch_set: + raise CommandError(f"Could not parse patch file '{patch_file}'") + if not patch_set.apply(root=bytes(library_path)): + raise CommandError(f"Could not apply the patch from '{patch_file}'") + if patch_set.already_patched: + self.stdout.write(f"Patch from '{patch_file}' was already applied") + else: + self.stdout.write(f"Applied the patch from '{patch_file}'") diff --git a/ietf/utils/management/commands/periodic_tasks.py b/ietf/utils/management/commands/periodic_tasks.py new file mode 100644 index 00000000000..2d34f8361c1 --- /dev/null +++ b/ietf/utils/management/commands/periodic_tasks.py @@ -0,0 +1,310 @@ +# Copyright The IETF Trust 2024, All Rights Reserved +import json +from django_celery_beat.models import CrontabSchedule, PeriodicTask + +from django.core.management.base import BaseCommand + +CRONTAB_DEFS = { + # same as "@weekly" in a crontab + "weekly": { + "minute": "0", + "hour": "0", + "day_of_month": "*", + "month_of_year": "*", + "day_of_week": "0", + "timezone": "America/Los_Angeles", + }, + "daily": { + "minute": "5", + "hour": "0", + "day_of_month": "*", + "month_of_year": "*", + "day_of_week": "*", + "timezone": "America/Los_Angeles", + }, + "hourly": { + "minute": "5", + "hour": "*", + "day_of_month": "*", + "month_of_year": "*", + "day_of_week": "*", + }, + "every_15m": { + "minute": "*/15", + "hour": "*", + "day_of_month": "*", + "month_of_year": "*", + "day_of_week": "*", + }, + "every_15m_except_midnight": { + "minute": "*/15", + "hour": "1-23", + "day_of_month": "*", + "month_of_year": "*", + "day_of_week": "*", + "timezone": "America/Los_Angeles", + }, +} + + +class Command(BaseCommand): + """Manage periodic tasks""" + crontabs = None + + def add_arguments(self, parser): + parser.add_argument("--create-default", action="store_true") + parser.add_argument("--enable", type=int, action="append") + parser.add_argument("--disable", type=int, action="append") + + def handle(self, *args, **options): + self.crontabs = self.get_or_create_crontabs() + if options["create_default"]: + self.create_default_tasks() + if options["enable"]: + self.enable_tasks(options["enable"]) + if options["disable"]: + self.disable_tasks(options["disable"]) + self.show_tasks() + + def get_or_create_crontabs(self): + crontabs = {} + for label, definition in CRONTAB_DEFS.items(): + crontabs[label], _ = CrontabSchedule.objects.get_or_create(**definition) + return crontabs + + def create_default_tasks(self): + PeriodicTask.objects.get_or_create( + name="Send scheduled mail", + task="ietf.message.tasks.send_scheduled_mail_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["every_15m"], + description="Send mail scheduled to go out at certain times" + ), + ) + + PeriodicTask.objects.get_or_create( + name="Partial sync with RFC Editor index", + task="ietf.sync.tasks.rfc_editor_index_update_task", + kwargs=json.dumps(dict(full_index=False)), + defaults=dict( + enabled=False, + crontab=self.crontabs["every_15m_except_midnight"], # don't collide with full sync + description=( + "Reparse the last _year_ of RFC index entries until " + "https://github.com/ietf-tools/datatracker/issues/3734 is addressed. " + "This takes about 20s on production as of 2022-08-11." + ) + ), + ) + + PeriodicTask.objects.get_or_create( + name="Full sync with RFC Editor index", + task="ietf.sync.tasks.rfc_editor_index_update_task", + kwargs=json.dumps(dict(full_index=True)), + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description=( + "Run an extended version of the rfc editor update to catch changes with backdated timestamps" + ), + ), + ) + + PeriodicTask.objects.get_or_create( + name="Fetch meeting attendance", + task="ietf.stats.tasks.fetch_meeting_attendance_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Fetch meeting attendance data from ietf.org/registration/attendees", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Send review reminders", + task="ietf.review.tasks.send_review_reminders_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Send reminders originating from the review app", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Expire I-Ds", + task="ietf.doc.tasks.expire_ids_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Create expiration notices for expired I-Ds", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Expire Last Calls", + task="ietf.doc.tasks.expire_last_calls_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Move docs whose last call has expired to their next states", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Sync with IANA changes", + task="ietf.sync.tasks.iana_changes_update_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Fetch change list from IANA and apply to documents", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Sync with IANA protocols page", + task="ietf.sync.tasks.iana_protocols_update_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Fetch protocols page from IANA and update document event logs", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Update I-D index files", + task="ietf.idindex.tasks.idindex_update_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Update I-D index files", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Send expiration notifications", + task="ietf.doc.tasks.notify_expirations_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["weekly"], + description="Send notifications about I-Ds that will expire in the next 14 days", + ) + ) + + PeriodicTask.objects.get_or_create( + name="Generate idnits2 rfcs-obsoleted blob", + task="ietf.doc.tasks.generate_idnits2_rfcs_obsoleted_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Generate the rfcs-obsoleted file used by idnits", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Generate idnits2 rfc-status blob", + task="ietf.doc.tasks.generate_idnits2_rfc_status_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Generate the rfc_status blob used by idnits", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Send NomCom reminders", + task="ietf.nomcom.tasks.send_nomcom_reminders_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Send acceptance and questionnaire reminders to nominees", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Generate WG charter files", + task="ietf.group.tasks.generate_wg_charters_files_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Update 1wg-charters.txt and 1wg-charters-by-acronym.txt", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Generate WG summary files", + task="ietf.group.tasks.generate_wg_summary_files_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Update 1wg-summary.txt and 1wg-summary-by-acronym.txt", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Generate I-D bibxml files", + task="ietf.doc.tasks.generate_draft_bibxml_files_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["hourly"], + description="Generate draft bibxml files for the last week's drafts", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Send personal API key usage emails", + task="ietf.person.tasks.send_apikey_usage_emails_task", + kwargs=json.dumps(dict(days=7)), + defaults=dict( + enabled=False, + crontab=self.crontabs["weekly"], + description="Send personal API key usage summary emails for the past week", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Purge old personal API key events", + task="ietf.person.tasks.purge_personal_api_key_events_task", + kwargs=json.dumps(dict(keep_days=14)), + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Purge PersonApiKeyEvent instances older than 14 days", + ), + ) + + PeriodicTask.objects.get_or_create( + name="Run Yang model checks", + task="ietf.submit.tasks.run_yang_model_checks_task", + defaults=dict( + enabled=False, + crontab=self.crontabs["daily"], + description="Re-run Yang model checks on all active drafts", + ), + ) + + def show_tasks(self): + for label, crontab in self.crontabs.items(): + tasks = PeriodicTask.objects.filter(crontab=crontab).order_by( + "task", "name" + ) + self.stdout.write(f"\n{label} ({crontab.human_readable})\n") + if tasks: + for task in tasks: + desc = f" {task.id:-3d}: {task.task} - {task.name}" + if task.enabled: + self.stdout.write(desc) + else: + self.stdout.write(self.style.NOTICE(f"{desc} - disabled")) + else: + self.stdout.write(" Nothing scheduled") + + def enable_tasks(self, pks): + PeriodicTask.objects.filter( + crontab__in=self.crontabs.values(), pk__in=pks + ).update(enabled=True) + + def disable_tasks(self, pks): + PeriodicTask.objects.filter( + crontab__in=self.crontabs.values(), pk__in=pks + ).update(enabled=False) diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py deleted file mode 100644 index 864dfafb729..00000000000 --- a/ietf/utils/management/commands/populate_yang_model_dirs.py +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright The IETF Trust 2016-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import io -import os -import sys -import time - -from pathlib import Path -from textwrap import dedent -from xym import xym - -from django.conf import settings -from django.core.management.base import BaseCommand - -import debug # pyflakes:ignore - -class Command(BaseCommand): - """ - Populate the yang module repositories from drafts and RFCs. - - Extracts yang models from RFCs (found in settings.RFC_PATH and places - them in settings.SUBMIT_YANG_RFC_MODEL_DIR, and from active drafts, placed in - settings.SUBMIT_YANG_DRAFT_MODEL_DIR. - - """ - - help = dedent(__doc__).strip() - - def add_arguments(self, parser): - parser.add_argument('--clean', - action='store_true', dest='clean', default=False, - help='Remove the current directory content before writing new models.') - - - def handle(self, *filenames, **options): - """ - - * All yang modules from published RFCs should be extracted and be - available in an rfc-yang repository. - - * All valid yang modules from active, not replaced, Internet-Drafts - should be extracted and be available in a draft-valid-yang repository. - - * All, valid and invalid, yang modules from active, not replaced, - Internet-Drafts should be available in a draft-all-yang repository. - (Actually, given precedence ordering, it would be enough to place - non-validating modules in a draft-invalid-yang repository instead). - - * In all cases, example modules should be excluded. - - * Precedence is established by the search order of the repository as - provided to pyang. - - * As drafts expire, models should be removed in order to catch cases - where a module being worked on depends on one which has slipped out - of the work queue. - - """ - - verbosity = int(options.get('verbosity')) - - def extract_from(file, dir, strict=True): - saved_stdout = sys.stdout - saved_stderr = sys.stderr - xymerr = io.StringIO() - xymout = io.StringIO() - sys.stderr = xymerr - sys.stdout = xymout - model_list = [] - try: - model_list = xym.xym(str(file), str(file.parent), str(dir), strict=strict, debug_level=verbosity-2) - for name in model_list: - modfile = moddir / name - mtime = file.stat().st_mtime - os.utime(str(modfile), (mtime, mtime)) - if '"' in name: - name = name.replace('"', '') - modfile.rename(str(moddir/name)) - model_list = [ n.replace('"','') for n in model_list ] - except Exception as e: - self.stderr.write("** Error when extracting from %s: %s" % (file, str(e))) - finally: - sys.stdout = saved_stdout - sys.stderr = saved_stderr - # - if verbosity > 1: - outmsg = xymout.getvalue() - if outmsg.strip(): - self.stdout.write(outmsg) - if verbosity>2: - errmsg = xymerr.getvalue() - if errmsg.strip(): - self.stderr.write(errmsg) - return model_list - - # Extract from new RFCs - - rfcdir = Path(settings.RFC_PATH) - - moddir = Path(settings.SUBMIT_YANG_RFC_MODEL_DIR) - if not moddir.exists(): - moddir.mkdir(parents=True) - - latest = 0 - for item in moddir.iterdir(): - if item.stat().st_mtime > latest: - latest = item.stat().st_mtime - - if verbosity > 0: - self.stdout.write("Extracting to %s ..." % moddir) - for item in rfcdir.iterdir(): - if item.is_file() and item.name.startswith('rfc') and item.name.endswith('.txt') and item.name[3:-4].isdigit(): - if item.stat().st_mtime > latest: - model_list = extract_from(item, moddir) - for name in model_list: - if name.startswith('ietf') or name.startswith('iana'): - if verbosity > 1: - self.stdout.write(" Extracted from %s: %s" % (item, name)) - elif verbosity > 0: - self.stdout.write('.', ending='') - self.stdout.flush() - else: - modfile = moddir / name - modfile.unlink() - if verbosity > 1: - self.stdout.write(" Skipped module from %s: %s" % (item, name)) - if verbosity > 0: - self.stdout.write("") - - # Extract valid modules from drafts - - six_months_ago = time.time() - 6*31*24*60*60 - def active(item): - return item.stat().st_mtime > six_months_ago - - draftdir = Path(settings.INTERNET_DRAFT_PATH) - - moddir = Path(settings.SUBMIT_YANG_DRAFT_MODEL_DIR) - if not moddir.exists(): - moddir.mkdir(parents=True) - if verbosity > 0: - self.stdout.write("Emptying %s ..." % moddir) - for item in moddir.iterdir(): - item.unlink() - - if verbosity > 0: - self.stdout.write("Extracting to %s ..." % moddir) - for item in draftdir.iterdir(): - try: - if item.is_file() and item.name.startswith('draft') and item.name.endswith('.txt') and active(item): - model_list = extract_from(item, moddir, strict=False) - for name in model_list: - if not name.startswith('example'): - if verbosity > 1: - self.stdout.write(" Extracted module from %s: %s" % (item, name)) - elif verbosity > 0: - self.stdout.write('.', ending='') - self.stdout.flush() - else: - modfile = moddir / name - modfile.unlink() - if verbosity > 1: - self.stdout.write(" Skipped module from %s: %s" % (item, name)) - except UnicodeDecodeError as e: - self.stderr.write('\nError: %s' % (e, )) - self.stderr.write(item.name) - self.stderr.write('') - if verbosity > 0: - self.stdout.write('') - diff --git a/ietf/utils/management/commands/run_yang_model_checks.py b/ietf/utils/management/commands/run_yang_model_checks.py deleted file mode 100644 index 13fb61c46b9..00000000000 --- a/ietf/utils/management/commands/run_yang_model_checks.py +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright The IETF Trust 2017-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import json - -from textwrap import dedent - -from django.core.management.base import BaseCommand - -import debug # pyflakes:ignore - -from ietf.doc.models import Document, State, DocAlias -from ietf.submit.models import Submission -from ietf.submit.checkers import DraftYangChecker - - -class Command(BaseCommand): - """ - Run yang model checks on active drafts. - - Repeats the yang checks in ietf/submit/checkers.py for active drafts, in - order to catch changes in status due to new modules becoming available in - the module directories. - - """ - - help = dedent(__doc__).strip() - - def add_arguments(self, parser): - parser.add_argument('draftnames', nargs="*", help="drafts to check, or none to check all active yang drafts") - parser.add_argument('--clean', - action='store_true', dest='clean', default=False, - help='Remove the current directory content before writing new models.') - - - def check_yang(self, checker, draft, force=False): - if self.verbosity > 1: - self.stdout.write("Checking %s-%s" % (draft.name, draft.rev)) - elif self.verbosity > 0: - self.stderr.write('.', ending='') - submission = Submission.objects.filter(name=draft.name, rev=draft.rev).order_by('-id').first() - if submission or force: - check = submission.checks.filter(checker=checker.name).order_by('-id').first() - if check or force: - result = checker.check_file_txt(draft.get_file_name()) - passed, message, errors, warnings, items = result - if self.verbosity > 2: - self.stdout.write(" Errors: %s\n" - " Warnings: %s\n" - " Message:\n%s\n" % (errors, warnings, message)) - items = json.loads(json.dumps(items)) - new_res = (passed, errors, warnings, message) - old_res = (check.passed, check.errors, check.warnings, check.message) if check else () - if new_res != old_res: - if self.verbosity > 1: - self.stdout.write(" Saving new yang checker results for %s-%s" % (draft.name, draft.rev)) - qs = submission.checks.filter(checker=checker.name).order_by('time') - submission.checks.filter(checker=checker.name).exclude(pk=qs.first().pk).delete() - submission.checks.create(submission=submission, checker=checker.name, passed=passed, - message=message, errors=errors, warnings=warnings, items=items, - symbol=checker.symbol) - else: - self.stderr.write("Error: did not find any submission object for %s-%s" % (draft.name, draft.rev)) - - def handle(self, *filenames, **options): - """ - """ - - self.verbosity = int(options.get('verbosity')) - drafts = options.get('draftnames') - - active_state = State.objects.get(type="draft", slug="active") - - checker = DraftYangChecker() - if drafts: - for name in drafts: - parts = name.rsplit('-',1) - if len(parts)==2 and len(parts[1])==2 and parts[1].isdigit(): - name = parts[0] - draft = DocAlias.objects.get(name=name).document - self.check_yang(checker, draft, force=True) - else: - for draft in Document.objects.filter(states=active_state, type_id='draft'): - self.check_yang(checker, draft) diff --git a/ietf/utils/management/commands/showloggers.py b/ietf/utils/management/commands/showloggers.py index 3de9db0c061..b79da9ce267 100644 --- a/ietf/utils/management/commands/showloggers.py +++ b/ietf/utils/management/commands/showloggers.py @@ -11,18 +11,7 @@ import debug # pyflakes:ignore class Command(BaseCommand): - """ - Display a list or tree representation of python loggers. - - Add a UTILS_LOGGER_LEVELS setting in settings_local.py to configure - non-default logging levels for any registered logger, for instance: - - UTILS_LOGGER_LEVELS = { - 'oicd_provider': 'DEBUG', - 'urllib3.connection': 'DEBUG', - } - - """ + """Display a list or tree representation of python loggers""" help = dedent(__doc__).strip() diff --git a/ietf/utils/management/commands/update_community_list_index.py b/ietf/utils/management/commands/update_community_list_index.py index 609577763e4..7f4951fd6e2 100644 --- a/ietf/utils/management/commands/update_community_list_index.py +++ b/ietf/utils/management/commands/update_community_list_index.py @@ -32,7 +32,7 @@ def handle(self, *args, **options): person = rule.person if not person and not group: try: - person = rule.community_list.user.person + person = rule.community_list.person except: pass name = ((group and group.acronym) or (person and person.email_address())) or '?' diff --git a/ietf/utils/management/commands/update_external_command_info.py b/ietf/utils/management/commands/update_external_command_info.py deleted file mode 100644 index e9e24f000d6..00000000000 --- a/ietf/utils/management/commands/update_external_command_info.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright The IETF Trust 2017-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import sys - -from textwrap import dedent - -from django.core.management.base import BaseCommand - -import debug # pyflakes:ignore - -from ietf.utils.models import VersionInfo -from ietf.utils.pipe import pipe - -class Command(BaseCommand): - """ - Update the version information for external commands used by the datatracker. - - Iterates through the entries in the VersionInfo table, runs the relevant - command, and updates the version string with the result. - - """ - - help = dedent(__doc__).strip() - - def handle(self, *filenames, **options): - for c in VersionInfo.objects.filter(used=True): - cmd = "%s %s" % (c.command, c.switch) - code, out, err = pipe(cmd) - out = out.decode('utf-8') - err = err.decode('utf-8') - if code != 0: - sys.stderr.write("Command '%s' returned %s: \n%s\n%s\n" % (cmd, code, out, err)) - else: - c.version = (out.strip()+'\n'+err.strip()).strip() - if options.get('verbosity', 1) > 1: - sys.stdout.write( - "Command: %s\n" - " Version: %s\n" % (cmd, c.version)) - c.save() diff --git a/ietf/utils/management/tests.py b/ietf/utils/management/tests.py index e94c39354f0..38be464c7f6 100644 --- a/ietf/utils/management/tests.py +++ b/ietf/utils/management/tests.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2013-2020, All Rights Reserved # -*- coding: utf-8 -*- -import mock +from unittest import mock from django.core.management import call_command, CommandError from django.test import override_settings @@ -12,7 +12,7 @@ from ietf.utils.test_utils import TestCase -@mock.patch.object(EmailOnFailureCommand, 'handle') +@mock.patch.object(EmailOnFailureCommand, 'handle', return_value=None) class EmailOnFailureCommandTests(TestCase): def test_calls_handle(self, handle_method): call_command(EmailOnFailureCommand()) diff --git a/ietf/utils/markdown.py b/ietf/utils/markdown.py index 63d1c7a70f1..0b522685b2f 100644 --- a/ietf/utils/markdown.py +++ b/ietf/utils/markdown.py @@ -12,13 +12,15 @@ from django.utils.safestring import mark_safe from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs -from ietf.utils.text import bleach_cleaner, bleach_linker +from .html import clean_html, liberal_clean_html +from .text import linkify + class LinkifyExtension(Extension): """ Simple Markdown extension inspired by https://github.com/daGrevis/mdx_linkify, - but using our bleach_linker directly. Doing the linkification on the converted + but using our own linker directly. Doing the linkification on the converted Markdown output introduces artifacts. """ @@ -31,12 +33,28 @@ def extendMarkdown(self, md): class LinkifyPostprocessor(Postprocessor): def run(self, text): - return urlize_ietf_docs(bleach_linker.linkify(text)) + return urlize_ietf_docs(linkify(text)) def markdown(text): return mark_safe( - bleach_cleaner.clean( + clean_html( + python_markdown.markdown( + text, + extensions=[ + "extra", + "nl2br", + "sane_lists", + "toc", + LinkifyExtension(), + ], + ) + ) + ) + +def liberal_markdown(text): + return mark_safe( + liberal_clean_html( python_markdown.markdown( text, extensions=[ diff --git a/ietf/utils/meetecho.py b/ietf/utils/meetecho.py index 26ae93f03d8..7654f67cd15 100644 --- a/ietf/utils/meetecho.py +++ b/ietf/utils/meetecho.py @@ -1,9 +1,10 @@ -# Copyright The IETF Trust 2021, All Rights Reserved +# Copyright The IETF Trust 2021-2024, All Rights Reserved # """Meetecho interim meeting scheduling API Implements the v1 API described in email from alex@meetecho.com -on 2021-12-09. +on 2021-12-09, plus additional slide management API discussed via +IM in 2024 Feb. API methods return Python objects equivalent to the JSON structures specified in the API documentation. Times and durations are represented @@ -13,29 +14,36 @@ import debug # pyflakes: ignore -from datetime import datetime, timedelta +import datetime from json import JSONDecodeError -from pytz import utc -from typing import Dict, Sequence, Union +from pprint import pformat +from typing import Sequence, TypedDict, TYPE_CHECKING, Union from urllib.parse import urljoin +# Guard against hypothetical cyclical import problems +if TYPE_CHECKING: + from ietf.doc.models import Document + from ietf.meeting.models import Session + class MeetechoAPI: - timezone = utc + timezone = datetime.UTC - def __init__(self, api_base: str, client_id: str, client_secret: str, request_timeout=3.01): + def __init__( + self, api_base: str, client_id: str, client_secret: str, request_timeout=3.01 + ): self.client_id = client_id self.client_secret = client_secret self.request_timeout = request_timeout # python-requests doc recommend slightly > a multiple of 3 seconds self._session = requests.Session() # if needed, add a trailing slash so urljoin won't eat the trailing path component - self.api_base = api_base if api_base.endswith('/') else f'{api_base}/' + self.api_base = api_base if api_base.endswith("/") else f"{api_base}/" def _request(self, method, url, api_token=None, json=None): """Execute an API request""" - headers = {'Accept': 'application/json'} + headers = {"Accept": "application/json"} if api_token is not None: - headers['Authorization'] = f'bearer {api_token}' + headers["Authorization"] = f"bearer {api_token}" try: response = self._session.request( @@ -47,28 +55,31 @@ def _request(self, method, url, api_token=None, json=None): ) except requests.RequestException as err: raise MeetechoAPIError(str(err)) from err - if response.status_code != 200: - raise MeetechoAPIError(f'API request failed (HTTP status code = {response.status_code})') + if response.status_code not in (200, 202): + # Could be more selective about status codes, but not seeing an immediate need + raise MeetechoAPIError( + f"API request failed (HTTP status code = {response.status_code})" + ) # try parsing the result as JSON in case the server failed to set the Content-Type header try: return response.json() except JSONDecodeError as err: - if response.headers['Content-Type'].startswith('application/json'): + if response.headers.get("Content-Type", "").startswith("application/json"): # complain if server told us to expect JSON and it was invalid - raise MeetechoAPIError('Error decoding response as JSON') from err + raise MeetechoAPIError("Error decoding response as JSON") from err return None - def _deserialize_time(self, s: str) -> datetime: - return self.timezone.localize(datetime.strptime(s, '%Y-%m-%d %H:%M:%S')) + def _deserialize_time(self, s: str) -> datetime.datetime: + return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M:%S").replace(tzinfo=self.timezone) - def _serialize_time(self, dt: datetime) -> str: - return dt.astimezone(self.timezone).strftime('%Y-%m-%d %H:%M:%S') + def _serialize_time(self, dt: datetime.datetime) -> str: + return dt.astimezone(self.timezone).strftime("%Y-%m-%d %H:%M:%S") - def _deserialize_duration(self, minutes: int) -> timedelta: - return timedelta(minutes=minutes) + def _deserialize_duration(self, minutes: int) -> datetime.timedelta: + return datetime.timedelta(minutes=minutes) - def _serialize_duration(self, td: timedelta) -> int: + def _serialize_duration(self, td: datetime.timedelta) -> int: return int(td.total_seconds() // 60) def _deserialize_meetings_response(self, response): @@ -76,30 +87,42 @@ def _deserialize_meetings_response(self, response): Deserializes data in the structure where needed (currently, that's time-related structures) """ - for session_data in response['rooms'].values(): - session_data['room']['start_time'] = self._deserialize_time(session_data['room']['start_time']) - session_data['room']['duration'] = self._deserialize_duration(session_data['room']['duration']) + for session_data in response["rooms"].values(): + session_data["room"]["start_time"] = self._deserialize_time( + session_data["room"]["start_time"] + ) + session_data["room"]["duration"] = self._deserialize_duration( + session_data["room"]["duration"] + ) return response def retrieve_wg_tokens(self, acronyms: Union[str, Sequence[str]]): """Retrieve API tokens for one or more WGs - :param acronyms: list of WG acronyms for which tokens are requested + :param acronyms: list of WG acronyms for which tokens are requested :return: {'tokens': {acronym0: token0, acronym1: token1, ...}} """ return self._request( - 'POST', 'auth/ietfservice/tokens', + "POST", + "auth/ietfservice/tokens", json={ - 'client': self.client_id, - 'secret': self.client_secret, - 'wgs': [acronyms] if isinstance(acronyms, str) else acronyms, - } + "client": self.client_id, + "secret": self.client_secret, + "wgs": [acronyms] if isinstance(acronyms, str) else acronyms, + }, ) - def schedule_meeting(self, wg_token: str, description: str, start_time: datetime, duration: timedelta, - extrainfo=''): + def schedule_meeting( + self, + wg_token: str, + room_id: int, + description: str, + start_time: datetime.datetime, + duration: datetime.timedelta, + extrainfo="", + ): """Schedule a meeting session - + Return structure is: { "rooms": { @@ -115,8 +138,9 @@ def schedule_meeting(self, wg_token: str, description: str, start_time: datetime } } } - - :param wg_token: token retrieved via retrieve_wg_tokens() + + :param wg_token: token retrieved via retrieve_wg_tokens() + :param room_id: int id to identify the room (will be echoed as room.id) :param description: str describing the meeting :param start_time: starting time as a datetime :param duration: duration as a timedelta @@ -125,13 +149,15 @@ def schedule_meeting(self, wg_token: str, description: str, start_time: datetime """ return self._deserialize_meetings_response( self._request( - 'POST', 'meeting/interim/createRoom', + "POST", + "meeting/interim/createRoom", api_token=wg_token, json={ - 'description': description, - 'start_time': self._serialize_time(start_time), - 'duration': self._serialize_duration(duration), - 'extrainfo': extrainfo, + "room_id": room_id, + "description": description, + "start_time": self._serialize_time(start_time), + "duration": self._serialize_duration(duration), + "extrainfo": extrainfo, }, ) ) @@ -154,7 +180,7 @@ def fetch_meetings(self, wg_token: str): } } } - + As of 2022-01-31, the return structure also includes a 'group' key whose value is the group acronym. This is not shown in the documentation. @@ -162,7 +188,7 @@ def fetch_meetings(self, wg_token: str): :return: meeting data dict """ return self._deserialize_meetings_response( - self._request('GET', 'meeting/interim/fetchRooms', api_token=wg_token) + self._request("GET", "meeting/interim/fetchRooms", api_token=wg_token) ) def delete_meeting(self, deletion_token: str): @@ -171,7 +197,166 @@ def delete_meeting(self, deletion_token: str): :param deletion_token: deletion_key from fetch_meetings() or schedule_meeting() return data :return: {} """ - return self._request('POST', 'meeting/interim/deleteRoom', api_token=deletion_token) + return self._request( + "POST", "meeting/interim/deleteRoom", api_token=deletion_token + ) + + class SlideDeckDict(TypedDict): + id: int + title: str + url: str + rev: str + order: int + + def add_slide_deck( + self, + wg_token: str, + session: str, # unique identifier + deck: SlideDeckDict, + ): + """Add a slide deck for the specified session + + API spec: + ⠀POST /materials + + Authentication -> same as interim scheduler + + content application/json + + body + { + "session": String, // Unique session identifier + "title": String, + "id": Number, + "url": String, + "rev": String, + "order": Number + } + + + Results + 202 Accepted + {4xx} + """ + self._request( + "POST", + "materials", + api_token=wg_token, + json={ + "session": session, + "title": deck["title"], + "id": deck["id"], + "url": deck["url"], + "rev": deck["rev"], + "order": deck["order"], + }, + ) + + def delete_slide_deck( + self, + wg_token: str, + session: str, # unique identifier + id: int, + ): + """Delete a slide deck from the specified session + + API spec: + DELETE /materials + + Authentication -> same as interim scheduler + + content application/json + + body + { + "session": String, + "id": Number + } + + + Results + 202 Accepted + {4xx} + """ + self._request( + "DELETE", + "materials", + api_token=wg_token, + json={ + "session": session, + "id": id, + }, + ) + + def update_slide_decks( + self, + wg_token: str, + session: str, # unique id + decks: list[SlideDeckDict], + ): + """Update/reorder decks for specified session + + PUT /materials + + Authentication -> same as interim scheduler + + content application/json + + body + { + "session": String, + "decks": [ + { + "id": Number, + "title": String, + "url": String, + "rev": String, + "order": Number + }, + { + "id": Number, + "title": String, + "url": String, + "rev": String, + "order": Number + }, + ... + ] + } + + + Results + 202 Accepted + """ + self._request( + "PUT", + "materials", + api_token=wg_token, + json={ + "session": session, + "decks": decks, + } + ) + + +class DebugMeetechoAPI(MeetechoAPI): + """Meetecho API stand-in that writes to stdout instead of making requests""" + def _request(self, method, url, api_token=None, json=None): + json_lines = pformat(json, width=60).split("\n") + debug.say( + "\n" + + "\n".join( + [ + f">> MeetechoAPI: request(method={method},", + f">> MeetechoAPI: url={url},", + f">> MeetechoAPI: api_token={api_token},", + ">> MeetechoAPI: json=" + json_lines[0], + ( + ">> MeetechoAPI: " + + "\n>> MeetechoAPI: ".join(l for l in json_lines[1:]) + ), + ">> MeetechoAPI: )" + ] + ) + ) + + def retrieve_wg_tokens(self, acronyms: Union[str, Sequence[str]]): + super().retrieve_wg_tokens(acronyms) # so that we capture the outgoing request + acronyms = [acronyms] if isinstance(acronyms, str) else acronyms + return { + "tokens": { + acro: f"{acro}-token" + for acro in acronyms + } + } class MeetechoAPIError(Exception): @@ -180,7 +365,18 @@ class MeetechoAPIError(Exception): class Conference: """Scheduled session/room representation""" - def __init__(self, manager, id, public_id, description, start_time, duration, url, deletion_token): + + def __init__( + self, + manager, + id, + public_id, + description, + start_time, + duration, + url, + deletion_token, + ): self._manager = manager self.id = id # Meetecho system ID self.public_id = public_id # public session UUID @@ -195,22 +391,23 @@ def from_api_dict(cls, manager, api_dict): # Returns a list of Conferences return [ cls( - **val['room'], + **val["room"], public_id=public_id, - url=val['url'], - deletion_token=val['deletion_token'], + url=val["url"], + deletion_token=val["deletion_token"], manager=manager, - ) for public_id, val in api_dict.items() + ) + for public_id, val in api_dict.items() ] def __str__(self): - return f'Meetecho conference {self.description}' + return f"Meetecho conference {self.description}" def __repr__(self): props = [ f'description="{self.description}"', - f'start_time={repr(self.start_time)}', - f'duration={repr(self.duration)}', + f"start_time={repr(self.start_time)}", + f"duration={repr(self.duration)}", ] return f'Conference({", ".join(props)})' @@ -218,8 +415,13 @@ def __eq__(self, other): return isinstance(other, type(self)) and all( getattr(self, attr) == getattr(other, attr) for attr in [ - 'id', 'public_id', 'description', 'start_time', - 'duration', 'url', 'deletion_token' + "id", + "public_id", + "description", + "start_time", + "duration", + "url", + "deletion_token", ] ) @@ -227,37 +429,154 @@ def delete(self): self._manager.delete_conference(self) -class ConferenceManager: - def __init__(self, api_config: dict): - self.api = MeetechoAPI(**api_config) - self.wg_tokens: Dict[str, str] = {} - +class Manager: + def __init__(self, api_config): + api_kwargs = dict( + api_base=api_config["api_base"], + client_id=api_config["client_id"], + client_secret=api_config["client_secret"], + ) + if "request_timeout" in api_config: + api_kwargs["request_timeout"] = api_config["request_timeout"] + if api_config.get("debug", False): + self.api = DebugMeetechoAPI(**api_kwargs) + else: + self.api = MeetechoAPI(**api_kwargs) + self.wg_tokens = {} + def wg_token(self, group): - group_acronym = group.acronym if hasattr(group, 'acronym') else group + group_acronym = group.acronym if hasattr(group, "acronym") else group if group_acronym not in self.wg_tokens: - self.wg_tokens[group_acronym] = self.api.retrieve_wg_tokens( - group_acronym - )['tokens'][group_acronym] + self.wg_tokens[group_acronym] = self.api.retrieve_wg_tokens(group_acronym)[ + "tokens" + ][group_acronym] return self.wg_tokens[group_acronym] + +class ConferenceManager(Manager): def fetch(self, group): response = self.api.fetch_meetings(self.wg_token(group)) - return Conference.from_api_dict(self, response['rooms']) + return Conference.from_api_dict(self, response["rooms"]) - def create(self, group, description, start_time, duration, extrainfo=''): + def create(self, group, session_id, description, start_time, duration, extrainfo=""): response = self.api.schedule_meeting( wg_token=self.wg_token(group), + room_id=int(session_id), description=description, start_time=start_time, duration=duration, extrainfo=extrainfo, ) - return Conference.from_api_dict(self, response['rooms']) - + return Conference.from_api_dict(self, response["rooms"]) + def delete_by_url(self, group, url): for conf in self.fetch(group): if conf.url == url: self.api.delete_meeting(conf.deletion_token) def delete_conference(self, conf: Conference): - self.api.delete_meeting(conf.deletion_token) \ No newline at end of file + self.api.delete_meeting(conf.deletion_token) + + +class SlidesManager(Manager): + """Interface between Datatracker models and Meetecho API + + Note: the URL sent for a slide deck comes from DocumentInfo.get_href() and includes the revision + of the slides being sent. Be sure that 1) the URL matches what api_get_session_materials() returns + for the slides; and 2) the URL is valid if it is fetched immediately - possibly even before the call + to SlidesManager.add() or send_update() returns. + """ + + def __init__(self, api_config): + super().__init__(api_config) + slides_notify_time = api_config.get("slides_notify_time", 15) + if slides_notify_time is None: + self.slides_notify_time = None + else: + self.slides_notify_time = datetime.timedelta(minutes=slides_notify_time) + + def _should_send_update(self, session): + if self.slides_notify_time is None: + return False + timeslot = session.official_timeslotassignment().timeslot + if timeslot is None: + return False + if self.slides_notify_time < datetime.timedelta(0): + return True # < 0 means "always" for a scheduled session + else: + now = datetime.datetime.now(tz=datetime.UTC) + return (timeslot.time - self.slides_notify_time) < now < (timeslot.end_time() + self.slides_notify_time) + + def add(self, session: "Session", slides: "Document", order: int): + if not self._should_send_update(session): + return + + # Would like to confirm that session.presentations includes the slides Document, but we can't + # (same problem regarding unsaved Documents discussed in the docstring) + self.api.add_slide_deck( + wg_token=self.wg_token(session.group), + session=str(session.pk), + deck={ + "id": slides.pk, + "title": slides.title, + "url": slides.get_href(), + "rev": slides.rev, + "order": order, + } + ) + + def delete(self, session: "Session", slides: "Document"): + """Delete a slide deck from the session""" + if not self._should_send_update(session): + return + + if session.presentations.filter(document=slides).exists(): + # "order" problems are very likely to result if we delete slides that are actually still + # linked to the session + raise MeetechoAPIError( + f"Slides {slides.pk} are still linked to session {session.pk}." + ) + # remove, leaving a hole + self.api.delete_slide_deck( + wg_token=self.wg_token(session.group), + session=str(session.pk), + id=slides.pk, + ) + if session.presentations.filter(document__type_id="slides").exists(): + self.send_update(session) # adjust order to fill in the hole + + def revise(self, session: "Session", slides: "Document"): + """Replace existing deck with its current state""" + if not self._should_send_update(session): + return + + sp = session.presentations.filter(document=slides).first() + if sp is None: + raise MeetechoAPIError(f"Slides {slides.pk} not in session {session.pk}") + order = sp.order + # remove, leaving a hole in the order on Meetecho's side + self.api.delete_slide_deck( + wg_token=self.wg_token(session.group), + session=str(session.pk), + id=slides.pk, + ) + self.add(session, slides, order) # fill in the hole + + def send_update(self, session: "Session"): + if not self._should_send_update(session): + return + + self.api.update_slide_decks( + wg_token=self.wg_token(session.group), + session=str(session.pk), + decks=[ + { + "id": deck.document.pk, + "title": deck.document.title, + "url": deck.document.get_href(), + "rev": deck.document.rev, + "order": deck.order, + } + for deck in session.presentations.filter(document__type="slides") + ] + ) diff --git a/ietf/utils/migrations/0002_delete_versioninfo.py b/ietf/utils/migrations/0002_delete_versioninfo.py new file mode 100644 index 00000000000..2835bb017b5 --- /dev/null +++ b/ietf/utils/migrations/0002_delete_versioninfo.py @@ -0,0 +1,16 @@ +# Generated by Django 4.2.11 on 2024-05-03 21:03 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("utils", "0001_initial"), + ] + + operations = [ + migrations.DeleteModel( + name="VersionInfo", + ), + ] diff --git a/ietf/utils/mime.py b/ietf/utils/mime.py index ab21cfe5c62..1f9b75b4dfa 100644 --- a/ietf/utils/mime.py +++ b/ietf/utils/mime.py @@ -5,6 +5,7 @@ import magic import re + def get_mime_type(content): # try to fixup encoding if hasattr(magic, "open"): @@ -13,15 +14,17 @@ def get_mime_type(content): filetype = m.buffer(content) else: m = magic.Magic() - m.cookie = magic.magic_open(magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING) + m.cookie = magic.magic_open( + magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING + ) magic.magic_load(m.cookie, None) filetype = m.from_buffer(content) # Work around silliness in libmagic on OpenSUSE 15.1 - filetype = filetype.replace('text/x-Algol68;', 'text/plain;') - if ';' in filetype and 'charset=' in filetype: - mimetype, charset = re.split('; *charset=', filetype) + filetype = filetype.replace("text/x-Algol68;", "text/plain;") + filetype = filetype.replace("application/vnd.hp-HPGL;", "text/plain;") + if ";" in filetype and "charset=" in filetype: + mimetype, charset = re.split("; *charset=", filetype) else: - mimetype = re.split(';', filetype)[0] - charset = 'utf-8' + mimetype = re.split(";", filetype)[0] + charset = "utf-8" return mimetype, charset - diff --git a/ietf/utils/models.py b/ietf/utils/models.py index 0915537fd83..21af5766e99 100644 --- a/ietf/utils/models.py +++ b/ietf/utils/models.py @@ -9,15 +9,6 @@ class DumpInfo(models.Model): host = models.CharField(max_length=128) tz = models.CharField(max_length=32, default='UTC') -class VersionInfo(models.Model): - time = models.DateTimeField(auto_now=True) - command = models.CharField(max_length=32) - switch = models.CharField(max_length=16) - version = models.CharField(max_length=64) - used = models.BooleanField(default=True) - class Meta: - verbose_name_plural = 'VersionInfo' - class ForeignKey(models.ForeignKey): "A local ForeignKey proxy which provides the on_delete value required under Django 2.0." def __init__(self, to, on_delete=models.CASCADE, **kwargs): diff --git a/ietf/utils/patch.py b/ietf/utils/patch.py index 9de2270ebb3..fd3e4a165d4 100644 --- a/ietf/utils/patch.py +++ b/ietf/utils/patch.py @@ -87,8 +87,7 @@ def createLock(self): debugmode = False def setdebug(): - global debugmode, streamhandler - + global debugmode debugmode = True loglevel = logging.DEBUG logformat = "%(levelname)8s %(message)s" diff --git a/ietf/utils/resources.py b/ietf/utils/resources.py index 6d61c5e2ed5..1252cfef146 100644 --- a/ietf/utils/resources.py +++ b/ietf/utils/resources.py @@ -12,7 +12,7 @@ from django.contrib.contenttypes.models import ContentType from ietf import api -from ietf.utils.models import DumpInfo, VersionInfo +from ietf.utils.models import DumpInfo class UserResource(ModelResource): @@ -43,21 +43,3 @@ class Meta: "host": ALL, } api.utils.register(DumpInfoResource()) - - -class VersionInfoResource(ModelResource): - class Meta: - queryset = VersionInfo.objects.all() - serializer = api.Serializer() - cache = SimpleCache() - #resource_name = 'versioninfo' - ordering = ['id', ] - filtering = { - "id": ALL, - "time": ALL, - "command": ALL, - "switch": ALL, - "version": ALL, - "used": ALL, - } -api.utils.register(VersionInfoResource()) diff --git a/ietf/utils/serialize.py b/ietf/utils/serialize.py index 342d211cf5c..77f97942cbe 100644 --- a/ietf/utils/serialize.py +++ b/ietf/utils/serialize.py @@ -16,7 +16,7 @@ def object_as_shallow_dict(obj): if isinstance(f, models.ManyToManyField): v = list(v.values_list("pk", flat=True)) elif isinstance(f, models.DateTimeField): - v = v.astimezone(datetime.timezone.utc).isoformat() + v = v.astimezone(datetime.UTC).isoformat() elif isinstance(f, models.DateField): v = v.strftime('%Y-%m-%d') diff --git a/ietf/utils/storage.py b/ietf/utils/storage.py index 0aa02cab868..bad5af51786 100644 --- a/ietf/utils/storage.py +++ b/ietf/utils/storage.py @@ -1,8 +1,95 @@ +# Copyright The IETF Trust 2020-2025, All Rights Reserved +"""Django Storage classes""" +import datetime +from hashlib import sha384 +from pathlib import Path +from typing import Optional + +from django.conf import settings +from django.core.files.base import File from django.core.files.storage import FileSystemStorage +from ietf.doc.storage_utils import store_file +from .log import log + class NoLocationMigrationFileSystemStorage(FileSystemStorage): - def deconstruct(obj): # pylint: disable=no-self-argument - path, args, kwargs = FileSystemStorage.deconstruct(obj) - kwargs["location"] = None - return (path, args, kwargs) + def deconstruct(self): + path, args, kwargs = super().deconstruct() + kwargs["location"] = None # don't record location in migrations + return path, args, kwargs + + +class BlobShadowFileSystemStorage(NoLocationMigrationFileSystemStorage): + """FileSystemStorage that shadows writes to the blob store as well + + Strips directories from the filename when naming the blob. + """ + + def __init__( + self, + *, # disallow positional arguments + kind: str, + location=None, + base_url=None, + file_permissions_mode=None, + directory_permissions_mode=None, + ): + self.kind = kind + super().__init__( + location, base_url, file_permissions_mode, directory_permissions_mode + ) + + def save(self, name, content, max_length=None): + # Write content to the filesystem - this deals with chunks, etc... + saved_name = super().save(name, content, max_length) + + if settings.ENABLE_BLOBSTORAGE: + try: + # Retrieve the content and write to the blob store + blob_name = Path(saved_name).name # strips path + with self.open(saved_name, "rb") as f: + store_file(self.kind, blob_name, f, allow_overwrite=True) + except Exception as err: + log(f"Blobstore Error: Failed to shadow {saved_name} at {self.kind}:{blob_name}: {repr(err)}") + if settings.SERVER_MODE == "development": + raise + return saved_name # includes the path! + + def deconstruct(self): + path, args, kwargs = super().deconstruct() + kwargs["kind"] = "" # don't record "kind" in migrations + return path, args, kwargs + + +class MetadataFile(File): + """File that includes metadata""" + + def __init__(self, file, name=None, mtime: Optional[datetime.datetime]=None, content_type=""): + super().__init__(file=file, name=name) + self.mtime = mtime + self.content_type = content_type + self._custom_metadata = None + + @property + def custom_metadata(self): + if self._custom_metadata is None: + self._custom_metadata = self._compute_custom_metadata() + return self._custom_metadata + + def _compute_custom_metadata(self): + try: + self.file.seek(0) + except AttributeError: # TODO-BLOBSTORE + raise NotImplementedError("cannot handle unseekable content") + content_bytes = self.file.read() + if not isinstance( + content_bytes, bytes + ): # TODO-BLOBSTORE: This is sketch-development only -remove before committing + raise Exception(f"Expected bytes - got {type(content_bytes)}") + self.file.seek(0) + return { + "len": f"{len(content_bytes)}", + "sha384": f"{sha384(content_bytes).hexdigest()}", + "mtime": None if self.mtime is None else self.mtime.isoformat(), + } diff --git a/ietf/utils/templatetags/htmlfilters.py b/ietf/utils/templatetags/htmlfilters.py index a0f9232c575..1e399e2d727 100644 --- a/ietf/utils/templatetags/htmlfilters.py +++ b/ietf/utils/templatetags/htmlfilters.py @@ -7,6 +7,7 @@ from django.template.defaultfilters import stringfilter from ietf.utils.html import remove_tags +from ietf.utils.markdown import markdown as utils_markdown register = Library() @@ -16,3 +17,9 @@ def removetags(value, tags): """Removes a comma-separated list of [X]HTML tags from the output.""" return remove_tags(value, re.split(r"\s*,\s*", tags)) + +@register.filter(name="markdown", is_safe=True) +def markdown(string): + # One issue is that the string is enclosed in

    ... Let's remove the leading/trailing ones... + return utils_markdown(string)[3:-4] + diff --git a/ietf/utils/templatetags/tests.py b/ietf/utils/templatetags/tests.py index a93bf2d94d6..859319be3dc 100644 --- a/ietf/utils/templatetags/tests.py +++ b/ietf/utils/templatetags/tests.py @@ -3,6 +3,7 @@ from django.template import Context, Origin, Template from django.test import override_settings +from ietf.utils.templatetags.textfilters import linkify from ietf.utils.test_utils import TestCase import debug # pyflakes: ignore @@ -39,3 +40,68 @@ def test_origin_outside_base_dir(self): output = template.render(Context()) self.assertNotIn(component, output, 'Full path components should not be revealed in html') + + +class TextfiltersTests(TestCase): + def test_linkify(self): + # Cases with autoescape = True (the default) + self.assertEqual( + linkify("plain string"), + "plain string", + ) + self.assertEqual( + linkify("https://www.ietf.org"), + '    https://www.ietf.org', + ) + self.assertEqual( + linkify('IETF'), + ( + '<a href="https://www.ietf.org">IETF</a>' + ), + ) + self.assertEqual( + linkify("somebody@example.com"), + 'somebody@example.com', + ) + self.assertEqual( + linkify("Some Body "), + ( + 'Some Body <' + 'somebody@example.com>' + ), + ) + self.assertEqual( + linkify(""), + "<script>alert('h4x0r3d');</script>", + ) + + # Cases with autoescape = False (these are dangerous and assume the caller + # has sanitized already) + self.assertEqual( + linkify("plain string", autoescape=False), + "plain string", + ) + self.assertEqual( + linkify("https://www.ietf.org", autoescape=False), + 'https://www.ietf.org', + ) + self.assertEqual( + linkify('IETF', autoescape=False), + 'IETF', + ) + self.assertEqual( + linkify("somebody@example.com", autoescape=False), + 'somebody@example.com', + ) + # bleach.Linkifier translates the < -> < and > -> > on this one + self.assertEqual( + linkify("Some Body ", autoescape=False), + ( + 'Some Body <' + 'somebody@example.com>' + ), + ) + self.assertEqual( + linkify("", autoescape=False), + "", + ) diff --git a/ietf/utils/templatetags/textfilters.py b/ietf/utils/templatetags/textfilters.py index 70b94cf6739..e3bfbe0c562 100644 --- a/ietf/utils/templatetags/textfilters.py +++ b/ietf/utils/templatetags/textfilters.py @@ -7,11 +7,12 @@ from django import template from django.conf import settings from django.template.defaultfilters import stringfilter +from django.utils.html import conditional_escape from django.utils.safestring import mark_safe import debug # pyflakes:ignore -from ietf.utils.text import xslugify as _xslugify, texescape, bleach_linker +from ietf.utils.text import linkify as _linkify, xslugify as _xslugify, texescape register = template.Library() @@ -71,10 +72,13 @@ def texescape_filter(value): "A TeX escape filter" return texescape(value) -@register.filter +@register.filter(needs_autoescape=True) @stringfilter -def linkify(value): - text = mark_safe(bleach_linker.linkify(value)) +def linkify(value, autoescape=True): + if autoescape: + # Escape unless the input was already a SafeString + value = conditional_escape(value) + text = mark_safe(_linkify(value)) # _linkify is a safe operation return text @register.filter diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py index 3e332421155..c5d34727511 100644 --- a/ietf/utils/test_data.py +++ b/ietf/utils/test_data.py @@ -7,16 +7,17 @@ from django.conf import settings from django.contrib.auth.models import User from django.utils import timezone -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str import debug # pyflakes:ignore -from ietf.doc.models import Document, DocAlias, State, DocumentAuthor, DocEvent, RelatedDocument, NewRevisionDocEvent +from ietf.doc.models import Document, State, DocumentAuthor, DocEvent, RelatedDocument, NewRevisionDocEvent +from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory, StatusChangeFactory, WgDraftFactory, WgRfcFactory from ietf.group.models import Group, GroupHistory, Role, RoleHistory from ietf.iesg.models import TelechatDate from ietf.ipr.models import HolderIprDisclosure, IprDocRel, IprDisclosureStateName, IprLicenseTypeName from ietf.meeting.models import Meeting, ResourceAssociation -from ietf.name.models import StreamName, DocRelationshipName, RoomResourceName, ConstraintName +from ietf.name.models import DocRelationshipName, RoomResourceName, ConstraintName from ietf.person.models import Person, Email from ietf.group.utils import setup_default_community_list_for_group from ietf.review.models import (ReviewRequest, ReviewerSettings, ReviewResultName, ReviewTypeName, ReviewTeamSettings ) @@ -38,7 +39,7 @@ def create_person(group, role_name, name=None, username=None, email_address=None user = User.objects.create(username=username,is_staff=is_staff,is_superuser=is_superuser) user.set_password(password) user.save() - person = Person.objects.create(name=name, ascii=unidecode_name(smart_text(name)), user=user) + person = Person.objects.create(name=name, ascii=unidecode_name(smart_str(name)), user=user) email = Email.objects.create(address=email_address, person=person, origin=user.username) Role.objects.create(group=group, name_id=role_name, person=person, email=email) return person @@ -83,7 +84,7 @@ def make_immutable_base_data(): create_person(iab, "chair") create_person(iab, "member") - ise = create_group(name="Independent Submission Editor", acronym="ise", type_id="rfcedtyp") + ise = create_group(name="Independent Submission Editor", acronym="ise", type_id="ise") create_person(ise, "chair") rsoc = create_group(name="RFC Series Oversight Committee", acronym="rsoc", type_id="rfcedtyp") @@ -176,7 +177,6 @@ def make_test_data(): charter.set_state(State.objects.get(used=True, slug="approved", type="charter")) group.charter = charter group.save() - DocAlias.objects.create(name=charter.name).docs.add(charter) setup_default_community_list_for_group(group) # ames WG @@ -198,7 +198,6 @@ def make_test_data(): rev="00", ) charter.set_state(State.objects.get(used=True, slug="infrev", type="charter")) - DocAlias.objects.create(name=charter.name).docs.add(charter) group.charter = charter group.save() setup_default_community_list_for_group(group) @@ -243,7 +242,6 @@ def make_test_data(): # rev="00", # ) #charter.set_state(State.objects.get(used=True, slug="infrev", type="charter")) - #DocAlias.objects.create(name=charter.name).docs.add(charter) #group.charter = charter #group.save() @@ -287,8 +285,6 @@ def make_test_data(): expires=timezone.now(), ) old_draft.set_state(State.objects.get(used=True, type="draft", slug="expired")) - old_alias = DocAlias.objects.create(name=old_draft.name) - old_alias.docs.add(old_draft) # draft draft = Document.objects.create( @@ -306,17 +302,13 @@ def make_test_data(): ad=ad, expires=timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), notify="aliens@example.mars", - note="", ) draft.set_state(State.objects.get(used=True, type="draft", slug="active")) draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req")) draft.set_state(State.objects.get(used=True, type="draft-stream-%s" % draft.stream_id, slug="wg-doc")) - doc_alias = DocAlias.objects.create(name=draft.name) - doc_alias.docs.add(draft) - - RelatedDocument.objects.create(source=draft, target=old_alias, relationship=DocRelationshipName.objects.get(slug='replaces')) + RelatedDocument.objects.create(source=draft, target=old_draft, relationship=DocRelationshipName.objects.get(slug='replaces')) old_draft.set_state(State.objects.get(type='draft', slug='repl')) DocumentAuthor.objects.create( @@ -362,7 +354,7 @@ def make_test_data(): IprDocRel.objects.create( disclosure=ipr, - document=doc_alias, + document=draft, revisions='00', ) @@ -391,37 +383,27 @@ def make_test_data(): ) # an independent submission before review - doc = Document.objects.create(name='draft-imaginary-independent-submission',type_id='draft',rev='00', - title="Some Independent Notes on Imagination") - doc.set_state(State.objects.get(used=True, type="draft", slug="active")) - DocAlias.objects.create(name=doc.name).docs.add(doc) + IndividualDraftFactory(title="Some Independent Notes on Imagination") # an irtf submission mid review - doc = Document.objects.create(name='draft-imaginary-irtf-submission', type_id='draft',rev='00', - stream=StreamName.objects.get(slug='irtf'), title="The Importance of Research Imagination") - docalias = DocAlias.objects.create(name=doc.name) - docalias.docs.add(doc) - doc.set_state(State.objects.get(type="draft", slug="active")) - crdoc = Document.objects.create(name='conflict-review-imaginary-irtf-submission', type_id='conflrev', - rev='00', notify="fsm@ietf.org", title="Conflict Review of IRTF Imagination Document") - DocAlias.objects.create(name=crdoc.name).docs.add(crdoc) - crdoc.set_state(State.objects.get(name='Needs Shepherd', type__slug='conflrev')) - crdoc.relateddocument_set.create(target=docalias,relationship_id='conflrev') + doc = IndividualDraftFactory(name="draft-imaginary-irtf-submission", stream_id="irtf", title="The Importance of Research Imagination") + ConflictReviewFactory(name="conflict-review-imaginary-irtf-submission", review_of=doc, notify="fsm@ietf.org", title="Conflict Review of IRTF Imagination Document") # A status change mid review iesg = Group.objects.get(acronym='iesg') - doc = Document.objects.create(name='status-change-imaginary-mid-review',type_id='statchg', rev='00', - notify="fsm@ietf.org", group=iesg, title="Status Change Review without Imagination") - doc.set_state(State.objects.get(slug='needshep',type__slug='statchg')) - docalias = DocAlias.objects.create(name='status-change-imaginary-mid-review') - docalias.docs.add(doc) + doc = StatusChangeFactory( + name='status-change-imaginary-mid-review', + notify="fsm@ietf.org", + group=iesg, + title="Status Change Review without Imagination", + states= [State.objects.get(type_id="statchg",slug="needshep")] + ) # Some things for a status change to affect def rfc_for_status_change_test_factory(name,rfc_num,std_level_id): - target_rfc = Document.objects.create(name=name, type_id='draft', std_level_id=std_level_id, notify="%s@ietf.org"%name) - target_rfc.set_state(State.objects.get(slug='rfc',type__slug='draft')) - DocAlias.objects.create(name=name).docs.add(target_rfc) - DocAlias.objects.create(name='rfc%d'%rfc_num).docs.add(target_rfc) + target_rfc = WgRfcFactory(rfc_number=rfc_num, std_level_id=std_level_id) + source_draft = WgDraftFactory(name=name, states=[("draft","rfc")], notify=f"{name}@ietf.org") + source_draft.relateddocument_set.create(relationship_id="became_rfc", target=target_rfc) return target_rfc rfc_for_status_change_test_factory('draft-ietf-random-thing',9999,'ps') rfc_for_status_change_test_factory('draft-ietf-random-otherthing',9998,'inf') diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py index 7453b40a4c2..1a3d4e5c3d1 100644 --- a/ietf/utils/test_runner.py +++ b/ietf/utils/test_runner.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2009-2020, All Rights Reserved +# Copyright The IETF Trust 2009-2025, All Rights Reserved # -*- coding: utf-8 -*- # # Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). @@ -48,16 +48,16 @@ import subprocess import tempfile import copy +from contextlib import contextmanager + +import boto3 +import botocore.config import factory.random import urllib3 import warnings -from urllib.parse import urlencode - -from fnmatch import fnmatch -from coverage.report import Reporter -from coverage.results import Numbers -from coverage.misc import NotPython +from typing import Callable, Optional +from urllib.parse import urlencode import django from django.conf import settings @@ -74,7 +74,7 @@ from django.template.backends.django import DjangoTemplates from django.template.backends.django import Template # type: ignore[attr-defined] from django.utils import timezone -# from django.utils.safestring import mark_safe +from django.views.generic import RedirectView, TemplateView import debug # pyflakes:ignore debug.debug = True @@ -82,19 +82,21 @@ import ietf import ietf.utils.mail from ietf.utils.management.commands import pyflakes -from ietf.utils.test_smtpserver import SMTPTestServerDriver +from ietf.utils.aiosmtpd import SMTPTestServerDriver from ietf.utils.test_utils import TestCase +from mypy_boto3_s3.service_resource import Bucket + -loaded_templates = set() -visited_urls = set() -test_database_name = None -old_destroy = None -old_create = None +loaded_templates: set[str] = set() +visited_urls: set[str] = set() +test_database_name: Optional[str] = None +old_destroy: Optional[Callable] = None +old_create: Optional[Callable] = None -template_coverage_collection = None -code_coverage_collection = None -url_coverage_collection = None +template_coverage_collection = False +url_coverage_collection = False +validation_settings = {"validate_html": None, "validate_html_harder": None, "show_logging": False} def start_vnu_server(port=8888): @@ -226,10 +228,12 @@ def load_and_run_fixtures(verbosity): fn() def safe_create_test_db(self, verbosity, *args, **kwargs): - global test_database_name, old_create + if old_create is None: + raise RuntimeError("old_create has not been set, cannot proceed") keepdb = kwargs.get('keepdb', False) if not keepdb: print(" Creating test database...") + global test_database_name test_database_name = old_create(self, 0, *args, **kwargs) if settings.GLOBAL_TEST_FIXTURES: @@ -239,8 +243,9 @@ def safe_create_test_db(self, verbosity, *args, **kwargs): return test_database_name def safe_destroy_test_db(*args, **kwargs): + if old_destroy is None: + raise RuntimeError("old_destroy has not been set, cannot proceed") sys.stdout.write('\n') - global test_database_name, old_destroy keepdb = kwargs.get('keepdb', False) if not keepdb: if settings.DATABASES["default"]["NAME"] != test_database_name: @@ -259,7 +264,14 @@ def pyflakes_test(self): path = os.path.join(settings.BASE_DIR) warnings = [] warnings = pyflakes.checkPaths([path], verbosity=0) - self.assertEqual([], [str(w) for w in warnings]) + + # Filter out warnings about unused global variables + filtered_warnings = [ + w for w in warnings + if not re.search(r"`global \w+` is unused: name is never assigned in scope", str(w)) + ] + + self.assertEqual([], [str(w) for w in filtered_warnings]) class MyPyTest(TestCase): @@ -282,7 +294,7 @@ class ValidatingTemplates(DjangoTemplates): def __init__(self, params): super().__init__(params) - if not settings.validate_html: + if not validation_settings["validate_html"]: return self.validation_cache = set() self.cwd = str(pathlib.Path.cwd()) @@ -298,7 +310,7 @@ def __init__(self, template, backend): def render(self, context=None, request=None): content = super().render(context, request) - if not settings.validate_html: + if not validation_settings["validate_html"]: return content if not self.origin.name.endswith("html"): @@ -310,7 +322,7 @@ def render(self, context=None, request=None): return content fingerprint = hash(content) + sys.maxsize + 1 # make hash positive - if not settings.validate_html_harder and fingerprint in self.backend.validation_cache: + if not validation_settings["validate_html_harder"] and fingerprint in self.backend.validation_cache: # already validated this HTML fragment, skip it # as an optimization, make page a bit smaller by not returning HTML for the menus # FIXME: figure out why this still includes base/menu.html @@ -326,7 +338,7 @@ def render(self, context=None, request=None): # don't validate each template by itself, causes too much overhead # instead, save a batch of them and then validate them all in one go # this delays error detection a bit, but is MUCH faster - settings.validate_html.batches[kind].append( + validation_settings["validate_html"].batches[kind].append( (self.origin.name, content, fingerprint) ) return content @@ -347,15 +359,13 @@ class TemplateCoverageLoader(BaseLoader): is_usable = True def get_template(self, template_name, skip=None): - global template_coverage_collection, loaded_templates - if template_coverage_collection == True: + if template_coverage_collection: loaded_templates.add(str(template_name)) raise TemplateDoesNotExist(template_name) def record_urls_middleware(get_response): def record_urls(request): - global url_coverage_collection, visited_urls - if url_coverage_collection == True: + if url_coverage_collection: visited_urls.add(request.path) return get_response(request) return record_urls @@ -401,8 +411,9 @@ def do_append(res, p0, p1, item): res.append((str(item.pattern), item)) return res + _all_templates = None -def get_template_paths(apps=None): +def get_template_paths(apps=None) -> list[str]: global _all_templates if not _all_templates: # TODO: Add app templates to the full list, if we are using @@ -411,25 +422,30 @@ def get_template_paths(apps=None): templatepaths = settings.TEMPLATES[0]['DIRS'] for templatepath in templatepaths: for dirpath, dirs, files in os.walk(templatepath): - if ".svn" in dirs: - dirs.remove(".svn") - relative_path = dirpath[len(templatepath)+1:] - for file in files: - ignore = False - for pattern in settings.TEST_TEMPLATE_IGNORE: - if fnmatch(file, pattern): - ignore = True - break - if ignore: - continue - if relative_path != "": - file = os.path.join(relative_path, file) - templates.add(file) - if apps: - templates = [ t for t in templates if t.split(os.path.sep)[0] in apps ] - _all_templates = templates + # glob against path from PROJECT_DIR + project_path = pathlib.Path( + dirpath.removeprefix(settings.PROJECT_DIR).lstrip("/") + ) + # label entries with name relative to templatepath + relative_path = pathlib.Path( + dirpath.removeprefix(templatepath).lstrip("/") + ) + if ( + apps + and len(relative_path.parts) > 0 + and relative_path.parts[0] not in apps + ): + continue # skip uninteresting apps + for filename in files: + file_path = project_path / filename + if not any( + file_path.match(pat) for pat in settings.TEST_TEMPLATE_IGNORE + ): + templates.add(relative_path / filename) + _all_templates = [str(t) for t in templates] return _all_templates + def save_test_results(failures, test_labels): # Record the test result in a file, in order to be able to check the # results and avoid re-running tests if we've already run them with OK @@ -445,50 +461,29 @@ def save_test_results(failures, test_labels): tfile.write("%s OK\n" % (timestr, )) tfile.close() -def set_coverage_checking(flag=True): + +def set_template_coverage(flag): global template_coverage_collection - global code_coverage_collection + orig = template_coverage_collection + template_coverage_collection = flag + return orig + + +def set_url_coverage(flag): global url_coverage_collection - if settings.SERVER_MODE == 'test': - if flag: - settings.TEST_CODE_COVERAGE_CHECKER.collector.resume() - template_coverage_collection = True - code_coverage_collection = True - url_coverage_collection = True - else: - settings.TEST_CODE_COVERAGE_CHECKER.collector.pause() - template_coverage_collection = False - code_coverage_collection = False - url_coverage_collection = False - -class CoverageReporter(Reporter): - def report(self): - self.find_file_reporters(None) - - total = Numbers() - result = {"coverage": 0.0, "covered": {}, "format": 5, } - for fr in self.file_reporters: - try: - analysis = self.coverage._analyze(fr) - nums = analysis.numbers - missing_nums = sorted(analysis.missing) - with io.open(analysis.filename, encoding='utf-8') as file: - lines = file.read().splitlines() - missing_lines = [ lines[l-1] for l in missing_nums ] - result["covered"][fr.relative_filename()] = (nums.n_statements, nums.pc_covered/100.0, missing_nums, missing_lines) - total += nums - except KeyboardInterrupt: # pragma: not covered - raise - except Exception: - report_it = not self.config.ignore_errors - if report_it: - typ, msg = sys.exc_info()[:2] - if typ is NotPython and not fr.should_be_python(): - report_it = False - if report_it: - raise - result["coverage"] = total.pc_covered/100.0 - return result + orig = url_coverage_collection + url_coverage_collection = flag + return orig + + +@contextmanager +def disable_coverage(): + """Context manager/decorator that disables template/url coverage""" + orig_template = set_template_coverage(False) + orig_url = set_url_coverage(False) + yield + set_template_coverage(orig_template) + set_url_coverage(orig_url) class CoverageTest(unittest.TestCase): @@ -511,8 +506,8 @@ def report_test_result(self, test): # Assert coverage failure only if we're running the full test suite -- if we're # only running some tests, then of course the coverage is going to be low. if self.runner.run_full_test_suite: - # Permit 0.02% variation in results -- otherwise small code changes become a pain - fudge_factor = 0.0002 + # Permit a small variation in results -- otherwise small code changes become a pain + fudge_factor = 0.0004 self.assertLessEqual(len(test_missing), len(master_missing), msg = "New %s without test coverage since %s: %s" % (test, latest_coverage_version, list(set(test_missing) - set(master_missing)))) if not self.runner.ignore_lower_coverage: @@ -521,7 +516,6 @@ def report_test_result(self, test): ( test, test_coverage*100, latest_coverage_version, master_coverage*100, )) def template_coverage_test(self): - global loaded_templates if self.runner.check_coverage: apps = [ app.split('.')[-1] for app in self.runner.test_apps ] all = get_template_paths(apps) @@ -550,8 +544,10 @@ def ignore_pattern(regex, pattern): return (regex in ("^_test500/$", "^accounts/testemail/$") or regex.startswith("^admin/") or re.search('^api/v1/[^/]+/[^/]+/', regex) - or getattr(pattern.callback, "__name__", "") == "RedirectView" - or getattr(pattern.callback, "__name__", "") == "TemplateView" + or ( + hasattr(pattern.callback, "view_class") + and issubclass(pattern.callback.view_class, (RedirectView, TemplateView)) + ) or pattern.callback == django.views.static.serve) patterns = [(regex, re.compile(regex, re.U), obj) for regex, obj in url_patterns @@ -575,23 +571,24 @@ def ignore_pattern(regex, pattern): self.skipTest("Coverage switched off with --skip-coverage") def code_coverage_test(self): - if self.runner.check_coverage: - include = [ os.path.join(path, '*') for path in self.runner.test_paths ] - checker = self.runner.code_coverage_checker - checker.stop() + if ( + self.runner.check_coverage + and settings.TEST_CODE_COVERAGE_CHECKER is not None + ): + coverage_manager = settings.TEST_CODE_COVERAGE_CHECKER + coverage_manager.stop() # Save to the .coverage file - checker.save() + coverage_manager.save() # Apply the configured and requested omit and include data - checker.config.from_args(ignore_errors=None, omit=settings.TEST_CODE_COVERAGE_EXCLUDE_FILES, - include=include, file=None) - for pattern in settings.TEST_CODE_COVERAGE_EXCLUDE_LINES: - checker.exclude(pattern) # Maybe output an HTML report if self.runner.run_full_test_suite and self.runner.html_report: - checker.html_report(directory=settings.TEST_CODE_COVERAGE_REPORT_DIR) - # In any case, build a dictionary with per-file data for this run - reporter = CoverageReporter(checker, checker.config) - self.runner.coverage_data["code"] = reporter.report() + coverage_manager.checker.html_report( + directory=settings.TEST_CODE_COVERAGE_REPORT_DIR + ) + # Generate the output report data + self.runner.coverage_data["code"] = coverage_manager.report( + include=[str(pathlib.Path(p) / "*") for p in self.runner.test_paths] + ) self.report_test_result("code") else: self.skipTest("Coverage switched off with --skip-coverage") @@ -717,18 +714,39 @@ def add_arguments(cls, parser): parser.add_argument('--validate-html-harder', action='store_true', dest="validate_html_harder", default=False, help='Validate all generated HTML with additional validators (slow)') - - def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_version_coverage=None, html_report=None, permit_mixed_migrations=None, show_logging=None, validate_html=None, validate_html_harder=None, **kwargs): - # + parser.add_argument('--rerun-until-failure', + action='store_true', dest='rerun', default=False, + help='Run the indicated tests in a loop until a failure occurs. ' ) + parser.add_argument('--no-manage-blobstore', action='store_false', dest='manage_blobstore', + help='Disable creating/deleting test buckets in the blob store.' + 'When this argument is used, a set of buckets with "test-" prefixed to their ' + 'names must already exist.') + + def __init__( + self, + ignore_lower_coverage=False, + skip_coverage=False, + save_version_coverage=None, + html_report=None, + permit_mixed_migrations=None, + show_logging=None, + validate_html=None, + validate_html_harder=None, + rerun=None, + manage_blobstore=True, + **kwargs + ): # self.ignore_lower_coverage = ignore_lower_coverage self.check_coverage = not skip_coverage self.save_version_coverage = save_version_coverage self.html_report = html_report self.permit_mixed_migrations = permit_mixed_migrations self.show_logging = show_logging - settings.validate_html = self if validate_html else None - settings.validate_html_harder = self if validate_html and validate_html_harder else None - settings.show_logging = show_logging + self.rerun = rerun + self.test_labels = None + validation_settings["validate_html"] = self if validate_html else None + validation_settings["validate_html_harder"] = self if validate_html and validate_html_harder else None + validation_settings["show_logging"] = show_logging # self.root_dir = os.path.dirname(settings.BASE_DIR) self.coverage_file = os.path.join(self.root_dir, settings.TEST_COVERAGE_MAIN_FILE) @@ -739,11 +757,15 @@ def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_versio "as the collection of test coverage data isn't currently threadsafe.") sys.exit(1) self.check_coverage = False + from ietf.doc.tests import TemplateTagTest # import here to prevent circular imports + # Ensure that the coverage tests come last. Specifically list TemplateTagTest before CoverageTest. If this list + # contains parent classes to later subclasses, the parent classes will determine the ordering, so use the most + # specific classes necessary to get the right ordering: + self.reorder_by = (PyFlakesTestCase, MyPyTest,) + self.reorder_by + (StaticLiveServerTestCase, TemplateTagTest, CoverageTest,) + #self.buckets = set() + self.blobstoremanager = TestBlobstoreManager() if manage_blobstore else None def setup_test_environment(self, **kwargs): - global template_coverage_collection - global url_coverage_collection - ietf.utils.mail.test_mode = True ietf.utils.mail.SMTP_ADDR['ip4'] = '127.0.0.1' ietf.utils.mail.SMTP_ADDR['port'] = 2025 @@ -780,23 +802,12 @@ def setup_test_environment(self, **kwargs): "covered": {}, "format": 1, }, - "migration": { - "present": {}, - "format": 3, - } } settings.TEMPLATES[0]['OPTIONS']['loaders'] = ('ietf.utils.test_runner.TemplateCoverageLoader',) + settings.TEMPLATES[0]['OPTIONS']['loaders'] settings.MIDDLEWARE = ('ietf.utils.test_runner.record_urls_middleware',) + tuple(settings.MIDDLEWARE) - self.code_coverage_checker = settings.TEST_CODE_COVERAGE_CHECKER - if not self.code_coverage_checker._started: - sys.stderr.write(" ** Warning: In %s: Expected the coverage checker to have\n" - " been started already, but it wasn't. Doing so now. Coverage numbers\n" - " will be off, though.\n" % __name__) - self.code_coverage_checker.start() - if settings.SITE_ID != 1: print(" Changing SITE_ID to '1' during testing.") settings.SITE_ID = 1 @@ -824,7 +835,7 @@ def setup_test_environment(self, **kwargs): try: # remember the value so ietf.utils.mail.send_smtp() will use the same ietf.utils.mail.SMTP_ADDR['port'] = base + offset - self.smtpd_driver = SMTPTestServerDriver((ietf.utils.mail.SMTP_ADDR['ip4'],ietf.utils.mail.SMTP_ADDR['port']),None) + self.smtpd_driver = SMTPTestServerDriver(ietf.utils.mail.SMTP_ADDR['ip4'],ietf.utils.mail.SMTP_ADDR['port'], None) self.smtpd_driver.start() print((" Running an SMTP test server on %(ip4)s:%(port)s to catch outgoing email." % ietf.utils.mail.SMTP_ADDR)) break @@ -843,7 +854,7 @@ def setup_test_environment(self, **kwargs): s[1] = tuple(s[1]) # random.setstate() won't accept a list in lieu of a tuple factory.random.set_random_state(s) - if not settings.validate_html: + if not validation_settings["validate_html"]: print(" Not validating any generated HTML; " "please do so at least once before committing changes") else: @@ -878,6 +889,10 @@ def setup_test_environment(self, **kwargs): "form-dup-name": "off", # Don't trip over unused disable blocks "no-unused-disable": "off", + # Ignore focusable elements in aria-hidden elements + "hidden-focusable": "off", + # Ignore missing unique identifier for page "landmarks" + "unique-landmark": "off", }, } @@ -912,13 +927,16 @@ def setup_test_environment(self, **kwargs): self.config_file[kind].flush() pathlib.Path(self.config_file[kind].name).chmod(0o644) - if not settings.validate_html_harder: + if not validation_settings["validate_html_harder"]: print("") self.vnu = None else: print(" (extra pedantically)") self.vnu = start_vnu_server() + if self.blobstoremanager is not None: + self.blobstoremanager.createTestBlobstores() + super(IetfTestRunner, self).setup_test_environment(**kwargs) def teardown_test_environment(self, **kwargs): @@ -941,7 +959,7 @@ def teardown_test_environment(self, **kwargs): with open(self.coverage_file, "w") as file: json.dump(self.coverage_master, file, indent=2, sort_keys=True) - if settings.validate_html: + if validation_settings["validate_html"]: for kind in self.batches: if len(self.batches[kind]): print(f" WARNING: not all templates of kind '{kind}' were validated") @@ -949,6 +967,9 @@ def teardown_test_environment(self, **kwargs): if self.vnu: self.vnu.terminate() + if self.blobstoremanager is not None: + self.blobstoremanager.destroyTestBlobstores() + super(IetfTestRunner, self).teardown_test_environment(**kwargs) def validate(self, testcase): @@ -1007,7 +1028,7 @@ def validate(self, testcase): + "\n" ) - if settings.validate_html_harder and kind != "frag": + if validation_settings["validate_html_harder"] and kind != "frag": files = [ os.path.join(d, f) for d, dirs, files in os.walk(tmppath) @@ -1058,20 +1079,63 @@ def get_test_paths(self, test_labels): test_paths = [ os.path.join(*app.split('.')) for app in test_apps ] return test_apps, test_paths - def run_tests(self, test_labels, extra_tests=None, **kwargs): - global old_destroy, old_create, test_database_name, template_coverage_collection, code_coverage_collection, url_coverage_collection - from django.db import connection - from ietf.doc.tests import TemplateTagTest + # Django 5 will drop the extra_tests mechanism for the test runner. Work around + # by adding a special label to the test suite, then injecting our extra tests + # in load_tests_for_label() + def build_suite(self, test_labels=None, extra_tests=None, **kwargs): + if test_labels is None: + # Base class sets test_labels to ["."] if it was None. The label we're + # adding will interfere with that, so replicate that behavior here. + test_labels = ["."] + test_labels = ("_ietf_extra_tests",) + tuple(test_labels) + return super().build_suite(test_labels, extra_tests, **kwargs) + + def load_tests_for_label(self, label, discover_kwargs): + if label == "_ietf_extra_tests": + return self._extra_tests() or None + return super().load_tests_for_label(label, discover_kwargs) + + def _extra_tests(self): + """Get extra tests that should be added to the test suite""" + tests = [] + if validation_settings["validate_html"]: + tests += [ + TemplateValidationTests( + test_runner=self, + validate_html=self, + methodName='run_template_validation', + ), + ] + if self.check_coverage: + global template_coverage_collection, url_coverage_collection + template_coverage_collection = True + url_coverage_collection = True + tests += [ + PyFlakesTestCase(test_runner=self, methodName='pyflakes_test'), + MyPyTest(test_runner=self, methodName='mypy_test'), + #CoverageTest(test_runner=self, methodName='interleaved_migrations_test'), + CoverageTest(test_runner=self, methodName='url_coverage_test'), + CoverageTest(test_runner=self, methodName='template_coverage_test'), + CoverageTest(test_runner=self, methodName='code_coverage_test'), + ] + return tests - if extra_tests is None: - extra_tests=[] + def run_suite(self, suite, **kwargs): + failures = super(IetfTestRunner, self).run_suite(suite, **kwargs) + while self.rerun and not failures.errors and not failures.failures: + suite = self.build_suite(self.test_labels) + failures = super(IetfTestRunner, self).run_suite(suite, **kwargs) + return failures + def run_tests(self, test_labels, extra_tests=None, **kwargs): # Tests that involve switching back and forth between the real # database and the test database are way too dangerous to run # against the production database if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]: raise EnvironmentError("Refusing to run tests on production server") + from django.db import connection + global old_destroy, old_create old_create = connection.creation.__class__.create_test_db connection.creation.__class__.create_test_db = safe_create_test_db old_destroy = connection.creation.__class__.destroy_test_db @@ -1084,35 +1148,7 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs): self.test_apps, self.test_paths = self.get_test_paths(test_labels) - if settings.validate_html: - extra_tests += [ - TemplateValidationTests( - test_runner=self, - validate_html=self, - methodName='run_template_validation', - ), - ] - - if self.check_coverage: - template_coverage_collection = True - code_coverage_collection = True - url_coverage_collection = True - extra_tests += [ - PyFlakesTestCase(test_runner=self, methodName='pyflakes_test'), - MyPyTest(test_runner=self, methodName='mypy_test'), - #CoverageTest(test_runner=self, methodName='interleaved_migrations_test'), - CoverageTest(test_runner=self, methodName='url_coverage_test'), - CoverageTest(test_runner=self, methodName='template_coverage_test'), - CoverageTest(test_runner=self, methodName='code_coverage_test'), - ] - - # ensure that the coverage tests come last. Specifically list - # TemplateTagTest before CoverageTest. If this list contains - # parent classes to later subclasses, the parent classes will - # determine the ordering, so use the most specific classes - # necessary to get the right ordering: - self.reorder_by = (PyFlakesTestCase, MyPyTest, ) + self.reorder_by + (StaticLiveServerTestCase, TemplateTagTest, CoverageTest, ) - + self.test_labels = test_labels # these are used in our run_suite() and not available to it otherwise failures = super(IetfTestRunner, self).run_tests(test_labels, extra_tests=extra_tests, **kwargs) if self.check_coverage: @@ -1136,10 +1172,10 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs): if self.run_full_test_suite: print((" %8s coverage: %6.2f%% (%s: %6.2f%%)" % - (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, ))) + (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, ))) else: print((" %8s coverage: %6.2f%%" % - (test.capitalize(), test_coverage*100, ))) + (test.capitalize(), test_coverage*100, ))) print((""" Per-file code and template coverage and per-url-pattern url coverage data @@ -1156,34 +1192,43 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs): return failures -class IetfLiveServerTestCase(StaticLiveServerTestCase): - @classmethod - def setUpClass(cls): - set_coverage_checking(False) - super(IetfLiveServerTestCase, cls).setUpClass() - - def setUp(self): - super(IetfLiveServerTestCase, self).setUp() - # LiveServerTestCase uses TransactionTestCase which seems to - # somehow interfere with the fixture loading process in - # IetfTestRunner when running multiple tests (the first test - # is fine, in the next ones the fixtures have been wiped) - - # this is no doubt solvable somehow, but until then we simply - # recreate them here - from ietf.person.models import Person - if not Person.objects.exists(): - load_and_run_fixtures(verbosity=0) - self.replaced_settings = dict() - if hasattr(settings, 'IDTRACKER_BASE_URL'): - self.replaced_settings['IDTRACKER_BASE_URL'] = settings.IDTRACKER_BASE_URL - settings.IDTRACKER_BASE_URL = self.live_server_url - @classmethod - def tearDownClass(cls): - super(IetfLiveServerTestCase, cls).tearDownClass() - set_coverage_checking(True) - - def tearDown(self): - for k, v in self.replaced_settings.items(): - setattr(settings, k, v) - super().tearDown() +class TestBlobstoreManager(): + # N.B. buckets and blobstore are intentional Class-level attributes + buckets: set[Bucket] = set() + + blobstore = boto3.resource("s3", + endpoint_url="http://blobstore:9000", + aws_access_key_id="minio_root", + aws_secret_access_key="minio_pass", + aws_session_token=None, + config = botocore.config.Config( + request_checksum_calculation="when_required", + response_checksum_validation="when_required", + signature_version="s3v4", + ), + #config=botocore.config.Config(signature_version=botocore.UNSIGNED), + verify=False + ) + + def createTestBlobstores(self): + for storagename in settings.ARTIFACT_STORAGE_NAMES: + bucketname = f"test-{storagename}" + try: + bucket = self.blobstore.create_bucket(Bucket=bucketname) + self.buckets.add(bucket) + except self.blobstore.meta.client.exceptions.BucketAlreadyOwnedByYou: + bucket = self.blobstore.Bucket(bucketname) + self.buckets.add(bucket) + + def destroyTestBlobstores(self): + self.emptyTestBlobstores(destroy=True) + + def emptyTestBlobstores(self, destroy=False): + # debug.show('f"Asked to empty test blobstores with destroy={destroy}"') + for bucket in self.buckets: + bucket.objects.delete() + if destroy: + bucket.delete() + if destroy: + self.buckets = set() diff --git a/ietf/utils/test_smtpserver.py b/ietf/utils/test_smtpserver.py deleted file mode 100644 index 66675aa0b15..00000000000 --- a/ietf/utils/test_smtpserver.py +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright The IETF Trust 2014-2020, All Rights Reserved -# -*- coding: utf-8 -*- - - -import smtpd -import threading -import asyncore - -import debug # pyflakes:ignore - -class AsyncCoreLoopThread(object): - - def wrap_loop(self, exit_condition, timeout=1.0, use_poll=False, map=None): - if map is None: - map = asyncore.socket_map - while map and not exit_condition: - asyncore.loop(timeout=1.0, use_poll=False, map=map, count=1) - - def start(self): - """Start the listening service""" - self.exit_condition = [] - kwargs={'exit_condition':self.exit_condition,'timeout':1.0} - self.thread = threading.Thread(target=self.wrap_loop, kwargs=kwargs) - self.thread.daemon = True - self.thread.daemon = True - self.thread.start() - - def stop(self): - """Stop the listening service""" - self.exit_condition.append(True) - self.thread.join() - - -class SMTPTestChannel(smtpd.SMTPChannel): - -# mail_options = ['BODY=8BITMIME', 'SMTPUTF8'] - - def smtp_RCPT(self, arg): - if not self.mailfrom: - self.push(str('503 Error: need MAIL command')) - return - arg = self._strip_command_keyword('TO:', arg) - address, __ = self._getaddr(arg) - if not address: - self.push(str('501 Syntax: RCPT TO:
    ')) - return - if "poison" in address: - self.push(str('550 Error: Not touching that')) - return - self.rcpt_options = [] - self.rcpttos.append(address) - self.push(str('250 Ok')) - -class SMTPTestServer(smtpd.SMTPServer): - - def __init__(self,localaddr,remoteaddr,inbox): - if inbox is not None: - self.inbox=inbox - else: - self.inbox = [] - smtpd.SMTPServer.__init__(self,localaddr,remoteaddr) - - def handle_accept(self): - pair = self.accept() - if pair is not None: - conn, addr = pair - #channel = SMTPTestChannel(self, conn, addr) - SMTPTestChannel(self, conn, addr) - - def process_message(self, peer, mailfrom, rcpttos, data, mail_options=None, rcpt_options=None): - self.inbox.append(data) - - -class SMTPTestServerDriver(object): - def __init__(self, localaddr, remoteaddr, inbox=None): - self.localaddr=localaddr - self.remoteaddr=remoteaddr - if inbox is not None: - self.inbox = inbox - else: - self.inbox = [] - self.thread_driver = None - - def start(self): - self.smtpserver = SMTPTestServer(self.localaddr,self.remoteaddr,self.inbox) - self.thread_driver = AsyncCoreLoopThread() - self.thread_driver.start() - - def stop(self): - if self.thread_driver: - self.thread_driver.stop() - diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py index ddd274a6138..86c5a0c1c31 100644 --- a/ietf/utils/test_utils.py +++ b/ietf/utils/test_utils.py @@ -34,7 +34,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import os +import tempfile import re import email import html5lib @@ -211,6 +211,7 @@ class TestCase(django.test.TestCase): 'INTERNET_DRAFT_ARCHIVE_DIR', 'INTERNET_DRAFT_PATH', 'BIBXML_BASE_PATH', + 'FTP_DIR', ] parser = html5lib.HTMLParser(strict=True) @@ -238,13 +239,8 @@ def normalize(x): def tempdir(self, label): slug = slugify(self.__class__.__name__.replace('.','-')) - dirname = "tmp-{label}-{slug}-dir".format(**locals()) - if 'VIRTUAL_ENV' in os.environ: - dirname = os.path.join(os.environ['VIRTUAL_ENV'], dirname) - path = os.path.abspath(dirname) - if not os.path.exists(path): - os.mkdir(path) - return path + suffix = "-{label}-{slug}-dir".format(**locals()) + return tempfile.mkdtemp(suffix=suffix) def assertNoFormPostErrors(self, response, error_css_selector=".is-invalid"): """Try to fish out form errors, if none found at least check the @@ -305,7 +301,7 @@ def setUp(self): # Replace settings paths with temporary directories. self._ietf_temp_dirs = {} # trashed during tearDown, DO NOT put paths you care about in this - for setting in self.settings_temp_path_overrides: + for setting in set(self.settings_temp_path_overrides): self._ietf_temp_dirs[setting] = self.tempdir(slugify(setting)) self._ietf_saved_context = django.test.utils.override_settings(**self._ietf_temp_dirs) self._ietf_saved_context.enable() diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py index 69c16be6dab..3288309095c 100644 --- a/ietf/utils/tests.py +++ b/ietf/utils/tests.py @@ -1,26 +1,29 @@ -# Copyright The IETF Trust 2014-2020, All Rights Reserved +# Copyright The IETF Trust 2014-2025, All Rights Reserved # -*- coding: utf-8 -*- import datetime import io import json +import lxml.etree import os.path import pytz import shutil import types -from mock import patch +from unittest.mock import call, patch from pyquery import PyQuery from typing import Dict, List # pyflakes:ignore +from email.message import Message from email.mime.image import MIMEImage from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from fnmatch import fnmatch from importlib import import_module from textwrap import dedent from tempfile import mkdtemp +from xml2rfc import log as xml2rfc_log +from xml2rfc.util.date import extract_date as xml2rfc_extract_date from django.apps import apps from django.contrib.auth.models import User @@ -31,27 +34,41 @@ from django.template.defaulttags import URLNode from django.template.loader import get_template, render_to_string from django.templatetags.static import StaticNode +from django.test import RequestFactory from django.urls import reverse as urlreverse import debug # pyflakes:ignore +from ietf.admin.sites import AdminSite from ietf.person.name import name_parts, unidecode_name from ietf.submit.tests import submission_file from ietf.utils.draft import PlaintextDraft, getmeta from ietf.utils.fields import SearchableField from ietf.utils.log import unreachable, assertion -from ietf.utils.mail import send_mail_preformatted, send_mail_text, send_mail_mime, outbox, get_payload_text -from ietf.utils.test_runner import get_template_paths, set_coverage_checking +from ietf.utils.mail import ( + send_mail_preformatted, + send_mail_text, + send_mail_mime, + outbox, + get_payload_text, + decode_header_value, + show_that_mail_was_sent, +) +from ietf.utils.test_runner import ( + get_template_paths, + set_template_coverage, + set_url_coverage, +) from ietf.utils.test_utils import TestCase, unicontent from ietf.utils.text import parse_unicode from ietf.utils.timezone import timezone_not_near_midnight -from ietf.utils.xmldraft import XMLDraft +from ietf.utils.xmldraft import XMLDraft, InvalidMetadataError, capture_xml2rfc_output class SendingMail(TestCase): def test_send_mail_preformatted(self): msg = """To: to1@example.com, to2@example.com -From: from1@ietf.org, from2@ietf.org +From: from1@ietf.org Cc: cc1@example.com, cc2@example.com Bcc: bcc1@example.com, bcc2@example.com Subject: subject @@ -61,7 +78,7 @@ def test_send_mail_preformatted(self): send_mail_preformatted(None, msg, {}, {}) recv = outbox[-1] self.assertSameEmail(recv['To'], ', ') - self.assertSameEmail(recv['From'], 'from1@ietf.org, from2@ietf.org') + self.assertSameEmail(recv['From'], 'from1@ietf.org') self.assertSameEmail(recv['Cc'], 'cc1@example.com, cc2@example.com') self.assertSameEmail(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'subject') @@ -69,14 +86,14 @@ def test_send_mail_preformatted(self): override = { 'To': 'oto1@example.net, oto2@example.net', - 'From': 'ofrom1@ietf.org, ofrom2@ietf.org', + 'From': 'ofrom1@ietf.org', 'Cc': 'occ1@example.net, occ2@example.net', 'Subject': 'osubject', } send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override) recv = outbox[-1] self.assertSameEmail(recv['To'], ', ') - self.assertSameEmail(recv['From'], 'ofrom1@ietf.org, ofrom2@ietf.org') + self.assertSameEmail(recv['From'], 'ofrom1@ietf.org') self.assertSameEmail(recv['Cc'], 'occ1@example.net, occ2@example.net') self.assertSameEmail(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'osubject') @@ -84,14 +101,14 @@ def test_send_mail_preformatted(self): override = { 'To': ['', 'oto2@example.net'], - 'From': ['', 'ofrom2@ietf.org'], + 'From': [''], 'Cc': ['', 'occ2@example.net'], 'Subject': 'osubject', } send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override) recv = outbox[-1] self.assertSameEmail(recv['To'], ', ') - self.assertSameEmail(recv['From'], ', ofrom2@ietf.org') + self.assertSameEmail(recv['From'], '') self.assertSameEmail(recv['Cc'], ', occ2@example.net') self.assertSameEmail(recv['Bcc'], None) self.assertEqual(recv['Subject'], 'osubject') @@ -107,6 +124,135 @@ def test_send_mail_preformatted(self): recv = outbox[-1] self.assertEqual(recv['Fuzz'], 'bucket, monger') + +class MailUtilsTests(TestCase): + def test_decode_header_value(self): + self.assertEqual( + decode_header_value("cake"), + "cake", + "decodes simple string value", + ) + self.assertEqual( + decode_header_value("=?utf-8?b?8J+Ogg==?="), + "\U0001f382", + "decodes single utf-8-encoded part", + ) + self.assertEqual( + decode_header_value("=?utf-8?b?8J+Ogg==?= = =?macintosh?b?jYxrjg==?="), + "\U0001f382 = çåké", + "decodes a value with non-utf-8 encodings", + ) + + # Patch in a side_effect so we can distinguish values that came from decode_header_value. + @patch("ietf.utils.mail.decode_header_value", side_effect=lambda s: f"decoded-{s}") + @patch("ietf.utils.mail.messages") + def test_show_that_mail_was_sent(self, mock_messages, mock_decode_header_value): + request = RequestFactory().get("/some/path") + request.user = object() # just needs to exist + msg = Message() + msg["To"] = "to-value" + msg["Subject"] = "subject-value" + msg["Cc"] = "cc-value" + with patch("ietf.ietfauth.utils.has_role", return_value=True): + show_that_mail_was_sent(request, "mail was sent", msg, "bcc-value") + self.assertCountEqual( + mock_decode_header_value.call_args_list, + [call("to-value"), call("subject-value"), call("cc-value"), call("bcc-value")], + ) + self.assertEqual(mock_messages.info.call_args[0][0], request) + self.assertIn("mail was sent", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-cc-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-bcc-value", mock_messages.info.call_args[0][1]) + mock_messages.reset_mock() + mock_decode_header_value.reset_mock() + + # no bcc + with patch("ietf.ietfauth.utils.has_role", return_value=True): + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertCountEqual( + mock_decode_header_value.call_args_list, + [call("to-value"), call("subject-value"), call("cc-value")], + ) + self.assertEqual(mock_messages.info.call_args[0][0], request) + self.assertIn("mail was sent", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-cc-value", mock_messages.info.call_args[0][1]) + # Note: here and below - when using assertNotIn(), leaving off the "decoded-" prefix + # proves that neither the original value nor the decoded value appear. + self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1]) + mock_messages.reset_mock() + mock_decode_header_value.reset_mock() + + # no cc + del msg["Cc"] + with patch("ietf.ietfauth.utils.has_role", return_value=True): + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertCountEqual( + mock_decode_header_value.call_args_list, + [call("to-value"), call("subject-value")], + ) + self.assertEqual(mock_messages.info.call_args[0][0], request) + self.assertIn("mail was sent", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("cc-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1]) + mock_messages.reset_mock() + mock_decode_header_value.reset_mock() + + # no to + del msg["To"] + with patch("ietf.ietfauth.utils.has_role", return_value=True): + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertCountEqual( + mock_decode_header_value.call_args_list, + [call("[no to]"), call("subject-value")], + ) + self.assertEqual(mock_messages.info.call_args[0][0], request) + self.assertIn("mail was sent", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-[no to]", mock_messages.info.call_args[0][1]) + self.assertNotIn("to-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("cc-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1]) + mock_messages.reset_mock() + mock_decode_header_value.reset_mock() + + # no subject + del msg["Subject"] + with patch("ietf.ietfauth.utils.has_role", return_value=True): + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertCountEqual( + mock_decode_header_value.call_args_list, + [call("[no to]"), call("[no subject]")], + ) + self.assertEqual(mock_messages.info.call_args[0][0], request) + self.assertIn("mail was sent", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-[no subject]", mock_messages.info.call_args[0][1]) + self.assertNotIn("subject-value", mock_messages.info.call_args[0][1]) + self.assertIn("decoded-[no to]", mock_messages.info.call_args[0][1]) + self.assertNotIn("to-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("cc-value", mock_messages.info.call_args[0][1]) + self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1]) + mock_messages.reset_mock() + mock_decode_header_value.reset_mock() + + # user does not have role + with patch("ietf.ietfauth.utils.has_role", return_value=False): + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertFalse(mock_messages.called) + + # no user + request.user = None + with patch("ietf.ietfauth.utils.has_role", return_value=True) as mock_has_role: + show_that_mail_was_sent(request, "mail was sent", msg, None) + self.assertFalse(mock_messages.called) + self.assertFalse(mock_has_role.called) + + class TestSMTPServer(TestCase): def test_address_rejected(self): @@ -169,15 +315,16 @@ def qualified(name): return list(callbacks) -class TemplateChecksTestCase(TestCase): +class TemplateChecksTestCase(TestCase): # pragma: no cover paths = [] # type: List[str] templates = {} # type: Dict[str, Template] def setUp(self): super().setUp() - set_coverage_checking(False) - self.paths = list(get_template_paths()) + set_template_coverage(False) + set_url_coverage(False) + self.paths = get_template_paths() # already filtered ignores self.paths.sort() for path in self.paths: try: @@ -186,17 +333,14 @@ def setUp(self): pass def tearDown(self): - set_coverage_checking(True) + set_template_coverage(True) + set_url_coverage(True) super().tearDown() def test_parse_templates(self): errors = [] for path in self.paths: - for pattern in settings.TEST_TEMPLATE_IGNORE: - if fnmatch(path, pattern): - continue - if not path in self.templates: - + if path not in self.templates: try: get_template(path) except Exception as e: @@ -209,7 +353,7 @@ def apply_template_test(self, func, node_type, msg, *args, **kwargs): errors = [] for path, template in self.templates.items(): origin = str(template.origin).replace(settings.BASE_DIR, '') - for node in template: + for node in template.nodelist: for child in node.get_nodes_by_type(node_type): errors += func(child, origin, *args, **kwargs) if errors: @@ -324,7 +468,7 @@ def test_all_model_admins_exist(self): User.objects.create_superuser('admin', 'admin@example.org', 'admin+password') self.client.login(username='admin', password='admin+password') rtop = self.client.get("/admin/") - self.assertContains(rtop, 'Django administration') + self.assertContains(rtop, AdminSite.site_header()) for name in self.apps: app_name = self.apps[name] self.assertContains(rtop, name) @@ -400,6 +544,262 @@ def test_get_refs_v2(self): } ) + def test_parse_creation_date(self): + # override date_today to avoid skew when test runs around midnight + today = datetime.date.today() + with capture_xml2rfc_output(), patch("ietf.utils.xmldraft.date_today", return_value=today): + # Note: using a dict as a stand-in for XML elements, which rely on the get() method + self.assertEqual( + XMLDraft.parse_creation_date({"year": "2022", "month": "11", "day": "24"}), + datetime.date(2022, 11, 24), + "Fully specified date should be parsed", + ) + self.assertEqual( + XMLDraft.parse_creation_date(None), None, "return None if input is None" + ) + # Cases where the date is empty - missing fields or fields filled in with blank strings. + self.assertEqual(XMLDraft.parse_creation_date({}), today) + self.assertEqual(XMLDraft.parse_creation_date({"day": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({}), today) + self.assertEqual(XMLDraft.parse_creation_date({"year": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({"month": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({"day": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({"year": "", "month": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({"year": "", "day": ""}), today) + self.assertEqual(XMLDraft.parse_creation_date({"month": "", "day": ""}), today) + self.assertEqual( + XMLDraft.parse_creation_date({"year": "", "month": "", "day": ""}), today + ) + self.assertEqual( + XMLDraft.parse_creation_date( + {"year": str(today.year), "month": str(today.month), "day": ""} + ), + today, + ) + # When year/month do not match, day should be 15th of the month + self.assertEqual( + XMLDraft.parse_creation_date( + {"year": str(today.year - 1), "month": str(today.month), "day": ""} + ), + datetime.date(today.year - 1, today.month, 15), + ) + self.assertEqual( + XMLDraft.parse_creation_date( + { + "year": str(today.year), + "month": "1" if today.month != 1 else "2", + "day": "", + } + ), + datetime.date(today.year, 1 if today.month != 1 else 2, 15), + ) + # Some exeception-inducing conditions + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError if a year-only date is not current", + ): + XMLDraft.parse_creation_date( + { + "year": str(today.year - 1), + "month": "", + "day": "", + } + ) + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError for a non-numeric year" + ): + XMLDraft.parse_creation_date( + { + "year": "two thousand twenty-five", + "month": "2", + "day": "28", + } + ) + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError for an invalid month" + ): + XMLDraft.parse_creation_date( + { + "year": "2024", + "month": "13", + "day": "28", + } + ) + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError for a misspelled month" + ): + XMLDraft.parse_creation_date( + { + "year": "2024", + "month": "Oktobur", + "day": "28", + } + ) + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError for an invalid day" + ): + XMLDraft.parse_creation_date( + { + "year": "2024", + "month": "feb", + "day": "31", + } + ) + with self.assertRaises( + InvalidMetadataError, + msg="raise an InvalidMetadataError for a non-numeric day" + ): + XMLDraft.parse_creation_date( + { + "year": "2024", + "month": "feb", + "day": "twenty-four", + } + ) + + + def test_parse_docname(self): + with self.assertRaises(ValueError) as cm: + XMLDraft.parse_docname(lxml.etree.Element("xml")) # no docName + self.assertIn("Missing docName attribute", str(cm.exception)) + + # There to be more invalid docNames, but we use XMLDraft in places where we don't + # actually care about the validation, so for now just test what has long been the + # implementation. + with self.assertRaises(ValueError) as cm: + XMLDraft.parse_docname(lxml.etree.Element("xml", docName="")) # not a valid docName + self.assertIn("Unable to parse docName", str(cm.exception)) + + self.assertEqual( + XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz-01")), + ("draft-foo-bar-baz", "01"), + ) + + self.assertEqual( + XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz")), + ("draft-foo-bar-baz", None), + ) + + self.assertEqual( + XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz-")), + ("draft-foo-bar-baz-", None), + ) + + # This is awful, but is how we've been running for some time. The missing rev will trigger + # validation errors for submissions, so we're at least somewhat guarded against this + # property. + self.assertEqual( + XMLDraft.parse_docname(lxml.etree.Element("xml", docName="-01")), + ("-01", None), + ) + + def test_render_author_name(self): + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element("author", fullname="Joanna Q. Public")), + "Joanna Q. Public", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + fullname="Joanna Q. Public", + asciiFullname="Not the Same at All", + )), + "Joanna Q. Public", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + fullname=chr(340)+"ich", + asciiFullname="Rich UTF-8", + )), + chr(340)+"ich (Rich UTF-8)", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + fullname="Joanna Q. Public", + initials="J. Q.", + surname="Public-Private", + )), + "Joanna Q. Public", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + initials="J. Q.", + surname="Public", + )), + "J. Q. Public", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + surname="Public", + )), + "Public", + ) + self.assertEqual( + XMLDraft.render_author_name(lxml.etree.Element( + "author", + initials="J. Q.", + )), + "J. Q.", + ) + + @patch("ietf.utils.xmldraft.XMLDraft.__init__", return_value=None) + def test_get_title(self, mock_init): + xmldraft = XMLDraft("fake") + self.assertTrue(mock_init.called) + # Stub XML that does not have a front/title element + xmldraft.xmlroot = lxml.etree.XML( + "" # no title + ) + self.assertEqual(xmldraft.get_title(), "") + + # Stub XML that has a front/title element + xmldraft.xmlroot = lxml.etree.XML( + "This Is the Title" + ) + self.assertEqual(xmldraft.get_title(), "This Is the Title") + + + def test_capture_xml2rfc_output(self): + """capture_xml2rfc_output reroutes and captures xml2rfc logs""" + orig_write_out = xml2rfc_log.write_out + orig_write_err = xml2rfc_log.write_err + with capture_xml2rfc_output() as outer_log_streams: # ensure no output + # such meta! very Inception! + with capture_xml2rfc_output() as inner_log_streams: + # arbitrary xml2rfc method that triggers a log, nothing special otherwise + xml2rfc_extract_date({"year": "fish"}, datetime.date(2025,3,1)) + self.assertNotEqual(inner_log_streams, outer_log_streams) + self.assertEqual(xml2rfc_log.write_out, outer_log_streams["stdout"], "out stream should be restored") + self.assertEqual(xml2rfc_log.write_err, outer_log_streams["stderr"], "err stream should be restored") + self.assertEqual(xml2rfc_log.write_out, orig_write_out, "original out stream should be restored") + self.assertEqual(xml2rfc_log.write_err, orig_write_err, "original err stream should be restored") + + # don't happen to get any output on stdout and not paranoid enough to force some, just test stderr + self.assertGreater(len(inner_log_streams["stderr"].getvalue()), 0, "want output on inner streams") + self.assertEqual(len(outer_log_streams["stdout"].getvalue()), 0, "no output on outer streams") + self.assertEqual(len(outer_log_streams["stderr"].getvalue()), 0, "no output on outer streams") + + def test_capture_xml2rfc_output_exception_handling(self): + """capture_xml2rfc_output restores streams after an exception""" + orig_write_out = xml2rfc_log.write_out + orig_write_err = xml2rfc_log.write_err + with capture_xml2rfc_output() as outer_log_streams: # ensure no output + with self.assertRaises(RuntimeError), capture_xml2rfc_output() as inner_log_streams: + raise RuntimeError("nooo") + self.assertNotEqual(inner_log_streams, outer_log_streams) + self.assertEqual(xml2rfc_log.write_out, outer_log_streams["stdout"], "out stream should be restored") + self.assertEqual(xml2rfc_log.write_err, outer_log_streams["stderr"], "err stream should be restored") + self.assertEqual(xml2rfc_log.write_out, orig_write_out, "original out stream should be restored") + self.assertEqual(xml2rfc_log.write_err, orig_write_err, "original err stream should be restored") + class NameTests(TestCase): @@ -548,3 +948,12 @@ class TestForm(Form): self.assertTrue(changed_form.has_changed()) unchanged_form = TestForm(initial={'test_field': [1]}, data={'test_field': [1]}) self.assertFalse(unchanged_form.has_changed()) + + +class HealthTests(TestCase): + def test_health(self): + self.assertEqual( + self.client.get("/health/").status_code, + 200, + ) + diff --git a/ietf/utils/tests_coverage.py b/ietf/utils/tests_coverage.py new file mode 100644 index 00000000000..68795994a7e --- /dev/null +++ b/ietf/utils/tests_coverage.py @@ -0,0 +1,56 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +"""Tests of the coverage.py module""" + +from unittest import mock + +from django.test import override_settings + +from .coverage import CoverageManager +from .test_utils import TestCase + + +class CoverageManagerTests(TestCase): + @override_settings( + BASE_DIR="/path/to/project/ietf", + TEST_CODE_COVERAGE_EXCLUDE_FILES=["a.py"], + TEST_CODE_COVERAGE_EXCLUDE_LINES=["some-regex"], + ) + @mock.patch("ietf.utils.coverage.Coverage") + def test_coverage_manager(self, mock_coverage): + """CoverageManager managed coverage correctly in non-production mode + + Presumes we're not running tests in production mode. + """ + cm = CoverageManager() + self.assertFalse(cm.started) + + cm.start() + self.assertTrue(cm.started) + self.assertEqual(cm.checker, mock_coverage.return_value) + self.assertTrue(mock_coverage.called) + coverage_kwargs = mock_coverage.call_args.kwargs + self.assertEqual(coverage_kwargs["source"], ["/path/to/project/ietf"]) + self.assertEqual(coverage_kwargs["omit"], ["a.py"]) + self.assertTrue(isinstance(cm.checker.exclude, mock.Mock)) + assert isinstance(cm.checker.exclude, mock.Mock) # for type checker + self.assertEqual(cm.checker.exclude.call_count, 1) + cm.checker.exclude.assert_called_with("some-regex") + + @mock.patch("ietf.utils.coverage.Coverage") + def test_coverage_manager_is_defanged_in_production(self, mock_coverage): + """CoverageManager is a no-op in production mode""" + # Be careful faking settings.SERVER_MODE, but there's really no other way to + # test this. + with override_settings(SERVER_MODE="production"): + cm = CoverageManager() + cm.start() + + # Check that nothing actually happened + self.assertFalse(mock_coverage.called) + self.assertIsNone(cm.checker) + self.assertFalse(cm.started) + + # Check that other methods are guarded appropriately + cm.stop() + cm.save() + self.assertIsNone(cm.report()) diff --git a/ietf/utils/tests_meetecho.py b/ietf/utils/tests_meetecho.py index db3d36f4051..502e936483a 100644 --- a/ietf/utils/tests_meetecho.py +++ b/ietf/utils/tests_meetecho.py @@ -1,19 +1,21 @@ # Copyright The IETF Trust 2021, All Rights Reserved # -*- coding: utf-8 -*- import datetime -import pytz import requests import requests_mock -from unittest.mock import patch +from unittest.mock import call, patch from urllib.parse import urljoin +from zoneinfo import ZoneInfo from django.conf import settings from django.test import override_settings from django.utils import timezone +from ietf.doc.factories import DocumentFactory +from ietf.meeting.factories import SessionFactory, SessionPresentationFactory from ietf.utils.tests import TestCase -from .meetecho import Conference, ConferenceManager, MeetechoAPI, MeetechoAPIError +from .meetecho import Conference, ConferenceManager, MeetechoAPI, MeetechoAPIError, SlidesManager API_BASE = 'https://meetecho-api.example.com' CLIENT_ID = 'datatracker' @@ -22,6 +24,7 @@ 'api_base': API_BASE, 'client_id': CLIENT_ID, 'client_secret': CLIENT_SECRET, + 'slides_notify_time': -1, # always send notification } @@ -31,6 +34,7 @@ class APITests(TestCase): schedule_meeting_url = urljoin(API_BASE, 'meeting/interim/createRoom') fetch_meetings_url = urljoin(API_BASE, 'meeting/interim/fetchRooms') delete_meetings_url = urljoin(API_BASE, 'meeting/interim/deleteRoom') + slide_deck_url = urljoin(API_BASE, "materials") def setUp(self): super().setUp() @@ -78,7 +82,7 @@ def test_schedule_meeting(self): 'rooms': { '3d55bce0-535e-4ba8-bb8e-734911cf3c32': { 'room': { - 'id': 18, + 'id': 18, # should match room_id in api.schedule_meeting() below 'start_time': '2021-09-14 10:00:00', 'duration': 130, 'description': 'interim-2021-wgname-01', @@ -93,7 +97,8 @@ def test_schedule_meeting(self): api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET) api_response = api.schedule_meeting( wg_token='my-token', - start_time=pytz.utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)), + room_id=18, + start_time=datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC), duration=datetime.timedelta(minutes=130), description='interim-2021-wgname-01', extrainfo='message for staff', @@ -112,6 +117,7 @@ def test_schedule_meeting(self): self.assertEqual( request.json(), { + 'room_id': 18, 'duration': 130, 'start_time': '2021-09-14 10:00:00', 'extrainfo': 'message for staff', @@ -121,11 +127,11 @@ def test_schedule_meeting(self): ) # same time in different time zones for start_time in [ - pytz.utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)), - pytz.timezone('america/halifax').localize(datetime.datetime(2021, 9, 14, 7, 0, 0)), - pytz.timezone('europe/kiev').localize(datetime.datetime(2021, 9, 14, 13, 0, 0)), - pytz.timezone('pacific/easter').localize(datetime.datetime(2021, 9, 14, 5, 0, 0)), - pytz.timezone('africa/porto-novo').localize(datetime.datetime(2021, 9, 14, 11, 0, 0)), + datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC), + datetime.datetime(2021, 9, 14, 7, 0, 0, tzinfo=ZoneInfo('America/Halifax')), + datetime.datetime(2021, 9, 14, 13, 0, 0, tzinfo=ZoneInfo('Europe/Kiev')), + datetime.datetime(2021, 9, 14, 5, 0, 0, tzinfo=ZoneInfo('Pacific/Easter')), + datetime.datetime(2021, 9, 14, 11, 0, 0, tzinfo=ZoneInfo('Africa/Porto-Novo')), ]: self.assertEqual( api_response, @@ -143,7 +149,7 @@ def test_schedule_meeting(self): }, } }, - f'Incorrect time conversion for {start_time.tzinfo.zone}', + f'Incorrect time conversion for {start_time.tzinfo}', ) def test_fetch_meetings(self): @@ -192,7 +198,7 @@ def test_fetch_meetings(self): '3d55bce0-535e-4ba8-bb8e-734911cf3c32': { 'room': { 'id': 18, - 'start_time': pytz.utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)), + 'start_time': datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=130), 'description': 'interim-2021-wgname-01', }, @@ -202,7 +208,7 @@ def test_fetch_meetings(self): 'e68e96d4-d38f-475b-9073-ecab46ca96a5': { 'room': { 'id': 23, - 'start_time': pytz.utc.localize(datetime.datetime(2021, 9, 15, 14, 30, 0)), + 'start_time': datetime.datetime(2021, 9, 15, 14, 30, 0, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=30), 'description': 'interim-2021-wgname-02', }, @@ -228,6 +234,136 @@ def test_delete_meeting(self): self.assertIsNone(request.body, 'Delete meeting request has no body') self.assertCountEqual(api_response, data_to_fetch) + def test_add_slide_deck(self): + self.requests_mock.post(self.slide_deck_url, status_code=202) + + api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET) + api_response = api.add_slide_deck( + wg_token="my-token", + session="1234", + deck={ + "title": "A Slide Deck", + "id": 17, + "url": "https://example.com/decks/17", + "rev": "00", + "order": 0, + } + ) + self.assertIsNone(api_response) # no return value from this call + + self.assertTrue(self.requests_mock.called) + request = self.requests_mock.last_request + self.assertIn("Authorization", request.headers) + self.assertEqual( + request.headers["Content-Type"], + "application/json", + "Incorrect request content-type", + ) + self.assertEqual(request.headers["Authorization"], "bearer my-token", + "Incorrect request authorization header") + self.assertEqual( + request.json(), + { + "session": "1234", + "title": "A Slide Deck", + "id": 17, + "url": "https://example.com/decks/17", + "rev": "00", + "order": 0, + }, + "Incorrect request content" + ) + + def test_delete_slide_deck(self): + self.requests_mock.delete(self.slide_deck_url, status_code=202) + + api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET) + api_response = api.delete_slide_deck( + wg_token="my-token", + session="1234", + id=17, + ) + self.assertIsNone(api_response) # no return value from this call + + self.assertTrue(self.requests_mock.called) + request = self.requests_mock.last_request + self.assertIn("Authorization", request.headers) + self.assertEqual( + request.headers["Content-Type"], + "application/json", + "Incorrect request content-type", + ) + self.assertEqual(request.headers["Authorization"], "bearer my-token", + "Incorrect request authorization header") + self.assertEqual( + request.json(), + { + "session": "1234", + "id": 17, + }, + "Incorrect request content" + ) + + def test_update_slide_decks(self): + self.requests_mock.put(self.slide_deck_url, status_code=202) + + api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET) + api_response = api.update_slide_decks( + wg_token="my-token", + session="1234", + decks=[ + { + "title": "A Slide Deck", + "id": 17, + "url": "https://example.com/decks/17", + "rev": "00", + "order": 0, + }, + { + "title": "Another Slide Deck", + "id": 23, + "url": "https://example.com/decks/23", + "rev": "03", + "order": 1, + } + ] + ) + self.assertIsNone(api_response) # no return value from this call + + self.assertTrue(self.requests_mock.called) + request = self.requests_mock.last_request + self.assertIn("Authorization", request.headers) + self.assertEqual( + request.headers["Content-Type"], + "application/json", + "Incorrect request content-type", + ) + self.assertEqual(request.headers["Authorization"], "bearer my-token", + "Incorrect request authorization header") + self.assertEqual( + request.json(), + { + "session": "1234", + "decks": [ + { + "title": "A Slide Deck", + "id": 17, + "url": "https://example.com/decks/17", + "rev": "00", + "order": 0, + }, + { + "title": "Another Slide Deck", + "id": 23, + "url": "https://example.com/decks/23", + "rev": "03", + "order": 1, + }, + ], + }, + "Incorrect request content" + ) + def test_request_helper_failed_requests(self): self.requests_mock.register_uri(requests_mock.ANY, urljoin(API_BASE, 'unauthorized/url/endpoint'), status_code=401) self.requests_mock.register_uri(requests_mock.ANY, urljoin(API_BASE, 'forbidden/url/endpoint'), status_code=403) @@ -250,7 +386,7 @@ def test_request_helper_exception(self): def test_time_serialization(self): """Time de/serialization should be consistent""" - time = timezone.now().astimezone(pytz.utc).replace(microsecond=0) # cut off to 0 microseconds + time = timezone.now().astimezone(datetime.UTC).replace(microsecond=0) # cut off to 0 microseconds api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET) self.assertEqual(api._deserialize_time(api._serialize_time(time)), time) @@ -264,7 +400,7 @@ def test_conference_from_api_dict(self): 'session-1-uuid': { 'room': { 'id': 1, - 'start_time': pytz.utc.localize(datetime.datetime(2022,2,4,1,2,3)), + 'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=45), 'description': 'some-description', }, @@ -274,7 +410,7 @@ def test_conference_from_api_dict(self): 'session-2-uuid': { 'room': { 'id': 2, - 'start_time': pytz.utc.localize(datetime.datetime(2022,2,5,4,5,6)), + 'start_time': datetime.datetime(2022,2,5,4,5,6, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=90), 'description': 'another-description', }, @@ -291,7 +427,7 @@ def test_conference_from_api_dict(self): id=1, public_id='session-1-uuid', description='some-description', - start_time=pytz.utc.localize(datetime.datetime(2022, 2, 4, 1, 2, 3)), + start_time=datetime.datetime(2022, 2, 4, 1, 2, 3, tzinfo=datetime.UTC), duration=datetime.timedelta(minutes=45), url='https://example.com/some/url', deletion_token='delete-me', @@ -301,7 +437,7 @@ def test_conference_from_api_dict(self): id=2, public_id='session-2-uuid', description='another-description', - start_time=pytz.utc.localize(datetime.datetime(2022, 2, 5, 4, 5, 6)), + start_time=datetime.datetime(2022, 2, 5, 4, 5, 6, tzinfo=datetime.UTC), duration=datetime.timedelta(minutes=90), url='https://example.com/another/url', deletion_token='delete-me-too', @@ -317,7 +453,7 @@ def test_fetch(self, mock_fetch, _): 'session-1-uuid': { 'room': { 'id': 1, - 'start_time': pytz.utc.localize(datetime.datetime(2022,2,4,1,2,3)), + 'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=45), 'description': 'some-description', }, @@ -336,7 +472,7 @@ def test_fetch(self, mock_fetch, _): id=1, public_id='session-1-uuid', description='some-description', - start_time=pytz.utc.localize(datetime.datetime(2022,2,4,1,2,3)), + start_time=datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC), duration=datetime.timedelta(minutes=45), url='https://example.com/some/url', deletion_token='delete-me', @@ -351,8 +487,8 @@ def test_create(self, mock_schedule, _): 'rooms': { 'session-1-uuid': { 'room': { - 'id': 1, - 'start_time': pytz.utc.localize(datetime.datetime(2022,2,4,1,2,3)), + 'id': 1, # value should match session_id param to cm.create() below + 'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC), 'duration': datetime.timedelta(minutes=45), 'description': 'some-description', }, @@ -362,7 +498,7 @@ def test_create(self, mock_schedule, _): }, } cm = ConferenceManager(settings.MEETECHO_API_CONFIG) - result = cm.create('group', 'desc', 'starttime', 'dur', 'extra') + result = cm.create('group', '1', 'desc', 'starttime', 'dur', 'extra') self.assertEqual( result, [Conference( @@ -370,7 +506,7 @@ def test_create(self, mock_schedule, _): id=1, public_id='session-1-uuid', description='some-description', - start_time=pytz.utc.localize(datetime.datetime(2022,2,4,1,2,3)), + start_time=datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC), duration=datetime.timedelta(minutes=45), url='https://example.com/some/url', deletion_token='delete-me', @@ -381,6 +517,7 @@ def test_create(self, mock_schedule, _): kwargs, { 'wg_token': 'atoken', + 'room_id': 1, 'description': 'desc', 'start_time': 'starttime', 'duration': 'dur', @@ -394,10 +531,139 @@ def test_delete_conference(self, mock_delete): args, kwargs = mock_delete.call_args self.assertEqual(args, ('delete-this',)) - @patch('ietf.utils.meetecho.MeetechoAPI.delete_meeting') def test_delete_by_url(self, mock_delete): cm = ConferenceManager(settings.MEETECHO_API_CONFIG) cm.delete_conference(Conference(None, None, None, None, None, None, 'the-url', 'delete-this')) args, kwargs = mock_delete.call_args self.assertEqual(args, ('delete-this',)) + + +@patch.object(SlidesManager, 'wg_token', return_value='atoken') +@override_settings(MEETECHO_API_CONFIG=API_CONFIG) +class SlidesManagerTests(TestCase): + @patch("ietf.utils.meetecho.MeetechoAPI.add_slide_deck") + def test_add(self, mock_add, mock_wg_token): + sm = SlidesManager(settings.MEETECHO_API_CONFIG) + session = SessionFactory() + slides_doc = DocumentFactory(type_id="slides") + sm.add(session, slides_doc, 13) + self.assertTrue(mock_wg_token.called) + self.assertTrue(mock_add.called) + self.assertEqual( + mock_add.call_args, + call( + wg_token="atoken", + session=str(session.pk), + deck={ + "id": slides_doc.pk, + "title": slides_doc.title, + "url": slides_doc.get_href(session.meeting), + "rev": slides_doc.rev, + "order": 13, + }, + ), + ) + + @patch("ietf.utils.meetecho.MeetechoAPI.update_slide_decks") + @patch("ietf.utils.meetecho.MeetechoAPI.delete_slide_deck") + def test_delete(self, mock_delete, mock_update, mock_wg_token): + sm = SlidesManager(settings.MEETECHO_API_CONFIG) + # Test scenario: we had a session with two slide decks and we already deleted the SessionPresentation + # for one and are now updating Meetecho + slides = SessionPresentationFactory(document__type_id="slides", order=1) # still attached to the session + session = slides.session + slides_doc = slides.document + removed_slides_doc = DocumentFactory(type_id="slides") + + with self.assertRaises(MeetechoAPIError): + sm.delete(session, slides_doc) # can't remove slides still attached to the session + self.assertFalse(any([mock_wg_token.called, mock_delete.called, mock_update.called])) + + sm.delete(session, removed_slides_doc) + self.assertTrue(mock_wg_token.called) + self.assertTrue(mock_delete.called) + self.assertEqual( + mock_delete.call_args, + call(wg_token="atoken", session=str(session.pk), id=removed_slides_doc.pk), + ) + self.assertTrue(mock_update.called) + self.assertEqual( + mock_update.call_args, + call( + wg_token="atoken", + session=str(session.pk), + decks=[ + { + "id": slides_doc.pk, + "title": slides_doc.title, + "url": slides_doc.get_href(session.meeting), + "rev": slides_doc.rev, + "order": 1, + }, + ] + ) + ) + mock_delete.reset_mock() + mock_update.reset_mock() + + # Delete the other session and check that we don't make the update call + slides.delete() + sm.delete(session, slides_doc) + self.assertTrue(mock_delete.called) + self.assertFalse(mock_update.called) + + @patch("ietf.utils.meetecho.MeetechoAPI.delete_slide_deck") + @patch("ietf.utils.meetecho.MeetechoAPI.add_slide_deck") + def test_revise(self, mock_add, mock_delete, mock_wg_token): + sm = SlidesManager(settings.MEETECHO_API_CONFIG) + slides = SessionPresentationFactory(document__type_id="slides", order=23) + slides_doc = slides.document + sm.revise(slides.session, slides.document) + self.assertTrue(mock_wg_token.called) + self.assertTrue(mock_delete.called) + self.assertEqual( + mock_delete.call_args, + call(wg_token="atoken", session=str(slides.session.pk), id=slides_doc.pk), + ) + self.assertTrue(mock_add.called) + self.assertEqual( + mock_add.call_args, + call( + wg_token="atoken", + session=str(slides.session.pk), + deck={ + "id": slides_doc.pk, + "title": slides_doc.title, + "url": slides_doc.get_href(slides.session.meeting), + "rev": slides_doc.rev, + "order": 23, + }, + ), + ) + + + @patch("ietf.utils.meetecho.MeetechoAPI.update_slide_decks") + def test_send_update(self, mock_send_update, mock_wg_token): + sm = SlidesManager(settings.MEETECHO_API_CONFIG) + slides = SessionPresentationFactory(document__type_id="slides") + SessionPresentationFactory(session=slides.session, document__type_id="agenda") + sm.send_update(slides.session) + self.assertTrue(mock_wg_token.called) + self.assertTrue(mock_send_update.called) + self.assertEqual( + mock_send_update.call_args, + call( + wg_token="atoken", + session=str(slides.session_id), + decks=[ + { + "id": slides.document_id, + "title": slides.document.title, + "url": slides.document.get_href(slides.session.meeting), + "rev": slides.document.rev, + "order": 0, + } + ] + ) + ) diff --git a/ietf/utils/text.py b/ietf/utils/text.py index 48f5538cba6..590ec3fd30a 100644 --- a/ietf/utils/text.py +++ b/ietf/utils/text.py @@ -1,17 +1,15 @@ # Copyright The IETF Trust 2016-2020, All Rights Reserved # -*- coding: utf-8 -*- - -import bleach # type: ignore -import copy +import bleach import email import re import textwrap import tlds import unicodedata -from django.core.validators import URLValidator from django.core.exceptions import ValidationError +from django.core.validators import URLValidator from django.utils.functional import keep_lazy from django.utils.safestring import mark_safe @@ -19,57 +17,58 @@ from .texescape import init as texescape_init, tex_escape_map -tlds_sorted = sorted(tlds.tld_set, key=len, reverse=True) -protocols = set(bleach.sanitizer.ALLOWED_PROTOCOLS) -protocols.add("ftp") # we still have some ftp links -protocols.add("xmpp") # we still have some xmpp links - -tags = set(bleach.sanitizer.ALLOWED_TAGS).union( - { - # fmt: off - 'a', 'abbr', 'acronym', 'address', 'b', 'big', - 'blockquote', 'body', 'br', 'caption', 'center', 'cite', 'code', 'col', - 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'font', - 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'ins', 'kbd', - 'li', 'ol', 'p', 'pre', 'q', 's', 'samp', 'small', 'span', 'strike', 'style', - 'strong', 'sub', 'sup', 'table', 'title', 'tbody', 'td', 'tfoot', 'th', 'thead', - 'tr', 'tt', 'u', 'ul', 'var' - # fmt: on - } -) +# Sort in reverse so substrings are considered later - e.g., so ".co" comes after ".com". +tlds_sorted = sorted(tlds.tld_set, reverse=True) -attributes = copy.copy(bleach.sanitizer.ALLOWED_ATTRIBUTES) -attributes["*"] = ["id"] -attributes["ol"] = ["start"] +# Protocols we're interested in auto-linking. See also ietf.utils.html.acceptable_protocols, +# which is protocols we allow people to include explicitly in sanitized html. +linkable_protocols = ["http", "https", "mailto", "ftp", "xmpp"] -bleach_cleaner = bleach.sanitizer.Cleaner( - tags=tags, attributes=attributes, protocols=protocols, strip=True -) -validate_url = URLValidator() +_validate_url = URLValidator() def check_url_validity(attrs, new=False): + """Callback for bleach linkify + + :param attrs: dict of attributes of the tag + :param new: boolean - True if the link is new; False if was found in text + :return: new dict of attributes for the link, or None to block link creation + + Attributes are namespaced, so normally look like `(None, "SomeAttribute")`. + This includes as the keys in the `attrs` argument, so `attrs[(None, "href")]` + would be the value of the href attribute. + """ if (None, "href") not in attrs: # rfc2html creates a tags without href return attrs url = attrs[(None, "href")] try: if url.startswith("http"): - validate_url(url) + _validate_url(url) except ValidationError: return None return attrs -bleach_linker = bleach.Linker( +_bleach_linker = bleach.Linker( callbacks=[check_url_validity], - url_re=bleach.linkifier.build_url_re(tlds=tlds_sorted, protocols=protocols), + url_re=bleach.linkifier.build_url_re(tlds=tlds_sorted, protocols=linkable_protocols), email_re=bleach.linkifier.build_email_re(tlds=tlds_sorted), # type: ignore parse_email=True, ) +def linkify(text): + """Convert URL-ish substrings into HTML links + + This does no sanitization whatsoever. Caller must sanitize the input or output as + contextually appropriate. Do not call `mark_safe()` on the output if the input is + user-provided unless it has been sanitized or escaped. + """ + return _bleach_linker.linkify(text) + + @keep_lazy(str) def xslugify(value): """ diff --git a/ietf/utils/timezone.py b/ietf/utils/timezone.py index a396b5e82d9..e08dfa02f2c 100644 --- a/ietf/utils/timezone.py +++ b/ietf/utils/timezone.py @@ -26,7 +26,7 @@ def _tzinfo(tz: Union[str, datetime.tzinfo, None]): Accepts a tzinfo or string containing a timezone name. Defaults to UTC if tz is None. """ if tz is None: - return datetime.timezone.utc + return datetime.UTC elif isinstance(tz, datetime.tzinfo): return tz else: diff --git a/ietf/utils/unicodenormalize.py b/ietf/utils/unicodenormalize.py new file mode 100644 index 00000000000..8644dbdb79f --- /dev/null +++ b/ietf/utils/unicodenormalize.py @@ -0,0 +1,9 @@ +# Copyright The IETF Trust 2025, All Rights Reserved +import unicodedata + +def normalize_for_sorting(text): + """Normalize text for proper accent-aware sorting.""" + # Normalize the text to NFD (decomposed form) + decomposed = unicodedata.normalize('NFD', text) + # Filter out combining diacritical marks + return ''.join(char for char in decomposed if not unicodedata.combining(char)) diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py index 7f46d9c4316..6abda9b9732 100644 --- a/ietf/utils/urls.py +++ b/ietf/utils/urls.py @@ -6,12 +6,14 @@ from inspect import isclass -from django.conf.urls import url as django_url -from django.views.generic import View +from django.urls import re_path from django.utils.encoding import force_str +from django.views.generic import View def url(regex, view, kwargs=None, name=None): - if callable(view) and hasattr(view, '__name__'): + if hasattr(view, "view_class"): + view_name = "%s.%s" % (view.__module__, view.view_class.__name__) + elif callable(view) and hasattr(view, '__name__'): view_name = "%s.%s" % (view.__module__, view.__name__) else: view_name = regex @@ -42,5 +44,5 @@ def url(regex, view, kwargs=None, name=None): #debug.show('branch') #debug.show('name') pass - return django_url(regex, view, kwargs=kwargs, name=name) + return re_path(regex, view, kwargs=kwargs, name=name) diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py index ec7366fd1d0..92a20f5a266 100644 --- a/ietf/utils/validators.py +++ b/ietf/utils/validators.py @@ -4,6 +4,8 @@ import os import re +from email.utils import parseaddr + from pyquery import PyQuery from urllib.parse import urlparse, urlsplit, urlunsplit @@ -11,10 +13,17 @@ from django.apps import apps from django.conf import settings from django.core.exceptions import ObjectDoesNotExist, ValidationError -from django.core.validators import RegexValidator, URLValidator, EmailValidator, _lazy_re_compile, BaseValidator +from django.core.validators import ( + RegexValidator, + URLValidator, + BaseValidator, + validate_email, + ProhibitNullCharactersValidator, +) from django.template.defaultfilters import filesizeformat from django.utils.deconstruct import deconstructible from django.utils.ipv6 import is_valid_ipv6_address +from django.utils.regex_helper import _lazy_re_compile # type: ignore from django.utils.translation import gettext_lazy as _ import debug # pyflakes:ignore @@ -59,6 +68,7 @@ def __ne__(self, other): validate_regular_expression_string = RegexStringValidator() + def validate_file_size(file, missing_ok=False): try: size = file.size @@ -68,8 +78,14 @@ def validate_file_size(file, missing_ok=False): else: raise - if size > settings.SECR_MAX_UPLOAD_SIZE: - raise ValidationError('Please keep filesize under %s. Requested upload size was %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file.size))) + if size > settings.DATATRACKER_MAX_UPLOAD_SIZE: + raise ValidationError( + "Please keep filesize under {}. Requested upload size was {}".format( + filesizeformat(settings.DATATRACKER_MAX_UPLOAD_SIZE), + filesizeformat(file.size) + ) + ) + def validate_mime_type(file, valid, missing_ok=False): try: @@ -128,8 +144,17 @@ def validate_no_html_frame(file): # instantiations of sub-validiators used by the external_resource validator validate_url = URLValidator() -validate_http_url = URLValidator(schemes=['http','https']) -validate_email = EmailValidator() +validate_http_url = URLValidator(schemes=["http", "https"]) +validate_no_nulls = ProhibitNullCharactersValidator() + + +def validate_mailbox_address(s): + """Validate an RFC 5322 'mailbox' (e.g., "Some Person" )""" + # parseaddr() returns ("", "") on err; validate_email() will reject that for us + name, addr = parseaddr(s) + validate_no_nulls(name) # could be stricter... + validate_email(addr) + def validate_ipv6_address(value): if not is_valid_ipv6_address(value): diff --git a/ietf/utils/xmldraft.py b/ietf/utils/xmldraft.py index 7e8674ea785..f555a0a16a0 100644 --- a/ietf/utils/xmldraft.py +++ b/ietf/utils/xmldraft.py @@ -1,16 +1,35 @@ -# Copyright The IETF Trust 2022, All Rights Reserved +# Copyright The IETF Trust 2022-2025, All Rights Reserved # -*- coding: utf-8 -*- +import datetime import io import re import xml2rfc import debug # pyflakes: ignore -from contextlib import ExitStack +from contextlib import contextmanager +from lxml.etree import XMLSyntaxError +from xml2rfc.util.date import augment_date, extract_date +from ietf.utils.timezone import date_today from .draft import Draft +@contextmanager +def capture_xml2rfc_output(): + orig_write_out = xml2rfc.log.write_out + orig_write_err = xml2rfc.log.write_err + parser_out = io.StringIO() + parser_err = io.StringIO() + xml2rfc.log.write_out = parser_out + xml2rfc.log.write_err = parser_err + try: + yield {"stdout": parser_out, "stderr": parser_err} + finally: + xml2rfc.log.write_out = orig_write_out + xml2rfc.log.write_err = orig_write_err + + class XMLDraft(Draft): """Draft from XML source @@ -25,7 +44,7 @@ def __init__(self, xml_file): # cast xml_file to str so, e.g., this will work with a Path self.xmltree, self.xml_version = self.parse_xml(str(xml_file)) self.xmlroot = self.xmltree.getroot() - self.filename, self.revision = self._parse_docname() + self.filename, self.revision = self.parse_docname(self.xmlroot) @staticmethod def parse_xml(filename): @@ -34,25 +53,18 @@ def parse_xml(filename): Converts to xml2rfc v3 schema, then returns the root of the v3 tree and the original xml version. """ - orig_write_out = xml2rfc.log.write_out - orig_write_err = xml2rfc.log.write_err - parser_out = io.StringIO() - parser_err = io.StringIO() - - with ExitStack() as stack: - @stack.callback - def cleanup(): # called when context exited, even if there's an exception - xml2rfc.log.write_out = orig_write_out - xml2rfc.log.write_err = orig_write_err - - xml2rfc.log.write_out = parser_out - xml2rfc.log.write_err = parser_err + with capture_xml2rfc_output() as parser_logs: parser = xml2rfc.XmlRfcParser(filename, quiet=True) try: tree = parser.parse() + except XMLSyntaxError: + raise InvalidXMLError() except Exception as e: - raise XMLParseError(parser_out.getvalue(), parser_err.getvalue()) from e + raise XMLParseError( + parser_logs["stdout"].getvalue(), + parser_logs["stderr"].getvalue(), + ) from e xml_version = tree.getroot().get('version', '2') if xml_version == '2': @@ -85,8 +97,9 @@ def _document_name(self, ref): # check the anchor next anchor = ref.get("anchor").lower() # always give back lowercase label = anchor.rstrip("0123456789") # remove trailing digits - if label in series: - number = int(anchor[len(label) :]) + maybe_number = anchor[len(label) :] + if label in series and maybe_number.isdigit(): + number = int(maybe_number) return f"{label}{number}" # if we couldn't find a match so far, try the seriesInfo @@ -118,8 +131,11 @@ def _reference_section_name(self, section_elt): section_name = section_elt.get('title') # fall back to title if we have it return section_name - def _parse_docname(self): - docname = self.xmlroot.attrib.get('docName') + @staticmethod + def parse_docname(xmlroot): + docname = xmlroot.attrib.get('docName') + if docname is None: + raise ValueError("Missing docName attribute in the XML root element") revmatch = re.match( r'^(?P.+?)(?:-(?P[0-9][0-9]))?$', docname, @@ -131,7 +147,62 @@ def _parse_docname(self): return revmatch.group('filename'), revmatch.group('rev') def get_title(self): - return self.xmlroot.findtext('front/title').strip() + title_text = self.xmlroot.findtext('front/title') + return "" if title_text is None else title_text.strip() + + @staticmethod + def parse_creation_date(date_elt): + if date_elt is None: + return None + + today = date_today() + + # Outright reject non-numeric year / day (xml2rfc's extract_date does not do this) + # (n.b., "year" can be non-numeric in a section per RFC 7991) + year = date_elt.get("year") + day = date_elt.get("day") + non_numeric_year = year and not year.isdigit() + non_numeric_day = day and not day.isdigit() + if non_numeric_day or non_numeric_year: + raise InvalidMetadataError( + "Unable to parse the element in the section: " + "year and day must be numeric values if specified." + ) + + try: + # ths mimics handling of date elements in the xml2rfc text/html writers + year, month, day = extract_date(date_elt, today) + year, month, day = augment_date(year, month, day, today) + except Exception as err: + # Give a generic error if anything goes wrong so far... + raise InvalidMetadataError( + "Unable to parse the element in the section." + ) from err + + if not day: + # Must choose a day for a datetime.date. Per RFC 7991 sect 2.17, we use + # today's date if it is consistent with the rest of the date. Otherwise, + # arbitrariy (and consistent with the text parser) assume the 15th. + if year == today.year and month == today.month: + day = today.day + else: + day = 15 + + try: + creation_date = datetime.date(year, month, day) + except Exception: + # If everything went well, we should have had a valid datetime, but we didn't. + # The parsing _worked_ but not in a way that we can go forward with. + raise InvalidMetadataError( + "The element in the section specified an incomplete date " + "that was not consistent with today's date. If you specify only a year, " + "it must be the four-digit current year. To use today's date, omit the " + "date tag or use ." + ) + return creation_date + + def get_creation_date(self): + return self.parse_creation_date(self.xmlroot.find("front/date")) # todo fix the implementation of XMLDraft.get_abstract() # @@ -148,6 +219,35 @@ def get_title(self): # abstract = self.xmlroot.findtext('front/abstract') # return abstract.strip() if abstract else '' + @staticmethod + def render_author_name(author_elt): + """Get a displayable name for an author, if possible + + Based on TextWriter.render_author_name() from xml2rfc. If fullname is present, uses that. + If not, uses either initials + surname or just surname. Finally, returns None because this + author is evidently an organization, not a person. + + Does not involve ascii* attributes because rfc7991 requires fullname if any of those are + present. + """ + # Use fullname attribute, if present + fullname = author_elt.attrib.get("fullname", "").strip() + if fullname: + # If any 8bit chars in the fullname, try to append the author's + # name in ascii. + if any([x >= 0x80 for x in fullname.encode('utf8')]): + asciifullname = author_elt.attrib.get("asciiFullname", "").strip() + if asciifullname: + fullname = fullname + ' (' + asciifullname + ')' + return fullname + surname = author_elt.attrib.get("surname", "").strip() + initials = author_elt.attrib.get("initials", "").strip() + if surname or initials: + # This allows the possibility that only initials are used, which is a bit nonsensical + # but seems to be technically allowed by RFC 7991. + return f"{initials} {surname}".strip() + return None + def get_author_list(self): """Get detailed author list @@ -166,7 +266,7 @@ def get_author_list(self): for author in self.xmlroot.findall('front/author'): info = { - 'name': author.attrib.get('fullname'), + 'name': self.render_author_name(author), 'email': author.findtext('address/email'), 'affiliation': author.findtext('organization'), } @@ -210,3 +310,12 @@ def __init__(self, out: str, err: str, *args): def parser_msgs(self): return self._out.splitlines() + self._err.splitlines() + + +class InvalidXMLError(Exception): + """File is not valid XML""" + pass + + +class InvalidMetadataError(Exception): + """XML is well-formed but has invalid metadata""" diff --git a/ietf/wsgi.py b/ietf/wsgi.py index c43334874b3..bd17da5ba0d 100644 --- a/ietf/wsgi.py +++ b/ietf/wsgi.py @@ -1,23 +1,17 @@ -# Copyright The IETF Trust 2013-2021, All Rights Reserved +# Copyright The IETF Trust 2013-2024, All Rights Reserved # -*- coding: utf-8 -*- - import os import sys -import syslog path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER) - if not path in sys.path: sys.path.insert(0, path) os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings") -syslog.syslog("Starting datatracker wsgi instance") - from django.core.wsgi import get_wsgi_application -application = get_wsgi_application() +application = get_wsgi_application() diff --git a/jsconfig.json b/jsconfig.json index 0898bb2e2af..da44ff2fb25 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -15,7 +15,7 @@ "vueCompilerOptions": { "target": 3, "plugins": [ - "@volar/vue-language-plugin-pug" + "@vue/language-plugin-pug" ] } } diff --git a/k8s/README.md b/k8s/README.md new file mode 100644 index 00000000000..3966101ab80 --- /dev/null +++ b/k8s/README.md @@ -0,0 +1,5 @@ +# Kustomize deployment + +## Run locally + +The `secrets.yaml` file is provided as a reference only and must be referenced manually in the `kustomization.yaml` file. \ No newline at end of file diff --git a/k8s/auth.yaml b/k8s/auth.yaml new file mode 100644 index 00000000000..392e306b548 --- /dev/null +++ b/k8s/auth.yaml @@ -0,0 +1,158 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: auth +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: auth + strategy: + type: Recreate + template: + metadata: + labels: + app: auth + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Auth Container + # ----------------------------------------------------- + - name: auth + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-home + mountPath: /home/datatracker + - name: dt-xml2rfc-cache + mountPath: /var/cache/xml2rfc + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + env: + - name: "CONTAINER_ROLE" + value: "datatracker" + # ensures the pod gets recreated on every deploy: + - name: "DEPLOY_UID" + value: "$DEPLOY_UID" + envFrom: + - secretRef: + name: dt-secrets-env + startupProbe: + httpGet: + port: 8000 + path: /health/ + initialDelaySeconds: 10 + periodSeconds: 5 + failureThreshold: 30 + timeoutSeconds: 3 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + # ----------------------------------------------------- + # Nginx Container + # ----------------------------------------------------- + - name: nginx + image: "ghcr.io/nginxinc/nginx-unprivileged:1.27" + imagePullPolicy: IfNotPresent + ports: + - containerPort: 8080 + name: http + protocol: TCP + livenessProbe: + httpGet: + port: 8080 + path: /health/nginx + securityContext: + readOnlyRootFilesystem: true + volumeMounts: + - name: nginx-tmp + mountPath: /tmp + - name: dt-cfg + mountPath: /etc/nginx/conf.d/00logging.conf + subPath: nginx-logging.conf + - name: dt-cfg + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx-auth.conf + # ----------------------------------------------------- + # ScoutAPM Container + # ----------------------------------------------------- + - name: scoutapm + image: "scoutapp/scoutapm:version-1.4.0" + imagePullPolicy: IfNotPresent + # Replace command with one that will shut down on a TERM signal + # The ./core-agent start command line is from the scoutapm docker image + command: + - "sh" + - "-c" + - >- + trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM; + ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 & + wait $! + livenessProbe: + exec: + command: + - "sh" + - "-c" + - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'" + securityContext: + readOnlyRootFilesystem: true + runAsUser: 65534 # "nobody" user by default + runAsGroup: 65534 # "nogroup" group by default + volumes: + # To be overriden with the actual shared volume + - name: dt-vol + - name: dt-tmp + emptyDir: + sizeLimit: "2Gi" + - name: dt-xml2rfc-cache + emptyDir: + sizeLimit: "2Gi" + - name: dt-home + emptyDir: + sizeLimit: "2Gi" + - name: dt-cfg + configMap: + name: files-cfgmap + - name: nginx-tmp + emptyDir: + sizeLimit: "500Mi" + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 60 +--- +apiVersion: v1 +kind: Service +metadata: + name: auth +spec: + type: ClusterIP + ports: + - port: 80 + targetPort: http + protocol: TCP + name: http + selector: + app: auth diff --git a/k8s/beat.yaml b/k8s/beat.yaml new file mode 100644 index 00000000000..cc98beecf62 --- /dev/null +++ b/k8s/beat.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: beat + labels: + deleteBeforeUpgrade: yes +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: beat + strategy: + type: Recreate + template: + metadata: + labels: + app: beat + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Beat Container + # ----------------------------------------------------- + - name: beat + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + env: + - name: "CONTAINER_ROLE" + value: "beat" + envFrom: + - secretRef: + name: dt-secrets-env + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + volumes: + # To be overridden with the actual shared volume + - name: dt-vol + - name: dt-tmp + emptyDir: + sizeLimit: "2Gi" + - name: dt-cfg + configMap: + name: files-cfgmap + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 600 diff --git a/k8s/celery.yaml b/k8s/celery.yaml new file mode 100644 index 00000000000..a2799f2a6d8 --- /dev/null +++ b/k8s/celery.yaml @@ -0,0 +1,107 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: celery + labels: + deleteBeforeUpgrade: yes +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: celery + strategy: + type: Recreate + template: + metadata: + labels: + app: celery + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Celery Container + # ----------------------------------------------------- + - name: celery + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-home + mountPath: /home/datatracker + - name: dt-xml2rfc-cache + mountPath: /var/cache/xml2rfc + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + env: + - name: "CONTAINER_ROLE" + value: "celery" + envFrom: + - secretRef: + name: dt-secrets-env + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + # ----------------------------------------------------- + # ScoutAPM Container + # ----------------------------------------------------- + - name: scoutapm + image: "scoutapp/scoutapm:version-1.4.0" + imagePullPolicy: IfNotPresent + # Replace command with one that will shut down on a TERM signal + # The ./core-agent start command line is from the scoutapm docker image + command: + - "sh" + - "-c" + - >- + trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM; + ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 & + wait $! + livenessProbe: + exec: + command: + - "sh" + - "-c" + - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'" + securityContext: + readOnlyRootFilesystem: true + runAsUser: 65534 # "nobody" user by default + runAsGroup: 65534 # "nogroup" group by default + volumes: + # To be overridden with the actual shared volume + - name: dt-vol + - name: dt-tmp + emptyDir: + sizeLimit: "2Gi" + - name: dt-xml2rfc-cache + emptyDir: + sizeLimit: "2Gi" + - name: dt-home + emptyDir: + sizeLimit: "2Gi" + - name: dt-cfg + configMap: + name: files-cfgmap + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 600 diff --git a/k8s/datatracker.yaml b/k8s/datatracker.yaml new file mode 100644 index 00000000000..50a2c696878 --- /dev/null +++ b/k8s/datatracker.yaml @@ -0,0 +1,179 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: datatracker +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: datatracker + strategy: + type: Recreate + template: + metadata: + labels: + app: datatracker + spec: + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Datatracker Container + # ----------------------------------------------------- + - name: datatracker + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-home + mountPath: /home/datatracker + - name: dt-xml2rfc-cache + mountPath: /var/cache/xml2rfc + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + env: + - name: "CONTAINER_ROLE" + value: "datatracker" + # ensures the pod gets recreated on every deploy: + - name: "DEPLOY_UID" + value: "$DEPLOY_UID" + envFrom: + - secretRef: + name: dt-secrets-env + startupProbe: + httpGet: + port: 8000 + path: /health/ + initialDelaySeconds: 10 + periodSeconds: 5 + failureThreshold: 30 + timeoutSeconds: 3 + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + # ----------------------------------------------------- + # Nginx Container + # ----------------------------------------------------- + - name: nginx + image: "ghcr.io/nginxinc/nginx-unprivileged:1.27" + imagePullPolicy: IfNotPresent + ports: + - containerPort: 8080 + name: http + protocol: TCP + livenessProbe: + httpGet: + port: 8080 + path: /health/nginx + securityContext: + readOnlyRootFilesystem: true + volumeMounts: + - name: nginx-tmp + mountPath: /tmp + - name: dt-cfg + mountPath: /etc/nginx/conf.d/00logging.conf + subPath: nginx-logging.conf + - name: dt-cfg + # Replaces the original default.conf + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx-datatracker.conf + # ----------------------------------------------------- + # ScoutAPM Container + # ----------------------------------------------------- + - name: scoutapm + image: "scoutapp/scoutapm:version-1.4.0" + imagePullPolicy: IfNotPresent + # Replace command with one that will shut down on a TERM signal + # The ./core-agent start command line is from the scoutapm docker image + command: + - "sh" + - "-c" + - >- + trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM; + ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 & + wait $! + livenessProbe: + exec: + command: + - "sh" + - "-c" + - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'" + securityContext: + readOnlyRootFilesystem: true + runAsUser: 65534 # "nobody" user by default + runAsGroup: 65534 # "nogroup" group by default + initContainers: + - name: migration + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + env: + - name: "CONTAINER_ROLE" + value: "migrations" + envFrom: + - secretRef: + name: dt-secrets-env + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-home + mountPath: /home/datatracker + - name: dt-xml2rfc-cache + mountPath: /var/cache/xml2rfc + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + volumes: + # To be overriden with the actual shared volume + - name: dt-vol + - name: dt-tmp + emptyDir: + sizeLimit: "2Gi" + - name: dt-xml2rfc-cache + emptyDir: + sizeLimit: "2Gi" + - name: dt-home + emptyDir: + sizeLimit: "2Gi" + - name: dt-cfg + configMap: + name: files-cfgmap + - name: nginx-tmp + emptyDir: + sizeLimit: "500Mi" + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 60 +--- +apiVersion: v1 +kind: Service +metadata: + name: datatracker +spec: + type: ClusterIP + ports: + - port: 80 + targetPort: http + protocol: TCP + name: http + selector: + app: datatracker diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml new file mode 100644 index 00000000000..769cb03517e --- /dev/null +++ b/k8s/kustomization.yaml @@ -0,0 +1,17 @@ +namespace: datatracker +namePrefix: dt- +configMapGenerator: + - name: files-cfgmap + files: + - nginx-logging.conf + - nginx-auth.conf + - nginx-datatracker.conf + - settings_local.py +resources: + - auth.yaml + - beat.yaml + - celery.yaml + - datatracker.yaml + - memcached.yaml + - rabbitmq.yaml + - replicator.yaml diff --git a/k8s/memcached.yaml b/k8s/memcached.yaml new file mode 100644 index 00000000000..8f73f3d0d50 --- /dev/null +++ b/k8s/memcached.yaml @@ -0,0 +1,90 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: memcached +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: memcached + template: + metadata: + labels: + app: memcached + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Memcached + # ----------------------------------------------------- + - image: "memcached:1.6-alpine" + imagePullPolicy: IfNotPresent + args: ["-m", "1024"] + name: memcached + ports: + - name: memcached + containerPort: 11211 + protocol: TCP + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + # memcached image sets up uid/gid 11211 + runAsUser: 11211 + runAsGroup: 11211 + # ----------------------------------------------------- + # Memcached Exporter for Prometheus + # ----------------------------------------------------- + - image: "quay.io/prometheus/memcached-exporter:v0.14.3" + imagePullPolicy: IfNotPresent + name: memcached-exporter + ports: + - name: metrics + containerPort: 9150 + protocol: TCP + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 65534 # nobody + runAsGroup: 65534 # nobody + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 30 +--- +apiVersion: v1 +kind: Service +metadata: + name: memcached + annotations: + k8s.grafana.com/scrape: "true" # this is not a bool + k8s.grafana.com/metrics.portName: "metrics" +spec: + type: ClusterIP + ports: + - port: 11211 + targetPort: memcached + protocol: TCP + name: memcached + - port: 9150 + targetPort: metrics + protocol: TCP + name: metrics + selector: + app: memcached diff --git a/k8s/nginx-auth.conf b/k8s/nginx-auth.conf new file mode 100644 index 00000000000..95aa838064b --- /dev/null +++ b/k8s/nginx-auth.conf @@ -0,0 +1,42 @@ +server { + listen 8080 default_server; + server_name _; + + # Replace default "main" formatter with the ietfjson formatter from nginx-logging.conf + access_log /var/log/nginx/access.log ietfjson; + + # Note that regex location matches take priority over non-regex "prefix" matches. Use regexes so that + # our deny all rule does not squelch the other locations. + location ~ ^/health/nginx$ { + access_log off; + return 200; + } + + location ~ ^/robots.txt$ { + add_header Content-Type text/plain; + return 200 "User-agent: *\nDisallow: /\n"; + } + + location ~ ^/accounts/create.* { + return 302 https://datatracker.ietf.org/accounts/create; + } + + # n.b. (?!...) is a negative lookahead group + location ~ ^(/(?!(api/openid/|accounts/login/|accounts/logout/|accounts/reset/|person/.*/photo|group/groupmenu.json)).*) { + return 302 https://datatracker.ietf.org$${keepempty}request_uri; + } + + location / { + add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' data: https://datatracker.ietf.org/ https://www.ietf.org/ http://ietf.org/ https://analytics.ietf.org https://static.ietf.org; frame-ancestors 'self' ietf.org *.ietf.org meetecho.com *.meetecho.com gather.town *.gather.town"; + proxy_set_header Host $${keepempty}host; + proxy_set_header Connection close; + proxy_set_header X-Request-Start "t=$${keepempty}msec"; + proxy_set_header X-Forwarded-For $${keepempty}proxy_add_x_forwarded_for; + proxy_hide_header X-Datatracker-Is-Authenticated; # hide this from the outside world + proxy_pass http://localhost:8000; + # Set timeouts longer than Cloudflare proxy limits + proxy_connect_timeout 60; # nginx default (Cf = 15) + proxy_read_timeout 120; # nginx default = 60 (Cf = 100) + proxy_send_timeout 60; # nginx default = 60 (Cf = 30) + } +} diff --git a/k8s/nginx-datatracker.conf b/k8s/nginx-datatracker.conf new file mode 100644 index 00000000000..882d7563c25 --- /dev/null +++ b/k8s/nginx-datatracker.conf @@ -0,0 +1,32 @@ +server { + listen 8080 default_server; + server_name _; + + # Replace default "main" formatter with the ietfjson formatter from nginx-logging.conf + access_log /var/log/nginx/access.log ietfjson; + + location /health/nginx { + access_log off; + return 200; + } + + location /robots.txt { + add_header Content-Type text/plain; + return 200 "User-agent: *\nDisallow: /doc/pdf/\n"; + } + + location / { + add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' data: https://datatracker.ietf.org/ https://www.ietf.org/ http://ietf.org/ https://analytics.ietf.org https://static.ietf.org; frame-ancestors 'self' ietf.org *.ietf.org meetecho.com *.meetecho.com"; + proxy_set_header Host $${keepempty}host; + proxy_set_header Connection close; + proxy_set_header X-Request-Start "t=$${keepempty}msec"; + proxy_set_header X-Forwarded-For $${keepempty}proxy_add_x_forwarded_for; + proxy_hide_header X-Datatracker-Is-Authenticated; # hide this from the outside world + proxy_pass http://localhost:8000; + # Set timeouts longer than Cloudflare proxy limits + proxy_connect_timeout 60; # nginx default (Cf = 15) + proxy_read_timeout 120; # nginx default = 60 (Cf = 100) + proxy_send_timeout 60; # nginx default = 60 (Cf = 30) + client_max_body_size 0; # disable size check + } +} diff --git a/k8s/nginx-logging.conf b/k8s/nginx-logging.conf new file mode 100644 index 00000000000..673d7a29abb --- /dev/null +++ b/k8s/nginx-logging.conf @@ -0,0 +1,22 @@ +# Define JSON log format - must be loaded before config that references it. +# Note that each line is fully enclosed in single quotes. Commas in arrays are +# intentionally inside the single quotes. +log_format ietfjson escape=json + '{' + '"time":"$${keepempty}time_iso8601",' + '"remote_ip":"$${keepempty}remote_addr",' + '"request":"$${keepempty}request",' + '"host":"$${keepempty}host",' + '"path":"$${keepempty}request_uri",' + '"method":"$${keepempty}request_method",' + '"status":"$${keepempty}status",' + '"len_bytes":"$${keepempty}body_bytes_sent",' + '"duration_s":"$${keepempty}request_time",' + '"referer":"$${keepempty}http_referer",' + '"user_agent":"$${keepempty}http_user_agent",' + '"x_forwarded_for":"$${keepempty}http_x_forwarded_for",' + '"x_forwarded_proto":"$${keepempty}http_x_forwarded_proto",' + '"cf_connecting_ip":"$${keepempty}http_cf_connecting_ip",' + '"cf_ray":"$${keepempty}http_cf_ray",' + '"asn":"$${keepempty}http_x_ip_src_asnum"' + '}'; diff --git a/k8s/rabbitmq.yaml b/k8s/rabbitmq.yaml new file mode 100644 index 00000000000..780a3992390 --- /dev/null +++ b/k8s/rabbitmq.yaml @@ -0,0 +1,188 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: rabbitmq +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: rabbitmq + template: + metadata: + labels: + app: rabbitmq + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # RabbitMQ Container + # ----------------------------------------------------- + - image: "ghcr.io/ietf-tools/datatracker-mq:3.13-alpine" + imagePullPolicy: Always + name: rabbitmq + ports: + - name: amqp + containerPort: 5672 + protocol: TCP + volumeMounts: + - name: rabbitmq-data + mountPath: /var/lib/rabbitmq + subPath: "rabbitmq" + - name: rabbitmq-tmp + mountPath: /tmp + - name: rabbitmq-config + mountPath: "/etc/rabbitmq" + env: + - name: CELERY_PASSWORD + valueFrom: + secretKeyRef: + name: dt-secrets-env + key: CELERY_PASSWORD + livenessProbe: + exec: + command: ["rabbitmq-diagnostics", "-q", "ping", "-t", "30"] + periodSeconds: 30 + timeoutSeconds: 35 # slightly longer than ping "-t" option + startupProbe: + initialDelaySeconds: 15 + periodSeconds: 5 + timeoutSeconds: 35 # slightly longer than ping "-t" option + successThreshold: 1 + failureThreshold: 60 + exec: + command: ["rabbitmq-diagnostics", "-q", "ping", "-t", "30"] + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + # rabbitmq image sets up uid/gid 100/101 + runAsUser: 100 + runAsGroup: 101 + initContainers: + # ----------------------------------------------------- + # Init RabbitMQ data + # ----------------------------------------------------- + - name: init-rabbitmq + image: busybox:stable + command: + - "sh" + - "-c" + - "mkdir -p -m700 /mnt/rabbitmq && chown 100:101 /mnt/rabbitmq" + securityContext: + runAsNonRoot: false + runAsUser: 0 + readOnlyRootFilesystem: true + volumeMounts: + - name: "rabbitmq-data" + mountPath: "/mnt" + volumes: + - name: rabbitmq-tmp + emptyDir: + sizeLimit: "50Mi" + - name: rabbitmq-config + configMap: + name: "rabbitmq-configmap" + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 30 + volumeClaimTemplates: + - metadata: + name: rabbitmq-data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi + # storageClassName: "" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: rabbitmq-configmap +data: + definitions.json: |- + { + "permissions": [ + { + "configure": ".*", + "read": ".*", + "user": "datatracker", + "vhost": "dt", + "write": ".*" + } + ], + "users": [ + { + "hashing_algorithm": "rabbit_password_hashing_sha256", + "limits": {}, + "name": "datatracker", + "password_hash": "HJxcItcpXtBN+R/CH7dUelfKBOvdUs3AWo82SBw2yLMSguzb", + "tags": [] + } + ], + "vhosts": [ + { + "limits": [], + "metadata": { + "description": "", + "tags": [] + }, + "name": "dt" + } + ] + } + rabbitmq.conf: |- + # prevent guest from logging in over tcp + loopback_users.guest = true + + # load saved definitions + load_definitions = /etc/rabbitmq/definitions.json + + # Ensure that enough disk is available to flush to disk. To do this, need to limit the + # memory available to the container to something reasonable. See + # https://www.rabbitmq.com/production-checklist.html#monitoring-and-resource-usage + # for recommendations. + + # 1-1.5 times the memory available to the container is adequate for disk limit + disk_free_limit.absolute = 6000MB + + # This should be ~40% of the memory available to the container. Use an + # absolute number because relative will be proprtional to the full machine + # memory. + vm_memory_high_watermark.absolute = 1600MB + + # Logging + log.file = false + log.console = true + log.console.level = info + log.console.formatter = json +--- +apiVersion: v1 +kind: Service +metadata: + name: rabbitmq +spec: + type: ClusterIP + clusterIP: None # headless service + ports: + - port: 5672 + targetPort: amqp + protocol: TCP + name: amqp + selector: + app: rabbitmq diff --git a/k8s/replicator.yaml b/k8s/replicator.yaml new file mode 100644 index 00000000000..9c462bd96ba --- /dev/null +++ b/k8s/replicator.yaml @@ -0,0 +1,82 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: replicator + labels: + deleteBeforeUpgrade: yes +spec: + replicas: 1 + revisionHistoryLimit: 2 + selector: + matchLabels: + app: replicator + strategy: + type: Recreate + template: + metadata: + labels: + app: replicator + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - datatracker + topologyKey: "kubernetes.io/hostname" + securityContext: + runAsNonRoot: true + containers: + # ----------------------------------------------------- + # Celery Container + # ----------------------------------------------------- + - name: celery + image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG" + imagePullPolicy: Always + volumeMounts: + - name: dt-vol + mountPath: /a + - name: dt-tmp + mountPath: /tmp + - name: dt-home + mountPath: /home/datatracker + - name: dt-xml2rfc-cache + mountPath: /var/cache/xml2rfc + - name: dt-cfg + mountPath: /workspace/ietf/settings_local.py + subPath: settings_local.py + env: + - name: "CONTAINER_ROLE" + value: "replicator" + envFrom: + - secretRef: + name: dt-secrets-env + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsUser: 1000 + runAsGroup: 1000 + volumes: + # To be overridden with the actual shared volume + - name: dt-vol + - name: dt-tmp + emptyDir: + sizeLimit: "2Gi" + - name: dt-xml2rfc-cache + emptyDir: + sizeLimit: "2Gi" + - name: dt-home + emptyDir: + sizeLimit: "2Gi" + - name: dt-cfg + configMap: + name: files-cfgmap + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 600 diff --git a/k8s/secrets.yaml b/k8s/secrets.yaml new file mode 100644 index 00000000000..ba90af9c2a5 --- /dev/null +++ b/k8s/secrets.yaml @@ -0,0 +1,83 @@ +apiVersion: v1 +kind: Secret +metadata: + name: secrets-env +type: Opaque +stringData: + DATATRACKER_SERVER_MODE: "development" # development for staging, production for production + DATATRACKER_ADMINS: |- + Robert Sparks + Ryan Cross + Kesara Rathnayake + Jennifer Richards + Nicolas Giard + DATATRACKER_ALLOWED_HOSTS: ".ietf.org" # newline-separated list also allowed + # DATATRACKER_DATATRACKER_DEBUG: "false" + + # DB access details - needs to be filled in + # DATATRACKER_DB_HOST: "db" + # DATATRACKER_DB_PORT: "5432" + # DATATRACKER_DB_NAME: "datatracker" + # DATATRACKER_DB_USER: "django" # secret + # DATATRACKER_DB_PASS: "RkTkDPFnKpko" # secret + # DATATRACKER_DB_CONN_MAX_AGE: "0" # connection per request if not set, no limit if set to "None" + # DATATRACKER_DB_CONN_HEALTH_CHECKS: "false" + + DATATRACKER_DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk" # secret + + # Set this to point testing / staging at the production statics server until we + # sort that out + # DATATRACKER_STATIC_URL: "https://static.ietf.org/dt/12.10.0/" + + # DATATRACKER_EMAIL_DEBUG: "true" + + # Outgoing email details + # DATATRACKER_EMAIL_HOST: "localhost" # defaults to localhost + # DATATRACKER_EMAIL_PORT: "2025" # defaults to 2025 + + # The value here is the default from settings.py (i.e., not actually secret) + DATATRACKER_NOMCOM_APP_SECRET_B64: "m9pzMezVoFNJfsvU9XSZxGnXnwup6P5ZgCQeEnROOoQ=" # secret + + DATATRACKER_IANA_SYNC_PASSWORD: "this-is-the-iana-sync-password" # secret + DATATRACKER_RFC_EDITOR_SYNC_PASSWORD: "this-is-the-rfc-editor-sync-password" # secret + DATATRACKER_YOUTUBE_API_KEY: "this-is-the-youtube-api-key" # secret + DATATRACKER_GITHUB_BACKUP_API_KEY: "this-is-the-github-backup-api-key" # secret + + # API key configuration + DATATRACKER_API_KEY_TYPE: "ES265" + # secret - value here is the default from settings.py (i.e., not actually secret) + DATATRACKER_API_PUBLIC_KEY_PEM_B64: |- + Ci0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tCk1Ga3dFd1lIS29aSXpqMENBUVlJS + 29aSXpqMERBUWNEUWdBRXFWb2pzYW9mREpTY3VNSk4rdHNodW15Tk01TUUKZ2Fyel + ZQcWtWb3ZtRjZ5RTdJSi9kdjRGY1YrUUtDdEovck9TOGUzNlk4WkFFVll1dWtoZXM + weVoxdz09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo= + # secret - value here is the default from settings.py (i.e., not actually secret) + DATATRACKER_API_PRIVATE_KEY_PEM_B64: |- + Ci0tLS0tQkVHSU4gUFJJVkFURSBLRVktLS0tLQpNSUdIQWdFQU1CTUdCeXFHU000O + UFnRUdDQ3FHU000OUF3RUhCRzB3YXdJQkFRUWdvSTZMSmtvcEtxOFhySGk5ClFxR1 + F2RTRBODNURllqcUx6KzhnVUxZZWNzcWhSQU5DQUFTcFdpT3hxaDhNbEp5NHdrMzY + yeUc2Ykkwemt3U0IKcXZOVStxUldpK1lYcklUc2duOTIvZ1Z4WDVBb0swbitzNUx4 + N2ZwanhrQVJWaTY2U0Y2elRKblgKLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= + + #DATATRACKER_REGISTRATION_API_KEY: "some-key" # secret" + + # DATATRACKER_MEETECHO_API_BASE: "https://meetings.conf.meetecho.com/api/v1/" + DATATRACKER_MEETECHO_CLIENT_ID: "this-is-the-meetecho-client-id" # secret + DATATRACKER_MEETECHO_CLIENT_SECRET: "this-is-the-meetecho-client-secret" # secret + + # DATATRACKER_MATOMO_SITE_ID: "7" # must be present to enable Matomo + # DATATRACKER_MATOMO_DOMAIN_PATH: "analytics.ietf.org" + + CELERY_PASSWORD: "this-is-a-secret" # secret + + # Only one of these may be set + # DATATRACKER_APP_API_TOKENS_JSON_B64: "e30K" # secret + # DATATRACKER_APP_API_TOKENS_JSON: "{}" # secret + + # use this to override default - one entry per line + # DATATRACKER_CSRF_TRUSTED_ORIGINS: |- + # https://datatracker.staging.ietf.org + + # Scout configuration + DATATRACKER_SCOUT_KEY: "this-is-the-scout-key" + DATATRACKER_SCOUT_NAME: "StagingDatatracker" \ No newline at end of file diff --git a/k8s/settings_local.py b/k8s/settings_local.py new file mode 100644 index 00000000000..f8ffacc83fc --- /dev/null +++ b/k8s/settings_local.py @@ -0,0 +1,430 @@ +# Copyright The IETF Trust 2007-2024, All Rights Reserved +# -*- coding: utf-8 -*- + +from base64 import b64decode +from email.utils import parseaddr +import json + +from ietf import __release_hash__ +from ietf.settings import * # pyflakes:ignore +from ietf.settings import ( + STORAGES, + ARTIFACT_STORAGE_NAMES, + BLOBSTORAGE_CONNECT_TIMEOUT, + BLOBSTORAGE_READ_TIMEOUT, + BLOBSTORAGE_MAX_ATTEMPTS, +) +import botocore.config + + +def _multiline_to_list(s): + """Helper to split at newlines and conver to list""" + return [item.strip() for item in s.split("\n")] + + +# Default to "development". Production _must_ set DATATRACKER_SERVER_MODE="production" in the env! +SERVER_MODE = os.environ.get("DATATRACKER_SERVER_MODE", "development") + +# Secrets +_SECRET_KEY = os.environ.get("DATATRACKER_DJANGO_SECRET_KEY", None) +if _SECRET_KEY is not None: + SECRET_KEY = _SECRET_KEY +else: + raise RuntimeError("DATATRACKER_DJANGO_SECRET_KEY must be set") + +_NOMCOM_APP_SECRET_B64 = os.environ.get("DATATRACKER_NOMCOM_APP_SECRET_B64", None) +if _NOMCOM_APP_SECRET_B64 is not None: + NOMCOM_APP_SECRET = b64decode(_NOMCOM_APP_SECRET_B64) +else: + raise RuntimeError("DATATRACKER_NOMCOM_APP_SECRET_B64 must be set") + +_IANA_SYNC_PASSWORD = os.environ.get("DATATRACKER_IANA_SYNC_PASSWORD", None) +if _IANA_SYNC_PASSWORD is not None: + IANA_SYNC_PASSWORD = _IANA_SYNC_PASSWORD +else: + raise RuntimeError("DATATRACKER_IANA_SYNC_PASSWORD must be set") + +_RFC_EDITOR_SYNC_PASSWORD = os.environ.get("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD", None) +if _RFC_EDITOR_SYNC_PASSWORD is not None: + RFC_EDITOR_SYNC_PASSWORD = os.environ.get("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD") +else: + raise RuntimeError("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD must be set") + +_YOUTUBE_API_KEY = os.environ.get("DATATRACKER_YOUTUBE_API_KEY", None) +if _YOUTUBE_API_KEY is not None: + YOUTUBE_API_KEY = _YOUTUBE_API_KEY +else: + raise RuntimeError("DATATRACKER_YOUTUBE_API_KEY must be set") + +_GITHUB_BACKUP_API_KEY = os.environ.get("DATATRACKER_GITHUB_BACKUP_API_KEY", None) +if _GITHUB_BACKUP_API_KEY is not None: + GITHUB_BACKUP_API_KEY = _GITHUB_BACKUP_API_KEY +else: + raise RuntimeError("DATATRACKER_GITHUB_BACKUP_API_KEY must be set") + +_API_KEY_TYPE = os.environ.get("DATATRACKER_API_KEY_TYPE", None) +if _API_KEY_TYPE is not None: + API_KEY_TYPE = _API_KEY_TYPE +else: + raise RuntimeError("DATATRACKER_API_KEY_TYPE must be set") + +_API_PUBLIC_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PUBLIC_KEY_PEM_B64", None) +if _API_PUBLIC_KEY_PEM_B64 is not None: + API_PUBLIC_KEY_PEM = b64decode(_API_PUBLIC_KEY_PEM_B64) +else: + raise RuntimeError("DATATRACKER_API_PUBLIC_KEY_PEM_B64 must be set") + +_API_PRIVATE_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PRIVATE_KEY_PEM_B64", None) +if _API_PRIVATE_KEY_PEM_B64 is not None: + API_PRIVATE_KEY_PEM = b64decode(_API_PRIVATE_KEY_PEM_B64) +else: + raise RuntimeError("DATATRACKER_API_PRIVATE_KEY_PEM_B64 must be set") + +# Set DEBUG if DATATRACKER_DEBUG env var is the word "true" +DEBUG = os.environ.get("DATATRACKER_DEBUG", "false").lower() == "true" + +# DATATRACKER_ALLOWED_HOSTS env var is a newline-separated list of allowed hosts +_allowed_hosts_str = os.environ.get("DATATRACKER_ALLOWED_HOSTS", None) +if _allowed_hosts_str is not None: + ALLOWED_HOSTS = _multiline_to_list(_allowed_hosts_str) + +DATABASES = { + "default": { + "HOST": os.environ.get("DATATRACKER_DB_HOST", "db"), + "PORT": os.environ.get("DATATRACKER_DB_PORT", "5432"), + "NAME": os.environ.get("DATATRACKER_DB_NAME", "datatracker"), + "ENGINE": "django.db.backends.postgresql", + "USER": os.environ.get("DATATRACKER_DB_USER", "django"), + "PASSWORD": os.environ.get("DATATRACKER_DB_PASS", ""), + "OPTIONS": json.loads(os.environ.get("DATATRACKER_DB_OPTS_JSON", "{}")), + }, + "blobdb": { + "HOST": os.environ.get("BLOBDB_DB_HOST", "blobdb"), + "PORT": os.environ.get("BLOBDB_DB_PORT", "5432"), + "NAME": os.environ.get("BLOBDB_DB_NAME", "blob"), + "ENGINE": "django.db.backends.postgresql", + "USER": os.environ.get("BLOBDB_DB_USER", "django"), + "PASSWORD": os.environ.get("BLOBDB_DB_PASS", ""), + "OPTIONS": json.loads(os.environ.get("BLOBDB_DB_OPTS_JSON", "{}")), + }, +} + +DATABASE_ROUTERS = ["ietf.blobdb.routers.BlobdbStorageRouter"] +BLOBDB_DATABASE = "blobdb" + +# Configure persistent connections. A setting of 0 is Django's default. +_conn_max_age = os.environ.get("DATATRACKER_DB_CONN_MAX_AGE", "0") +for dbname in ["default", "blobdb"]: + # A string "none" means unlimited age. + DATABASES[dbname]["CONN_MAX_AGE"] = ( + None if _conn_max_age.lower() == "none" else int(_conn_max_age) + ) +# Enable connection health checks if DATATRACKER_DB_CONN_HEALTH_CHECK is the string "true" +_conn_health_checks = bool( + os.environ.get("DATATRACKER_DB_CONN_HEALTH_CHECKS", "false").lower() == "true" +) +for dbname in ["default", "blobdb"]: + DATABASES[dbname]["CONN_HEALTH_CHECKS"] = _conn_health_checks + +# DATATRACKER_ADMINS is a newline-delimited list of addresses parseable by email.utils.parseaddr +_admins_str = os.environ.get("DATATRACKER_ADMINS", None) +if _admins_str is not None: + ADMINS = [parseaddr(admin) for admin in _multiline_to_list(_admins_str)] +else: + raise RuntimeError("DATATRACKER_ADMINS must be set") + +USING_DEBUG_EMAIL_SERVER = ( + os.environ.get("DATATRACKER_EMAIL_DEBUG", "false").lower() == "true" +) +EMAIL_HOST = os.environ.get("DATATRACKER_EMAIL_HOST", "localhost") +EMAIL_PORT = int(os.environ.get("DATATRACKER_EMAIL_PORT", "2025")) + +_celery_password = os.environ.get("CELERY_PASSWORD", None) +if _celery_password is None: + raise RuntimeError("CELERY_PASSWORD must be set") +CELERY_BROKER_URL = "amqp://datatracker:{password}@{host}/{queue}".format( + host=os.environ.get("RABBITMQ_HOSTNAME", "dt-rabbitmq"), + password=_celery_password, + queue=os.environ.get("RABBITMQ_QUEUE", "dt"), +) + +# mailarchive API key +_mailing_list_archive_api_key = os.environ.get( + "DATATRACKER_MAILING_LIST_ARCHIVE_API_KEY", None +) +if _mailing_list_archive_api_key is None: + raise RuntimeError("DATATRACKER_MAILING_LIST_ARCHIVE_API_KEY must be set") +MAILING_LIST_ARCHIVE_API_KEY = _mailing_list_archive_api_key + +IANA_SYNC_USERNAME = "ietfsync" +IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes" +IANA_SYNC_PROTOCOLS_URL = "http://www.iana.org/protocols/" + +RFC_EDITOR_NOTIFICATION_URL = "http://www.rfc-editor.org/parser/parser.php" + +_registration_api_key = os.environ.get("DATATRACKER_REGISTRATION_API_KEY", None) +if _registration_api_key is None: + raise RuntimeError("DATATRACKER_REGISTRATION_API_KEY must be set") +STATS_REGISTRATION_ATTENDEES_JSON_URL = f"https://registration.ietf.org/{{number}}/attendees/?apikey={_registration_api_key}" + +# Registration Participants API config - key must be set, but the URL can be left +# to the default in settings.py +_registration_participants_api_key = os.environ.get( + "DATATRACKER_REGISTRATION_PARTICIPANTS_API_KEY", None +) +if _registration_participants_api_key is None: + raise RuntimeError("DATATRACKER_REGISTRATION_PARTICIPANTS_API_KEY must be set") +REGISTRATION_PARTICIPANTS_API_KEY = _registration_participants_api_key + +_registration_participants_api_url = os.environ.get( + "DATATRACKER_REGISTRATION_PARTICIPANTS_API_URL", None +) +if _registration_participants_api_url is not None: + REGISTRATION_PARTICIPANTS_API_URL = _registration_participants_api_url + +# FIRST_CUTOFF_DAYS = 12 +# SECOND_CUTOFF_DAYS = 12 +# SUBMISSION_CUTOFF_DAYS = 26 +# SUBMISSION_CORRECTION_DAYS = 57 +MEETING_MATERIALS_SUBMISSION_CUTOFF_DAYS = 26 +MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS = 54 + +# disable htpasswd by setting to a do-nothing command +HTPASSWD_COMMAND = "/bin/true" + +_MEETECHO_CLIENT_ID = os.environ.get("DATATRACKER_MEETECHO_CLIENT_ID", None) +_MEETECHO_CLIENT_SECRET = os.environ.get("DATATRACKER_MEETECHO_CLIENT_SECRET", None) +if _MEETECHO_CLIENT_ID is not None and _MEETECHO_CLIENT_SECRET is not None: + MEETECHO_API_CONFIG = { + "api_base": os.environ.get( + "DATATRACKER_MEETECHO_API_BASE", + "https://meetings.conf.meetecho.com/api/v1/", + ), + "client_id": _MEETECHO_CLIENT_ID, + "client_secret": _MEETECHO_CLIENT_SECRET, + "request_timeout": 3.01, # python-requests doc recommend slightly > a multiple of 3 seconds + } +else: + raise RuntimeError( + "DATATRACKER_MEETECHO_CLIENT_ID and DATATRACKER_MEETECHO_CLIENT_SECRET must be set" + ) + +# For APP_API_TOKENS, accept either base64-encoded JSON or raw JSON, but not both. +# To decode / pretty-print the encoded form, run: +# base64 -d | jq . +# paste the encoded secret into stdin. Copy/paste that into an editor you trust not +# to leave a copy lying around. When done editing, copy/paste the final JSON through +# jq -c | base64 +# and copy/paste the output into the secret store. +if "DATATRACKER_APP_API_TOKENS_JSON_B64" in os.environ: + if "DATATRACKER_APP_API_TOKENS_JSON" in os.environ: + raise RuntimeError( + "Only one of DATATRACKER_APP_API_TOKENS_JSON and DATATRACKER_APP_API_TOKENS_JSON_B64 may be set" + ) + _APP_API_TOKENS_JSON = b64decode( + os.environ.get("DATATRACKER_APP_API_TOKENS_JSON_B64") + ) +else: + _APP_API_TOKENS_JSON = os.environ.get("DATATRACKER_APP_API_TOKENS_JSON", None) + +if _APP_API_TOKENS_JSON is not None: + APP_API_TOKENS = json.loads(_APP_API_TOKENS_JSON) +else: + APP_API_TOKENS = {} + +EMAIL_COPY_TO = "" + +# Until we teach the datatracker to look beyond cloudflare for this check +IDSUBMIT_MAX_DAILY_SAME_SUBMITTER = 5000 + +# Leave DATATRACKER_MATOMO_SITE_ID unset to disable Matomo reporting +if "DATATRACKER_MATOMO_SITE_ID" in os.environ: + MATOMO_DOMAIN_PATH = os.environ.get( + "DATATRACKER_MATOMO_DOMAIN_PATH", "analytics.ietf.org" + ) + MATOMO_SITE_ID = os.environ.get("DATATRACKER_MATOMO_SITE_ID") + MATOMO_DISABLE_COOKIES = True + +# Leave DATATRACKER_SCOUT_KEY unset to disable Scout APM agent +_SCOUT_KEY = os.environ.get("DATATRACKER_SCOUT_KEY", None) +if _SCOUT_KEY is not None: + if SERVER_MODE == "production": + PROD_PRE_APPS = [ + "scout_apm.django", + ] + else: + DEV_PRE_APPS = [ + "scout_apm.django", + ] + SCOUT_MONITOR = True + SCOUT_KEY = _SCOUT_KEY + SCOUT_NAME = os.environ.get("DATATRACKER_SCOUT_NAME", "Datatracker") + SCOUT_ERRORS_ENABLED = True + SCOUT_SHUTDOWN_MESSAGE_ENABLED = False + SCOUT_CORE_AGENT_SOCKET_PATH = "tcp://{host}:{port}".format( + host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"), + port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"), + ) + SCOUT_CORE_AGENT_DOWNLOAD = False + SCOUT_CORE_AGENT_LAUNCH = False + SCOUT_REVISION_SHA = __release_hash__[:7] + +STATIC_URL = os.environ.get("DATATRACKER_STATIC_URL", None) +if STATIC_URL is None: + from ietf import __version__ + + STATIC_URL = f"https://static.ietf.org/dt/{__version__}/" + +# Set these to the same as "production" in settings.py, whether production mode or not +MEDIA_ROOT = "/a/www/www6s/lib/dt/media/" +MEDIA_URL = "https://www.ietf.org/lib/dt/media/" +PHOTOS_DIRNAME = "photo" +PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME + +# Normally only set for debug, but needed until we have a real FS +DJANGO_VITE["default"]["manifest_path"] = os.path.join( + BASE_DIR, "static/dist-neue/manifest.json" +) + +# Binaries that are different in the docker image +DE_GFM_BINARY = "/usr/local/bin/de-gfm" +IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits" + +# Duplicating production cache from settings.py and using it whether we're in production mode or not +MEMCACHED_HOST = os.environ.get("DT_MEMCACHED_SERVICE_HOST", "127.0.0.1") +MEMCACHED_PORT = os.environ.get("DT_MEMCACHED_SERVICE_PORT", "11211") +from ietf import __version__ + +CACHES = { + "default": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + "VERSION": __version__, + "KEY_PREFIX": "ietf:dt", + # Key function is default except with sha384-encoded key + "KEY_FUNCTION": lambda key, key_prefix, version: ( + f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}" + ), + }, + "proceedings": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + # No release-specific VERSION setting. + "KEY_PREFIX": "ietf:dt:proceedings", + # Key function is default except with sha384-encoded key + "KEY_FUNCTION": lambda key, key_prefix, version: ( + f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}" + ), + }, + "sessions": { + "BACKEND": "ietf.utils.cache.LenientMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + # No release-specific VERSION setting. + "KEY_PREFIX": "ietf:dt", + }, + "htmlized": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/htmlized", + "OPTIONS": { + "MAX_ENTRIES": 100000, # 100,000 + }, + }, + "pdfized": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/pdfized", + "OPTIONS": { + "MAX_ENTRIES": 100000, # 100,000 + }, + }, + "slowpages": { + "BACKEND": "django.core.cache.backends.filebased.FileBasedCache", + "LOCATION": "/a/cache/datatracker/slowpages", + "OPTIONS": { + "MAX_ENTRIES": 5000, + }, + }, + "celery-results": { + "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache", + "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}", + "KEY_PREFIX": "ietf:celery", + }, +} + +_csrf_trusted_origins_str = os.environ.get("DATATRACKER_CSRF_TRUSTED_ORIGINS") +if _csrf_trusted_origins_str is not None: + CSRF_TRUSTED_ORIGINS = _multiline_to_list(_csrf_trusted_origins_str) + +# Console logs as JSON instead of plain when running in k8s +LOGGING["handlers"]["console"]["formatter"] = "json" + +# Configure storages for the replica blob store +_blob_store_endpoint_url = os.environ.get("DATATRACKER_BLOB_STORE_ENDPOINT_URL") +_blob_store_access_key = os.environ.get("DATATRACKER_BLOB_STORE_ACCESS_KEY") +_blob_store_secret_key = os.environ.get("DATATRACKER_BLOB_STORE_SECRET_KEY") +if None in (_blob_store_endpoint_url, _blob_store_access_key, _blob_store_secret_key): + raise RuntimeError( + "All of DATATRACKER_BLOB_STORE_ENDPOINT_URL, DATATRACKER_BLOB_STORE_ACCESS_KEY, " + "and DATATRACKER_BLOB_STORE_SECRET_KEY must be set" + ) +_blob_store_bucket_prefix = os.environ.get("DATATRACKER_BLOB_STORE_BUCKET_PREFIX", "") +_blob_store_enable_profiling = ( + os.environ.get("DATATRACKER_BLOB_STORE_ENABLE_PROFILING", "false").lower() == "true" +) +_blob_store_max_attempts = int( + os.environ.get("DATATRACKER_BLOB_STORE_MAX_ATTEMPTS", BLOBSTORAGE_MAX_ATTEMPTS) +) +_blob_store_connect_timeout = float( + os.environ.get( + "DATATRACKER_BLOB_STORE_CONNECT_TIMEOUT", BLOBSTORAGE_CONNECT_TIMEOUT + ) +) +_blob_store_read_timeout = float( + os.environ.get("DATATRACKER_BLOB_STORE_READ_TIMEOUT", BLOBSTORAGE_READ_TIMEOUT) +) + +for storagename in ARTIFACT_STORAGE_NAMES: + if storagename in ["staging"]: + continue + replica_storagename = f"r2-{storagename}" + STORAGES[replica_storagename] = { + "BACKEND": "ietf.doc.storage.MetadataS3Storage", + "OPTIONS": dict( + endpoint_url=_blob_store_endpoint_url, + access_key=_blob_store_access_key, + secret_key=_blob_store_secret_key, + security_token=None, + client_config=botocore.config.Config( + request_checksum_calculation="when_required", + response_checksum_validation="when_required", + signature_version="s3v4", + connect_timeout=_blob_store_connect_timeout, + read_timeout=_blob_store_read_timeout, + retries={"total_max_attempts": _blob_store_max_attempts}, + ), + verify=False, + bucket_name=f"{_blob_store_bucket_prefix}{storagename}".strip(), + ietf_log_blob_timing=_blob_store_enable_profiling, + ), + } + +# Configure the blobdb app for artifact storage +_blobdb_replication_enabled = ( + os.environ.get("DATATRACKER_BLOBDB_REPLICATION_ENABLED", "true").lower() == "true" +) +_blobdb_replication_verbose_logging = ( + os.environ.get("DATATRACKER_BLOBDB_REPLICATION_VERBOSE_LOGGING", "false").lower() + == "true" +) + +BLOBDB_REPLICATION = { + "ENABLED": _blobdb_replication_enabled, + "DEST_STORAGE_PATTERN": "r2-{bucket}", + "INCLUDE_BUCKETS": ARTIFACT_STORAGE_NAMES, + "EXCLUDE_BUCKETS": ["staging"], + "VERBOSE_LOGGING": _blobdb_replication_verbose_logging, +} + +# Optionally disable password strength enforcement at login (on by default) +PASSWORD_POLICY_ENFORCE_AT_LOGIN = ( + os.environ.get("DATATRACKER_ENFORCE_PW_POLICY", "true").lower() != "false" +) diff --git a/media/.gitignore b/media/.gitignore deleted file mode 100644 index dfa8ca37ce9..00000000000 --- a/media/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/floor diff --git a/media/photo/nopictureavailable.jpg b/media/photo/nopictureavailable.jpg deleted file mode 100644 index 0895f9f57c7..00000000000 Binary files a/media/photo/nopictureavailable.jpg and /dev/null differ diff --git a/media/photo/profile-default.jpg b/media/photo/profile-default.jpg deleted file mode 100644 index d6b03e10041..00000000000 Binary files a/media/photo/profile-default.jpg and /dev/null differ diff --git a/mypy.ini b/mypy.ini index 825bf03169d..19df7ec9b00 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,7 +1,5 @@ [mypy] -#mypy_path = ./stubs/ - ignore_missing_imports = True plugins = @@ -9,12 +7,3 @@ plugins = [mypy.plugins.django-stubs] django_settings_module = ietf.settings - -[mypy-ietf.group.migrations.0004_add_group_feature_fields] -ignore_errors = True - -[mypy-ietf.group.migrations.0002_groupfeatures_historicalgroupfeatures] -ignore_errors = True - -[mypy-ietf.doc.migrations.0001_initial] -ignore_errors = True diff --git a/package.json b/package.json index e878dd31c02..e2e6fd7dab7 100644 --- a/package.json +++ b/package.json @@ -7,73 +7,73 @@ "legacy:build": "parcel build" }, "dependencies": { - "@fullcalendar/bootstrap5": "6.1.6", - "@fullcalendar/core": "6.1.6", - "@fullcalendar/daygrid": "6.1.6", - "@fullcalendar/icalendar": "6.1.6", - "@fullcalendar/interaction": "6.1.6", - "@fullcalendar/list": "6.1.6", - "@fullcalendar/luxon2": "6.1.6", - "@fullcalendar/timegrid": "6.1.6", - "@fullcalendar/vue3": "6.1.6", - "@popperjs/core": "2.11.7", + "@fullcalendar/bootstrap5": "6.1.11", + "@fullcalendar/core": "6.1.11", + "@fullcalendar/daygrid": "6.1.11", + "@fullcalendar/icalendar": "6.1.11", + "@fullcalendar/interaction": "6.1.11", + "@fullcalendar/list": "6.1.11", + "@fullcalendar/luxon3": "6.1.11", + "@fullcalendar/timegrid": "6.1.11", + "@fullcalendar/vue3": "6.1.11", + "@popperjs/core": "2.11.8", "@twuni/emojify": "1.0.2", - "bootstrap": "5.2.3", - "bootstrap-icons": "1.10.5", - "browser-fs-access": "0.33.1", - "caniuse-lite": "1.0.30001481", - "d3": "7.8.4", + "bootstrap": "5.3.3", + "bootstrap-icons": "1.11.3", + "browser-fs-access": "0.35.0", + "caniuse-lite": "1.0.30001603", + "d3": "7.9.0", "file-saver": "2.0.5", - "highcharts": "11.0.1", + "highcharts": "11.4.0", "ical.js": "1.5.0", - "jquery": "3.6.4", + "jquery": "3.7.1", "js-cookie": "3.0.5", "list.js": "2.3.1", "lodash": "4.17.21", "lodash-es": "4.17.21", - "luxon": "3.3.0", - "moment": "2.29.4", - "moment-timezone": "0.5.43", + "luxon": "3.4.4", + "moment": "2.30.1", + "moment-timezone": "0.5.45", "ms": "2.1.3", "murmurhash-js": "1.0.0", - "naive-ui": "2.34.3", - "pinia": "2.0.35", + "naive-ui": "2.38.1", + "pinia": "2.1.7", "pinia-plugin-persist": "1.0.0", "select2": "4.1.0-rc.0", "select2-bootstrap-5-theme": "1.3.0", "send": "0.18.0", - "shepherd.js": "11.1.1", + "shepherd.js": "11.2.0", "slugify": "1.6.6", - "sortablejs": "1.15.0", - "vanillajs-datepicker": "1.3.1", - "vue": "3.2.47", - "vue-router": "4.1.6", + "sortablejs": "1.15.2", + "vanillajs-datepicker": "1.3.4", + "vue": "3.4.21", + "vue-router": "4.3.0", "zxcvbn": "4.4.2" }, "devDependencies": { - "@faker-js/faker": "7.6.0", - "@parcel/optimizer-data-url": "2.8.3", - "@parcel/transformer-inline-string": "2.8.3", - "@parcel/transformer-sass": "2.8.3", - "@rollup/pluginutils": "5.0.2", - "@vitejs/plugin-vue": "4.2.1", + "@parcel/optimizer-data-url": "2.12.0", + "@parcel/transformer-inline-string": "2.12.0", + "@parcel/transformer-sass": "2.12.0", + "@rollup/pluginutils": "5.1.0", + "@vitejs/plugin-vue": "4.6.2", + "@vue/language-plugin-pug": "2.0.7", "browserlist": "latest", - "c8": "7.13.0", - "eslint": "8.39.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-cypress": "2.13.3", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-n": "15.7.0", + "c8": "9.1.0", + "eslint": "8.57.0", + "eslint-config-standard": "17.1.0", + "eslint-plugin-cypress": "2.15.1", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-n": "16.6.2", "eslint-plugin-node": "11.1.0", "eslint-plugin-promise": "6.1.1", - "eslint-plugin-vue": "9.11.0", - "html-validate": "7.16.0", + "eslint-plugin-vue": "9.24.0", + "html-validate": "8.18.1", "jquery-migrate": "3.4.1", - "parcel": "2.8.3", + "parcel": "2.12.0", "pug": "3.0.2", - "sass": "1.62.1", + "sass": "1.72.0", "seedrandom": "3.0.5", - "vite": "4.3.4" + "vite": "4.5.3" }, "targets": { "ietf": { @@ -83,12 +83,14 @@ "ietf/static/css/document_html_inline.scss", "ietf/static/css/document_html_referenced.scss", "ietf/static/css/document_html_txt.scss", + "ietf/static/css/highcharts.scss", "ietf/static/css/ietf.scss", "ietf/static/css/liaisons.css", "ietf/static/css/list.scss", "ietf/static/css/select2.scss", "ietf/static/images/iab-logo-card.png", "ietf/static/images/iab-logo.svg", + "ietf/static/images/iab-logo-white.svg", "ietf/static/images/iesg-draft-state-diagram.png", "ietf/static/images/ietf-logo-card.png", "ietf/static/images/ietf-logo-nor-16-dev.png", @@ -104,14 +106,19 @@ "ietf/static/images/ietf-logo-nor-mask.svg", "ietf/static/images/ietf-logo-nor-white.svg", "ietf/static/images/ietf-logo-nor.svg", + "ietf/static/images/ietf-logo-white.svg", "ietf/static/images/ietf-logo.svg", "ietf/static/images/irtf-logo-card.png", + "ietf/static/images/irtf-logo-white.svg", "ietf/static/images/irtf-logo.svg", + "ietf/static/js/add_session_recordings.js", "ietf/static/js/agenda_filter.js", "ietf/static/js/agenda_materials.js", + "ietf/static/js/announcement.js", "ietf/static/js/complete-review.js", "ietf/static/js/create_timeslot.js", "ietf/static/js/create_timeslot.js", + "ietf/static/js/custom_striped.js", "ietf/static/js/d3.js", "ietf/static/js/datepicker.js", "ietf/static/js/doc-search.js", @@ -128,11 +135,13 @@ "ietf/static/js/highcharts.js", "ietf/static/js/highstock.js", "ietf/static/js/ietf.js", + "ietf/static/js/investigate.js", "ietf/static/js/ipr-edit.js", "ietf/static/js/ipr-search.js", "ietf/static/js/js-cookie.js", "ietf/static/js/liaisons.js", "ietf/static/js/list.js", + "ietf/static/js/login.js", "ietf/static/js/manage-community-list.js", "ietf/static/js/manage-review-requests.js", "ietf/static/js/meeting-interim-request.js", @@ -140,14 +149,19 @@ "ietf/static/js/password_strength.js", "ietf/static/js/select2.js", "ietf/static/js/session_details_form.js", + "ietf/static/js/session_form.js", + "ietf/static/js/session_request.js", "ietf/static/js/sortable.js", "ietf/static/js/stats.js", "ietf/static/js/status-change-edit-relations.js", + "ietf/static/js/theme.js", "ietf/static/js/timeslot_edit.js", "ietf/static/js/timezone.js", "ietf/static/js/upcoming.js", "ietf/static/js/upload-material.js", + "ietf/static/js/upload-session-agenda.js", "ietf/static/js/upload_bofreq.js", + "ietf/static/js/upload_statement.js", "ietf/static/js/zxcvbn.js" ] }, @@ -197,8 +211,6 @@ "ietf/secr/static/images/tooltag-arrowright.webp", "ietf/secr/static/images/tooltag-arrowright_over.webp", "ietf/secr/static/js/dynamic_inlines.js", - "ietf/secr/static/js/session_form.js", - "ietf/secr/static/js/sessions.js", "ietf/secr/static/js/utils.js" ] } diff --git a/patch/add-django-cprofile-filter.patch b/patch/add-django-cprofile-filter.patch index 128d5a9f095..bf684a0b33e 100644 --- a/patch/add-django-cprofile-filter.patch +++ b/patch/add-django-cprofile-filter.patch @@ -1,15 +1,9 @@ ---- django_cprofile_middleware/middleware.py.old 2018-04-04 06:32:29.282187502 -0700 -+++ django_cprofile_middleware/middleware.py 2018-04-06 10:11:18.936855634 -0700 -@@ -1,4 +1,5 @@ - import pstats -+import re - - try: - import cProfile as profile -@@ -14,6 +15,15 @@ - from django.utils.deprecation import MiddlewareMixin - - +--- django_cprofile_middleware/middleware.py.old 2024-06-27 21:03:56.975128007 +0000 ++++ django_cprofile_middleware/middleware.py 2024-06-27 23:45:59.421683008 +0000 +@@ -19,6 +19,16 @@ + from django_cprofile_middleware.utils import MiddlewareMixin + + +class Stats(pstats.Stats): + def filter_stats(self, regex): + oldstats = self.stats @@ -18,17 +12,64 @@ + for func, (cc, nc, tt, ct, callers) in oldstats.iteritems(): + if filter.search(pstats.func_std_string(func)): + newstats[func] = (cc, nc, tt, ct, callers) ++ + class ProfilerMiddleware(MiddlewareMixin): """ Simple profile middleware to profile django views. To run it, add ?prof to -@@ -62,8 +72,13 @@ +@@ -38,9 +48,11 @@ + ?download => Download profile file suitable for visualization. For example + in snakeviz or RunSnakeRun + +- This is adapted from an example found here: +- http://www.slideshare.net/zeeg/django-con-high-performance-django-presentation. ++ Patched with https://github.com/omarish/django-cprofile-middleware/pull/23 ++ for operation with Django 4.2.5+ + """ ++ PROFILER_REQUEST_ATTR_NAME = '_django_cprofile_middleware_profiler' ++ + def can(self, request): + requires_staff = getattr( + settings, "DJANGO_CPROFILE_MIDDLEWARE_REQUIRE_STAFF", True) +@@ -52,10 +64,11 @@ + + def process_view(self, request, callback, callback_args, callback_kwargs): + if self.can(request): +- self.profiler = profile.Profile() ++ profiler = profile.Profile() ++ setattr(request, self.PROFILER_REQUEST_ATTR_NAME, profiler) + args = (request,) + callback_args + try: +- return self.profiler.runcall( ++ return profiler.runcall( + callback, *args, **callback_kwargs) + except Exception: + # we want the process_exception middleware to fire +@@ -63,12 +76,13 @@ + return + + def process_response(self, request, response): +- if self.can(request): +- self.profiler.create_stats() ++ if hasattr(request, self.PROFILER_REQUEST_ATTR_NAME): ++ profiler = getattr(request, self.PROFILER_REQUEST_ATTR_NAME) ++ profiler.create_stats() + if 'download' in request.GET: + import marshal + +- output = marshal.dumps(self.profiler.stats) ++ output = marshal.dumps(profiler.stats) + response = HttpResponse( + output, content_type='application/octet-stream') + response['Content-Disposition'] = 'attachment;' \ +@@ -76,9 +90,14 @@ response['Content-Length'] = len(output) else: io = StringIO() - stats = pstats.Stats(self.profiler, stream=io) ++ stats = Stats(profiler, stream=io) + - stats.strip_dirs().sort_stats(request.GET.get('sort', 'time')) -+ stats = Stats(self.profiler, stream=io) + if request.GET.get('stripdirs', False): + stats = stats.strip_dirs() + filter = request.GET.get('filter', None) @@ -36,5 +77,5 @@ + stats.filter_stats(filter) + stats.sort_stats(request.GET.get('psort') or 'time') stats.print_stats(int(request.GET.get('count', 100))) + response = HttpResponse('
    %s
    ' % io.getvalue()) - return response diff --git a/patch/add-django-http-cookie-value-none.patch b/patch/add-django-http-cookie-value-none.patch deleted file mode 100644 index ab75235f2e7..00000000000 --- a/patch/add-django-http-cookie-value-none.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- django/http/response.py.orig 2020-07-08 14:34:42.776562458 +0200 -+++ django/http/response.py 2020-07-08 14:35:56.454687322 +0200 -@@ -197,8 +197,8 @@ - if httponly: - self.cookies[key]['httponly'] = True - if samesite: -- if samesite.lower() not in ('lax', 'strict'): -- raise ValueError('samesite must be "lax" or "strict".') -+ if samesite.lower() not in ('lax', 'strict', 'none'): -+ raise ValueError('samesite must be "lax", "strict", or "none", not "%s".' % samesite) - self.cookies[key]['samesite'] = samesite - - def setdefault(self, key, value): diff --git a/patch/change-oidc-provider-field-sizes-228.patch b/patch/change-oidc-provider-field-sizes-228.patch index 8203f163bda..0a96fbc4147 100644 --- a/patch/change-oidc-provider-field-sizes-228.patch +++ b/patch/change-oidc-provider-field-sizes-228.patch @@ -143,7 +143,7 @@ diff -ur oidc_provider.orig/migrations/0015_change_client_code.py oidc_provider/ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc_provider/migrations/0016_userconsent_and_verbosenames.py --- oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py 2018-04-13 21:43:28.000000000 +0200 +++ oidc_provider/migrations/0016_userconsent_and_verbosenames.py 2020-06-07 13:34:26.826716519 +0200 -@@ -32,12 +32,12 @@ +@@ -31,12 +31,12 @@ migrations.AlterField( model_name='client', name='client_id', @@ -158,7 +158,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc ), migrations.AlterField( model_name='client', -@@ -84,17 +84,17 @@ +@@ -83,17 +83,17 @@ migrations.AlterField( model_name='code', name='code', @@ -179,7 +179,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc ), migrations.AlterField( model_name='code', -@@ -109,7 +109,7 @@ +@@ -108,7 +108,7 @@ migrations.AlterField( model_name='code', name='nonce', @@ -188,7 +188,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc ), migrations.AlterField( model_name='code', -@@ -135,7 +135,7 @@ +@@ -134,7 +134,7 @@ migrations.AlterField( model_name='token', name='access_token', @@ -197,7 +197,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc ), migrations.AlterField( model_name='token', -@@ -151,7 +151,7 @@ +@@ -150,7 +150,7 @@ migrations.AlterField( model_name='token', name='refresh_token', @@ -281,7 +281,7 @@ diff -ur oidc_provider.orig/migrations/0021_refresh_token_not_unique.py oidc_pro diff -ur oidc_provider.orig/models.py oidc_provider/models.py --- oidc_provider.orig/models.py 2018-09-14 21:34:52.000000000 +0200 +++ oidc_provider/models.py 2020-06-07 13:34:26.830716635 +0200 -@@ -67,8 +67,8 @@ +@@ -66,8 +66,8 @@ verbose_name=_(u'Client Type'), help_text=_(u'Confidential clients are capable of maintaining the confidentiality' u' of their credentials. Public clients are incapable.')) @@ -292,7 +292,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py response_types = models.ManyToManyField(ResponseType) jwt_alg = models.CharField( max_length=10, -@@ -78,15 +78,15 @@ +@@ -77,15 +77,15 @@ help_text=_(u'Algorithm used to encode ID Tokens.')) date_created = models.DateField(auto_now_add=True, verbose_name=_(u'Date Created')) website_url = models.CharField( @@ -311,7 +311,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py logo = models.FileField( blank=True, default='', upload_to='oidc_provider/clients', verbose_name=_(u'Logo Image')) reuse_consent = models.BooleanField( -@@ -186,12 +186,12 @@ +@@ -185,12 +185,12 @@ user = models.ForeignKey( settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) @@ -328,7 +328,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py class Meta: verbose_name = _(u'Authorization Code') -@@ -205,8 +205,8 @@ +@@ -204,8 +204,8 @@ user = models.ForeignKey( settings.AUTH_USER_MODEL, null=True, verbose_name=_(u'User'), on_delete=models.CASCADE) diff --git a/patch/django-cookie-delete-with-all-settings.patch b/patch/django-cookie-delete-with-all-settings.patch index 830f031d7fa..4ceaf8fceb4 100644 --- a/patch/django-cookie-delete-with-all-settings.patch +++ b/patch/django-cookie-delete-with-all-settings.patch @@ -1,6 +1,6 @@ --- django/contrib/messages/storage/cookie.py.orig 2020-08-13 11:10:36.719177122 +0200 +++ django/contrib/messages/storage/cookie.py 2020-08-13 11:45:23.503463150 +0200 -@@ -92,6 +92,8 @@ +@@ -109,6 +109,8 @@ response.delete_cookie( self.cookie_name, domain=settings.SESSION_COOKIE_DOMAIN, @@ -9,38 +9,49 @@ samesite=settings.SESSION_COOKIE_SAMESITE, ) ---- django/http/response.py.orig 2020-08-13 11:16:04.060627793 +0200 -+++ django/http/response.py 2020-08-13 11:54:03.482476973 +0200 -@@ -210,12 +210,18 @@ +--- django/http/response.py.orig 2025-12-02 22:12:05.197283001 +0000 ++++ django/http/response.py 2025-12-02 22:26:01.396576013 +0000 +@@ -286,20 +286,28 @@ value = signing.get_cookie_signer(salt=key + salt).sign(value) return self.set_cookie(key, value, **kwargs) - -- def delete_cookie(self, key, path='/', domain=None, samesite=None): -+ def delete_cookie(self, key, path='/', domain=None, secure=False, httponly=False, samesite=None): - # Most browsers ignore the Set-Cookie header if the cookie name starts - # with __Host- or __Secure- and the cookie doesn't use the secure flag. -- secure = key.startswith(('__Secure-', '__Host-')) + +- def delete_cookie(self, key, path="/", domain=None, samesite=None): ++ def delete_cookie(self, key, path="/", domain=None, secure=False, httponly=False, samesite=None): + # Browsers can ignore the Set-Cookie header if the cookie doesn't use + # the secure flag and: + # - the cookie name starts with "__Host-" or "__Secure-", or + # - the samesite is "none". +- secure = key.startswith(("__Secure-", "__Host-")) or ( +- samesite and samesite.lower() == "none" +- ) + if key in self.cookies: -+ domain = self.cookies[key].get('domain', domain) -+ secure = self.cookies[key].get('secure', secure) -+ httponly = self.cookies[key].get('httponly', httponly) -+ samesite = self.cookies[key].get('samesite', samesite) ++ domain = self.cookies[key].get("domain", domain) ++ secure = self.cookies[key].get("secure", secure) ++ httponly = self.cookies[key].get("httponly", httponly) ++ samesite = self.cookies[key].get("samesite", samesite) + else: -+ secure = secure or key.startswith(('__Secure-', '__Host-')) ++ secure = secure or ( ++ key.startswith(("__Secure-", "__Host-")) or ++ (samesite and samesite.lower() == "none") ++ ) self.set_cookie( -- key, max_age=0, path=path, domain=domain, secure=secure, -+ key, max_age=0, path=path, domain=domain, secure=secure, httponly=httponly, - expires='Thu, 01 Jan 1970 00:00:00 GMT', samesite=samesite, + key, + max_age=0, + path=path, + domain=domain, + secure=secure, ++ httponly=httponly, + expires="Thu, 01 Jan 1970 00:00:00 GMT", + samesite=samesite, ) - --- django/contrib/sessions/middleware.py.orig 2020-08-13 12:12:12.401898114 +0200 +++ django/contrib/sessions/middleware.py 2020-08-13 12:14:52.690520659 +0200 -@@ -39,6 +39,8 @@ - settings.SESSION_COOKIE_NAME, - path=settings.SESSION_COOKIE_PATH, - domain=settings.SESSION_COOKIE_DOMAIN, -+ secure=settings.SESSION_COOKIE_SECURE or None, -+ httponly=settings.SESSION_COOKIE_HTTPONLY or None, - samesite=settings.SESSION_COOKIE_SAMESITE, - ) - else: +@@ -38,6 +38,8 @@ + settings.SESSION_COOKIE_NAME, + path=settings.SESSION_COOKIE_PATH, + domain=settings.SESSION_COOKIE_DOMAIN, ++ secure=settings.SESSION_COOKIE_SECURE or None, ++ httponly=settings.SESSION_COOKIE_HTTPONLY or None, + samesite=settings.SESSION_COOKIE_SAMESITE, + ) + patch_vary_headers(response, ("Cookie",)) diff --git a/patch/fix-django-password-strength-kwargs.patch b/patch/fix-django-password-strength-kwargs.patch deleted file mode 100644 index 9f24ce932a9..00000000000 --- a/patch/fix-django-password-strength-kwargs.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- django_password_strength/widgets.py.orig 2020-06-24 16:07:28.479533134 +0200 -+++ django_password_strength/widgets.py 2020-06-24 16:08:09.540714290 +0200 -@@ -8,7 +8,7 @@ - Form widget to show the user how strong his/her password is. - """ - -- def render(self, name, value, attrs=None): -+ def render(self, name, value, **kwargs): - strength_markup = """ -
    -
    -@@ -30,7 +30,7 @@ - except KeyError: - self.attrs['class'] = 'password_strength' - -- return mark_safe( super(PasswordInput, self).render(name, value, attrs) + strength_markup ) -+ return mark_safe( super(PasswordInput, self).render(name, value, **kwargs) + strength_markup ) - - class Media: - js = ( -@@ -48,7 +48,7 @@ - super(PasswordConfirmationInput, self).__init__(attrs, render_value) - self.confirm_with=confirm_with - -- def render(self, name, value, attrs=None): -+ def render(self, name, value, **kwargs): - if self.confirm_with: - self.attrs['data-confirm-with'] = 'id_%s' % self.confirm_with - -@@ -68,4 +68,4 @@ - except KeyError: - self.attrs['class'] = 'password_confirmation' - -- return mark_safe( super(PasswordInput, self).render(name, value, attrs) + confirmation_markup ) -+ return mark_safe( super(PasswordInput, self).render(name, value, **kwargs) + confirmation_markup ) - diff --git a/patch/fix-oidc-access-token-post.patch b/patch/fix-oidc-access-token-post.patch index 4234fdf61d2..00271633e7b 100644 --- a/patch/fix-oidc-access-token-post.patch +++ b/patch/fix-oidc-access-token-post.patch @@ -11,12 +11,10 @@ diff -ur oidc_provider.orig/lib/utils/common.py oidc_provider/lib/utils/common.p --- oidc_provider.orig/lib/utils/oauth2.py 2020-05-22 15:09:21.009044320 +0200 +++ oidc_provider/lib/utils/oauth2.py 2020-06-05 17:05:23.271285858 +0200 -@@ -21,10 +21,14 @@ - """ +@@ -22,9 +22,13 @@ auth_header = request.META.get('HTTP_AUTHORIZATION', '') -- if re.compile('^[Bb]earer\s{1}.+$').match(auth_header): -+ if re.compile(r'^[Bb]earer\s{1}.+$').match(auth_header): + if re.compile(r'^[Bb]earer\s{1}.+$').match(auth_header): access_token = auth_header.split()[1] - else: + elif request.method == 'GET': @@ -27,13 +25,4 @@ diff -ur oidc_provider.orig/lib/utils/common.py oidc_provider/lib/utils/common.p + access_token = '' return access_token - -@@ -39,7 +43,7 @@ - """ - auth_header = request.META.get('HTTP_AUTHORIZATION', '') - -- if re.compile('^Basic\s{1}.+$').match(auth_header): -+ if re.compile(r'^Basic\s{1}.+$').match(auth_header): - b64_user_pass = auth_header.split()[1] - try: - user_pass = b64decode(b64_user_pass).decode('utf-8').split(':') + diff --git a/patch/tastypie-django22-fielderror-response.patch b/patch/tastypie-django22-fielderror-response.patch index bb4decd7561..3b4418fc66b 100644 --- a/patch/tastypie-django22-fielderror-response.patch +++ b/patch/tastypie-django22-fielderror-response.patch @@ -1,26 +1,26 @@ ---- tastypie/resources.py.orig 2020-08-24 13:14:25.463166100 +0200 -+++ tastypie/resources.py 2020-08-24 13:15:55.133759224 +0200 -@@ -15,7 +15,7 @@ +--- tastypie/resources.py.orig 2025-07-29 19:00:01.526948002 +0000 ++++ tastypie/resources.py 2025-07-29 19:07:15.324127008 +0000 +@@ -12,7 +12,7 @@ ObjectDoesNotExist, MultipleObjectsReturned, ValidationError, FieldDoesNotExist ) from django.core.signals import got_request_exception -from django.core.exceptions import ImproperlyConfigured +from django.core.exceptions import ImproperlyConfigured, FieldError from django.db.models.fields.related import ForeignKey - try: - from django.contrib.gis.db.models.fields import GeometryField -@@ -2207,6 +2207,8 @@ + from django.urls.conf import re_path + from tastypie.utils.timezone import make_naive_utc +@@ -2216,6 +2216,8 @@ return self.authorized_read_list(objects, bundle) except ValueError: raise BadRequest("Invalid resource lookup data provided (mismatched type).") + except FieldError as e: + raise BadRequest("Invalid resource lookup: %s." % e) - + def obj_get(self, bundle, **kwargs): """ --- tastypie/paginator.py.orig 2020-08-25 15:24:46.391588425 +0200 +++ tastypie/paginator.py 2020-08-25 15:24:53.591797122 +0200 -@@ -128,6 +128,8 @@ +@@ -124,6 +124,8 @@ except (AttributeError, TypeError): # If it's not a QuerySet (or it's ilk), fallback to ``len``. return len(self.objects) diff --git a/playwright/.gitignore b/playwright/.gitignore index 75e854d8dcf..f38d036a792 100644 --- a/playwright/.gitignore +++ b/playwright/.gitignore @@ -2,3 +2,4 @@ node_modules/ /test-results/ /playwright-report/ /playwright/.cache/ +auth.json \ No newline at end of file diff --git a/playwright/helpers/common.js b/playwright/helpers/common.js index 5ba39ba022e..c4dd7e2640c 100644 --- a/playwright/helpers/common.js +++ b/playwright/helpers/common.js @@ -13,5 +13,29 @@ module.exports = { return rect.top < bottom && rect.top > 0 - rect.height }) + }, + /** + * Override page DateTime with a new value + * + * @param {Object} page Page object + * @param {Object} dateTimeOverride New DateTime object + */ + overridePageDateTime: async (page, dateTimeOverride) => { + await page.addInitScript(`{ + // Extend Date constructor to default to fixed time + Date = class extends Date { + constructor(...args) { + if (args.length === 0) { + super(${dateTimeOverride.toMillis()}); + } else { + super(...args); + } + } + } + // Override Date.now() to start from fixed time + const __DateNowOffset = ${dateTimeOverride.toMillis()} - Date.now(); + const __DateNow = Date.now; + Date.now = () => __DateNow() + __DateNowOffset; + }`) } } diff --git a/playwright/helpers/meeting.js b/playwright/helpers/meeting.js index 29d748d640a..634ca2e8c68 100644 --- a/playwright/helpers/meeting.js +++ b/playwright/helpers/meeting.js @@ -22,7 +22,7 @@ const sessionsWithWebex = [3, 4] // Use constant randomness seed seedrandom(TEST_SEED.toString(), { global: true }) faker.seed(TEST_SEED) -const { sample, sampleSize } = _.runInContext() +const { random, sample, sampleSize } = _.runInContext() /** * Generate area response from label + children @@ -60,7 +60,7 @@ function createGroup ({ label, mayBeBof = false, toggledBy = [] }) { } // 10% chance of BoF, if enabled - const isBof = mayBeBof && faker.mersenne.rand(100, 0) < 10 + const isBof = mayBeBof && random(0, 100) < 10 if (isBof) { toggledBy.push('bof') } @@ -139,7 +139,7 @@ function createEvent ({ }, floors) { const floor = sample(floors) const room = hasLocation ? sample(floor.rooms) : { name: 'Somewhere' } - const eventName = name ?? faker.lorem.sentence(faker.mersenne.rand(5, 2)) + const eventName = name ?? faker.lorem.sentence(random(2, 5)) return { id: ++lastEventId, sessionId: ++lastSessionId, @@ -164,7 +164,7 @@ function createEvent ({ 'hackathon-sessc' ], groupAcronym: group.keyword, - groupName: faker.lorem.sentence(faker.mersenne.rand(5, 2)), + groupName: faker.lorem.sentence(random(2, 5)), groupParent: { acronym: area.keyword }, @@ -215,11 +215,11 @@ module.exports = { break } case 'future': { - startDate = DateTime.fromISO(faker.date.future(1).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 }) + startDate = DateTime.fromISO(faker.date.future({ years: 1 }).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 }) break } default: { - startDate = DateTime.fromISO(faker.date.past(5, DateTime.utc().minus({ months: 3 }), { zone: 'Asia/Tokyo' }).toISOString()).startOf('week').minus({ days: 2 }) + startDate = DateTime.fromISO(faker.date.past({ years: 5, refDate: DateTime.utc().minus({ months: 3 }) }).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 }) break } } @@ -236,13 +236,13 @@ module.exports = { short: `L${floorIdx}`, width: floor.width, height: floor.height, - rooms: _.times(faker.mersenne.rand(10, 5), (ridx) => { + rooms: _.times(random(5, 10), (ridx) => { const roomName = `${faker.science.chemicalElement().name} ${floorIdx}-${ridx + 1}` // Keep 10% margin on each side const roomXUnit = Math.round(floor.width / 10) const roomYUnit = Math.round(floor.height / 10) - const roomX = faker.mersenne.rand(roomXUnit * 8, roomXUnit) - const roomY = faker.mersenne.rand(roomYUnit * 8, roomYUnit) + const roomX = random(roomXUnit, roomXUnit * 8) + const roomY = random(roomYUnit, roomYUnit * 8) return { id: floorIdx * 100 + ridx, name: roomName, @@ -269,7 +269,7 @@ module.exports = { for (const area of firstAreasNames) { firstAreas.push(createArea({ label: area, - children: _.times(faker.mersenne.rand(25, 2), (idx) => { + children: _.times(random(2, 25), (idx) => { return createGroup({ mayBeBof: true }) }) })) @@ -282,7 +282,7 @@ module.exports = { for (const area of ['UVW', 'XYZ0']) { secondAreas.push(createArea({ label: area, - children: _.times(faker.mersenne.rand(25, 2), (idx) => { + children: _.times(random(2, 25), (idx) => { return createGroup({ mayBeBof: true }) }) })) @@ -395,7 +395,7 @@ module.exports = { name: 'Hackathon Kickoff', startDateTime: day1.set({ hour: 10, minute: 30 }), duration: '30m', - ...findAreaGroup('hackathon-kickoff', categories[2]), + ...findAreaGroup('hackathon', categories[2]), showAgenda: true, hasAgenda: true, hasRecordings: true, @@ -609,6 +609,9 @@ module.exports = { startDateTime: curDay.set({ hour: 17, minute: 30 }), duration: '2h', type: 'plenary', + showAgenda: true, + hasAgenda: true, + hasRecordings: true, ...findAreaGroup('ietf-plenary', categories[2]) }, floors)) } @@ -620,17 +623,17 @@ module.exports = { return { meeting: { number: '123', - city: faker.address.cityName(), + city: faker.location.city(), startDate: startDate.toISODate(), endDate: endDate.toISODate(), - updated: faker.date.between(startDate.toISO(), endDate.toISO()).toISOString(), + updated: faker.date.between({ from: startDate.toISO(), to: endDate.toISO() }).toISOString(), timezone: 'Asia/Tokyo', infoNote: faker.lorem.paragraph(4), warningNote: '' }, categories, isCurrentMeeting: dateMode !== 'past', - useNotes: true, + usesNotes: true, schedule, floors } diff --git a/playwright/package-lock.json b/playwright/package-lock.json index 6becd70e11f..abe2518ef28 100644 --- a/playwright/package-lock.json +++ b/playwright/package-lock.json @@ -6,23 +6,32 @@ "packages": { "": { "dependencies": { - "@faker-js/faker": "7.6.0", + "@faker-js/faker": "8.4.1", "lodash": "4.17.21", "lodash-es": "4.17.21", - "luxon": "3.3.0", + "luxon": "3.4.4", "ms": "2.1.3", "seedrandom": "3.0.5", "slugify": "1.6.6" }, "devDependencies": { - "@playwright/test": "1.33.0", - "eslint": "8.39.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-n": "15.7.0", + "@playwright/test": "1.42.1", + "eslint": "8.57.0", + "eslint-config-standard": "17.1.0", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-n": "16.6.2", "eslint-plugin-node": "11.1.0", "eslint-plugin-promise": "6.1.1", - "npm-check-updates": "16.10.8" + "npm-check-updates": "16.14.18" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@colors/colors": { @@ -51,23 +60,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", - "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", + "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.1", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -83,37 +92,37 @@ } }, "node_modules/@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@faker-js/faker": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz", - "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", + "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/fakerjs" + } + ], "engines": { - "node": ">=14.0.0", - "npm": ">=6.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0", + "npm": ">=6.14.13" } }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { @@ -134,11 +143,78 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "dev": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -187,14 +263,13 @@ } }, "node_modules/@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "dependencies": { "@npmcli/promise-spawn": "^6.0.0", "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", "npm-pick-manifest": "^8.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", @@ -216,9 +291,9 @@ } }, "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -246,20 +321,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@npmcli/node-gyp": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", @@ -282,9 +343,9 @@ } }, "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -297,9 +358,9 @@ } }, "node_modules/@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "dependencies": { "@npmcli/node-gyp": "^3.0.0", @@ -313,9 +374,9 @@ } }, "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "dependencies": { "isexe": "^2.0.0" @@ -327,23 +388,29 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@playwright/test": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.33.0.tgz", - "integrity": "sha512-YunBa2mE7Hq4CfPkGzQRK916a4tuZoVx/EpLjeWlTVOnD4S2+fdaQZE0LJkbfhN5FTSKNLdcl7MoT5XB37bTkg==", + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz", + "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==", "dev": true, "dependencies": { - "@types/node": "*", - "playwright-core": "1.33.0" + "playwright": "1.42.1" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=14" - }, - "optionalDependencies": { - "fsevents": "2.3.2" + "node": ">=16" } }, "node_modules/@pnpm/network.ca-file": { @@ -371,11 +438,36 @@ "node": ">=12" } }, + "node_modules/@sigstore/bundle": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz", + "integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==", + "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz", + "integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -413,13 +505,23 @@ "node": ">= 10" } }, - "node_modules/@tufjs/models": { + "node_modules/@tufjs/canonical-json": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.0.tgz", - "integrity": "sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", "dev": true, "dependencies": { - "minimatch": "^6.1.0" + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -435,15 +537,15 @@ } }, "node_modules/@tufjs/models/node_modules/minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -461,10 +563,16 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, - "node_modules/@types/node": { - "version": "18.7.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz", - "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==", + "node_modules/@types/semver-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", + "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, "node_modules/abbrev": { @@ -474,9 +582,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -621,15 +729,15 @@ } }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -648,15 +756,34 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -667,14 +794,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -684,6 +811,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -826,6 +974,18 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/builtins": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", @@ -836,21 +996,20 @@ } }, "node_modules/cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "version": "17.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz", + "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==", "dev": true, "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", - "glob": "^8.0.1", + "glob": "^10.2.2", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", "ssri": "^10.0.0", "tar": "^6.1.11", "unique-filename": "^3.0.0" @@ -869,19 +1028,22 @@ } }, "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -897,15 +1059,18 @@ } }, "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/cacheable-lookup": { @@ -936,13 +1101,14 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1067,9 +1233,9 @@ } }, "node_modules/commander": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", - "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "engines": { "node": ">=14" @@ -1237,12 +1403,27 @@ "node": ">=10" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -1345,25 +1526,26 @@ "dev": true }, "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -1371,19 +1553,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -1393,26 +1579,26 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { @@ -1457,27 +1643,28 @@ } }, "node_modules/eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1485,22 +1672,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -1513,10 +1697,22 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, "node_modules/eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", "dev": true, "funding": [ { @@ -1532,22 +1728,25 @@ "url": "https://feross.org/support" } ], + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "eslint": "^8.0.1", "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", "eslint-plugin-promise": "^6.0.0" } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "dependencies": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -1560,9 +1759,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "dependencies": { "debug": "^3.2.7" @@ -1585,70 +1784,49 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "node_modules/eslint-plugin-es-x": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz", + "integrity": "sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==", "dev": true, "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.6.0", + "eslint-compat-utils": "^0.1.2" }, "engines": { - "node": ">=8.10.0" + "node": "^14.18.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" + "url": "https://github.com/sponsors/ota-meshi" }, "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" + "eslint": ">=8" } }, "node_modules/eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" @@ -1679,31 +1857,34 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-n": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", - "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "version": "16.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz", + "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==", "dev": true, "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", + "eslint-plugin-es-x": "^7.5.0", + "get-tsconfig": "^4.7.0", + "globals": "^13.24.0", + "ignore": "^5.2.4", + "is-builtin-module": "^3.2.1", + "is-core-module": "^2.12.1", "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" + "resolve": "^1.22.2", + "semver": "^7.5.3" }, "engines": { - "node": ">=12.22.0" + "node": ">=16.0.0" }, "funding": { "url": "https://github.com/sponsors/mysticatea" @@ -1797,9 +1978,9 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -1812,37 +1993,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1852,14 +2006,14 @@ } }, "node_modules/espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1910,6 +2064,12 @@ "node": ">=0.10.0" } }, + "node_modules/exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2039,6 +2199,34 @@ "is-callable": "^1.1.3" } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", + "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/form-data-encoder": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz", @@ -2049,21 +2237,21 @@ } }, "node_modules/fp-and-or": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz", - "integrity": "sha512-wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", + "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", "dev": true, "engines": { "node": ">=10" } }, "node_modules/fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz", + "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "minipass": "^5.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -2090,21 +2278,24 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -2142,14 +2333,15 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2195,6 +2387,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-tsconfig": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -2252,9 +2456,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2344,24 +2548,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -2381,12 +2573,12 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2449,6 +2641,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hosted-git-info": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", @@ -2539,21 +2743,21 @@ } }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" } }, "node_modules/ignore-walk": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.1.tgz", - "integrity": "sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "dependencies": { - "minimatch": "^6.1.6" + "minimatch": "^9.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -2569,15 +2773,15 @@ } }, "node_modules/ignore-walk/node_modules/minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -2626,12 +2830,6 @@ "node": ">=8" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -2649,22 +2847,22 @@ "dev": true }, "node_modules/ini": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.0.tgz", - "integrity": "sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -2719,6 +2917,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "dependencies": { + "builtin-modules": "^3.3.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -2744,12 +2957,12 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2947,16 +3160,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -2992,24 +3201,42 @@ "node": ">=12" } }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", "dev": true }, - "node_modules/js-sdsl": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", - "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", - "dev": true - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -3187,120 +3414,37 @@ } }, "node_modules/luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", "engines": { "node": ">=12" } }, "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", "dev": true, "dependencies": { "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "negotiator": "^0.6.3", "promise-retry": "^2.0.1", "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/make-fetch-happen/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "ssri": "^10.0.0" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/make-fetch-happen/node_modules/lru-cache": { @@ -3312,66 +3456,6 @@ "node": ">=12" } }, - "node_modules/make-fetch-happen/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/make-fetch-happen/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3425,9 +3509,9 @@ "dev": true }, "node_modules/minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "engines": { "node": ">=8" @@ -3458,34 +3542,22 @@ } }, "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz", + "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==", "dev": true, "dependencies": { - "minipass": "^3.1.6", + "minipass": "^5.0.0", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" }, "optionalDependencies": { "encoding": "^0.1.13" } }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/minipass-flush": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", @@ -3638,15 +3710,16 @@ } }, "node_modules/node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", + "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==", "dev": true, "dependencies": { "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", "glob": "^7.1.4", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", + "make-fetch-happen": "^11.0.3", "nopt": "^6.0.0", "npmlog": "^6.0.0", "rimraf": "^3.0.2", @@ -3737,39 +3810,42 @@ } }, "node_modules/npm-check-updates": { - "version": "16.10.8", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.8.tgz", - "integrity": "sha512-e+p3rUCvaU0iKOvi+/Xiyx+mLe9/aRTu9Zrc7+TR6H2q+uFgmXEwqbXYN9Ngqsta8gdTjpn751UD5MEOogO5cA==", + "version": "16.14.18", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.18.tgz", + "integrity": "sha512-9iaRe9ohx9ykdbLjPRIYcq1A0RkrPYUx9HmQK1JIXhfxtJCNE/+497H9Z4PGH6GWRALbz5KF+1iZoySK2uSEpQ==", "dev": true, "dependencies": { - "chalk": "^5.2.0", + "@types/semver-utils": "^1.1.1", + "chalk": "^5.3.0", "cli-table3": "^0.6.3", - "commander": "^10.0.0", + "commander": "^10.0.1", "fast-memoize": "^2.5.2", "find-up": "5.0.0", - "fp-and-or": "^0.1.3", + "fp-and-or": "^0.1.4", "get-stdin": "^8.0.0", "globby": "^11.0.4", "hosted-git-info": "^5.1.0", - "ini": "^4.0.0", + "ini": "^4.1.1", "js-yaml": "^4.1.0", "json-parse-helpfulerror": "^1.0.3", "jsonlines": "^0.1.1", "lodash": "^4.17.21", - "minimatch": "^8.0.3", + "make-fetch-happen": "^11.1.1", + "minimatch": "^9.0.3", "p-map": "^4.0.0", - "pacote": "15.1.1", + "pacote": "15.2.0", "parse-github-url": "^1.0.2", "progress": "^2.0.3", "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.2", + "rc-config-loader": "^4.1.3", "remote-git-tags": "^3.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.8", + "rimraf": "^5.0.5", + "semver": "^7.5.4", "semver-utils": "^1.1.4", "source-map-support": "^0.5.21", - "spawn-please": "^2.0.1", - "strip-json-comments": "^5.0.0", + "spawn-please": "^2.0.2", + "strip-ansi": "^7.1.0", + "strip-json-comments": "^5.0.1", "untildify": "^4.0.0", "update-notifier": "^6.0.2" }, @@ -3781,7 +3857,19 @@ "node": ">=14.14" } }, - "node_modules/npm-check-updates/node_modules/brace-expansion": { + "node_modules/npm-check-updates/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/npm-check-updates/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", @@ -3791,9 +3879,9 @@ } }, "node_modules/npm-check-updates/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -3803,15 +3891,19 @@ } }, "node_modules/npm-check-updates/node_modules/glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3821,9 +3913,9 @@ } }, "node_modules/npm-check-updates/node_modules/minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -3836,15 +3928,15 @@ } }, "node_modules/npm-check-updates/node_modules/rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", "dev": true, "dependencies": { - "glob": "^9.2.0" + "glob": "^10.3.7" }, "bin": { - "rimraf": "dist/cjs/src/bin.js" + "rimraf": "dist/esm/bin.mjs" }, "engines": { "node": ">=14" @@ -3853,10 +3945,25 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/npm-check-updates/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/npm-check-updates/node_modules/strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", + "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", "dev": true, "engines": { "node": ">=14.16" @@ -3866,9 +3973,9 @@ } }, "node_modules/npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz", + "integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==", "dev": true, "dependencies": { "semver": "^7.1.1" @@ -3878,9 +3985,9 @@ } }, "node_modules/npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -3935,9 +4042,9 @@ } }, "node_modules/npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", + "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", "dev": true, "dependencies": { "npm-install-checks": "^6.0.0", @@ -3950,13 +4057,13 @@ } }, "node_modules/npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "dependencies": { "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", @@ -3967,58 +4074,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/npm-registry-fetch/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, "node_modules/npmlog": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", @@ -4035,9 +4090,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4070,15 +4125,44 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4097,17 +4181,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -4186,9 +4270,9 @@ } }, "node_modules/pacote": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz", - "integrity": "sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "dependencies": { "@npmcli/git": "^4.0.0", @@ -4197,7 +4281,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", @@ -4206,7 +4290,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^6.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", + "sigstore": "^1.3.0", "ssri": "^10.0.0", "tar": "^6.1.11" }, @@ -4275,13 +4359,13 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.7.0.tgz", - "integrity": "sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "dependencies": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -4291,21 +4375,21 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz", - "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz", + "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==", "dev": true, "engines": { "node": "14 || >=16.14" } }, "node_modules/path-scurry/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", + "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", "dev": true, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/path-type": { @@ -4329,16 +4413,34 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/playwright-core": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.33.0.tgz", - "integrity": "sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==", + "node_modules/playwright": { + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz", + "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==", "dev": true, + "dependencies": { + "playwright-core": "1.42.1" + }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=14" + "node": ">=16" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz", + "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==", + "dev": true, + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=16" } }, "node_modules/prelude-ls": { @@ -4407,9 +4509,9 @@ "dev": true }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -4478,9 +4580,9 @@ } }, "node_modules/rc-config-loader": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.2.tgz", - "integrity": "sha512-qKTnVWFl9OQYKATPzdfaZIbTxcHziQl92zYSxYC6umhOqyAsoj8H8Gq/+aFjAso68sBdjTz3A7omqeAkkF1MWg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", + "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -4517,12 +4619,12 @@ } }, "node_modules/read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, "dependencies": { - "glob": "^8.0.1", + "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", "normalize-package-data": "^5.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -4554,34 +4656,40 @@ } }, "node_modules/read-package-json/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/read-package-json/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/readable-stream": { @@ -4599,14 +4707,14 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -4673,12 +4781,12 @@ } }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -4704,6 +4812,15 @@ "node": ">=4" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/responselike": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", @@ -4776,6 +4893,24 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4823,9 +4958,9 @@ "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4864,6 +4999,35 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -4906,14 +5070,15 @@ "dev": true }, "node_modules/sigstore": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.1.1.tgz", - "integrity": "sha512-4hR3tPP1y59YWlaoAgAWFVZ7srTjNWOrrpkQXWu05qP0BvwFYyt3K3l848+IHo+mKhkOzGcNDf7ktASXLEPC+A==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz", + "integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" + "@sigstore/bundle": "^1.0.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" }, "bin": { "sigstore": "bin/sigstore.js" @@ -4922,58 +5087,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/sigstore/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/sigstore/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/sigstore/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -5055,9 +5168,9 @@ } }, "node_modules/spawn-please": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.1.tgz", - "integrity": "sha512-W+cFbZR2q2mMTfjz5ZGvhBAiX+e/zczFCNlbS9mxiSdYswBXwUuBUT+a0urH+xZZa8f/bs0mXHyZsZHR9hKogA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", + "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3" @@ -5099,12 +5212,12 @@ "dev": true }, "node_modules/ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz", + "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==", "dev": true, "dependencies": { - "minipass": "^4.0.0" + "minipass": "^5.0.0" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -5133,15 +5246,30 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -5151,28 +5279,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5190,6 +5318,19 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -5236,14 +5377,14 @@ } }, "node_modules/tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", + "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -5295,104 +5436,104 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, "dependencies": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" } }, "node_modules/tuf-js": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.1.tgz", - "integrity": "sha512-WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", "dev": true, "dependencies": { - "@tufjs/models": "1.0.0", - "make-fetch-happen": "^11.0.1" + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/tuf-js/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, "engines": { - "node": ">=12" + "node": ">= 0.8.0" } }, - "node_modules/tuf-js/node_modules/make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/tuf-js/node_modules/minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", "dev": true, "dependencies": { - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" + "node": ">= 0.4" } }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", "dev": true, "dependencies": { - "prelude-ls": "^1.2.1" + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/typed-array-length": { @@ -5590,17 +5731,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -5683,19 +5823,10 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", - "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, "dependencies": { "ansi-styles": "^6.1.0", @@ -5709,6 +5840,24 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrap-ansi/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -5821,6 +5970,12 @@ } }, "dependencies": { + "@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true + }, "@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -5838,20 +5993,20 @@ } }, "@eslint-community/regexpp": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", - "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", + "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", "dev": true }, "@eslint/eslintrc": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", - "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.1", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -5861,30 +6016,24 @@ } }, "@eslint/js": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", - "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true }, "@faker-js/faker": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz", - "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==" - }, - "@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", + "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==" }, "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" } }, @@ -5895,11 +6044,59 @@ "dev": true }, "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", "dev": true }, + "@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "requires": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, + "emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "requires": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + } + }, + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5936,14 +6133,13 @@ } }, "@npmcli/git": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.3.tgz", - "integrity": "sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", "dev": true, "requires": { "@npmcli/promise-spawn": "^6.0.0", "lru-cache": "^7.4.4", - "mkdirp": "^1.0.4", "npm-pick-manifest": "^8.0.0", "proc-log": "^3.0.0", "promise-inflight": "^1.0.1", @@ -5959,9 +6155,9 @@ "dev": true }, "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -5979,16 +6175,6 @@ "npm-normalize-package-bin": "^3.0.0" } }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, "@npmcli/node-gyp": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", @@ -6005,9 +6191,9 @@ }, "dependencies": { "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -6016,9 +6202,9 @@ } }, "@npmcli/run-script": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz", - "integrity": "sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", "dev": true, "requires": { "@npmcli/node-gyp": "^3.0.0", @@ -6029,9 +6215,9 @@ }, "dependencies": { "which": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz", - "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -6039,15 +6225,20 @@ } } }, + "@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true + }, "@playwright/test": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.33.0.tgz", - "integrity": "sha512-YunBa2mE7Hq4CfPkGzQRK916a4tuZoVx/EpLjeWlTVOnD4S2+fdaQZE0LJkbfhN5FTSKNLdcl7MoT5XB37bTkg==", + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz", + "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==", "dev": true, "requires": { - "@types/node": "*", - "fsevents": "2.3.2", - "playwright-core": "1.33.0" + "playwright": "1.42.1" } }, "@pnpm/network.ca-file": { @@ -6069,12 +6260,31 @@ "config-chain": "^1.1.11" } }, + "@sigstore/bundle": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz", + "integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==", + "dev": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.0" + } + }, "@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz", + "integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==", "dev": true }, + "@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "dev": true, + "requires": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + } + }, "@sindresorhus/is": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", @@ -6096,13 +6306,20 @@ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true }, - "@tufjs/models": { + "@tufjs/canonical-json": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.0.tgz", - "integrity": "sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "dev": true + }, + "@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", "dev": true, "requires": { - "minimatch": "^6.1.0" + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" }, "dependencies": { "brace-expansion": { @@ -6115,9 +6332,9 @@ } }, "minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -6137,10 +6354,16 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, - "@types/node": { - "version": "18.7.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz", - "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==", + "@types/semver-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", + "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", + "dev": true + }, + "@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, "abbrev": { @@ -6150,9 +6373,9 @@ "dev": true }, "acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true }, "acorn-jsx": { @@ -6261,15 +6484,15 @@ } }, "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" } }, @@ -6279,30 +6502,58 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, + "array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + } + }, "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, + "arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "requires": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + } + }, "available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -6402,6 +6653,12 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true + }, "builtins": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", @@ -6412,21 +6669,20 @@ } }, "cacache": { - "version": "17.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", - "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", + "version": "17.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz", + "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==", "dev": true, "requires": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", - "glob": "^8.0.1", + "glob": "^10.2.2", "lru-cache": "^7.7.1", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", "ssri": "^10.0.0", "tar": "^6.1.11", "unique-filename": "^3.0.0" @@ -6442,16 +6698,16 @@ } }, "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "lru-cache": { @@ -6461,9 +6717,9 @@ "dev": true }, "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -6493,13 +6749,14 @@ } }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" } }, "callsites": { @@ -6580,9 +6837,9 @@ "dev": true }, "commander": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", - "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true }, "concat-map": { @@ -6708,12 +6965,24 @@ "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true }, + "define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "requires": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } @@ -6792,25 +7061,26 @@ "dev": true }, "es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", "dev": true, "requires": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -6818,39 +7088,43 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" } }, "es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, "requires": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" } }, "es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "es-to-primitive": { @@ -6877,27 +7151,28 @@ "dev": true }, "eslint": { - "version": "8.39.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", - "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.39.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.0", - "espree": "^9.5.1", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -6905,41 +7180,45 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" } }, + "eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "requires": {} + }, "eslint-config-standard": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz", - "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", "dev": true, "requires": {} }, "eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "requires": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" }, "dependencies": { "debug": { @@ -6954,9 +7233,9 @@ } }, "eslint-module-utils": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", - "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, "requires": { "debug": "^3.2.7" @@ -6973,54 +7252,40 @@ } } }, - "eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "eslint-plugin-es-x": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz", + "integrity": "sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==", "dev": true, "requires": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" - }, - "dependencies": { - "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - } - }, - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.6.0", + "eslint-compat-utils": "^0.1.2" } }, "eslint-plugin-import": { - "version": "2.27.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz", - "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, "requires": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.7.4", - "has": "^1.0.3", - "is-core-module": "^2.11.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.values": "^1.1.6", - "resolve": "^1.22.1", - "semver": "^6.3.0", - "tsconfig-paths": "^3.14.1" + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" }, "dependencies": { "debug": { @@ -7042,27 +7307,30 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true } } }, "eslint-plugin-n": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", - "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "version": "16.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz", + "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==", "dev": true, "requires": { + "@eslint-community/eslint-utils": "^4.4.0", "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", + "eslint-plugin-es-x": "^7.5.0", + "get-tsconfig": "^4.7.0", + "globals": "^13.24.0", + "ignore": "^5.2.4", + "is-builtin-module": "^3.2.1", + "is-core-module": "^2.12.1", "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" + "resolve": "^1.22.2", + "semver": "^7.5.3" } }, "eslint-plugin-node": { @@ -7120,47 +7388,30 @@ "requires": {} }, "eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, "eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true }, "espree": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", - "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "requires": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.0" + "eslint-visitor-keys": "^3.4.1" } }, "esquery": { @@ -7193,6 +7444,12 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, + "exponential-backoff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "dev": true + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -7303,6 +7560,24 @@ "is-callable": "^1.1.3" } }, + "foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "dependencies": { + "signal-exit": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", + "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", + "dev": true + } + } + }, "form-data-encoder": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz", @@ -7310,18 +7585,18 @@ "dev": true }, "fp-and-or": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz", - "integrity": "sha512-wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", + "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", "dev": true }, "fs-minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", - "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz", + "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==", "dev": true, "requires": { - "minipass": "^4.0.0" + "minipass": "^5.0.0" } }, "fs.realpath": { @@ -7338,21 +7613,21 @@ "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true }, "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" } }, "functions-have-names": { @@ -7378,14 +7653,15 @@ } }, "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dev": true, "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-stdin": { @@ -7410,6 +7686,15 @@ "get-intrinsic": "^1.1.1" } }, + "get-tsconfig": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "dev": true, + "requires": { + "resolve-pkg-maps": "^1.0.0" + } + }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -7451,9 +7736,9 @@ } }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -7516,21 +7801,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, "has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -7544,12 +7820,12 @@ "dev": true }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", "dev": true, "requires": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" } }, "has-proto": { @@ -7585,6 +7861,15 @@ "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", "dev": true }, + "hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "requires": { + "function-bind": "^1.1.2" + } + }, "hosted-git-info": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", @@ -7659,18 +7944,18 @@ } }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true }, "ignore-walk": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.1.tgz", - "integrity": "sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", + "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", "dev": true, "requires": { - "minimatch": "^6.1.6" + "minimatch": "^9.0.0" }, "dependencies": { "brace-expansion": { @@ -7683,9 +7968,9 @@ } }, "minimatch": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", - "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -7721,12 +8006,6 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -7744,19 +8023,19 @@ "dev": true }, "ini": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.0.tgz", - "integrity": "sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", + "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "dev": true }, "internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", "dev": true, "requires": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" } }, @@ -7796,6 +8075,15 @@ "has-tostringtag": "^1.0.0" } }, + "is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "requires": { + "builtin-modules": "^3.3.0" + } + }, "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -7812,12 +8100,12 @@ } }, "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "requires": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "is-date-object": { @@ -7943,16 +8231,12 @@ } }, "is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "requires": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" } }, "is-typedarray": { @@ -7976,24 +8260,34 @@ "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", "dev": true }, + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "requires": { + "@isaacs/cliui": "^8.0.2", + "@pkgjs/parseargs": "^0.11.0" + } + }, "jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", "dev": true }, - "js-sdsl": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", - "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", - "dev": true - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -8127,156 +8421,43 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "luxon": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz", - "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==" - }, - "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "dependencies": { - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - }, + "requires": { + "yallist": "^4.0.0" + } + }, + "luxon": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==" + }, + "make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "dev": true, + "requires": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "dependencies": { "lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } } } }, @@ -8318,9 +8499,9 @@ "dev": true }, "minipass": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz", - "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true }, "minipass-collect": { @@ -8344,26 +8525,15 @@ } }, "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz", + "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==", "dev": true, "requires": { "encoding": "^0.1.13", - "minipass": "^3.1.6", + "minipass": "^5.0.0", "minipass-sized": "^1.0.3", "minizlib": "^2.1.2" - }, - "dependencies": { - "minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - } } }, "minipass-flush": { @@ -8492,15 +8662,16 @@ "dev": true }, "node-gyp": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", - "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz", + "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==", "dev": true, "requires": { "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", "glob": "^7.1.4", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", + "make-fetch-happen": "^11.0.3", "nopt": "^6.0.0", "npmlog": "^6.0.0", "rimraf": "^3.0.2", @@ -8563,43 +8734,52 @@ } }, "npm-check-updates": { - "version": "16.10.8", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.8.tgz", - "integrity": "sha512-e+p3rUCvaU0iKOvi+/Xiyx+mLe9/aRTu9Zrc7+TR6H2q+uFgmXEwqbXYN9Ngqsta8gdTjpn751UD5MEOogO5cA==", + "version": "16.14.18", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.18.tgz", + "integrity": "sha512-9iaRe9ohx9ykdbLjPRIYcq1A0RkrPYUx9HmQK1JIXhfxtJCNE/+497H9Z4PGH6GWRALbz5KF+1iZoySK2uSEpQ==", "dev": true, "requires": { - "chalk": "^5.2.0", + "@types/semver-utils": "^1.1.1", + "chalk": "^5.3.0", "cli-table3": "^0.6.3", - "commander": "^10.0.0", + "commander": "^10.0.1", "fast-memoize": "^2.5.2", "find-up": "5.0.0", - "fp-and-or": "^0.1.3", + "fp-and-or": "^0.1.4", "get-stdin": "^8.0.0", "globby": "^11.0.4", "hosted-git-info": "^5.1.0", - "ini": "^4.0.0", + "ini": "^4.1.1", "js-yaml": "^4.1.0", "json-parse-helpfulerror": "^1.0.3", "jsonlines": "^0.1.1", "lodash": "^4.17.21", - "minimatch": "^8.0.3", + "make-fetch-happen": "^11.1.1", + "minimatch": "^9.0.3", "p-map": "^4.0.0", - "pacote": "15.1.1", + "pacote": "15.2.0", "parse-github-url": "^1.0.2", "progress": "^2.0.3", "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.2", + "rc-config-loader": "^4.1.3", "remote-git-tags": "^3.0.0", - "rimraf": "^4.4.1", - "semver": "^7.3.8", + "rimraf": "^5.0.5", + "semver": "^7.5.4", "semver-utils": "^1.1.4", "source-map-support": "^0.5.21", - "spawn-please": "^2.0.1", - "strip-json-comments": "^5.0.0", + "spawn-please": "^2.0.2", + "strip-ansi": "^7.1.0", + "strip-json-comments": "^5.0.1", "untildify": "^4.0.0", "update-notifier": "^6.0.2" }, "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, "brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -8610,62 +8790,72 @@ } }, "chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true }, "glob": { - "version": "9.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", - "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "minimatch": "^8.0.2", - "minipass": "^4.2.4", - "path-scurry": "^1.6.1" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "minimatch": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", - "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" } }, "rimraf": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", - "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "dev": true, + "requires": { + "glob": "^10.3.7" + } + }, + "strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "requires": { - "glob": "^9.2.0" + "ansi-regex": "^6.0.1" } }, "strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", + "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", "dev": true } } }, "npm-install-checks": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.0.0.tgz", - "integrity": "sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz", + "integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==", "dev": true, "requires": { "semver": "^7.1.1" } }, "npm-normalize-package-bin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz", - "integrity": "sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true }, "npm-package-arg": { @@ -8707,9 +8897,9 @@ } }, "npm-pick-manifest": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz", - "integrity": "sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", + "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", "dev": true, "requires": { "npm-install-checks": "^6.0.0", @@ -8719,61 +8909,18 @@ } }, "npm-registry-fetch": { - "version": "14.0.3", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", - "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", "dev": true, "requires": { "make-fetch-happen": "^11.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minipass-fetch": "^3.0.0", "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", "npm-package-arg": "^10.0.0", "proc-log": "^3.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } } }, "npmlog": { @@ -8789,9 +8936,9 @@ } }, "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true }, "object-keys": { @@ -8812,15 +8959,38 @@ "object-keys": "^1.1.1" } }, + "object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + } + }, + "object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "once": { @@ -8833,17 +9003,17 @@ } }, "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "requires": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" } }, "p-cancelable": { @@ -8892,9 +9062,9 @@ } }, "pacote": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz", - "integrity": "sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", + "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", "dev": true, "requires": { "@npmcli/git": "^4.0.0", @@ -8903,7 +9073,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", @@ -8912,7 +9082,7 @@ "promise-retry": "^2.0.1", "read-package-json": "^6.0.0", "read-package-json-fast": "^3.0.0", - "sigstore": "^1.0.0", + "sigstore": "^1.3.0", "ssri": "^10.0.0", "tar": "^6.1.11" } @@ -8957,25 +9127,25 @@ "dev": true }, "path-scurry": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.7.0.tgz", - "integrity": "sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "requires": { - "lru-cache": "^9.0.0", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "dependencies": { "lru-cache": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.3.tgz", - "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz", + "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==", "dev": true }, "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", + "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", "dev": true } } @@ -8992,10 +9162,20 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "playwright": { + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz", + "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==", + "dev": true, + "requires": { + "fsevents": "2.3.2", + "playwright-core": "1.42.1" + } + }, "playwright-core": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.33.0.tgz", - "integrity": "sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==", + "version": "1.42.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz", + "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==", "dev": true }, "prelude-ls": { @@ -9049,9 +9229,9 @@ "dev": true }, "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true }, "pupa": { @@ -9102,9 +9282,9 @@ } }, "rc-config-loader": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.2.tgz", - "integrity": "sha512-qKTnVWFl9OQYKATPzdfaZIbTxcHziQl92zYSxYC6umhOqyAsoj8H8Gq/+aFjAso68sBdjTz3A7omqeAkkF1MWg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", + "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", "dev": true, "requires": { "debug": "^4.3.4", @@ -9122,12 +9302,12 @@ } }, "read-package-json": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz", - "integrity": "sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", "dev": true, "requires": { - "glob": "^8.0.1", + "glob": "^10.2.2", "json-parse-even-better-errors": "^3.0.0", "normalize-package-data": "^5.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -9143,22 +9323,22 @@ } }, "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -9188,14 +9368,14 @@ } }, "regexp.prototype.flags": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", - "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" } }, "regexpp": { @@ -9235,12 +9415,12 @@ "dev": true }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dev": true, "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -9257,6 +9437,12 @@ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, + "resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true + }, "responselike": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", @@ -9296,6 +9482,18 @@ "queue-microtask": "^1.2.2" } }, + "safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -9326,9 +9524,9 @@ "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -9355,6 +9553,29 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true }, + "set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, + "requires": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -9388,57 +9609,15 @@ "dev": true }, "sigstore": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.1.1.tgz", - "integrity": "sha512-4hR3tPP1y59YWlaoAgAWFVZ7srTjNWOrrpkQXWu05qP0BvwFYyt3K3l848+IHo+mKhkOzGcNDf7ktASXLEPC+A==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz", + "integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==", "dev": true, "requires": { - "@sigstore/protobuf-specs": "^0.1.0", - "make-fetch-happen": "^11.0.1", - "tuf-js": "^1.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } + "@sigstore/bundle": "^1.0.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" } }, "sisteransi": { @@ -9502,9 +9681,9 @@ } }, "spawn-please": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.1.tgz", - "integrity": "sha512-W+cFbZR2q2mMTfjz5ZGvhBAiX+e/zczFCNlbS9mxiSdYswBXwUuBUT+a0urH+xZZa8f/bs0mXHyZsZHR9hKogA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", + "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", "dev": true, "requires": { "cross-spawn": "^7.0.3" @@ -9543,12 +9722,12 @@ "dev": true }, "ssri": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.1.tgz", - "integrity": "sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz", + "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==", "dev": true, "requires": { - "minipass": "^4.0.0" + "minipass": "^5.0.0" } }, "string_decoder": { @@ -9571,37 +9750,48 @@ "strip-ansi": "^6.0.1" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "strip-ansi": { @@ -9613,6 +9803,15 @@ "ansi-regex": "^5.0.1" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -9641,14 +9840,14 @@ "dev": true }, "tar": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", - "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==", + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", + "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" @@ -9692,68 +9891,26 @@ } }, "tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, "requires": { "@types/json5": "^0.0.29", - "json5": "^1.0.1", + "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" } }, "tuf-js": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.1.tgz", - "integrity": "sha512-WTp382/PR96k0dI4GD5RdiRhgOU0rAC7+lnoih/5pZg3cyb3aNMqDozleEEWwyfT3+FOg7Qz9JU3n6A44tLSHw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", "dev": true, "requires": { - "@tufjs/models": "1.0.0", - "make-fetch-happen": "^11.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz", - "integrity": "sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^4.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - } - }, - "minipass-fetch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz", - "integrity": "sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^4.0.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - } + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" } }, "type-check": { @@ -9771,6 +9928,42 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, + "typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, + "typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "requires": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + } + }, "typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -9923,17 +10116,16 @@ } }, "which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "requires": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" } }, "wide-align": { @@ -9988,16 +10180,10 @@ } } }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, "wrap-ansi": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", - "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, "requires": { "ansi-styles": "^6.1.0", @@ -10045,6 +10231,17 @@ } } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/playwright/package.json b/playwright/package.json index 86b7d6ac375..5e3ba94782b 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -3,24 +3,25 @@ "install-deps": "playwright install --with-deps", "test": "playwright test", "test:legacy": "playwright test -c playwright-legacy.config.js", + "test:legacy:visual": "playwright test -c playwright-legacy.config.js --headed --workers=1", "test:visual": "playwright test --headed --workers=1", "test:debug": "playwright test --debug" }, "devDependencies": { - "@playwright/test": "1.33.0", - "eslint": "8.39.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-n": "15.7.0", + "@playwright/test": "1.42.1", + "eslint": "8.57.0", + "eslint-config-standard": "17.1.0", + "eslint-plugin-import": "2.29.1", + "eslint-plugin-n": "16.6.2", "eslint-plugin-node": "11.1.0", "eslint-plugin-promise": "6.1.1", - "npm-check-updates": "16.10.8" + "npm-check-updates": "16.14.18" }, "dependencies": { - "@faker-js/faker": "7.6.0", + "@faker-js/faker": "8.4.1", "lodash": "4.17.21", "lodash-es": "4.17.21", - "luxon": "3.3.0", + "luxon": "3.4.4", "ms": "2.1.3", "seedrandom": "3.0.5", "slugify": "1.6.6" diff --git a/playwright/tests-legacy/docs/ad.spec.js b/playwright/tests-legacy/docs/ad.spec.js new file mode 100644 index 00000000000..80b8b27cda4 --- /dev/null +++ b/playwright/tests-legacy/docs/ad.spec.js @@ -0,0 +1,26 @@ +const { test, expect } = require('@playwright/test') +const viewports = require('../../helpers/viewports') + +// ==================================================================== +// IESG Dashboard +// ==================================================================== + +test.describe('/doc/ad/', () => { + test.beforeEach(async ({ page }) => { + await page.setViewportSize({ + width: viewports.desktop[0], + height: viewports.desktop[1] + }) + + await page.goto('/doc/ad/') + }) + + test('Pre pubreq', async ({ page }) => { + const tablesLocator = page.locator('table') + const tablesCount = await tablesLocator.count() + expect(tablesCount).toBeGreaterThan(0) + const firstTable = tablesLocator.nth(0) + const theadTexts = await firstTable.locator('thead').allInnerTexts() + expect(theadTexts.join('')).toContain('Pre pubreq') + }) +}) diff --git a/playwright/tests-legacy/secr/announcement.spec.js b/playwright/tests-legacy/secr/announcement.spec.js new file mode 100644 index 00000000000..4dbbc25a813 --- /dev/null +++ b/playwright/tests-legacy/secr/announcement.spec.js @@ -0,0 +1,77 @@ +const { test, expect } = require('@playwright/test') +const viewports = require('../../helpers/viewports') +const { setTimeout } = require('timers/promises') + +// ==================================================================== +// ANNOUNCEMENT | DESKTOP viewport +// ==================================================================== + +test.describe('desktop', () => { + + test.beforeAll(async ({ browser }) => { + const context = await browser.newContext(); + const page = await context.newPage(); + + await page.goto('/accounts/login/'); + + await page.fill('input#id_username', 'glen'); + await page.fill('input#id_password', 'password'); + + await page.click('button[type="submit"]'); + await page.waitForURL('/accounts/profile/'); + + await context.storageState({ path: 'auth.json' }); + + await context.close(); + }); + + test.beforeEach(async ({ browser }) => { + // Reuse the authentication state in each test + const context = await browser.newContext({ storageState: 'auth.json' }); + const page = await context.newPage(); + await page.setViewportSize({ + width: viewports.desktop[0], + height: viewports.desktop[1] + }) + await page.goto(`/secr/announcement/`); + await page.locator('h1:text("Announcement")').waitFor({ state: 'visible' }) + await setTimeout(500) + // Attach the page to the test context + test.info().page = page; + }) + + test('show to custom', async () => { + const page = test.info().page; + + // to_custom should initially be hidden + const element = page.locator('#id_to_custom'); + await expect(element).toBeHidden(); + await page.selectOption('select#id_to', 'Other...'); + await expect(element).toBeVisible(); + }) + + test('back button', async () => { + const page = test.info().page; + + const element = page.locator('#id_to_custom'); + await page.selectOption('select#id_to', 'Other...'); + await expect(element).toBeVisible(); + await page.fill('input#id_to_custom', 'custom@example.com'); + await page.selectOption('select#id_frm', 'IETF Chair '); + await page.fill('input#id_reply_to', 'greg@example.com'); + await page.fill('input#id_subject', 'About Stuff'); + await page.fill('textarea#id_body', 'This is the stuff'); + + await page.click('text="Continue"'); + const h2Locator = page.locator('h2:text("Confirm Announcement")'); + await h2Locator.waitFor({ state: 'visible' }); + + // click back button and check to_custom + await page.click('text="Back"'); + const subjectLocator = page.locator('input#id_subject'); + await subjectLocator.waitFor({ state: 'visible' }); + await expect(element).toBeVisible(); + await expect(element).toHaveValue('custom@example.com'); + }) + +}) \ No newline at end of file diff --git a/playwright/tests/meeting/agenda.spec.js b/playwright/tests/meeting/agenda.spec.js index a68fdeff2a5..2248027a38a 100644 --- a/playwright/tests/meeting/agenda.spec.js +++ b/playwright/tests/meeting/agenda.spec.js @@ -238,7 +238,7 @@ test.describe('past - desktop', () => { // Name column // ----------- // Event icon - if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && ['office hours', 'hackathon'].some(s => event.name.toLowerCase().indexOf(s) >= 0))) { + if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && event.name.toLowerCase().indexOf('office hours') >= 0)) { await expect(row.locator('.agenda-table-cell-name > i.bi')).toBeVisible() } // Name link @@ -275,7 +275,7 @@ test.describe('past - desktop', () => { const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons') if (event.flags.agenda) { // Show meeting materials button - await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible() + await expect(eventButtons.locator(`#btn-btn-${event.id}-mat`)).toBeVisible() // ZIP materials button await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar`)).toHaveAttribute('href', `/meeting/${meetingData.meeting.number}/agenda/${event.acronym}-drafts.tgz`) await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar > i.bi`)).toBeVisible() @@ -286,10 +286,17 @@ test.describe('past - desktop', () => { // No meeting materials yet warning badge await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible() } - // Notepad button - const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}` - await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink) - await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible() + if (event.groupAcronym === 'hackathon') { + // Hackathon Wiki button + const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon` + await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink) + await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki > i.bi`)).toBeVisible() + } else { + // Notepad button + const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}` + await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink) + await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible() + } // Chat logs await expect(eventButtons.locator(`#btn-lnk-${event.id}-logs`)).toHaveAttribute('href', event.links.chatArchive) await expect(eventButtons.locator(`#btn-lnk-${event.id}-logs > i.bi`)).toBeVisible() @@ -418,7 +425,7 @@ test.describe('past - desktop', () => { }) }) // Open dialog - await page.locator(`#agenda-rowid-${event.id} #btn-lnk-${event.id}-mat`).click() + await page.locator(`#agenda-rowid-${event.id} #btn-btn-${event.id}-mat`).click() await expect(page.locator('.agenda-eventdetails')).toBeVisible() // Header await expect(page.locator('.agenda-eventdetails .n-card-header__main > .detail-header > .bi')).toBeVisible() @@ -500,7 +507,7 @@ test.describe('past - desktop', () => { }) }) // Open dialog - await page.locator(`#btn-lnk-${event.id}-mat`).click() + await page.locator(`#btn-btn-${event.id}-mat`).click() await expect(page.locator('.agenda-eventdetails')).toBeVisible() // Slides Tab await page.locator('.agenda-eventdetails .detail-nav > a').nth(1).click() @@ -1151,7 +1158,7 @@ test.describe('future - desktop', () => { if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) { if (event.flags.agenda) { // Show meeting materials button - await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible() + await expect(eventButtons.locator(`#btn-btn-${event.id}-mat`)).toBeVisible() // ZIP materials button await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar`)).toHaveAttribute('href', `/meeting/${meetingData.meeting.number}/agenda/${event.acronym}-drafts.tgz`) await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar > i.bi`)).toBeVisible() @@ -1162,10 +1169,17 @@ test.describe('future - desktop', () => { // No meeting materials yet warning badge await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible() } - // Notepad button - const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}` - await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink) - await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible() + if (event.groupAcronym === 'hackathon') { + // Hackathon Wiki button + const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon` + await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink) + await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki > i.bi`)).toBeVisible() + } else { + // Notepad button + const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}` + await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink) + await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible() + } // Chat room await expect(eventButtons.locator(`#btn-lnk-${event.id}-room`)).toHaveAttribute('href', event.links.chat) await expect(eventButtons.locator(`#btn-lnk-${event.id}-room > i.bi`)).toBeVisible() @@ -1199,13 +1213,18 @@ test.describe('future - desktop', () => { await expect(eventButtons.locator(`#btn-lnk-${event.id}-remotecallin`)).toHaveAttribute('href', remoteCallInUrl) await expect(eventButtons.locator(`#btn-lnk-${event.id}-remotecallin > i.bi`)).toBeVisible() } - // calendar + // Calendar if (event.links.calendar) { await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar`)).toHaveAttribute('href', event.links.calendar) await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar > i.bi`)).toBeVisible() } } else { - await expect(eventButtons).toHaveCount(0) + if (event.links.calendar) { + await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar`)).toHaveAttribute('href', event.links.calendar) + await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar > i.bi`)).toBeVisible() + } else { + await expect(eventButtons).toHaveCount(0) + } } } } @@ -1264,22 +1283,7 @@ test.describe('live - desktop', () => { }) // Override Date in page to fixed time - await page.addInitScript(`{ - // Extend Date constructor to default to fixed time - Date = class extends Date { - constructor(...args) { - if (args.length === 0) { - super(${currentTime.toMillis()}); - } else { - super(...args); - } - } - } - // Override Date.now() to start from fixed time - const __DateNowOffset = ${currentTime.toMillis()} - Date.now(); - const __DateNow = Date.now; - Date.now = () => __DateNow() + __DateNowOffset; - }`) + await commonHelper.overridePageDateTime(page, currentTime) // Visit agenda page and await Meeting Data API call to complete await Promise.all([ @@ -1334,6 +1338,89 @@ test.describe('live - desktop', () => { }) }) +// ==================================================================== +// AGENDA (live meeting) | DESKTOP viewport | Plenary Extended Time Buttons +// ==================================================================== + +test.describe('live - desktop - plenary extended time buttons', () => { + let meetingData + let plenarySessionId + + test.beforeAll(async () => { + // Generate meeting data + meetingData = meetingHelper.generateAgendaResponse({ dateMode: 'current' }) + plenarySessionId = meetingData.schedule.find(s => s.type === 'plenary').id + }) + + test.beforeEach(async ({ page }) => { + // Intercept Meeting Data API + await page.route(`**/api/meeting/${meetingData.meeting.number}/agenda-data`, route => { + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify(meetingData) + }) + }) + + await page.setViewportSize({ + width: viewports.desktop[0], + height: viewports.desktop[1] + }) + }) + + // -> BUTTONS PRESENT AFTER EVENT, SAME DAY + + test('same day - after event', async ({ page }) => { + // Override Date in page to fixed time + const currentTime = DateTime.fromISO('2022-02-01T13:45:15', { zone: 'Asia/Tokyo' }).plus({ days: 1 }).set({ hour: 20, minute: 30 }) + await commonHelper.overridePageDateTime(page, currentTime) + + // Visit agenda page and await Meeting Data API call to complete + await Promise.all([ + page.waitForResponse(`**/api/meeting/${meetingData.meeting.number}/agenda-data`), + page.goto(`/meeting/${meetingData.meeting.number}/agenda`) + ]) + + // Wait for page to be ready + await page.locator('.agenda h1').waitFor({ state: 'visible' }) + await setTimeout(500) + + // Check for plenary event + await expect(page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary')).toBeVisible() + await page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary').scrollIntoViewIfNeeded() + + // Check for full video client + on-site tool + await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-video`)).toBeVisible() + await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-onsitetool`)).toBeVisible() + }) + + // -> BUTTONS NO LONGER PRESENT AFTER EVENT, NEXT DAY + + test('next day - after event', async ({ page }) => { + // Override Date in page to fixed time + const currentTime = DateTime.fromISO('2022-02-01T13:45:15', { zone: 'Asia/Tokyo' }).plus({ days: 2 }).set({ hour: 2, minute: 30 }) + await commonHelper.overridePageDateTime(page, currentTime) + + // Visit agenda page and await Meeting Data API call to complete + await Promise.all([ + page.waitForResponse(`**/api/meeting/${meetingData.meeting.number}/agenda-data`), + page.goto(`/meeting/${meetingData.meeting.number}/agenda`) + ]) + + // Wait for page to be ready + await page.locator('.agenda h1').waitFor({ state: 'visible' }) + await setTimeout(500) + + // Check for plenary event + await expect(page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary')).toBeVisible() + await page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary').scrollIntoViewIfNeeded() + + // Check for full video client + on-site tool + await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-video`)).not.toBeVisible() + await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-onsitetool`)).not.toBeVisible() + }) +}) + // ==================================================================== // AGENDA (past meeting) | SMALL DESKTOP/TABLET/MOBILE viewports // ==================================================================== @@ -1427,27 +1514,34 @@ test.describe('past - small screens', () => { // has a bottom mobile bar await expect(page.locator('.agenda-mobile-bar')).toBeVisible() - await expect(barBtnLocator).toHaveCount(4) - await expect(barBtnLocator.first()).toContainText('Filters') - await expect(barBtnLocator.nth(1)).toContainText('Cal') - await expect(barBtnLocator.nth(2)).toContainText('.ics') - await expect(barBtnLocator.last().locator('> *')).toHaveCount(1) - await expect(barBtnLocator.last().locator('> *')).toHaveClass(/bi/) + await expect(barBtnLocator).toHaveCount(5) - // can open the filters overlay + // can open the jump to day dropdown await barBtnLocator.first().click() + const jumpDayDdnLocator = page.locator('.n-dropdown-menu [data-testid=mobile-link]') + await expect(jumpDayDdnLocator).toHaveCount(7) + for (let idx = 0; idx < 7; idx++) { + const localDateTime = DateTime.fromISO(meetingData.meeting.startDate, { zone: meetingData.meeting.timezone }) + .setLocale(BROWSER_LOCALE) + .plus({ days: idx }) + .toFormat('ccc LLL d') + await expect(jumpDayDdnLocator.nth(idx)).toContainText(`Jump to ${localDateTime}`) + } + + // can open the filters overlay + await barBtnLocator.nth(1).click() await expect(page.locator('.agenda-personalize')).toBeVisible() await page.locator('.agenda-personalize .agenda-personalize-actions > button').nth(1).click() await expect(page.locator('.agenda-personalize')).toBeHidden() // can open the calendar view - await barBtnLocator.nth(1).click() + await barBtnLocator.nth(2).click() await expect(page.locator('.agenda-calendar')).toBeVisible() await page.locator('.agenda-calendar .agenda-calendar-actions > button').nth(1).click() await expect(page.locator('.agenda-calendar')).toBeHidden() // can open the ics dropdown - await barBtnLocator.nth(2).click() + await barBtnLocator.nth(3).click() const calDdnLocator = page.locator('.n-dropdown-menu > .n-dropdown-option') await expect(calDdnLocator).toHaveCount(2) await expect(calDdnLocator.first()).toContainText('Subscribe') diff --git a/playwright/tests/status/status.spec.js b/playwright/tests/status/status.spec.js new file mode 100644 index 00000000000..c70617e2fd6 --- /dev/null +++ b/playwright/tests/status/status.spec.js @@ -0,0 +1,66 @@ +const { + test, + expect +} = require('@playwright/test') +const { STATUS_STORAGE_KEY, generateStatusTestId } = require('../../../client/shared/status-common.js') + +test.describe('site status', () => { + const noStatus = { + hasMessage: false + } + + const status1 = { + hasMessage: true, + id: 1, + slug: '2024-7-9fdfdf-sdfsdf', + title: 'My status title', + body: 'My status body', + url: '/status/2024-7-9fdfdf-sdfsdf', + date: '2024-07-09T07:05:13+00:00', + by: 'Exile is a cool Amiga game' + } + + test.beforeEach(({ page, browserName }) => { + page.setDefaultTimeout(15 * 1000) // increase default timeout + test.skip(browserName === 'firefox', 'bypassing flaky tests on Firefox') + }) + + test('Renders server status as Notification', async ({ page }) => { + await page.route('/status/latest.json', route => { + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify(status1) + }) + }) + await page.goto('/') + await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(1) + }) + + test("Doesn't render dismissed server statuses", async ({ page }) => { + await page.route('/status/latest.json', route => { + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify(status1) + }) + }) + await page.goto('/') + await page.evaluate(({ key, value }) => localStorage.setItem(key, value), { key: STATUS_STORAGE_KEY, value: JSON.stringify([status1.id]) }) + await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(0) + }) + + test('Handles no server status', async ({ page }) => { + await page.route('/status/latest.json', route => { + route.fulfill({ + status: 200, + contentType: 'application/json', + body: JSON.stringify(noStatus) + }) + }) + + await page.goto('/') + + await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(0) + }) +}) diff --git a/pyzmail/__init__.py b/pyzmail/__init__.py deleted file mode 100644 index f6c8854abc1..00000000000 --- a/pyzmail/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -# pyzmail/__init__.py -# (c) Alain Spineux -# http://www.magiksys.net/pyzmail -# Released under LGPL - -from . import utils -from .generate import compose_mail, send_mail, send_mail2 -from .parse import email_address_re, PyzMessage, PzMessage, decode_text -from .parse import message_from_string, message_from_file -from .parse import message_from_bytes, message_from_binary_file # python >= 3.2 -from .version import __version__ - -# to help epydoc to display functions available from top of the package -__all__= [ 'compose_mail', 'send_mail', 'send_mail2', 'email_address_re', \ - 'PyzMessage', 'PzMessage', 'decode_text', '__version__', - 'utils', 'generate', 'parse', 'version', - 'message_from_string','message_from_file', - 'message_from_binary_file', 'message_from_bytes', # python >= 3.2 - ] - diff --git a/pyzmail/generate.py b/pyzmail/generate.py deleted file mode 100644 index 2ad1f622462..00000000000 --- a/pyzmail/generate.py +++ /dev/null @@ -1,529 +0,0 @@ -# -# pyzmail/generate.py -# (c) Alain Spineux -# http://www.magiksys.net/pyzmail -# Released under LGPL - -""" -Useful functions to compose and send emails. - -For short: - ->>> payload, mail_from, rcpt_to, msg_id=compose_mail((u'Me', 'me@foo.com'), -... [(u'Him', 'him@bar.com')], u'the subject', 'iso-8859-1', ('Hello world', 'us-ascii'), -... attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')]) -... #doctest: +SKIP ->>> error=send_mail(payload, mail_from, rcpt_to, 'localhost', smtp_port=25) -... #doctest: +SKIP -""" - -import os, sys -import time -import base64 -import smtplib, socket -import email -import email.encoders -import email.header -import email.utils -import email.mime -import email.mime.base -import email.mime.text -import email.mime.image -import email.mime.multipart - -from . import utils - -def format_addresses(addresses, header_name=None, charset=None): - """ - Convert a list of addresses into a MIME-compliant header for a From, To, Cc, - or any other I{address} related field. - This mixes the use of email.utils.formataddr() and email.header.Header(). - - @type addresses: list - @param addresses: list of addresses, can be a mix of string a tuple of the form - C{[ 'address@domain', (u'Name', 'name@domain'), ...]}. - If C{u'Name'} contains non us-ascii characters, it must be a - unicode string or encoded using the I{charset} argument. - @type header_name: string or None - @keyword header_name: the name of the header. Its length is used to limit - the length of the first line of the header according the RFC's - requirements. (not very important, but it's better to match the - requirements when possible) - @type charset: str - @keyword charset: the encoding charset for non unicode I{name} and a B{hint} - for encoding of unicode string. In other words, - if the I{name} of an address in a byte string containing non - I{us-ascii} characters, then C{name.decode(charset)} - must generate the expected result. If a unicode string - is used instead, charset will be tried to encode the - string, if it fail, I{utf-8} will be used. - With B{Python 3.x} I{charset} is no more a hint and an exception will - be raised instead of using I{utf-8} has a fall back. - @rtype: str - @return: the encoded list of formated addresses separated by commas, - ready to use as I{Header} value. - - >>> print format_addresses([('John', 'john@foo.com') ], 'From', 'us-ascii').encode() - John - >>> print format_addresses([(u'l\\xe9o', 'leo@foo.com') ], 'To', 'iso-8859-1').encode() - =?iso-8859-1?q?l=E9o?= - >>> print format_addresses([(u'l\\xe9o', 'leo@foo.com') ], 'To', 'us-ascii').encode() - ... # don't work in 3.X because charset is more than a hint - ... #doctest: +SKIP - =?utf-8?q?l=C3=A9o?= - >>> # because u'l\xe9o' cannot be encoded into us-ascii, utf8 is used instead - >>> print format_addresses([('No\\xe9', 'noe@f.com'), (u'M\\u0101ori', 'maori@b.com') ], 'Cc', 'iso-8859-1').encode() - ... # don't work in 3.X because charset is more than a hint - ... #doctest: +SKIP - =?iso-8859-1?q?No=E9?= , =?utf-8?b?TcSBb3Jp?= - >>> # 'No\xe9' is already encoded into iso-8859-1, but u'M\\u0101ori' cannot be encoded into iso-8859-1 - >>> # then utf8 is used here - >>> print format_addresses(['a@bar.com', ('John', 'john@foo.com') ], 'From', 'us-ascii').encode() - a@bar.com , John - """ - header=email.header.Header(charset=charset, header_name=header_name) - for i, address in enumerate(addresses): - if i!=0: - # add separator between addresses - header.append(',', charset='us-ascii') - - try: - name, addr=address - except ValueError: - # address is not a tuple, their is no name, only email address - header.append(address, charset='us-ascii') - else: - # check if address name is a unicode or byte string in "pure" us-ascii - if utils.is_usascii(name): - # name is a us-ascii byte string, i can use formataddr - formated_addr=email.utils.formataddr((name, addr)) - # us-ascii must be used and not default 'charset' - header.append(formated_addr, charset='us-ascii') - else: - # this is not as "pure" us-ascii string - # Header will use "RFC2047" to encode the address name - # if name is byte string, charset will be used to decode it first - header.append(name) - # here us-ascii must be used and not default 'charset' - header.append('<%s>' % (addr,), charset='us-ascii') - - return header - - -def build_mail(text, html=None, attachments=None, embeddeds=None): - """ - Generate the core of the email message regarding the parameters. - The structure of the MIME email may vary, but the general one is as follow:: - - multipart/mixed (only if attachments are included) - | - +-- multipart/related (only if embedded contents are included) - | | - | +-- multipart/alternative (only if text AND html are available) - | | | - | | +-- text/plain (text version of the message) - | | +-- text/html (html version of the message) - | | - | +-- image/gif (where to include embedded contents) - | - +-- application/msword (where to add attachments) - - @param text: the text version of the message, under the form of a tuple: - C{(encoded_content, encoding)} where I{encoded_content} is a byte string - encoded using I{encoding}. - I{text} can be None if the message has no text version. - @type text: tuple or None - @keyword html: the HTML version of the message, under the form of a tuple: - C{(encoded_content, encoding)} where I{encoded_content} is a byte string - encoded using I{encoding} - I{html} can be None if the message has no HTML version. - @type html: tuple or None - @keyword attachments: the list of attachments to include into the mail, in the - form [(data, maintype, subtype, filename, charset), ..] where : - - I{data} : is the raw data, or a I{charset} encoded string for 'text' - content. - - I{maintype} : is a MIME main type like : 'text', 'image', 'application' .... - - I{subtype} : is a MIME sub type of the above I{maintype} for example : - 'plain', 'png', 'msword' for respectively 'text/plain', 'image/png', - 'application/msword'. - - I{filename} this is the filename of the attachment, it must be a - 'us-ascii' string or a tuple of the form - C{(encoding, language, encoded_filename)} - following the RFC2231 requirement, for example - C{('iso-8859-1', 'fr', u'r\\xe9pertoir.png'.encode('iso-8859-1'))} - - I{charset} : if I{maintype} is 'text', then I{data} must be encoded - using this I{charset}. It can be None for non 'text' content. - @type attachments: list - @keyword embeddeds: is a list of documents embedded inside the HTML or text - version of the message. It is similar to the I{attachments} list, - but I{filename} is replaced by I{content_id} that is related to - the B{cid} reference into the HTML or text version of the message. - @type embeddeds: list - @rtype: inherit from email.Message - @return: the message in a MIME object - - >>> mail=build_mail(('Hello world', 'us-ascii'), attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')]) - >>> mail.set_boundary('===limit1==') - >>> print mail.as_string(unixfrom=False) - Content-Type: multipart/mixed; boundary="===limit1==" - MIME-Version: 1.0 - - --===limit1== - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - - Hello world - --===limit1== - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - Content-Disposition: attachment; filename="text.txt" - - attached - --===limit1==-- - """ - - if attachments is None: - attachments = [] - if embeddeds is None: - embeddeds = [] - - main=text_part=html_part=None - if text: - content, charset=text - main=text_part=email.mime.text.MIMEText(content, 'plain', charset) - - if html: - content, charset=html - main=html_part=email.mime.text.MIMEText(content, 'html', charset) - - if not text_part and not html_part: - main=text_part=email.mime.text.MIMEText('', 'plain', 'us-ascii') - elif text_part and html_part: - # need to create a multipart/alternative to include text and html version - main=email.mime.multipart.MIMEMultipart('alternative', None, [text_part, html_part]) - - if embeddeds: - related=email.mime.multipart.MIMEMultipart('related') - related.attach(main) - for part in embeddeds: - if not isinstance(part, email.mime.base.MIMEBase): - data, maintype, subtype, content_id, charset=part - if (maintype=='text'): - part=email.mime.text.MIMEText(data, subtype, charset) - else: - part=email.mime.base.MIMEBase(maintype, subtype) - part.set_payload(data) - email.encoders.encode_base64(part) - part.add_header('Content-ID', '<'+content_id+'>') - part.add_header('Content-Disposition', 'inline') - related.attach(part) - main=related - - if attachments: - mixed=email.mime.multipart.MIMEMultipart('mixed') - mixed.attach(main) - for part in attachments: - if not isinstance(part, email.mime.base.MIMEBase): - data, maintype, subtype, filename, charset=part - if (maintype=='text'): - part=email.mime.text.MIMEText(data, subtype, charset) - else: - part=email.mime.base.MIMEBase(maintype, subtype) - part.set_payload(data) - email.encoders.encode_base64(part) - part.add_header('Content-Disposition', 'attachment', filename=filename) - mixed.attach(part) - main=mixed - - return main - -def complete_mail(message, sender, recipients, subject, default_charset, cc=None, bcc=None, message_id_string=None, date=None, headers=None): - """ - Fill in the From, To, Cc, Subject, Date and Message-Id I{headers} of - one existing message regarding the parameters. - - @type message:email.Message - @param message: the message to fill in - @type sender: tuple - @param sender: a tuple of the form (u'Sender Name', 'sender.address@domain.com') - @type recipients: list - @param recipients: a list of addresses. Address can be tuple or string like - expected by L{format_addresses()}, for example: C{[ 'address@dmain.com', - (u'Recipient Name', 'recipient.address@domain.com'), ... ]} - @type subject: str - @param subject: The subject of the message, can be a unicode string or a - string encoded using I{default_charset} encoding. Prefert unicode to - byte string here. - @type default_charset: str - @param default_charset: The default charset for this email. Arguments - that are non unicode string are supposed to be encoded using this charset. - This I{charset} will be used has an hint when encoding mail content. - @type cc: list - @keyword cc: The I{carbone copy} addresses. Same format as the I{recipients} - argument. - @type bcc: list - @keyword bcc: The I{blind carbone copy} addresses. Same format as the I{recipients} - argument. - @type message_id_string: str or None - @keyword message_id_string: if None, don't append any I{Message-ID} to the - mail, let the SMTP do the job, else use the string to generate a unique - I{ID} using C{email.utils.make_msgid()}. The generated value is - returned as last argument. For example use the name of your application. - @type date: int or None - @keyword date: utc time in second from the epoch or None. If None then - use curent time C{time.time()} instead. - @type headers: list of tuple - @keyword headers: a list of C{(field, value)} tuples to fill in the mail - header fields. Values are encoded using I{default_charset}. - @rtype: tuple - @return: B{(payload, mail_from, rcpt_to, msg_id)} - - I{payload} (str) is the content of the email, generated from the message - - I{mail_from} (str) is the address of the sender to pass to the SMTP host - - I{rcpt_to} (list) is a list of the recipients addresses to pass to the SMTP host - of the form C{[ 'a@b.com', c@d.com', ]}. This combine all recipients, - I{carbone copy} addresses and I{blind carbone copy} addresses. - - I{msg_id} (None or str) None if message_id_string==None else the generated value for - the message-id. If not None, this I{Message-ID} is already written - into the payload. - - >>> import email.mime.text - >>> msg=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii') - >>> # I could use build_mail() instead - >>> payload, mail_from, rcpt_to, msg_id=complete_mail(msg, ('Me', 'me@foo.com'), - ... [ ('Him', 'him@bar.com'), ], 'Non unicode subject', 'iso-8859-1', - ... cc=['her@bar.com',], date=1313558269, headers=[('User-Agent', u'pyzmail'), ]) - >>> print payload - ... # 3.X encode User-Agent: using 'iso-8859-1' even if it contains only us-asccii - ... # doctest: +ELLIPSIS - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - From: Me - To: Him - Cc: her@bar.com - Subject: =?iso-8859-1?q?Non_unicode_subject?= - Date: ... - User-Agent: ...pyzmail... - - The text. - >>> print 'mail_from=%r rcpt_to=%r' % (mail_from, rcpt_to) - mail_from='me@foo.com' rcpt_to=['him@bar.com', 'her@bar.com'] - """ - def getaddr(address): - if isinstance(address, tuple): - return address[1] - else: - return address - - if cc is None: - cc=[] - if bcc is None: - bcc=[] - if headers is None: - headers=[] - - mail_from=getaddr(sender[1]) - rcpt_to=list(map(getaddr, recipients)) - rcpt_to.extend(list(map(getaddr, cc))) - rcpt_to.extend(list(map(getaddr, bcc))) - - message['From'] = format_addresses([ sender, ], header_name='from', charset=default_charset) - if recipients: - message['To'] = format_addresses(recipients, header_name='to', charset=default_charset) - if cc: - message['Cc'] = format_addresses(cc, header_name='cc', charset=default_charset) - message['Subject'] = email.header.Header(subject, default_charset) - if date: - utc_from_epoch=date - else: - utc_from_epoch=time.time() - message['Date'] = email.utils.formatdate(utc_from_epoch, localtime=True) - - if message_id_string: - msg_id=message['Message-Id']=email.utils.make_msgid(message_id_string) - else: - msg_id=None - - for field, value in headers: - message[field]=email.header.Header(value, default_charset) - - payload=message.as_string() - - return payload, mail_from, rcpt_to, msg_id - -def compose_mail(sender, recipients, subject, default_charset, text, html=None, attachments=None, embeddeds=None, cc=None, bcc=None, message_id_string=None, date=None, headers=None): - """ - Compose an email regarding the arguments. Call L{build_mail()} and - L{complete_mail()} at once. - - Read the B{parameters} descriptions of both functions L{build_mail()} and L{complete_mail()}. - - Returned value is the same as for L{build_mail()} and L{complete_mail()}. - You can pass the returned values to L{send_mail()} or L{send_mail2()}. - - @rtype: tuple - @return: B{(payload, mail_from, rcpt_to, msg_id)} - - >>> payload, mail_from, rcpt_to, msg_id=compose_mail((u'Me', 'me@foo.com'), [(u'Him', 'him@bar.com')], u'the subject', 'iso-8859-1', ('Hello world', 'us-ascii'), attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')]) - """ - if attachments is None: - attachments=[] - if embeddeds is None: - embeddeds=[] - if cc is None: - cc=[] - if bcc is None: - bcc = [] - if headers is None: - headers=[] - - message=build_mail(text, html, attachments, embeddeds) - return complete_mail(message, sender, recipients, subject, default_charset, cc, bcc, message_id_string, date, headers) - - -def send_mail2(payload, mail_from, rcpt_to, smtp_host, smtp_port=25, smtp_mode='normal', smtp_login=None, smtp_password=None): - """ - Send the message to a SMTP host. Look at the L{send_mail()} documentation. - L{send_mail()} call this function and catch all exceptions to convert them - into a user friendly error message. The returned value - is always a dictionary. It can be empty if all recipients have been - accepted. - - @rtype: dict - @return: This function return the value returnd by C{smtplib.SMTP.sendmail()} - or raise the same exceptions. - - This method will return normally if the mail is accepted for at least one - recipient. Otherwise it will raise an exception. That is, if this - method does not raise an exception, then someone should get your mail. - If this method does not raise an exception, it returns a dictionary, - with one entry for each recipient that was refused. Each entry contains a - tuple of the SMTP error code and the accompanying error message sent by the server. - - @raise smtplib.SMTPException: Look at the standard C{smtplib.SMTP.sendmail()} documentation. - - """ - if smtp_mode=='ssl': - smtp=smtplib.SMTP_SSL(smtp_host, smtp_port) - else: - smtp=smtplib.SMTP(smtp_host, smtp_port) - if smtp_mode=='tls': - smtp.starttls() - - if smtp_login and smtp_password: - if sys.version_info<(3, 0): - # python 2.x - # login and password must be encoded - # because HMAC used in CRAM_MD5 require non unicode string - smtp.login(smtp_login.encode('utf-8'), smtp_password.encode('utf-8')) - else: - #python 3.x - smtp.login(smtp_login, smtp_password) - try: - ret=smtp.sendmail(mail_from, rcpt_to, payload) - finally: - try: - smtp.quit() - except Exception as e: - pass - - return ret - -def send_mail(payload, mail_from, rcpt_to, smtp_host, smtp_port=25, smtp_mode='normal', smtp_login=None, smtp_password=None): - """ - Send the message to a SMTP host. Handle SSL, TLS and authentication. - I{payload}, I{mail_from} and I{rcpt_to} can come from values returned by - L{complete_mail()}. This function call L{send_mail2()} but catch all - exceptions and return friendly error message instead. - - @type payload: str - @param payload: the mail content. - @type mail_from: str - @param mail_from: the sender address, for example: C{'me@domain.com'}. - @type rcpt_to: list - @param rcpt_to: The list of the recipient addresses in the form - C{[ 'a@b.com', c@d.com', ]}. No names here, only email addresses. - @type smtp_host: str - @param smtp_host: the IP address or the name of the SMTP host. - @type smtp_port: int - @keyword smtp_port: the port to connect to on the SMTP host. Default is C{25}. - @type smtp_mode: str - @keyword smtp_mode: the way to connect to the SMTP host, can be: - C{'normal'}, C{'ssl'} or C{'tls'}. default is C{'normal'} - @type smtp_login: str or None - @keyword smtp_login: If authentication is required, this is the login. - Be carefull to I{UTF8} encode your login if it contains - non I{us-ascii} characters. - @type smtp_password: str or None - @keyword smtp_password: If authentication is required, this is the password. - Be carefull to I{UTF8} encode your password if it - contains non I{us-ascii} characters. - - @rtype: dict or str - @return: This function return a dictionary of failed recipients - or a string with an error message. - - If all recipients have been accepted the dictionary is empty. If the - returned value is a string, none of the recipients will get the message. - - The dictionary is exactly of the same sort as - smtplib.SMTP.sendmail() returns with one entry for each recipient that - was refused. Each entry contains a tuple of the SMTP error code and - the accompanying error message sent by the server. - - Example: - - >>> send_mail('Subject: hello\\n\\nmessage', 'a@foo.com', [ 'b@bar.com', ], 'localhost') #doctest: +SKIP - {} - - Here is how to use the returned value:: - if isinstance(ret, dict): - if ret: - print 'failed' recipients: - for recipient, (code, msg) in ret.iteritems(): - print 'code=%d recipient=%s\terror=%s' % (code, recipient, msg) - else: - print 'success' - else: - print 'Error:', ret - - To use your GMail account to send your mail:: - smtp_host='smtp.gmail.com' - smtp_port=587 - smtp_mode='tls' - smtp_login='your.gmail.addresse@gmail.com' - smtp_password='your.gmail.password' - - Use your GMail address for the sender ! - - """ - - error=dict() - try: - ret=send_mail2(payload, mail_from, rcpt_to, smtp_host, smtp_port, smtp_mode, smtp_login, smtp_password) - except (socket.error, ) as e: - error='server %s:%s not responding: %s' % (smtp_host, smtp_port, e) - except smtplib.SMTPAuthenticationError as e: - error='authentication error: %s' % (e, ) - except smtplib.SMTPRecipientsRefused as e: - # code, error=e.recipients[recipient_addr] - error='all recipients refused: '+', '.join(list(e.recipients.keys())) - except smtplib.SMTPSenderRefused as e: - # e.sender, e.smtp_code, e.smtp_error - error='sender refused: %s' % (e.sender, ) - except smtplib.SMTPDataError as e: - error='SMTP protocol mismatch: %s' % (e, ) - except smtplib.SMTPHeloError as e: - error="server didn't reply properly to the HELO greeting: %s" % (e, ) - except smtplib.SMTPException as e: - error='SMTP error: %s' % (e, ) -# except Exception, e: -# raise # unknown error - else: - # failed addresses and error messages - error=ret - - return error - diff --git a/pyzmail/parse.py b/pyzmail/parse.py deleted file mode 100644 index 9f86c371774..00000000000 --- a/pyzmail/parse.py +++ /dev/null @@ -1,817 +0,0 @@ -# -# pyzmail/parse.py -# (c) Alain Spineux -# http://www.magiksys.net/pyzmail -# Released under LGPL - -""" -Useful functions to parse emails - -@var email_address_re: a regex that match well formed email address (from perlfaq9) -@undocumented: atom_rfc2822 -@undocumented: atom_posfix_restricted -@undocumented: atom -@undocumented: dot_atom -@undocumented: local -@undocumented: domain_lit -@undocumented: domain -@undocumented: addr_spec -""" - -import re -import io -import email -import email.errors -import email.header -import email.message -import mimetypes - -from .utils import * - -# email address REGEX matching the RFC 2822 spec from perlfaq9 -# my $atom = qr{[a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+}; -# my $dot_atom = qr{$atom(?:\.$atom)*}; -# my $quoted = qr{"(?:\\[^\r\n]|[^\\"])*"}; -# my $local = qr{(?:$dot_atom|$quoted)}; -# my $domain_lit = qr{\[(?:\\\S|[\x21-\x5a\x5e-\x7e])*\]}; -# my $domain = qr{(?:$dot_atom|$domain_lit)}; -# my $addr_spec = qr{$local\@$domain}; -# -# Python's translation -atom_rfc2822=r"[a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+" -atom_posfix_restricted=r"[a-zA-Z0-9_#\$&'*+/=?\^`{}~|\-]+" # without '!' and '%' -atom=atom_rfc2822 -dot_atom=atom + r"(?:\." + atom + ")*" -quoted=r'"(?:\\[^\r\n]|[^\\"])*"' -local="(?:" + dot_atom + "|" + quoted + ")" -domain_lit=r"\[(?:\\\S|[\x21-\x5a\x5e-\x7e])*\]" -domain="(?:" + dot_atom + "|" + domain_lit + ")" -addr_spec=local + "@" + domain -# and the result -email_address_re=re.compile('^'+addr_spec+'$') - -class MailPart: - """ - Data related to a mail part (aka message content, attachment or - embedded content in an email) - - @type charset: str or None - @ivar charset: the encoding of the I{get_payload()} content if I{type} is 'text/*' - and charset has been specified in the message - @type content_id: str or None - @ivar content_id: the MIME Content-ID if specified in the message. - @type description: str or None - @ivar description: the MIME Content-Description if specified in the message. - @type disposition: str or None - @ivar disposition: C{None}, C{'inline'} or C{'attachment'} depending - the MIME Content-Disposition value - @type filename: unicode or None - @ivar filename: the name of the file, if specified in the message. - @type part: inherit from email.mime.base.MIMEBase - @ivar part: the related part inside the message. - @type is_body: str or None - @ivar is_body: None if this part is not the mail content itself (an - attachment or embedded content), C{'text/plain'} if this part is the - text content or C{'text/html'} if this part is the HTML version. - @type sanitized_filename: str or None - @ivar sanitized_filename: This field is filled by L{PyzMessage} to store - a valid unique filename related or not with the original filename. - @type type: str - @ivar type: the MIME type, like 'text/plain', 'image/png', 'application/msword' ... - """ - - def __init__(self, part, filename=None, type=None, charset=None, content_id=None, description=None, disposition=None, sanitized_filename=None, is_body=None): - """ - Create an mail part and initialize all attributes - """ - self.part=part # original python part - self.filename=filename # filename in unicode (if any) - self.type=type # the mime-type - self.charset=charset # the charset (if any) - self.description=description # if any - self.disposition=disposition # 'inline', 'attachment' or None - self.sanitized_filename=sanitized_filename # cleanup your filename here (TODO) - self.is_body=is_body # usually in (None, 'text/plain' or 'text/html') - self.content_id=content_id # if any - if self.content_id: - # strip '<>' to ease search and replace in "root" content (TODO) - if self.content_id.startswith('<') and self.content_id.endswith('>'): - self.content_id=self.content_id[1:-1] - - def get_payload(self): - """ - decode and return part payload. if I{type} is 'text/*' and I{charset} - not C{None}, be careful to take care of the text encoding. Use - something like C{part.get_payload().decode(part.charset)} - """ - - payload=None - if self.type.startswith('message/'): - # I don't use msg.as_string() because I want to use mangle_from_=False - if sys.version_info<(3, 0): - # python 2.x - from email.generator import Generator - fp = io.StringIO() - g = Generator(fp, mangle_from_=False) - g.flatten(self.part, unixfrom=False) - payload=fp.getvalue() - else: - # support only for python >= 3.2 - from email.generator import BytesGenerator - import io - fp = io.BytesIO() - g = BytesGenerator(fp, mangle_from_=False) - g.flatten(self.part, unixfrom=False) - payload=fp.getvalue() - - else: - payload=self.part.get_payload(decode=True) - return payload - - def __repr__(self): - st='MailPart<' - if self.is_body: - st+='*' - st+=self.type - if self.charset: - st+=' charset='+self.charset - if self.filename: - st+=' filename='+self.filename - if self.content_id: - st+=' content_id='+self.content_id - st+=' len=%d' % (len(self.get_payload()), ) - st+='>' - return st - - - -_line_end_re=re.compile('\r\n|\n\r|\n|\r') - -def _friendly_header(header): - """ - Convert header returned by C{email.message.Message.get()} into a - user friendly string. - - Py3k C{email.message.Message.get()} return C{header.Header()} with charset - set to C{charset.UNKNOWN8BIT} when the header contains invalid characters, - else it return I{str} as Python 2.X does - - @type header: str or email.header.Header - @param header: the header to convert into a user friendly string - - @rtype: str - @returns: the converter header - """ - - save=header - if isinstance(header, email.header.Header): - header=str(header) - - return re.sub(_line_end_re, ' ', header) - -def decode_mail_header(value, default_charset='us-ascii'): - """ - Decode a header value into a unicode string. - Works like a more smarter python - C{u"".join(email.header.decode_header()} function - - @type value: str - @param value: the value of the header. - @type default_charset: str - @keyword default_charset: if one charset used in the header (multiple charset - can be mixed) is unknown, then use this charset instead. - - >>> decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_en_Fran=E7ais?=') - u'Courrier \\xe8lectronique en Fran\\xe7ais' - """ - -# value=_friendly_header(value) - try: - headers=email.header.decode_header(value) - except email.errors.HeaderParseError: - # this can append in email.base64mime.decode(), for example for this value: - # '=?UTF-8?B?15HXmdeh15jXqNeVINeY15DXpteUINeTJ9eV16jXlSDXkdeg15XXldeUINem15PXpywg15TXptei16bXldei15nXnSDXqdecINek15zXmdeZ?==?UTF-8?B?157XldeR15nXnCwg157Xldek16Ig157Xl9eV15wg15HXodeV15bXnyDXk9ec15DXnCDXldeh15gg157Xl9eR16rXldeqINep15wg15HXmdeQ?==?UTF-8?B?15zXmNeZ?=' - # then return a sanitized ascii string - # TODO: some improvements are possible here, but a failure here is - # unlikely - return value.encode('us-ascii', 'replace').decode('us-ascii') - else: - for i, (text, charset) in enumerate(headers): - # python 3.x - # email.header.decode_header('a') -> [('a', None)] - # email.header.decode_header('a =?ISO-8859-1?Q?foo?= b') - # --> [(b'a', None), (b'foo', 'iso-8859-1'), (b'b', None)] - # in Py3 text is sometime str and sometime byte :-( - # python 2.x - # email.header.decode_header('a') -> [('a', None)] - # email.header.decode_header('a =?ISO-8859-1?Q?foo?= b') - # --> [('a', None), ('foo', 'iso-8859-1'), ('b', None)] - if (charset is None and sys.version_info>=(3, 0)): - # Py3 - if isinstance(text, str): - # convert Py3 string into bytes string to be sure their is no - # non us-ascii chars and because next line expect byte string - text=text.encode('us-ascii', 'replace') - try: - headers[i]=text.decode(charset or 'us-ascii', 'replace') - except LookupError: - # if the charset is unknown, force default - headers[i]=text.decode(default_charset, 'replace') - - return "".join(headers) - -def get_mail_addresses(message, header_name): - """ - retrieve all email addresses from one message header - - @type message: email.message.Message - @param message: the email message - @type header_name: str - @param header_name: the name of the header, can be 'from', 'to', 'cc' or - any other header containing one or more email addresses - @rtype: list - @returns: a list of the addresses in the form of tuples - C{[(u'Name', 'addresse@domain.com'), ...]} - - >>> import email - >>> import email.mime.text - >>> msg=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii') - >>> msg['From']=email.email.utils.formataddr(('Me', 'me@foo.com')) - >>> msg['To']=email.email.utils.formataddr(('A', 'a@foo.com'))+', '+email.email.utils.formataddr(('B', 'b@foo.com')) - >>> print msg.as_string(unixfrom=False) - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - From: Me - To: A , B - - The text. - >>> get_mail_addresses(msg, 'from') - [(u'Me', 'me@foo.com')] - >>> get_mail_addresses(msg, 'to') - [(u'A', 'a@foo.com'), (u'B', 'b@foo.com')] - """ - addrs=email.utils.getaddresses([ _friendly_header(h) for h in message.get_all(header_name, [])]) - for i, (addr_name, addr) in enumerate(addrs): - if not addr_name and addr: - # only one string! Is it the address or the address name ? - # use the same for both and see later - addr_name=addr - - if is_usascii(addr): - # address must be ascii only and must match address regex - if not email_address_re.match(addr): - addr='' - else: - addr='' - addrs[i]=(decode_mail_header(addr_name), addr) - return addrs - -def get_filename(part): - """ - Find the filename of a mail part. Many MUA send attachments with the - filename in the I{name} parameter of the I{Content-type} header instead - of in the I{filename} parameter of the I{Content-Disposition} header. - - @type part: inherit from email.mime.base.MIMEBase - @param part: the mail part - @rtype: None or unicode - @returns: the filename or None if not found - - >>> import email.mime.image - >>> attach=email.mime.image.MIMEImage('data', 'png') - >>> attach.add_header('Content-Disposition', 'attachment', filename='image.png') - >>> get_filename(attach) - u'image.png' - >>> print attach.as_string(unixfrom=False) - Content-Type: image/png - MIME-Version: 1.0 - Content-Transfer-Encoding: base64 - Content-Disposition: attachment; filename="image.png" - - ZGF0YQ== - >>> import email.mime.text - >>> attach=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii') - >>> attach.add_header('Content-Disposition', 'attachment', filename=('iso-8859-1', 'fr', u'Fran\\xe7ais.txt'.encode('iso-8859-1'))) - >>> get_filename(attach) - u'Fran\\xe7ais.txt' - >>> print attach.as_string(unixfrom=False) - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - Content-Disposition: attachment; filename*="iso-8859-1'fr'Fran%E7ais.txt" - - The text. - """ - filename=part.get_param('filename', None, 'content-disposition') - if not filename: - filename=part.get_param('name', None) # default is 'content-type' - - if filename: - if isinstance(filename, tuple): - # RFC 2231 must be used to encode parameters inside MIME header - filename=email.utils.collapse_rfc2231_value(filename).strip() - else: - # But a lot of MUA erroneously use RFC 2047 instead of RFC 2231 - # in fact anybody missuse RFC2047 here !!! - filename=decode_mail_header(filename) - - return filename - -def _search_message_content(contents, part): - """ - recursive search of message content (text or HTML) inside - the structure of the email. Used by L{search_message_content()} - - @type contents: dict - @param contents: contents already found in parents or brothers I{parts}. - The dictionary will be completed as and when. key is the MIME type of the part. - @type part: inherit email.mime.base.MIMEBase - @param part: the part of the mail to look inside recursively. - """ - type=part.get_content_type() - if part.is_multipart(): # type.startswith('multipart/'): - # explore only True 'multipart/*' - # because 'messages/rfc822' are 'multipart/*' too but - # must not be explored here - if type=='multipart/related': - # the first part or the one pointed by start - start=part.get_param('start', None) - related_type=part.get_param('type', None) - for i, subpart in enumerate(part.get_payload()): - if (not start and i==0) or (start and start==subpart.get('Content-Id')): - _search_message_content(contents, subpart) - return - elif type=='multipart/alternative': - # all parts are candidates and latest is the best - for subpart in part.get_payload(): - _search_message_content(contents, subpart) - elif type in ('multipart/report', 'multipart/signed'): - # only the first part is candidate - try: - subpart=part.get_payload()[0] - except IndexError: - return - else: - _search_message_content(contents, subpart) - return - - elif type=='multipart/encrypted': - # the second part is the good one, but we need to de-crypt it - # using the first part. Do nothing - return - - else: - # unknown types must be handled as 'multipart/mixed' - # This is the peace of code that could probably be improved, - # I use a heuristic : if not already found, use first valid non - # 'attachment' parts found - for subpart in part.get_payload(): - tmp_contents=dict() - _search_message_content(tmp_contents, subpart) - for k, v in tmp_contents.items(): - if not subpart.get_param('attachment', None, 'content-disposition')=='': - # if not an attachment, initiate value if not already found - contents.setdefault(k, v) - return - else: - contents[part.get_content_type().lower()]=part - return - - return - -def search_message_content(mail): - """ - search of message content (text or HTML) inside - the structure of the mail. This function is used by L{get_mail_parts()} - to set the C{is_body} part of the L{MailPart}s - - @type mail: inherit from email.message.Message - @param mail: the message to search in. - @rtype: dict - @returns: a dictionary of the form C{{'text/plain': text_part, 'text/html': html_part}} - where text_part and html_part inherite from C{email.mime.text.MIMEText} - and are respectively the I{text} and I{HTML} version of the message content. - One part can be missing. The dictionay can aven be empty if none of the - parts math the requirements to be considered as the content. - """ - contents=dict() - _search_message_content(contents, mail) - return contents - -def get_mail_parts(msg): - """ - return a list of all parts of the message as a list of L{MailPart}. - Retrieve parts attributes to fill in L{MailPart} object. - - @type msg: inherit email.message.Message - @param msg: the message - @rtype: list - @returns: list of mail parts - - >>> import email.mime.multipart - >>> msg=email.mime.multipart.MIMEMultipart(boundary='===limit1==') - >>> import email.mime.text - >>> txt=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii') - >>> msg.attach(txt) - >>> import email.mime.image - >>> image=email.mime.image.MIMEImage('data', 'png') - >>> image.add_header('Content-Disposition', 'attachment', filename='image.png') - >>> msg.attach(image) - >>> print msg.as_string(unixfrom=False) - Content-Type: multipart/mixed; boundary="===limit1==" - MIME-Version: 1.0 - - --===limit1== - Content-Type: text/plain; charset="us-ascii" - MIME-Version: 1.0 - Content-Transfer-Encoding: 7bit - - The text. - --===limit1== - Content-Type: image/png - MIME-Version: 1.0 - Content-Transfer-Encoding: base64 - Content-Disposition: attachment; filename="image.png" - - ZGF0YQ== - --===limit1==-- - >>> parts=get_mail_parts(msg) - >>> parts - [MailPart<*text/plain charset=us-ascii len=9>, MailPart] - >>> # the star "*" means this is the mail content, not an attachment - >>> parts[0].get_payload().decode(parts[0].charset) - u'The text.' - >>> parts[1].filename, len(parts[1].get_payload()) - (u'image.png', 4) - - """ - mailparts=[] - - # retrieve messages of the email - contents=search_message_content(msg) - # reverse contents dict - parts=dict((v,k) for k, v in contents.items()) - - # organize the stack to handle deep first search - stack=[ msg, ] - while stack: - part=stack.pop(0) - type=part.get_content_type() - if type.startswith('message/'): - # ('message/delivery-status', 'message/rfc822', 'message/disposition-notification'): - # I don't want to explore the tree deeper her and just save source using msg.as_string() - # but I don't use msg.as_string() because I want to use mangle_from_=False - filename='message.eml' - mailparts.append(MailPart(part, filename=filename, type=type, charset=part.get_param('charset'), description=part.get('Content-Description'))) - elif part.is_multipart(): - # insert new parts at the beginning of the stack (deep first search) - stack[:0]=part.get_payload() - else: - charset=part.get_param('charset') - filename=get_filename(part) - - disposition=None - if part.get_param('inline', None, 'content-disposition')=='': - disposition='inline' - elif part.get_param('attachment', None, 'content-disposition')=='': - disposition='attachment' - - mailparts.append(MailPart(part, filename=filename, type=type, charset=charset, content_id=part.get('Content-Id'), description=part.get('Content-Description'), disposition=disposition, is_body=parts.get(part, False))) - - return mailparts - - -def decode_text(payload, charset, default_charset): - """ - Try to decode text content by trying multiple charset until success. - First try I{charset}, else try I{default_charset} finally - try popular charsets in order : ascii, utf-8, utf-16, windows-1252, cp850 - If all fail then use I{default_charset} and replace wrong characters - - @type payload: str - @param payload: the content to decode - @type charset: str or None - @param charset: the first charset to try if != C{None} - @type default_charset: str or None - @param default_charset: the second charset to try if != C{None} - - @rtype: tuple - @returns: a tuple of the form C{(payload, charset)} - - I{payload}: this is the decoded payload if charset is not None and - payload is a unicode string - - I{charset}: the charset that was used to decode I{payload} If charset is - C{None} then something goes wrong: if I{payload} is unicode then - invalid characters have been replaced and the used charset is I{default_charset} - else, if I{payload} is still byte string then nothing has been done. - - - """ - for chset in [ charset, default_charset, 'ascii', 'utf-8', 'utf-16', 'windows-1252', 'cp850' ]: - if chset: - try: - return payload.decode(chset), chset - except UnicodeError: - pass - - if default_charset: - return payload.decode(chset, 'replace'), None - - return payload, None - -class PyzMessage(email.message.Message): - """ - Inherit from email.message.Message. Combine L{get_mail_parts()}, - L{get_mail_addresses()} and L{decode_mail_header()} into a - B{convenient} object to access mail contents and attributes. - This class also B{sanitize} part filenames. - - @type mailparts: list of L{MailPart} - @ivar mailparts: list of L{MailPart} objects composing the email, I{text_part} - and I{html_part} are part of this list as are other attachements and embedded - contents. - @type text_part: L{MailPart} or None - @ivar text_part: the L{MailPart} object that contains the I{text} - version of the message, None if the mail has not I{text} content. - @type html_part: L{MailPart} or None - @ivar html_part: the L{MailPart} object that contains the I{HTML} - version of the message, None if the mail has not I{HTML} content. - - @note: Sample: - - >>> raw='''Content-Type: text/plain; charset="us-ascii" - ... MIME-Version: 1.0 - ... Content-Transfer-Encoding: 7bit - ... Subject: The subject - ... From: Me - ... To: A , B - ... - ... The text. - ... ''' - >>> msg=PyzMessage.factory(raw) - >>> print 'Subject: %r' % (msg.get_subject(), ) - Subject: u'The subject' - >>> print 'From: %r' % (msg.get_address('from'), ) - From: (u'Me', 'me@foo.com') - >>> print 'To: %r' % (msg.get_addresses('to'), ) - To: [(u'A', 'a@foo.com'), (u'B', 'b@foo.com')] - >>> print 'Cc: %r' % (msg.get_addresses('cc'), ) - Cc: [] - >>> for mailpart in msg.mailparts: - ... print ' %sfilename=%r sanitized_filename=%r type=%s charset=%s desc=%s size=%d' % ('*'if mailpart.is_body else ' ', mailpart.filename, mailpart.sanitized_filename, mailpart.type, mailpart.charset, mailpart.part.get('Content-Description'), 0 if mailpart.get_payload()==None else len(mailpart.get_payload())) - ... if mailpart.is_body=='text/plain': - ... payload, used_charset=decode_text(mailpart.get_payload(), mailpart.charset, None) - ... print ' >', payload.split('\\n')[0] - ... - *filename=None sanitized_filename='text.txt' type=text/plain charset=us-ascii desc=None size=10 - > The text. - """ - - @staticmethod - def smart_parser(input): - """ - Use the appropriate parser and return a email.message.Message object - (this is not a L{PyzMessage} object) - - @type input: string, file, bytes, binary_file or email.message.Message - @param input: the source of the message - @rtype: email.message.Message - @returns: the message - """ - if isinstance(input, email.message.Message): - return input - - if sys.version_info<(3, 0): - # python 2.x - if isinstance(input, str): - return email.message_from_string(input) - elif hasattr(input, 'read') and hasattr(input, 'readline'): - return email.message_from_file(input) - else: - raise ValueError('input must be a string, a file or a Message') - else: - # python 3.x - if isinstance(input, str): - return email.message_from_string(input) - elif isinstance(input, bytes): - # python >= 3.2 only - return email.message_from_bytes(input) - elif hasattr(input, 'read') and hasattr(input, 'readline'): - if hasattr(input, 'encoding'): - # python >= 3.2 only - return email.message_from_file(input) - else: - return email.message_from_binary_file(input) - else: - raise ValueError('input must be a string a bytes, a file or a Message') - - @staticmethod - def factory(input): - """ - Use the appropriate parser and return a L{PyzMessage} object - see L{smart_parser} - @type input: string, file, bytes, binary_file or email.message.Message - @param input: the source of the message - @rtype: L{PyzMessage} - @returns: the L{PyzMessage} message - """ - return PyzMessage(PyzMessage.smart_parser(input)) - - - def __init__(self, message): - """ - Initialize the object with data coming from I{message}. - - @type message: inherit email.message.Message - @param message: The message - """ - if not isinstance(message, email.message.Message): - raise ValueError("message must inherit from email.message.Message use PyzMessage.factory() instead") - self.__dict__.update(message.__dict__) - - self.mailparts=get_mail_parts(self) - self.text_part=None - self.html_part=None - - filenames=[] - for part in self.mailparts: - ext=mimetypes.guess_extension(part.type) - if not ext: - # default to .bin - ext='.bin' - elif ext=='.ksh': - # guess_extension() is not very accurate, .txt is more - # appropriate than .ksh - ext='.txt' - - sanitized_filename=sanitize_filename(part.filename, part.type.split('/', 1)[0], ext) - sanitized_filename=handle_filename_collision(sanitized_filename, filenames) - filenames.append(sanitized_filename.lower()) - part.sanitized_filename=sanitized_filename - - if part.is_body=='text/plain': - self.text_part=part - - if part.is_body=='text/html': - self.html_part=part - - def get_addresses(self, name): - """ - return the I{name} header value as an list of addresses tuple as - returned by L{get_mail_addresses()} - - @type name: str - @param name: the name of the header to read value from: 'to', 'cc' are - valid I{name} here. - @rtype: tuple - @returns: a tuple of the form C{('Sender Name', 'sender.address@domain.com')} - or C{('', '')} if no header match that I{name}. - """ - return get_mail_addresses(self, name) - - def get_address(self, name): - """ - return the I{name} header value as an address tuple as returned by - L{get_mail_addresses()} - - @type name: str - @param name: the name of the header to read value from: : C{'from'} can - be used to return the sender address. - @rtype: list of tuple - @returns: a list of tuple of the form C{[('Recipient Name', 'recipient.address@domain.com'), ...]} - or an empty list if no header match that I{name}. - """ - value=get_mail_addresses(self, name) - if value: - return value[0] - else: - return ('', '') - - def get_subject(self, default=''): - """ - return the RFC2047 decoded subject. - - @type default: any - @param default: The value to return if the message has no I{Subject} - @rtype: unicode - @returns: the subject or C{default} - """ - return self.get_decoded_header('subject', default) - - def get_decoded_header(self, name, default=''): - """ - return decoded header I{name} using RFC2047. Always use this function - to access header, because any header can contain invalid characters - and this function sanitize the string and avoid unicode exception later - in your program. - EVEN for date, I already saw a "Center box bar horizontal" instead - of a minus character. - - @type name: str - @param name: the name of the header to read value from. - @type default: any - @param default: The value to return if the I{name} field don't exist - in this message. - @rtype: unicode - @returns: the value of the header having that I{name} or C{default} if no - header have that name. - """ - value=self.get(name) - if value==None: - value=default - else: - value=decode_mail_header(value) - return value - -class PzMessage(PyzMessage): - """ - Old name and interface for PyzMessage. - B{Deprecated} - """ - - def __init__(self, input): - """ - Initialize the object with data coming from I{input}. - - @type input: str or file or email.message.Message - @param input: used as the raw content for the email, can be a string, - a file object or an email.message.Message object. - """ - PyzMessage.__init__(self, self.smart_parser(input)) - - -def message_from_string(s, *args, **kws): - """ - Parse a string into a L{PyzMessage} object model. - @type s: str - @param s: the input string - @rtype: L{PyzMessage} - @return: the L{PyzMessage} object - """ - return PyzMessage(email.message_from_string(s, *args, **kws)) - -def message_from_file(fp, *args, **kws): - """ - Read a file and parse its contents into a L{PyzMessage} object model. - @type fp: text_file - @param fp: the input file (must be open in text mode if Python >= 3.0) - @rtype: L{PyzMessage} - @return: the L{PyzMessage} object - """ - return PyzMessage(email.message_from_file(fp, *args, **kws)) - -def message_from_bytes(s, *args, **kws): - """ - Parse a bytes string into a L{PyzMessage} object model. - B{(Python >= 3.2)} - @type s: bytes - @param s: the input bytes string - @rtype: L{PyzMessage} - @return: the L{PyzMessage} object - """ - return PyzMessage(email.message_from_bytes(s, *args, **kws)) - -def message_from_binary_file(fp, *args, **kws): - """ - Read a binary file and parse its contents into a L{PyzMessage} object model. - B{(Python >= 3.2)} - @type fp: binary_file - @param fp: the input file, must be open in binary mode - @rtype: L{PyzMessage} - @return: the L{PyzMessage} object - """ - return PyzMessage(email.message_from_binary_file(fp, *args, **kws)) - - -if __name__ == "__main__": - import sys - - if len(sys.argv)<=1: - print('usage : %s filename' % sys.argv[0]) - print('read an email from file and display a resume of its content') - sys.exit(1) - - msg=PyzMessage.factory(open(sys.argv[1], 'rb')) - - print('Subject: %r' % (msg.get_subject(), )) - print('From: %r' % (msg.get_address('from'), )) - print('To: %r' % (msg.get_addresses('to'), )) - print('Cc: %r' % (msg.get_addresses('cc'), )) - print('Date: %r' % (msg.get_decoded_header('date', ''), )) - print('Message-Id: %r' % (msg.get_decoded_header('message-id', ''), )) - - for mailpart in msg.mailparts: - # dont forget to be careful to sanitize 'filename' and be carefull - # for filename collision, to before to save : - print(' %sfilename=%r type=%s charset=%s desc=%s size=%d' % ('*'if mailpart.is_body else ' ', mailpart.filename, mailpart.type, mailpart.charset, mailpart.part.get('Content-Description'), 0 if mailpart.get_payload()==None else len(mailpart.get_payload()))) - - if mailpart.is_body=='text/plain': - # print first 3 lines - payload, used_charset=decode_text(mailpart.get_payload(), mailpart.charset, None) - for line in payload.split('\n')[:3]: - # be careful console can be unable to display unicode characters - if line: - print(' >', line) - - - diff --git a/pyzmail/tests/__init__.py b/pyzmail/tests/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pyzmail/tests/test_both.py b/pyzmail/tests/test_both.py deleted file mode 100644 index 2607ed8d7fd..00000000000 --- a/pyzmail/tests/test_both.py +++ /dev/null @@ -1,99 +0,0 @@ -import unittest -import pyzmail -from pyzmail.generate import * -from pyzmail.parse import * - -class TestBoth(unittest.TestCase): - - def setUp(self): - pass - - def test_compose_and_parse(self): - """test generate and parse""" - - sender=('Me', 'me@foo.com') - recipients=[('Him', 'him@bar.com'), 'just@me.com'] - subject='Le sujet en Fran\xe7ais' - text_content='Bonjour aux Fran\xe7ais' - prefered_encoding='iso-8859-1' - text_encoding='iso-8859-1' - attachments=[('attached content', 'text', 'plain', 'textfile1.txt', 'us-ascii'), - ('Fran\xe7ais', 'text', 'plain', 'textfile2.txt', 'iso-8859-1'), - ('Fran\xe7ais', 'text', 'plain', 'textfile3.txt', 'iso-8859-1'), - (b'image', 'image', 'jpg', 'imagefile.jpg', None), - ] - embeddeds=[('embedded content', 'text', 'plain', 'embedded', 'us-ascii'), - (b'picture', 'image', 'png', 'picture', None), - ] - headers=[ ('X-extra', 'extra value'), ('X-extra2', "Seconde ent\xe8te"), ('X-extra3', 'last extra'),] - - message_id_string='pyzmail' - date=1313558269 - - payload, mail_from, rcpt_to, msg_id=pyzmail.compose_mail(\ - sender, \ - recipients, \ - subject, \ - prefered_encoding, \ - (text_content, text_encoding), \ - html=None, \ - attachments=attachments, \ - embeddeds=embeddeds, \ - headers=headers, \ - message_id_string=message_id_string, \ - date=date\ - ) - - msg=PyzMessage.factory(payload) - - self.assertEqual(sender, msg.get_address('from')) - self.assertEqual(recipients[0], msg.get_addresses('to')[0]) - self.assertEqual(recipients[1], msg.get_addresses('to')[1][1]) - self.assertEqual(subject, msg.get_subject()) - self.assertEqual(subject, msg.get_decoded_header('subject')) - - # try to handle different timezone carefully - mail_date=list(email.utils.parsedate(msg.get_decoded_header('date'))) - self.assertEqual(mail_date[:6], list(time.localtime(date))[:6]) - - self.assertNotEqual(msg.get('message-id').find(message_id_string), -1) - for name, value in headers: - self.assertEqual(value, msg.get_decoded_header(name)) - - for mailpart in msg.mailparts: - if mailpart.is_body: - self.assertEqual(mailpart.content_id, None) - self.assertEqual(mailpart.filename, None) - self.assertEqual(type(mailpart.sanitized_filename), str) - if mailpart.type=='text/plain': - self.assertEqual(mailpart.get_payload(), text_content.encode(text_encoding)) - else: - self.fail('found unknown body part') - else: - if mailpart.filename: - lst=attachments - self.assertEqual(mailpart.filename, mailpart.sanitized_filename) - self.assertEqual(mailpart.content_id, None) - elif mailpart.content_id: - lst=embeddeds - self.assertEqual(mailpart.filename, None) - else: - self.fail('found unknown part') - - found=False - for attach in lst: - found=(mailpart.filename and attach[3]==mailpart.filename) \ - or (mailpart.content_id and attach[3]==mailpart.content_id) - if found: - break - - if found: - self.assertEqual(mailpart.type, attach[1]+'/'+attach[2]) - payload=mailpart.get_payload() - if attach[1]=='text' and attach[4] and isinstance(attach[0], str): - payload=payload.decode(attach[4]) - self.assertEqual(payload, attach[0]) - else: - self.fail('found unknown attachment') - - diff --git a/pyzmail/tests/test_generate.py b/pyzmail/tests/test_generate.py deleted file mode 100644 index 7afdebc5931..00000000000 --- a/pyzmail/tests/test_generate.py +++ /dev/null @@ -1,30 +0,0 @@ -import unittest, doctest -import pyzmail -from pyzmail.generate import * - -class TestGenerate(unittest.TestCase): - - def setUp(self): - pass - - def test_format_addresses(self): - """test format_addresse""" - self.assertEqual('foo@example.com', str(format_addresses([ 'foo@example.com', ]))) - self.assertEqual('Foo ', str(format_addresses([ ('Foo', 'foo@example.com'), ]))) - # notice the space around the comma - self.assertEqual('foo@example.com , bar@example.com', str(format_addresses([ 'foo@example.com', 'bar@example.com']))) - # notice the space around the comma - self.assertEqual('Foo , Bar ', str(format_addresses([ ('Foo', 'foo@example.com'), ( 'Bar', 'bar@example.com')]))) - -# Add doctest -def load_tests(loader, tests, ignore): - # this works with python 2.7 and 3.x - tests.addTests(doctest.DocTestSuite(pyzmail.generate)) - return tests - -def additional_tests(): - # Add doctest for python 2.6 and below - if sys.version_info<(2, 7): - return doctest.DocTestSuite(pyzmail.generate) - else: - return unittest.TestSuite() diff --git a/pyzmail/tests/test_parse.py b/pyzmail/tests/test_parse.py deleted file mode 100644 index f7a5adb9e2d..00000000000 --- a/pyzmail/tests/test_parse.py +++ /dev/null @@ -1,290 +0,0 @@ -import unittest, doctest -import pyzmail -from pyzmail.parse import * - - -class Msg: - """mimic a email.Message""" - def __init__(self, value): - self.value=value - - def get_all(self, header_name, default): - if self.value: - return [self.value, ] - else: - return [] - -class TestParse(unittest.TestCase): - - def setUp(self): - pass - - def test_decode_mail_header(self): - """test decode_mail_header()""" - self.assertEqual(decode_mail_header(''), '') - self.assertEqual(decode_mail_header('hello'), 'hello') - self.assertEqual(decode_mail_header('hello '), 'hello ') - self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_Fran=E7ais?='), 'Courrier \xe8lectronique Fran\xe7ais') - self.assertEqual(decode_mail_header('=?utf8?q?Courrier_=C3=A8lectronique_Fran=C3=A7ais?='), 'Courrier \xe8lectronique Fran\xe7ais') - self.assertEqual(decode_mail_header('=?utf-8?b?RnJhbsOnYWlz?='), 'Fran\xe7ais') - self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_?= =?utf8?q?Fran=C3=A7ais?='), 'Courrier \xe8lectronique Fran\xe7ais') - self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_?= =?utf-8?b?RnJhbsOnYWlz?='), 'Courrier \xe8lectronique Fran\xe7ais') - self.assertEqual(decode_mail_header('h_subject_q_iso_8858_1 : =?ISO-8859-1?Q?Fran=E7ais=E20accentu=E9?= !'), 'h_subject_q_iso_8858_1 :Fran\xe7ais\xe20accentu\xe9!') - - def test_get_mail_addresses(self): - """test get_mail_addresses()""" - self.assertEqual([ ('foo@example.com', 'foo@example.com') ], get_mail_addresses(Msg('foo@example.com'), 'to')) - self.assertEqual([ ('Foo', 'foo@example.com'), ], get_mail_addresses(Msg('Foo '), 'to')) - # notice the space around the comma - self.assertEqual([ ('foo@example.com', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('foo@example.com , bar@example.com'), 'to')) - self.assertEqual([ ('Foo', 'foo@example.com'), ( 'Bar', 'bar@example.com')], get_mail_addresses(Msg('Foo , Bar '), 'to')) - self.assertEqual([ ('Foo', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('Foo , bar@example.com'), 'to')) - self.assertEqual([ ('Mr Foo', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('Mr\nFoo , bar@example.com'), 'to')) - - self.assertEqual([ ('Beno\xeet', 'benoit@example.com')], get_mail_addresses(Msg('=?utf-8?q?Beno=C3=AEt?= '), 'to')) - - # address already encoded into utf8 (bad) - address='Ant\xf3nio Foo '.encode('utf8') - if sys.version_info<(3, 0): - self.assertEqual([('Ant\ufffd\ufffdnio Foo', 'a.foo@example.com')], get_mail_addresses(Msg(address), 'to')) - else: - # Python 3.2 return header when surrogate characters are used in header - self.assertEqual([('Ant??nio Foo', 'a.foo@example.com'), ], get_mail_addresses(Msg(email.header.Header(address, charset=email.charset.UNKNOWN8BIT, header_name='to')), 'to')) - - def test_get_filename(self): - """test get_filename()""" - import email.mime.image - - filename='Fran\xe7ais.png' - if sys.version_info<(3, 0): - encoded_filename=filename.encode('iso-8859-1') - else: - encoded_filename=filename - - payload=b'data' - attach=email.mime.image.MIMEImage(payload, 'png') - attach.add_header('Content-Disposition', 'attachment', filename='image.png') - self.assertEqual('image.png', get_filename(attach)) - - attach=email.mime.image.MIMEImage(payload, 'png') - attach.add_header('Content-Disposition', 'attachment', filename=('iso-8859-1', 'fr', encoded_filename)) - self.assertEqual('Fran\xe7ais.png', get_filename(attach)) - - attach=email.mime.image.MIMEImage(payload, 'png') - attach.set_param('name', 'image.png') - self.assertEqual('image.png', get_filename(attach)) - - attach=email.mime.image.MIMEImage(payload, 'png') - attach.set_param('name', ('iso-8859-1', 'fr', encoded_filename)) - self.assertEqual('Fran\xe7ais.png', get_filename(attach)) - - attach=email.mime.image.MIMEImage(payload, 'png') - attach.add_header('Content-Disposition', 'attachment', filename='image.png') - attach.set_param('name', 'image_wrong.png') - self.assertEqual('image.png', get_filename(attach)) - - def test_get_mailparts(self): - """test get_mailparts()""" - import email.mime.multipart - import email.mime.text - import email.mime.image - msg=email.mime.multipart.MIMEMultipart(boundary='===limit1==') - txt=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii') - msg.attach(txt) - image=email.mime.image.MIMEImage(b'data', 'png') - image.add_header('Content-Disposition', 'attachment', filename='image.png') - image.add_header('Content-Description', 'the description') - image.add_header('Content-ID', '') - msg.attach(image) - - raw=msg.as_string(unixfrom=False) - expected_raw="""Content-Type: multipart/mixed; boundary="===limit1==" -MIME-Version: 1.0 - ---===limit1== -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit - -The text. ---===limit1== -Content-Type: image/png -MIME-Version: 1.0 -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; filename="image.png" -Content-Description: the description -Content-ID: - -ZGF0YQ== ---===limit1==--""" - - if sys.version_info<(3, 0): - expected_raw=expected_raw.replace('','') - else: - expected_raw=expected_raw.replace('','\n') - - self.assertEqual(raw, expected_raw) - - parts=get_mail_parts(msg) - # [MailPart<*text/plain charset=us-ascii len=9>, MailPart] - - self.assertEqual(len(parts), 2) - - self.assertEqual(parts[0].type, 'text/plain') - self.assertEqual(parts[0].is_body, 'text/plain') # not a error, is_body must be type - self.assertEqual(parts[0].charset, 'us-ascii') - self.assertEqual(parts[0].get_payload().decode(parts[0].charset), 'The text.') - - self.assertEqual(parts[1].type, 'image/png') - self.assertEqual(parts[1].is_body, False) - self.assertEqual(parts[1].charset, None) - self.assertEqual(parts[1].filename, 'image.png') - self.assertEqual(parts[1].description, 'the description') - self.assertEqual(parts[1].content_id, 'this.is.the.normaly.unique.contentid') - self.assertEqual(parts[1].get_payload(), b'data') - - - raw_1='''Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: simple test -From: Me -To: A , B -Cc: C , d@foo.com -User-Agent: pyzmail - -The text. -''' - - def check_message_1(self, msg): - self.assertEqual(msg.get_subject(), 'simple test') - self.assertEqual(msg.get_decoded_header('subject'), 'simple test') - self.assertEqual(msg.get_decoded_header('User-Agent'), 'pyzmail') - self.assertEqual(msg.get('User-Agent'), 'pyzmail') - self.assertEqual(msg.get_address('from'), ('Me', 'me@foo.com')) - self.assertEqual(msg.get_addresses('to'), [('A', 'a@foo.com'), ('B', 'b@foo.com')]) - self.assertEqual(msg.get_addresses('cc'), [('C', 'c@foo.com'), ('d@foo.com', 'd@foo.com')]) - self.assertEqual(len(msg.mailparts), 1) - self.assertEqual(msg.text_part, msg.mailparts[0]) - self.assertEqual(msg.html_part, None) - - # use 8bits encoding and 2 different charsets ! python 3.0 & 3.1 are not eable to parse this sample - raw_2=b"""From: sender@domain.com -To: recipient@domain.com -Date: Tue, 7 Jun 2011 16:32:17 +0200 -Subject: contains 8bits attachments using different encoding -Content-Type: multipart/mixed; boundary=mixed - ---mixed -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit - -body ---mixed -Content-Type: text/plain; charset="windows-1252" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="file1.txt" - -bo\xeete mail = mailbox ---mixed -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="file2.txt" - -bo\xc3\xaete mail = mailbox ---mixed-- -""" - - def check_message_2(self, msg): - self.assertEqual(msg.get_subject(), 'contains 8bits attachments using different encoding') - - body, file1, file2=msg.mailparts - - self.assertEqual('file1.txt', file1.filename) - self.assertEqual('file2.txt', file2.filename) - self.assertEqual('windows-1252', file1.charset) - self.assertEqual('utf-8', file2.charset) - content=b'bo\xeete mail = mailbox'.decode("windows-1252") - content1=file1.get_payload().decode(file1.charset) - content2=file2.get_payload().decode(file2.charset) - self.assertEqual(content, content1) - self.assertEqual(content, content2) - - # this one contain non us-ascii chars in the header - # py 2x and py3k return different value here - raw_3=b'Content-Type: text/plain; charset="us-ascii"\n' \ - b'MIME-Version: 1.0\n' \ - b'Content-Transfer-Encoding: 7bit\n' \ - + 'Subject: Beno\xeet & Ant\xf3nio\n'.encode('utf8') +\ - b'From: =?utf-8?q?Beno=C3=AEt?= \n' \ - + 'To: Ant\xf3nio Foo \n'.encode('utf8') \ - + 'Cc: Beno\xeet , d@foo.com\n'.encode('utf8') +\ - b'User-Agent: pyzmail\n' \ - b'\n' \ - b'The text.\n' - - def check_message_3(self, msg): - subject='Beno\ufffd\ufffdt & Ant\ufffd\ufffdnio' # if sys.version_info<(3, 0) else u'Beno??t & Ant??nio' - self.assertEqual(msg.get_subject(), subject) - self.assertEqual(msg.get_decoded_header('subject'), subject) - self.assertEqual(msg.get_decoded_header('User-Agent'), 'pyzmail') - self.assertEqual(msg.get('User-Agent'), 'pyzmail') - self.assertEqual(msg.get_address('from'), ('Beno\xeet', 'benoit@example.com')) - - to=msg.get_addresses('to') - self.assertEqual(to[0][1], 'a.foo@example.com') - self.assertEqual(to[0][0], 'Ant\ufffd\ufffdnio Foo' if sys.version_info<(3, 0) else 'Ant??nio Foo') - - cc=msg.get_addresses('cc') - self.assertEqual(cc[0][1], 'benoit@foo.com') - self.assertEqual(cc[0][0], 'Beno\ufffd\ufffdt' if sys.version_info<(3, 0) else 'Beno??t') - self.assertEqual(cc[1], ('d@foo.com', 'd@foo.com')) - - self.assertEqual(len(msg.mailparts), 1) - self.assertEqual(msg.text_part, msg.mailparts[0]) - self.assertEqual(msg.html_part, None) - - - def check_pyzmessage_factories(self, input, check): - """test PyzMessage from different sources""" - if isinstance(input, bytes) and sys.version_info>=(3, 2): - check(PyzMessage.factory(input)) - check(message_from_bytes(input)) - - import io - check(PyzMessage.factory(io.BytesIO(input))) - check(message_from_binary_file(io.BytesIO(input))) - - if isinstance(input, str): - - check(PyzMessage.factory(input)) - check(message_from_string(input)) - - import io - check(PyzMessage.factory(io.StringIO(input))) - check(message_from_file(io.StringIO(input))) - - def test_pyzmessage_factories(self): - """test PyzMessage class different sources""" - self.check_pyzmessage_factories(self.raw_1, self.check_message_1) - self.check_pyzmessage_factories(self.raw_2, self.check_message_2) - self.check_pyzmessage_factories(self.raw_3, self.check_message_3) - - -# Add doctest -def load_tests(loader, tests, ignore): - # this works with python 2.7 and 3.x - if sys.version_info<(3, 0): - tests.addTests(doctest.DocTestSuite(pyzmail.parse)) - return tests - -def additional_tests(): - # Add doctest for python 2.6 and below - if sys.version_info<(2, 7): - return doctest.DocTestSuite(pyzmail.parse) - else: - return unittest.TestSuite() - diff --git a/pyzmail/tests/test_send.py b/pyzmail/tests/test_send.py deleted file mode 100644 index 554f8549a4d..00000000000 --- a/pyzmail/tests/test_send.py +++ /dev/null @@ -1,77 +0,0 @@ -import threading, smtpd, asyncore, socket, smtplib, time -import unittest -import pyzmail -from pyzmail.generate import * - - -smtpd_addr='127.0.0.1' -smtpd_port=32525 -smtp_bad_port=smtpd_port-1 - -smtp_mode='normal' -smtp_login=None -smtp_password=None - - -class SMTPServer(smtpd.SMTPServer): - def __init__(self, localaddr, remoteaddr, received): - smtpd.SMTPServer.__init__(self, localaddr, remoteaddr) - self.set_reuse_addr() - # put the received mail into received list - self.received=received - - def process_message(self, peer, mail_from, rcpt_to, data): - ret=None - if mail_from.startswith('data_error'): - ret='552 Requested mail action aborted: exceeded storage allocation' - self.received.append((ret, peer, mail_from, rcpt_to, data)) - return ret - -class TestSend(unittest.TestCase): - - def setUp(self): - self.received=[] - self.smtp_server=SMTPServer((smtpd_addr, smtpd_port), None, self.received) - - def asyncloop(): - # check every sec if all channel are close - asyncore.loop(1) - - - self.payload, self.mail_from, self.rcpt_to, self.msg_id=compose_mail(('Me', 'me@foo.com'), [('Him', 'him@bar.com')], 'the subject', 'iso-8859-1', ('Hello world', 'us-ascii')) - - # start the server after having built the payload, to handle failure in - # the code above - self.smtpd_thread=threading.Thread(target=asyncloop) - self.smtpd_thread.daemon=True - self.smtpd_thread.start() - - - def tearDown(self): - self.smtp_server.close() - self.smtpd_thread.join() - - def test_simple_send(self): - """simple send""" - ret=send_mail(self.payload, self.mail_from, self.rcpt_to, smtpd_addr, smtpd_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password) - self.assertEqual(ret, dict()) - (ret, peer, mail_from, rcpt_to, payload)=self.received[0] - self.assertEqual(self.payload, payload) - self.assertEqual(self.mail_from, mail_from) - self.assertEqual(self.rcpt_to, rcpt_to) - self.assertEqual('127.0.0.1', peer[0]) - - def test_send_to_a_wrong_port(self): - """send to a wrong port""" - self.smtp_server.close() - ret=send_mail(self.payload, self.mail_from, self.rcpt_to, smtpd_addr, smtpd_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password) - self.assertEqual(type(ret), str) - - def test_send_data_error(self): - """smtp server return error code""" - ret=send_mail(self.payload, 'data_error@foo.com', self.rcpt_to, smtpd_addr, smtp_bad_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password) - self.assertEqual(type(ret), str) - -if __name__ == '__main__': - unittest.main() - diff --git a/pyzmail/tests/test_utils.py b/pyzmail/tests/test_utils.py deleted file mode 100644 index e03d07d0d91..00000000000 --- a/pyzmail/tests/test_utils.py +++ /dev/null @@ -1,24 +0,0 @@ -import unittest, doctest -import pyzmail -from pyzmail.utils import * - -class TestUtils(unittest.TestCase): - - def setUp(self): - pass - - def test_nothing(self): - pass - -# Add doctest -def load_tests(loader, tests, ignore): - # this works with python 2.7 and 3.x - tests.addTests(doctest.DocTestSuite(pyzmail.utils)) - return tests - -def additional_tests(): - # Add doctest for python 2.6 and below - if sys.version_info<(2, 7): - return doctest.DocTestSuite(pyzmail.utils) - else: - return unittest.TestSuite() diff --git a/pyzmail/utils.py b/pyzmail/utils.py deleted file mode 100644 index 436e2a4c34f..00000000000 --- a/pyzmail/utils.py +++ /dev/null @@ -1,155 +0,0 @@ -# -# pyzmail/utils.py -# (c) Alain Spineux -# http://www.magiksys.net/pyzmail -# Released under LGPL - -""" -Various functions used by other modules -@var invalid_chars_in_filename: a mix of characters not permitted in most used filesystems -@var invalid_windows_name: a list of unauthorized filenames under Windows -""" - -import sys - -invalid_chars_in_filename=b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f' \ - b'\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f' \ - b'<>:"/\\|?*%\'' - -invalid_windows_name=[b'CON', b'PRN', b'AUX', b'NUL', b'COM1', b'COM2', b'COM3', - b'COM4', b'COM5', b'COM6', b'COM7', b'COM8', b'COM9', - b'LPT1', b'LPT2', b'LPT3', b'LPT4', b'LPT5', b'LPT6', b'LPT7', - b'LPT8', b'LPT9' ] - -def sanitize_filename(filename, alt_name, alt_ext): - """ - Convert the given filename into a name that should work on all - platform. Remove non us-ascii characters, and drop invalid filename. - Use the I{alternative} filename if needed. - - @type filename: unicode or None - @param filename: the originale filename or None. Can be unicode. - @type alt_name: str - @param alt_name: the alternative filename if filename is None or useless - @type alt_ext: str - @param alt_ext: the alternative filename extension (including the '.') - - @rtype: str - @returns: a valid filename. - - >>> sanitize_filename('document.txt', 'file', '.txt') - 'document.txt' - >>> sanitize_filename('number1.txt', 'file', '.txt') - 'number1.txt' - >>> sanitize_filename(None, 'file', '.txt') - 'file.txt' - >>> sanitize_filename(u'R\\xe9pertoir.txt', 'file', '.txt') - 'Rpertoir.txt' - >>> # the '\\xe9' has been removed - >>> sanitize_filename(u'\\xe9\\xe6.html', 'file', '.txt') - 'file.html' - >>> # all non us-ascii characters have been removed, the alternative name - >>> # has been used the replace empty string. The originale extention - >>> # is still valid - >>> sanitize_filename(u'COM1.txt', 'file', '.txt') - 'COM1A.txt' - >>> # if name match an invalid name or assimilated then a A is added - """ - - if not filename: - return alt_name+alt_ext - - if ((sys.version_info<(3, 0) and isinstance(filename, str)) or \ - (sys.version_info>=(3, 0) and isinstance(filename, str))): - filename=filename.encode('ascii', 'ignore') - - filename=filename.translate(None, invalid_chars_in_filename) - filename=filename.strip() - - upper=filename.upper() - for name in invalid_windows_name: - if upper==name: - filename=filename+b'A' - break - if upper.startswith(name+b'.'): - filename=filename[:len(name)]+b'A'+filename[len(name):] - break - - if sys.version_info>=(3, 0): - # back to string - filename=filename.decode('us-ascii') - - if filename.rfind('.')==0: - filename=alt_name+filename - - return filename - -def handle_filename_collision(filename, filenames): - """ - Avoid filename collision, add a sequence number to the name when required. - 'file.txt' will be renamed into 'file-01.txt' then 'file-02.txt' ... - until their is no more collision. The file is not added to the list. - - Windows don't make the difference between lower and upper case. To avoid - "case" collision, the function compare C{filename.lower()} to the list. - If you provide a list in lower case only, then any collisions will be avoided. - - @type filename: str - @param filename: the filename - @type filenames: list or set - @param filenames: a list of filenames. - - @rtype: str - @returns: the I{filename} or the appropriately I{indexed} I{filename} - - >>> handle_filename_collision('file.txt', [ ]) - 'file.txt' - >>> handle_filename_collision('file.txt', [ 'file.txt' ]) - 'file-01.txt' - >>> handle_filename_collision('file.txt', [ 'file.txt', 'file-01.txt',]) - 'file-02.txt' - >>> handle_filename_collision('foo', [ 'foo',]) - 'foo-01' - >>> handle_filename_collision('foo', [ 'foo', 'foo-01',]) - 'foo-02' - >>> handle_filename_collision('FOO', [ 'foo', 'foo-01',]) - 'FOO-02' - """ - if filename.lower() in filenames: - try: - basename, ext=filename.rsplit('.', 1) - ext='.'+ext - except ValueError: - basename, ext=filename, '' - - i=1 - while True: - filename='%s-%02d%s' % (basename, i, ext) - if filename.lower() not in filenames: - break - i+=1 - - return filename - -def is_usascii(value): - """" - test if string contains us-ascii characters only - - >>> is_usascii('foo') - True - >>> is_usascii(u'foo') - True - >>> is_usascii(u'Fran\xe7ais') - False - >>> is_usascii('bad\x81') - False - """ - try: - # if value is byte string, it will be decoded first using us-ascii - # and will generate UnicodeEncodeError, this is fine too - value.encode('us-ascii') - except UnicodeError: - return False - - return True - \ No newline at end of file diff --git a/pyzmail/version.py b/pyzmail/version.py deleted file mode 100644 index 03e1b0c6dcc..00000000000 --- a/pyzmail/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__='1.0.3' diff --git a/requirements.txt b/requirements.txt index 44dcb66a748..02a4cf5fd02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,69 +1,91 @@ # -*- conf-mode -*- -setuptools>=51.1.0 # Require this first, to prevent later errors +setuptools>=80.9.0 # Require this first, to prevent later errors # -argon2-cffi>=21.3.0 # For the Argon2 password hasher option -beautifulsoup4>=4.11.1 # Only used in tests -bibtexparser>=1.2.0 # Only used in tests -bleach>=6 -celery>=5.2.6 -coverage>=4.5.4,<5.0 # Coverage 5.x moves from a json database to SQLite. Moving to 5.x will require substantial rewrites in ietf.utils.test_runner and ietf.release.views -decorator>=5.1.1 +aiosmtpd>=1.4.6 +argon2-cffi>=25.1.0 # For the Argon2 password hasher option +beautifulsoup4>=4.13.4 # Only used in tests +bibtexparser>=1.4.3 # Only used in tests +bleach>=6.2.0 # project is deprecated but supported +types-bleach>=6.2.0 +boto3>=1.39.15 +boto3-stubs[s3]>=1.39.15 +botocore>=1.39.15 +celery>=5.5.3 +coverage>=7.9.2 defusedxml>=0.7.1 # for TastyPie when using xml; not a declared dependency -Django>=2.2.28,<3.0 -django-analytical>=3.1.0 -django-bootstrap5>=21.3 -django-celery-beat>=2.3.0 -django-csp>=3.7 -django-cors-headers>=3.11.0 -django-debug-toolbar>=3.2.4 -django-form-utils>=1.0.3 # Only one use, in the liaisons app. Last release was in 2015. -django-markup>=1.5 # Limited use - need to reconcile against direct use of markdown -django-oidc-provider>=0.7,<0.8 # 0.8 dropped Django 2 support -django-password-strength>=1.2.1 -django-referrer-policy>=1.0 -django-simple-history>=3.0.0 -django-stubs==1.6.0 # The django-stubs version used determines the the mypy version indicated below -django-tastypie==0.14.3 # Version must be locked in sync with version of Django -django-vite>=2.0.2 -django-webtest>=1.9.10 # Only used in tests +Django>4.2,<5 +django-admin-rangefilter>=0.13.3 +django-analytical>=3.2.0 +django-bootstrap5>=25.1 +django-celery-beat>=2.7.0,<2.8.0 # pin until https://github.com/celery/django-celery-beat/issues/875 is resolved, then revisit +django-celery-results>=2.6.0 +django-cors-headers>=4.7.0 +django-debug-toolbar>=6.0.0 +django-markup>=1.10 # Limited use - need to reconcile against direct use of markdown +django-oidc-provider==0.8.2 # 0.8.3 changes logout flow and claim return +django-simple-history>=3.10.1 +django-storages>=1.14.6 +django-stubs>=4.2.7,<5 # The django-stubs version used determines the the mypy version indicated below +django-tastypie>=0.15.1 # Version must be kept in sync with Django +django-vite>=3.1.0 django-widget-tweaks>=1.4.12 -djlint>=1.0.0 # To auto-indent templates via "djlint --profile django --reformat" -docutils>=0.18.1 # Used only by dbtemplates for RestructuredText -factory-boy>=3.2.1 -github3.py>=3.2.0 -gunicorn>=20.1.0 +djangorestframework>=3.16.0 +docutils>=0.22.0 # Used only by dbtemplates for RestructuredText +types-docutils>=0.21.0 # should match docutils (0.22.0 not out yet) +drf-spectacular>=0.27 +drf-standardized-errors[openapi] >= 0.15.0 +factory-boy>=3.3.3 +gunicorn>=23.0.0 hashids>=1.3.1 -html2text>=2020.1.16 # Used only to clean comment field of secr/sreq +html2text>=2025.4.15 # Used only to clean comment field of secr/sreq html5lib>=1.1 # Only used in tests -inflect>= 6.0.2 -jsonfield>=3.1.0 # for SubmissionCheck. This is https://github.com/bradjasper/django-jsonfield/. -jwcrypto>=1.2 # for signed notifications - this is aspirational, and is not really used. -logging_tree>=1.9 # Used only by the showloggers management command -lxml>=4.8.0,<5 -markdown>=3.3.6 -mock>=4.0.3 # Used only by tests, of course -mypy>=0.782,<0.790 # Version requirements determined by django-stubs. -oic>=1.3 # Used only by tests -Pillow>=9.1.0 -psycopg2<2.9 -pyang>=2.5.3 -pyflakes>=2.4.0 -pyopenssl>=22.0.0 # Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency -pyquery>=1.4.3 -python-dateutil>=2.8.2 +icalendar>=5.0.0 +inflect>= 7.5.0 +jsonfield>=3.2.0 # deprecated - need to replace with Django's JSONField +jsonschema[format]>=4.25.0 +jwcrypto>=1.5.6 # for signed notifications - this is aspirational, and is not really used. +logging_tree>=1.10 # Used only by the showloggers management command +lxml>=6.0.0 +markdown>=3.8.0 +types-markdown>=3.8.0 +mock>=5.2.0 # should replace with unittest.mock and remove dependency +types-mock>=5.2.0 +mypy~=1.7.0 # Version requirements determined by django-stubs. +oic>=1.7.0 # Used only by tests +opentelemetry-sdk>=1.38.0 +opentelemetry-instrumentation-django>=0.59b0 +opentelemetry-instrumentation-psycopg2>=0.59b0 +opentelemetry-instrumentation-pymemcache>=0.59b0 +opentelemetry-instrumentation-requests>=0.59b0 +opentelemetry-exporter-otlp-proto-http>=1.38.0 +pillow>=11.3.0 +psycopg2>=2.9.10 +pyang>=2.6.1 +pydyf>=0.11.0 +pyflakes>=3.4.0 +pyopenssl>=25.1.0 # Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency +pyquery>=2.0.1 +python-dateutil>=2.9.0 +types-python-dateutil>=2.9.0 +python-json-logger>=3.3.0 python-magic==0.4.18 # Versions beyond the yanked .19 and .20 introduce form failures -python-memcached>=1.59 # for django.core.cache.backends.memcached -python-mimeparse>=1.6 # from TastyPie -pytz==2022.2.1 # Pinned as changes need to be vetted for their effect on Meeting fields -requests>=2.27.1 -requests-mock>=1.9.3 +pymemcache>=4.0.0 # for django.core.cache.backends.memcached.PyMemcacheCache +python-mimeparse>=2.0.0 # from TastyPie +pytz==2025.2 # Pinned as changes need to be vetted for their effect on Meeting fields +types-pytz==2025.2.0.20250809 # match pytz version +requests>=2.32.4 +types-requests>=2.32.4 +requests-mock>=1.12.1 rfc2html>=2.0.3 -scout-apm>=2.24.2 -selenium>=3.141.0,<4.0 -tblib>=1.7.0 # So that the django test runner provides tracebacks -tlds>=2022042700 # Used to teach bleach about which TLDs currently exist -tqdm>=4.64.0 -Unidecode>=1.3.4 -weasyprint>=53 -xml2rfc>=3.12.4 +scout-apm>=3.4.0 +selenium>=4.34.2 +tblib>=3.1.0 # So that the django test runner provides tracebacks +tlds>=2022042700 # Used to teach bleach about which TLDs currently exist +tqdm>=4.67.1 +unidecode>=1.4.0 +urllib3>=2.5.0 +weasyprint>=66.0 +xml2rfc>=3.30.0 xym>=0.6,<1.0 +zxcvbn>=4.5.0 +types-zxcvbn~=4.5.0.20250223 # match zxcvbn version diff --git a/test/data/profile-default.jpg b/test/data/profile-default.jpg deleted file mode 100644 index d6b03e10041..00000000000 Binary files a/test/data/profile-default.jpg and /dev/null differ diff --git a/test/data/youtube-discovery.json b/test/data/youtube-discovery.json deleted file mode 100644 index 983e1650c20..00000000000 --- a/test/data/youtube-discovery.json +++ /dev/null @@ -1,10879 +0,0 @@ -{ - "kind": "discovery#restDescription", - "etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/f81k8b4sv9uLeywfoj2KpL2xcPg\"", - "discoveryVersion": "v1", - "id": "youtube:v3", - "name": "youtube", - "canonicalName": "YouTube", - "version": "v3", - "revision": "20170130", - "title": "YouTube Data API", - "description": "Supports core YouTube features, such as uploading videos, creating and managing playlists, searching for content, and much more.", - "ownerDomain": "google.com", - "ownerName": "Google", - "icons": { - "x16": "https://www.google.com/images/icons/product/youtube-16.png", - "x32": "https://www.google.com/images/icons/product/youtube-32.png" - }, - "documentationLink": "https://developers.google.com/youtube/v3", - "protocol": "rest", - "baseUrl": "https://www.googleapis.com/youtube/v3/", - "basePath": "/youtube/v3/", - "rootUrl": "https://www.googleapis.com/", - "servicePath": "youtube/v3/", - "batchPath": "batch", - "parameters": { - "alt": { - "type": "string", - "description": "Data format for the response.", - "default": "json", - "enum": [ - "json" - ], - "enumDescriptions": [ - "Responses with Content-Type of application/json" - ], - "location": "query" - }, - "fields": { - "type": "string", - "description": "Selector specifying which fields to include in a partial response.", - "location": "query" - }, - "key": { - "type": "string", - "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.", - "location": "query" - }, - "oauth_token": { - "type": "string", - "description": "OAuth 2.0 token for the current user.", - "location": "query" - }, - "prettyPrint": { - "type": "boolean", - "description": "Returns response with indentations and line breaks.", - "default": "true", - "location": "query" - }, - "quotaUser": { - "type": "string", - "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.", - "location": "query" - }, - "userIp": { - "type": "string", - "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.", - "location": "query" - } - }, - "auth": { - "oauth2": { - "scopes": { - "https://www.googleapis.com/auth/youtube": { - "description": "Manage your YouTube account" - }, - "https://www.googleapis.com/auth/youtube.force-ssl": { - "description": "Manage your YouTube account" - }, - "https://www.googleapis.com/auth/youtube.readonly": { - "description": "View your YouTube account" - }, - "https://www.googleapis.com/auth/youtube.upload": { - "description": "Manage your YouTube videos" - }, - "https://www.googleapis.com/auth/youtubepartner": { - "description": "View and manage your assets and associated content on YouTube" - }, - "https://www.googleapis.com/auth/youtubepartner-channel-audit": { - "description": "View private information of your YouTube channel relevant during the audit process with a YouTube partner" - } - } - } - }, - "schemas": { - "AccessPolicy": { - "id": "AccessPolicy", - "type": "object", - "description": "Rights management policy for YouTube resources.", - "properties": { - "allowed": { - "type": "boolean", - "description": "The value of allowed indicates whether the access to the policy is allowed or denied by default." - }, - "exception": { - "type": "array", - "description": "A list of region codes that identify countries where the default policy do not apply.", - "items": { - "type": "string" - } - } - } - }, - "Activity": { - "id": "Activity", - "type": "object", - "description": "An activity resource contains information about an action that a particular channel, or user, has taken on YouTube.The actions reported in activity feeds include rating a video, sharing a video, marking a video as a favorite, commenting on a video, uploading a video, and so forth. Each activity resource identifies the type of action, the channel associated with the action, and the resource(s) associated with the action, such as the video that was rated or uploaded.", - "properties": { - "contentDetails": { - "$ref": "ActivityContentDetails", - "description": "The contentDetails object contains information about the content associated with the activity. For example, if the snippet.type value is videoRated, then the contentDetails object's content identifies the rated video." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the activity." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#activity\".", - "default": "youtube#activity" - }, - "snippet": { - "$ref": "ActivitySnippet", - "description": "The snippet object contains basic details about the activity, including the activity's type and group ID." - } - } - }, - "ActivityContentDetails": { - "id": "ActivityContentDetails", - "type": "object", - "description": "Details about the content of an activity: the video that was shared, the channel that was subscribed to, etc.", - "properties": { - "bulletin": { - "$ref": "ActivityContentDetailsBulletin", - "description": "The bulletin object contains details about a channel bulletin post. This object is only present if the snippet.type is bulletin." - }, - "channelItem": { - "$ref": "ActivityContentDetailsChannelItem", - "description": "The channelItem object contains details about a resource which was added to a channel. This property is only present if the snippet.type is channelItem." - }, - "comment": { - "$ref": "ActivityContentDetailsComment", - "description": "The comment object contains information about a resource that received a comment. This property is only present if the snippet.type is comment." - }, - "favorite": { - "$ref": "ActivityContentDetailsFavorite", - "description": "The favorite object contains information about a video that was marked as a favorite video. This property is only present if the snippet.type is favorite." - }, - "like": { - "$ref": "ActivityContentDetailsLike", - "description": "The like object contains information about a resource that received a positive (like) rating. This property is only present if the snippet.type is like." - }, - "playlistItem": { - "$ref": "ActivityContentDetailsPlaylistItem", - "description": "The playlistItem object contains information about a new playlist item. This property is only present if the snippet.type is playlistItem." - }, - "promotedItem": { - "$ref": "ActivityContentDetailsPromotedItem", - "description": "The promotedItem object contains details about a resource which is being promoted. This property is only present if the snippet.type is promotedItem." - }, - "recommendation": { - "$ref": "ActivityContentDetailsRecommendation", - "description": "The recommendation object contains information about a recommended resource. This property is only present if the snippet.type is recommendation." - }, - "social": { - "$ref": "ActivityContentDetailsSocial", - "description": "The social object contains details about a social network post. This property is only present if the snippet.type is social." - }, - "subscription": { - "$ref": "ActivityContentDetailsSubscription", - "description": "The subscription object contains information about a channel that a user subscribed to. This property is only present if the snippet.type is subscription." - }, - "upload": { - "$ref": "ActivityContentDetailsUpload", - "description": "The upload object contains information about the uploaded video. This property is only present if the snippet.type is upload." - } - } - }, - "ActivityContentDetailsBulletin": { - "id": "ActivityContentDetailsBulletin", - "type": "object", - "description": "Details about a channel bulletin post.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the resource associated with a bulletin post." - } - } - }, - "ActivityContentDetailsChannelItem": { - "id": "ActivityContentDetailsChannelItem", - "type": "object", - "description": "Details about a resource which was added to a channel.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the resource that was added to the channel." - } - } - }, - "ActivityContentDetailsComment": { - "id": "ActivityContentDetailsComment", - "type": "object", - "description": "Information about a resource that received a comment.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the resource associated with the comment." - } - } - }, - "ActivityContentDetailsFavorite": { - "id": "ActivityContentDetailsFavorite", - "type": "object", - "description": "Information about a video that was marked as a favorite video.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the resource that was marked as a favorite." - } - } - }, - "ActivityContentDetailsLike": { - "id": "ActivityContentDetailsLike", - "type": "object", - "description": "Information about a resource that received a positive (like) rating.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the rated resource." - } - } - }, - "ActivityContentDetailsPlaylistItem": { - "id": "ActivityContentDetailsPlaylistItem", - "type": "object", - "description": "Information about a new playlist item.", - "properties": { - "playlistId": { - "type": "string", - "description": "The value that YouTube uses to uniquely identify the playlist." - }, - "playlistItemId": { - "type": "string", - "description": "ID of the item within the playlist." - }, - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information about the resource that was added to the playlist." - } - } - }, - "ActivityContentDetailsPromotedItem": { - "id": "ActivityContentDetailsPromotedItem", - "type": "object", - "description": "Details about a resource which is being promoted.", - "properties": { - "adTag": { - "type": "string", - "description": "The URL the client should fetch to request a promoted item." - }, - "clickTrackingUrl": { - "type": "string", - "description": "The URL the client should ping to indicate that the user clicked through on this promoted item." - }, - "creativeViewUrl": { - "type": "string", - "description": "The URL the client should ping to indicate that the user was shown this promoted item." - }, - "ctaType": { - "type": "string", - "description": "The type of call-to-action, a message to the user indicating action that can be taken.", - "enum": [ - "unspecified", - "visitAdvertiserSite" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "customCtaButtonText": { - "type": "string", - "description": "The custom call-to-action button text. If specified, it will override the default button text for the cta_type." - }, - "descriptionText": { - "type": "string", - "description": "The text description to accompany the promoted item." - }, - "destinationUrl": { - "type": "string", - "description": "The URL the client should direct the user to, if the user chooses to visit the advertiser's website." - }, - "forecastingUrl": { - "type": "array", - "description": "The list of forecasting URLs. The client should ping all of these URLs when a promoted item is not available, to indicate that a promoted item could have been shown.", - "items": { - "type": "string" - } - }, - "impressionUrl": { - "type": "array", - "description": "The list of impression URLs. The client should ping all of these URLs to indicate that the user was shown this promoted item.", - "items": { - "type": "string" - } - }, - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the promoted video." - } - } - }, - "ActivityContentDetailsRecommendation": { - "id": "ActivityContentDetailsRecommendation", - "type": "object", - "description": "Information that identifies the recommended resource.", - "properties": { - "reason": { - "type": "string", - "description": "The reason that the resource is recommended to the user.", - "enum": [ - "unspecified", - "videoFavorited", - "videoLiked", - "videoWatched" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the recommended resource." - }, - "seedResourceId": { - "$ref": "ResourceId", - "description": "The seedResourceId object contains information about the resource that caused the recommendation." - } - } - }, - "ActivityContentDetailsSocial": { - "id": "ActivityContentDetailsSocial", - "type": "object", - "description": "Details about a social network post.", - "properties": { - "author": { - "type": "string", - "description": "The author of the social network post." - }, - "imageUrl": { - "type": "string", - "description": "An image of the post's author." - }, - "referenceUrl": { - "type": "string", - "description": "The URL of the social network post." - }, - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object encapsulates information that identifies the resource associated with a social network post." - }, - "type": { - "type": "string", - "description": "The name of the social network.", - "enum": [ - "facebook", - "googlePlus", - "twitter", - "unspecified" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - } - } - }, - "ActivityContentDetailsSubscription": { - "id": "ActivityContentDetailsSubscription", - "type": "object", - "description": "Information about a channel that a user subscribed to.", - "properties": { - "resourceId": { - "$ref": "ResourceId", - "description": "The resourceId object contains information that identifies the resource that the user subscribed to." - } - } - }, - "ActivityContentDetailsUpload": { - "id": "ActivityContentDetailsUpload", - "type": "object", - "description": "Information about the uploaded video.", - "properties": { - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the uploaded video." - } - } - }, - "ActivityListResponse": { - "id": "ActivityListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of activities, or events, that match the request criteria.", - "items": { - "$ref": "Activity" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#activityListResponse\".", - "default": "youtube#activityListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "ActivitySnippet": { - "id": "ActivitySnippet", - "type": "object", - "description": "Basic details about an activity, including title, description, thumbnails, activity type and group.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel associated with the activity." - }, - "channelTitle": { - "type": "string", - "description": "Channel title for the channel responsible for this activity" - }, - "description": { - "type": "string", - "description": "The description of the resource primarily associated with the activity.", - "annotations": { - "required": [ - "youtube.activities.insert" - ] - } - }, - "groupId": { - "type": "string", - "description": "The group ID associated with the activity. A group ID identifies user events that are associated with the same user and resource. For example, if a user rates a video and marks the same video as a favorite, the entries for those events would have the same group ID in the user's activity feed. In your user interface, you can avoid repetition by grouping events with the same groupId value." - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the resource that is primarily associated with the activity. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The title of the resource primarily associated with the activity." - }, - "type": { - "type": "string", - "description": "The type of activity that the resource describes.", - "enum": [ - "bulletin", - "channelItem", - "comment", - "favorite", - "like", - "playlistItem", - "promotedItem", - "recommendation", - "social", - "subscription", - "upload" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - } - }, - "Caption": { - "id": "Caption", - "type": "object", - "description": "A caption resource represents a YouTube caption track. A caption track is associated with exactly one YouTube video.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the caption track.", - "annotations": { - "required": [ - "youtube.captions.update" - ] - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#caption\".", - "default": "youtube#caption" - }, - "snippet": { - "$ref": "CaptionSnippet", - "description": "The snippet object contains basic details about the caption." - } - } - }, - "CaptionListResponse": { - "id": "CaptionListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of captions that match the request criteria.", - "items": { - "$ref": "Caption" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#captionListResponse\".", - "default": "youtube#captionListResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "CaptionSnippet": { - "id": "CaptionSnippet", - "type": "object", - "description": "Basic details about a caption track, such as its language and name.", - "properties": { - "audioTrackType": { - "type": "string", - "description": "The type of audio track associated with the caption track.", - "enum": [ - "commentary", - "descriptive", - "primary", - "unknown" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "failureReason": { - "type": "string", - "description": "The reason that YouTube failed to process the caption track. This property is only present if the state property's value is failed.", - "enum": [ - "processingFailed", - "unknownFormat", - "unsupportedFormat" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "isAutoSynced": { - "type": "boolean", - "description": "Indicates whether YouTube synchronized the caption track to the audio track in the video. The value will be true if a sync was explicitly requested when the caption track was uploaded. For example, when calling the captions.insert or captions.update methods, you can set the sync parameter to true to instruct YouTube to sync the uploaded track to the video. If the value is false, YouTube uses the time codes in the uploaded caption track to determine when to display captions." - }, - "isCC": { - "type": "boolean", - "description": "Indicates whether the track contains closed captions for the deaf and hard of hearing. The default value is false." - }, - "isDraft": { - "type": "boolean", - "description": "Indicates whether the caption track is a draft. If the value is true, then the track is not publicly visible. The default value is false." - }, - "isEasyReader": { - "type": "boolean", - "description": "Indicates whether caption track is formatted for \"easy reader,\" meaning it is at a third-grade level for language learners. The default value is false." - }, - "isLarge": { - "type": "boolean", - "description": "Indicates whether the caption track uses large text for the vision-impaired. The default value is false." - }, - "language": { - "type": "string", - "description": "The language of the caption track. The property value is a BCP-47 language tag.", - "annotations": { - "required": [ - "youtube.captions.insert" - ] - } - }, - "lastUpdated": { - "type": "string", - "description": "The date and time when the caption track was last updated. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "name": { - "type": "string", - "description": "The name of the caption track. The name is intended to be visible to the user as an option during playback.", - "annotations": { - "required": [ - "youtube.captions.insert" - ] - } - }, - "status": { - "type": "string", - "description": "The caption track's status.", - "enum": [ - "failed", - "serving", - "syncing" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "trackKind": { - "type": "string", - "description": "The caption track's type.", - "enum": [ - "ASR", - "forced", - "standard" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the video associated with the caption track.", - "annotations": { - "required": [ - "youtube.captions.insert" - ] - } - } - } - }, - "CdnSettings": { - "id": "CdnSettings", - "type": "object", - "description": "Brief description of the live stream cdn settings.", - "properties": { - "format": { - "type": "string", - "description": "The format of the video stream that you are sending to Youtube.", - "annotations": { - "required": [ - "youtube.liveStreams.insert", - "youtube.liveStreams.update" - ] - } - }, - "frameRate": { - "type": "string", - "description": "The frame rate of the inbound video data.", - "enum": [ - "30fps", - "60fps" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "ingestionInfo": { - "$ref": "IngestionInfo", - "description": "The ingestionInfo object contains information that YouTube provides that you need to transmit your RTMP or HTTP stream to YouTube." - }, - "ingestionType": { - "type": "string", - "description": "The method or protocol used to transmit the video stream.", - "enum": [ - "dash", - "rtmp" - ], - "enumDescriptions": [ - "", - "" - ], - "annotations": { - "required": [ - "youtube.liveStreams.insert", - "youtube.liveStreams.update" - ] - } - }, - "resolution": { - "type": "string", - "description": "The resolution of the inbound video data.", - "enum": [ - "1080p", - "1440p", - "2160p", - "240p", - "360p", - "480p", - "720p" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - } - } - }, - "Channel": { - "id": "Channel", - "type": "object", - "description": "A channel resource contains information about a YouTube channel.", - "properties": { - "auditDetails": { - "$ref": "ChannelAuditDetails", - "description": "The auditionDetails object encapsulates channel data that is relevant for YouTube Partners during the audition process." - }, - "brandingSettings": { - "$ref": "ChannelBrandingSettings", - "description": "The brandingSettings object encapsulates information about the branding of the channel." - }, - "contentDetails": { - "$ref": "ChannelContentDetails", - "description": "The contentDetails object encapsulates information about the channel's content." - }, - "contentOwnerDetails": { - "$ref": "ChannelContentOwnerDetails", - "description": "The contentOwnerDetails object encapsulates channel data that is relevant for YouTube Partners linked with the channel." - }, - "conversionPings": { - "$ref": "ChannelConversionPings", - "description": "The conversionPings object encapsulates information about conversion pings that need to be respected by the channel." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel." - }, - "invideoPromotion": { - "$ref": "InvideoPromotion", - "description": "The invideoPromotion object encapsulates information about promotion campaign associated with the channel." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channel\".", - "default": "youtube#channel" - }, - "localizations": { - "type": "object", - "description": "Localizations for different languages", - "additionalProperties": { - "$ref": "ChannelLocalization", - "description": "The language tag, using string since map_key require simple types." - } - }, - "snippet": { - "$ref": "ChannelSnippet", - "description": "The snippet object contains basic details about the channel, such as its title, description, and thumbnail images." - }, - "statistics": { - "$ref": "ChannelStatistics", - "description": "The statistics object encapsulates statistics for the channel." - }, - "status": { - "$ref": "ChannelStatus", - "description": "The status object encapsulates information about the privacy status of the channel." - }, - "topicDetails": { - "$ref": "ChannelTopicDetails", - "description": "The topicDetails object encapsulates information about Freebase topics associated with the channel." - } - } - }, - "ChannelAuditDetails": { - "id": "ChannelAuditDetails", - "type": "object", - "description": "The auditDetails object encapsulates channel data that is relevant for YouTube Partners during the audit process.", - "properties": { - "communityGuidelinesGoodStanding": { - "type": "boolean", - "description": "Whether or not the channel respects the community guidelines." - }, - "contentIdClaimsGoodStanding": { - "type": "boolean", - "description": "Whether or not the channel has any unresolved claims." - }, - "copyrightStrikesGoodStanding": { - "type": "boolean", - "description": "Whether or not the channel has any copyright strikes." - }, - "overallGoodStanding": { - "type": "boolean", - "description": "Describes the general state of the channel. This field will always show if there are any issues whatsoever with the channel. Currently this field represents the result of the logical and operation over the community guidelines good standing, the copyright strikes good standing and the content ID claims good standing, but this may change in the future." - } - } - }, - "ChannelBannerResource": { - "id": "ChannelBannerResource", - "type": "object", - "description": "A channel banner returned as the response to a channel_banner.insert call.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelBannerResource\".", - "default": "youtube#channelBannerResource" - }, - "url": { - "type": "string", - "description": "The URL of this banner image." - } - } - }, - "ChannelBrandingSettings": { - "id": "ChannelBrandingSettings", - "type": "object", - "description": "Branding properties of a YouTube channel.", - "properties": { - "channel": { - "$ref": "ChannelSettings", - "description": "Branding properties for the channel view." - }, - "hints": { - "type": "array", - "description": "Additional experimental branding properties.", - "items": { - "$ref": "PropertyValue" - } - }, - "image": { - "$ref": "ImageSettings", - "description": "Branding properties for branding images." - }, - "watch": { - "$ref": "WatchSettings", - "description": "Branding properties for the watch page." - } - } - }, - "ChannelContentDetails": { - "id": "ChannelContentDetails", - "type": "object", - "description": "Details about the content of a channel.", - "properties": { - "relatedPlaylists": { - "type": "object", - "properties": { - "favorites": { - "type": "string", - "description": "The ID of the playlist that contains the channel\"s favorite videos. Use the playlistItems.insert and playlistItems.delete to add or remove items from that list." - }, - "likes": { - "type": "string", - "description": "The ID of the playlist that contains the channel\"s liked videos. Use the playlistItems.insert and playlistItems.delete to add or remove items from that list." - }, - "uploads": { - "type": "string", - "description": "The ID of the playlist that contains the channel\"s uploaded videos. Use the videos.insert method to upload new videos and the videos.delete method to delete previously uploaded videos." - }, - "watchHistory": { - "type": "string", - "description": "The ID of the playlist that contains the channel\"s watch history. Use the playlistItems.insert and playlistItems.delete to add or remove items from that list." - }, - "watchLater": { - "type": "string", - "description": "The ID of the playlist that contains the channel\"s watch later playlist. Use the playlistItems.insert and playlistItems.delete to add or remove items from that list." - } - } - } - } - }, - "ChannelContentOwnerDetails": { - "id": "ChannelContentOwnerDetails", - "type": "object", - "description": "The contentOwnerDetails object encapsulates channel data that is relevant for YouTube Partners linked with the channel.", - "properties": { - "contentOwner": { - "type": "string", - "description": "The ID of the content owner linked to the channel." - }, - "timeLinked": { - "type": "string", - "description": "The date and time of when the channel was linked to the content owner. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - } - } - }, - "ChannelConversionPing": { - "id": "ChannelConversionPing", - "type": "object", - "description": "Pings that the app shall fire (authenticated by biscotti cookie). Each ping has a context, in which the app must fire the ping, and a url identifying the ping.", - "properties": { - "context": { - "type": "string", - "description": "Defines the context of the ping.", - "enum": [ - "cview", - "subscribe", - "unsubscribe" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "conversionUrl": { - "type": "string", - "description": "The url (without the schema) that the player shall send the ping to. It's at caller's descretion to decide which schema to use (http vs https) Example of a returned url: //googleads.g.doubleclick.net/pagead/ viewthroughconversion/962985656/?data=path%3DtHe_path%3Btype%3D cview%3Butuid%3DGISQtTNGYqaYl4sKxoVvKA&labe=default The caller must append biscotti authentication (ms param in case of mobile, for example) to this ping." - } - } - }, - "ChannelConversionPings": { - "id": "ChannelConversionPings", - "type": "object", - "description": "The conversionPings object encapsulates information about conversion pings that need to be respected by the channel.", - "properties": { - "pings": { - "type": "array", - "description": "Pings that the app shall fire (authenticated by biscotti cookie). Each ping has a context, in which the app must fire the ping, and a url identifying the ping.", - "items": { - "$ref": "ChannelConversionPing" - } - } - } - }, - "ChannelListResponse": { - "id": "ChannelListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of channels that match the request criteria.", - "items": { - "$ref": "Channel" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelListResponse\".", - "default": "youtube#channelListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "ChannelLocalization": { - "id": "ChannelLocalization", - "type": "object", - "description": "Channel localization setting", - "properties": { - "description": { - "type": "string", - "description": "The localized strings for channel's description." - }, - "title": { - "type": "string", - "description": "The localized strings for channel's title." - } - } - }, - "ChannelProfileDetails": { - "id": "ChannelProfileDetails", - "type": "object", - "properties": { - "channelId": { - "type": "string", - "description": "The YouTube channel ID." - }, - "channelUrl": { - "type": "string", - "description": "The channel's URL." - }, - "displayName": { - "type": "string", - "description": "The channel's display name." - }, - "profileImageUrl": { - "type": "string", - "description": "The channels's avatar URL." - } - } - }, - "ChannelSection": { - "id": "ChannelSection", - "type": "object", - "properties": { - "contentDetails": { - "$ref": "ChannelSectionContentDetails", - "description": "The contentDetails object contains details about the channel section content, such as a list of playlists or channels featured in the section." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel section." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelSection\".", - "default": "youtube#channelSection" - }, - "localizations": { - "type": "object", - "description": "Localizations for different languages", - "additionalProperties": { - "$ref": "ChannelSectionLocalization", - "description": "The language tag, using string since map_key require simple types." - } - }, - "snippet": { - "$ref": "ChannelSectionSnippet", - "description": "The snippet object contains basic details about the channel section, such as its type, style and title." - }, - "targeting": { - "$ref": "ChannelSectionTargeting", - "description": "The targeting object contains basic targeting settings about the channel section." - } - } - }, - "ChannelSectionContentDetails": { - "id": "ChannelSectionContentDetails", - "type": "object", - "description": "Details about a channelsection, including playlists and channels.", - "properties": { - "channels": { - "type": "array", - "description": "The channel ids for type multiple_channels.", - "items": { - "type": "string" - } - }, - "playlists": { - "type": "array", - "description": "The playlist ids for type single_playlist and multiple_playlists. For singlePlaylist, only one playlistId is allowed.", - "items": { - "type": "string" - } - } - } - }, - "ChannelSectionListResponse": { - "id": "ChannelSectionListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of ChannelSections that match the request criteria.", - "items": { - "$ref": "ChannelSection" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelSectionListResponse\".", - "default": "youtube#channelSectionListResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "ChannelSectionLocalization": { - "id": "ChannelSectionLocalization", - "type": "object", - "description": "ChannelSection localization setting", - "properties": { - "title": { - "type": "string", - "description": "The localized strings for channel section's title." - } - } - }, - "ChannelSectionSnippet": { - "id": "ChannelSectionSnippet", - "type": "object", - "description": "Basic details about a channel section, including title, style and position.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel that published the channel section." - }, - "defaultLanguage": { - "type": "string", - "description": "The language of the channel section's default title and description." - }, - "localized": { - "$ref": "ChannelSectionLocalization", - "description": "Localized title, read-only." - }, - "position": { - "type": "integer", - "description": "The position of the channel section in the channel.", - "format": "uint32" - }, - "style": { - "type": "string", - "description": "The style of the channel section.", - "enum": [ - "channelsectionStyleUndefined", - "horizontalRow", - "verticalList" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "title": { - "type": "string", - "description": "The channel section's title for multiple_playlists and multiple_channels." - }, - "type": { - "type": "string", - "description": "The type of the channel section.", - "enum": [ - "allPlaylists", - "channelsectionTypeUndefined", - "completedEvents", - "likedPlaylists", - "likes", - "liveEvents", - "multipleChannels", - "multiplePlaylists", - "popularUploads", - "postedPlaylists", - "postedVideos", - "recentActivity", - "recentPosts", - "recentUploads", - "singlePlaylist", - "subscriptions", - "upcomingEvents" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - } - }, - "ChannelSectionTargeting": { - "id": "ChannelSectionTargeting", - "type": "object", - "description": "ChannelSection targeting setting.", - "properties": { - "countries": { - "type": "array", - "description": "The country the channel section is targeting.", - "items": { - "type": "string" - } - }, - "languages": { - "type": "array", - "description": "The language the channel section is targeting.", - "items": { - "type": "string" - } - }, - "regions": { - "type": "array", - "description": "The region the channel section is targeting.", - "items": { - "type": "string" - } - } - } - }, - "ChannelSettings": { - "id": "ChannelSettings", - "type": "object", - "description": "Branding properties for the channel view.", - "properties": { - "country": { - "type": "string", - "description": "The country of the channel." - }, - "defaultLanguage": { - "type": "string" - }, - "defaultTab": { - "type": "string", - "description": "Which content tab users should see when viewing the channel." - }, - "description": { - "type": "string", - "description": "Specifies the channel description." - }, - "featuredChannelsTitle": { - "type": "string", - "description": "Title for the featured channels tab." - }, - "featuredChannelsUrls": { - "type": "array", - "description": "The list of featured channels.", - "items": { - "type": "string" - } - }, - "keywords": { - "type": "string", - "description": "Lists keywords associated with the channel, comma-separated." - }, - "moderateComments": { - "type": "boolean", - "description": "Whether user-submitted comments left on the channel page need to be approved by the channel owner to be publicly visible." - }, - "profileColor": { - "type": "string", - "description": "A prominent color that can be rendered on this channel page." - }, - "showBrowseView": { - "type": "boolean", - "description": "Whether the tab to browse the videos should be displayed." - }, - "showRelatedChannels": { - "type": "boolean", - "description": "Whether related channels should be proposed." - }, - "title": { - "type": "string", - "description": "Specifies the channel title." - }, - "trackingAnalyticsAccountId": { - "type": "string", - "description": "The ID for a Google Analytics account to track and measure traffic to the channels." - }, - "unsubscribedTrailer": { - "type": "string", - "description": "The trailer of the channel, for users that are not subscribers." - } - } - }, - "ChannelSnippet": { - "id": "ChannelSnippet", - "type": "object", - "description": "Basic details about a channel, including title, description and thumbnails. Next available id: 15.", - "properties": { - "country": { - "type": "string", - "description": "The country of the channel." - }, - "customUrl": { - "type": "string", - "description": "The custom url of the channel." - }, - "defaultLanguage": { - "type": "string", - "description": "The language of the channel's default title and description." - }, - "description": { - "type": "string", - "description": "The description of the channel." - }, - "localized": { - "$ref": "ChannelLocalization", - "description": "Localized title and description, read-only." - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the channel was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the channel. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The channel's title." - } - } - }, - "ChannelStatistics": { - "id": "ChannelStatistics", - "type": "object", - "description": "Statistics about a channel: number of subscribers, number of videos in the channel, etc.", - "properties": { - "commentCount": { - "type": "string", - "description": "The number of comments for the channel.", - "format": "uint64" - }, - "hiddenSubscriberCount": { - "type": "boolean", - "description": "Whether or not the number of subscribers is shown for this user." - }, - "subscriberCount": { - "type": "string", - "description": "The number of subscribers that the channel has.", - "format": "uint64" - }, - "videoCount": { - "type": "string", - "description": "The number of videos uploaded to the channel.", - "format": "uint64" - }, - "viewCount": { - "type": "string", - "description": "The number of times the channel has been viewed.", - "format": "uint64" - } - } - }, - "ChannelStatus": { - "id": "ChannelStatus", - "type": "object", - "description": "JSON template for the status part of a channel.", - "properties": { - "isLinked": { - "type": "boolean", - "description": "If true, then the user is linked to either a YouTube username or G+ account. Otherwise, the user doesn't have a public YouTube identity." - }, - "longUploadsStatus": { - "type": "string", - "description": "The long uploads status of this channel. See", - "enum": [ - "allowed", - "disallowed", - "eligible", - "longUploadsUnspecified" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "privacyStatus": { - "type": "string", - "description": "Privacy status of the channel.", - "enum": [ - "private", - "public", - "unlisted" - ], - "enumDescriptions": [ - "", - "", - "" - ] - } - } - }, - "ChannelTopicDetails": { - "id": "ChannelTopicDetails", - "type": "object", - "description": "Freebase topic information related to the channel.", - "properties": { - "topicCategories": { - "type": "array", - "description": "A list of Wikipedia URLs that describe the channel's content.", - "items": { - "type": "string" - } - }, - "topicIds": { - "type": "array", - "description": "A list of Freebase topic IDs associated with the channel. You can retrieve information about each topic using the Freebase Topic API.", - "items": { - "type": "string" - } - } - } - }, - "Comment": { - "id": "Comment", - "type": "object", - "description": "A comment represents a single YouTube comment.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the comment." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#comment\".", - "default": "youtube#comment" - }, - "snippet": { - "$ref": "CommentSnippet", - "description": "The snippet object contains basic details about the comment." - } - } - }, - "CommentListResponse": { - "id": "CommentListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of comments that match the request criteria.", - "items": { - "$ref": "Comment" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentListResponse\".", - "default": "youtube#commentListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "CommentSnippet": { - "id": "CommentSnippet", - "type": "object", - "description": "Basic details about a comment, such as its author and text.", - "properties": { - "authorChannelId": { - "type": "any", - "description": "The id of the author's YouTube channel, if any." - }, - "authorChannelUrl": { - "type": "string", - "description": "Link to the author's YouTube channel, if any." - }, - "authorDisplayName": { - "type": "string", - "description": "The name of the user who posted the comment." - }, - "authorProfileImageUrl": { - "type": "string", - "description": "The URL for the avatar of the user who posted the comment." - }, - "canRate": { - "type": "boolean", - "description": "Whether the current viewer can rate this comment." - }, - "channelId": { - "type": "string", - "description": "The id of the corresponding YouTube channel. In case of a channel comment this is the channel the comment refers to. In case of a video comment it's the video's channel." - }, - "likeCount": { - "type": "integer", - "description": "The total number of likes this comment has received.", - "format": "uint32" - }, - "moderationStatus": { - "type": "string", - "description": "The comment's moderation status. Will not be set if the comments were requested through the id filter.", - "enum": [ - "heldForReview", - "likelySpam", - "published", - "rejected" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "parentId": { - "type": "string", - "description": "The unique id of the parent comment, only set for replies." - }, - "publishedAt": { - "type": "string", - "description": "The date and time when the comment was orignally published. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "textDisplay": { - "type": "string", - "description": "The comment's text. The format is either plain text or HTML dependent on what has been requested. Even the plain text representation may differ from the text originally posted in that it may replace video links with video titles etc." - }, - "textOriginal": { - "type": "string", - "description": "The comment's original raw text as initially posted or last updated. The original text will only be returned if it is accessible to the viewer, which is only guaranteed if the viewer is the comment's author." - }, - "updatedAt": { - "type": "string", - "description": "The date and time when was last updated . The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "videoId": { - "type": "string", - "description": "The ID of the video the comment refers to, if any." - }, - "viewerRating": { - "type": "string", - "description": "The rating the viewer has given to this comment. For the time being this will never return RATE_TYPE_DISLIKE and instead return RATE_TYPE_NONE. This may change in the future.", - "enum": [ - "dislike", - "like", - "none", - "unspecified" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - } - } - }, - "CommentThread": { - "id": "CommentThread", - "type": "object", - "description": "A comment thread represents information that applies to a top level comment and all its replies. It can also include the top level comment itself and some of the replies.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the comment thread." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentThread\".", - "default": "youtube#commentThread" - }, - "replies": { - "$ref": "CommentThreadReplies", - "description": "The replies object contains a limited number of replies (if any) to the top level comment found in the snippet." - }, - "snippet": { - "$ref": "CommentThreadSnippet", - "description": "The snippet object contains basic details about the comment thread and also the top level comment." - } - } - }, - "CommentThreadListResponse": { - "id": "CommentThreadListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of comment threads that match the request criteria.", - "items": { - "$ref": "CommentThread" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentThreadListResponse\".", - "default": "youtube#commentThreadListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "CommentThreadReplies": { - "id": "CommentThreadReplies", - "type": "object", - "description": "Comments written in (direct or indirect) reply to the top level comment.", - "properties": { - "comments": { - "type": "array", - "description": "A limited number of replies. Unless the number of replies returned equals total_reply_count in the snippet the returned replies are only a subset of the total number of replies.", - "items": { - "$ref": "Comment" - } - } - } - }, - "CommentThreadSnippet": { - "id": "CommentThreadSnippet", - "type": "object", - "description": "Basic details about a comment thread.", - "properties": { - "canReply": { - "type": "boolean", - "description": "Whether the current viewer of the thread can reply to it. This is viewer specific - other viewers may see a different value for this field." - }, - "channelId": { - "type": "string", - "description": "The YouTube channel the comments in the thread refer to or the channel with the video the comments refer to. If video_id isn't set the comments refer to the channel itself." - }, - "isPublic": { - "type": "boolean", - "description": "Whether the thread (and therefore all its comments) is visible to all YouTube users." - }, - "topLevelComment": { - "$ref": "Comment", - "description": "The top level comment of this thread." - }, - "totalReplyCount": { - "type": "integer", - "description": "The total number of replies (not including the top level comment).", - "format": "uint32" - }, - "videoId": { - "type": "string", - "description": "The ID of the video the comments refer to, if any. No video_id implies a channel discussion comment." - } - } - }, - "ContentRating": { - "id": "ContentRating", - "type": "object", - "description": "Ratings schemes. The country-specific ratings are mostly for movies and shows. NEXT_ID: 69", - "properties": { - "acbRating": { - "type": "string", - "description": "The video's Australian Classification Board (ACB) or Australian Communications and Media Authority (ACMA) rating. ACMA ratings are used to classify children's television programming.", - "enum": [ - "acbC", - "acbE", - "acbG", - "acbM", - "acbMa15plus", - "acbP", - "acbPg", - "acbR18plus", - "acbUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "agcomRating": { - "type": "string", - "description": "The video's rating from Italy's Autorità per le Garanzie nelle Comunicazioni (AGCOM).", - "enum": [ - "agcomT", - "agcomUnrated", - "agcomVm14", - "agcomVm18" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "anatelRating": { - "type": "string", - "description": "The video's Anatel (Asociación Nacional de Televisión) rating for Chilean television.", - "enum": [ - "anatelA", - "anatelF", - "anatelI", - "anatelI10", - "anatelI12", - "anatelI7", - "anatelR", - "anatelUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "bbfcRating": { - "type": "string", - "description": "The video's British Board of Film Classification (BBFC) rating.", - "enum": [ - "bbfc12", - "bbfc12a", - "bbfc15", - "bbfc18", - "bbfcPg", - "bbfcR18", - "bbfcU", - "bbfcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "bfvcRating": { - "type": "string", - "description": "The video's rating from Thailand's Board of Film and Video Censors.", - "enum": [ - "bfvc13", - "bfvc15", - "bfvc18", - "bfvc20", - "bfvcB", - "bfvcE", - "bfvcG", - "bfvcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "bmukkRating": { - "type": "string", - "description": "The video's rating from the Austrian Board of Media Classification (Bundesministerium für Unterricht, Kunst und Kultur).", - "enum": [ - "bmukk10", - "bmukk12", - "bmukk14", - "bmukk16", - "bmukk6", - "bmukk8", - "bmukkAa", - "bmukkUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "catvRating": { - "type": "string", - "description": "Rating system for Canadian TV - Canadian TV Classification System The video's rating from the Canadian Radio-Television and Telecommunications Commission (CRTC) for Canadian English-language broadcasts. For more information, see the Canadian Broadcast Standards Council website.", - "enum": [ - "catv14plus", - "catv18plus", - "catvC", - "catvC8", - "catvG", - "catvPg", - "catvUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "catvfrRating": { - "type": "string", - "description": "The video's rating from the Canadian Radio-Television and Telecommunications Commission (CRTC) for Canadian French-language broadcasts. For more information, see the Canadian Broadcast Standards Council website.", - "enum": [ - "catvfr13plus", - "catvfr16plus", - "catvfr18plus", - "catvfr8plus", - "catvfrG", - "catvfrUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "cbfcRating": { - "type": "string", - "description": "The video's Central Board of Film Certification (CBFC - India) rating.", - "enum": [ - "cbfcA", - "cbfcS", - "cbfcU", - "cbfcUA", - "cbfcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "cccRating": { - "type": "string", - "description": "The video's Consejo de Calificación Cinematográfica (Chile) rating.", - "enum": [ - "ccc14", - "ccc18", - "ccc18s", - "ccc18v", - "ccc6", - "cccTe", - "cccUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "cceRating": { - "type": "string", - "description": "The video's rating from Portugal's Comissão de Classificação de Espect´culos.", - "enum": [ - "cceM12", - "cceM14", - "cceM16", - "cceM18", - "cceM4", - "cceM6", - "cceUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "chfilmRating": { - "type": "string", - "description": "The video's rating in Switzerland.", - "enum": [ - "chfilm0", - "chfilm12", - "chfilm16", - "chfilm18", - "chfilm6", - "chfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "chvrsRating": { - "type": "string", - "description": "The video's Canadian Home Video Rating System (CHVRS) rating.", - "enum": [ - "chvrs14a", - "chvrs18a", - "chvrsE", - "chvrsG", - "chvrsPg", - "chvrsR", - "chvrsUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "cicfRating": { - "type": "string", - "description": "The video's rating from the Commission de Contrôle des Films (Belgium).", - "enum": [ - "cicfE", - "cicfKntEna", - "cicfKtEa", - "cicfUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "cnaRating": { - "type": "string", - "description": "The video's rating from Romania's CONSILIUL NATIONAL AL AUDIOVIZUALULUI (CNA).", - "enum": [ - "cna12", - "cna15", - "cna18", - "cna18plus", - "cnaAp", - "cnaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "cncRating": { - "type": "string", - "description": "Rating system in France - Commission de classification cinematographique", - "enum": [ - "cnc10", - "cnc12", - "cnc16", - "cnc18", - "cncE", - "cncT", - "cncUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "csaRating": { - "type": "string", - "description": "The video's rating from France's Conseil supérieur de l?audiovisuel, which rates broadcast content.", - "enum": [ - "csa10", - "csa12", - "csa16", - "csa18", - "csaInterdiction", - "csaT", - "csaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "cscfRating": { - "type": "string", - "description": "The video's rating from Luxembourg's Commission de surveillance de la classification des films (CSCF).", - "enum": [ - "cscf12", - "cscf16", - "cscf18", - "cscf6", - "cscf9", - "cscfA", - "cscfAl", - "cscfUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "czfilmRating": { - "type": "string", - "description": "The video's rating in the Czech Republic.", - "enum": [ - "czfilm12", - "czfilm14", - "czfilm18", - "czfilmU", - "czfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "djctqRating": { - "type": "string", - "description": "The video's Departamento de Justiça, Classificação, Qualificação e Títulos (DJCQT - Brazil) rating.", - "enum": [ - "djctq10", - "djctq12", - "djctq14", - "djctq16", - "djctq18", - "djctqL", - "djctqUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "djctqRatingReasons": { - "type": "array", - "description": "Reasons that explain why the video received its DJCQT (Brazil) rating.", - "items": { - "type": "string", - "enum": [ - "djctqCriminalActs", - "djctqDrugs", - "djctqExplicitSex", - "djctqExtremeViolence", - "djctqIllegalDrugs", - "djctqImpactingContent", - "djctqInappropriateLanguage", - "djctqLegalDrugs", - "djctqNudity", - "djctqSex", - "djctqSexualContent", - "djctqViolence" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - }, - "ecbmctRating": { - "type": "string", - "description": "Rating system in Turkey - Evaluation and Classification Board of the Ministry of Culture and Tourism", - "enum": [ - "ecbmct13a", - "ecbmct13plus", - "ecbmct15a", - "ecbmct15plus", - "ecbmct18plus", - "ecbmct7a", - "ecbmct7plus", - "ecbmctG", - "ecbmctUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "eefilmRating": { - "type": "string", - "description": "The video's rating in Estonia.", - "enum": [ - "eefilmK12", - "eefilmK14", - "eefilmK16", - "eefilmK6", - "eefilmL", - "eefilmMs12", - "eefilmMs6", - "eefilmPere", - "eefilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "egfilmRating": { - "type": "string", - "description": "The video's rating in Egypt.", - "enum": [ - "egfilm18", - "egfilmBn", - "egfilmGn", - "egfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "eirinRating": { - "type": "string", - "description": "The video's Eirin (映倫) rating. Eirin is the Japanese rating system.", - "enum": [ - "eirinG", - "eirinPg12", - "eirinR15plus", - "eirinR18plus", - "eirinUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "fcbmRating": { - "type": "string", - "description": "The video's rating from Malaysia's Film Censorship Board.", - "enum": [ - "fcbm18", - "fcbm18pa", - "fcbm18pl", - "fcbm18sg", - "fcbm18sx", - "fcbmP13", - "fcbmPg13", - "fcbmU", - "fcbmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "fcoRating": { - "type": "string", - "description": "The video's rating from Hong Kong's Office for Film, Newspaper and Article Administration.", - "enum": [ - "fcoI", - "fcoIi", - "fcoIia", - "fcoIib", - "fcoIii", - "fcoUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "fmocRating": { - "type": "string", - "description": "This property has been deprecated. Use the contentDetails.contentRating.cncRating instead.", - "enum": [ - "fmoc10", - "fmoc12", - "fmoc16", - "fmoc18", - "fmocE", - "fmocU", - "fmocUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "fpbRating": { - "type": "string", - "description": "The video's rating from South Africa's Film and Publication Board.", - "enum": [ - "fpb10", - "fpb1012Pg", - "fpb13", - "fpb16", - "fpb18", - "fpb79Pg", - "fpbA", - "fpbPg", - "fpbUnrated", - "fpbX18", - "fpbXx" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "fpbRatingReasons": { - "type": "array", - "description": "Reasons that explain why the video received its FPB (South Africa) rating.", - "items": { - "type": "string", - "enum": [ - "fpbBlasphemy", - "fpbCriminalTechniques", - "fpbDrugs", - "fpbHorror", - "fpbImitativeActsTechniques", - "fpbLanguage", - "fpbNudity", - "fpbPrejudice", - "fpbSex", - "fpbSexualViolence", - "fpbViolence" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - }, - "fskRating": { - "type": "string", - "description": "The video's Freiwillige Selbstkontrolle der Filmwirtschaft (FSK - Germany) rating.", - "enum": [ - "fsk0", - "fsk12", - "fsk16", - "fsk18", - "fsk6", - "fskUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "grfilmRating": { - "type": "string", - "description": "The video's rating in Greece.", - "enum": [ - "grfilmE", - "grfilmK", - "grfilmK12", - "grfilmK13", - "grfilmK15", - "grfilmK17", - "grfilmK18", - "grfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "icaaRating": { - "type": "string", - "description": "The video's Instituto de la Cinematografía y de las Artes Audiovisuales (ICAA - Spain) rating.", - "enum": [ - "icaa12", - "icaa13", - "icaa16", - "icaa18", - "icaa7", - "icaaApta", - "icaaUnrated", - "icaaX" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ifcoRating": { - "type": "string", - "description": "The video's Irish Film Classification Office (IFCO - Ireland) rating. See the IFCO website for more information.", - "enum": [ - "ifco12", - "ifco12a", - "ifco15", - "ifco15a", - "ifco16", - "ifco18", - "ifcoG", - "ifcoPg", - "ifcoUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ilfilmRating": { - "type": "string", - "description": "The video's rating in Israel.", - "enum": [ - "ilfilm12", - "ilfilm16", - "ilfilm18", - "ilfilmAa", - "ilfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "incaaRating": { - "type": "string", - "description": "The video's INCAA (Instituto Nacional de Cine y Artes Audiovisuales - Argentina) rating.", - "enum": [ - "incaaAtp", - "incaaC", - "incaaSam13", - "incaaSam16", - "incaaSam18", - "incaaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "kfcbRating": { - "type": "string", - "description": "The video's rating from the Kenya Film Classification Board.", - "enum": [ - "kfcb16plus", - "kfcbG", - "kfcbPg", - "kfcbR", - "kfcbUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "kijkwijzerRating": { - "type": "string", - "description": "voor de Classificatie van Audiovisuele Media (Netherlands).", - "enum": [ - "kijkwijzer12", - "kijkwijzer16", - "kijkwijzer18", - "kijkwijzer6", - "kijkwijzer9", - "kijkwijzerAl", - "kijkwijzerUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "kmrbRating": { - "type": "string", - "description": "The video's Korea Media Rating Board (영상물등급위원회) rating. The KMRB rates videos in South Korea.", - "enum": [ - "kmrb12plus", - "kmrb15plus", - "kmrbAll", - "kmrbR", - "kmrbTeenr", - "kmrbUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "lsfRating": { - "type": "string", - "description": "The video's rating from Indonesia's Lembaga Sensor Film.", - "enum": [ - "lsf13", - "lsf17", - "lsf21", - "lsfA", - "lsfBo", - "lsfD", - "lsfR", - "lsfSu", - "lsfUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "mccaaRating": { - "type": "string", - "description": "The video's rating from Malta's Film Age-Classification Board.", - "enum": [ - "mccaa12", - "mccaa12a", - "mccaa14", - "mccaa15", - "mccaa16", - "mccaa18", - "mccaaPg", - "mccaaU", - "mccaaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "mccypRating": { - "type": "string", - "description": "The video's rating from the Danish Film Institute's (Det Danske Filminstitut) Media Council for Children and Young People.", - "enum": [ - "mccyp11", - "mccyp15", - "mccyp7", - "mccypA", - "mccypUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "mcstRating": { - "type": "string", - "description": "The video's rating system for Vietnam - MCST", - "enum": [ - "mcst0", - "mcst16plus", - "mcstC13", - "mcstC16", - "mcstC18", - "mcstGPg", - "mcstP", - "mcstUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "mdaRating": { - "type": "string", - "description": "The video's rating from Singapore's Media Development Authority (MDA) and, specifically, it's Board of Film Censors (BFC).", - "enum": [ - "mdaG", - "mdaM18", - "mdaNc16", - "mdaPg", - "mdaPg13", - "mdaR21", - "mdaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "medietilsynetRating": { - "type": "string", - "description": "The video's rating from Medietilsynet, the Norwegian Media Authority.", - "enum": [ - "medietilsynet11", - "medietilsynet12", - "medietilsynet15", - "medietilsynet18", - "medietilsynet6", - "medietilsynet7", - "medietilsynet9", - "medietilsynetA", - "medietilsynetUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "mekuRating": { - "type": "string", - "description": "The video's rating from Finland's Kansallinen Audiovisuaalinen Instituutti (National Audiovisual Institute).", - "enum": [ - "meku12", - "meku16", - "meku18", - "meku7", - "mekuS", - "mekuUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "mibacRating": { - "type": "string", - "description": "The video's rating from the Ministero dei Beni e delle Attività Culturali e del Turismo (Italy).", - "enum": [ - "mibacT", - "mibacUnrated", - "mibacVap", - "mibacVm12", - "mibacVm14", - "mibacVm18" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "mocRating": { - "type": "string", - "description": "The video's Ministerio de Cultura (Colombia) rating.", - "enum": [ - "moc12", - "moc15", - "moc18", - "moc7", - "mocBanned", - "mocE", - "mocT", - "mocUnrated", - "mocX" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "moctwRating": { - "type": "string", - "description": "The video's rating from Taiwan's Ministry of Culture (文化部).", - "enum": [ - "moctwG", - "moctwP", - "moctwPg", - "moctwR", - "moctwR12", - "moctwR15", - "moctwUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "mpaaRating": { - "type": "string", - "description": "The video's Motion Picture Association of America (MPAA) rating.", - "enum": [ - "mpaaG", - "mpaaNc17", - "mpaaPg", - "mpaaPg13", - "mpaaR", - "mpaaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "mtrcbRating": { - "type": "string", - "description": "The video's rating from the Movie and Television Review and Classification Board (Philippines).", - "enum": [ - "mtrcbG", - "mtrcbPg", - "mtrcbR13", - "mtrcbR16", - "mtrcbR18", - "mtrcbUnrated", - "mtrcbX" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "nbcRating": { - "type": "string", - "description": "The video's rating from the Maldives National Bureau of Classification.", - "enum": [ - "nbc12plus", - "nbc15plus", - "nbc18plus", - "nbc18plusr", - "nbcG", - "nbcPg", - "nbcPu", - "nbcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "nbcplRating": { - "type": "string", - "description": "The video's rating in Poland.", - "enum": [ - "nbcpl18plus", - "nbcplI", - "nbcplIi", - "nbcplIii", - "nbcplIv", - "nbcplUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "nfrcRating": { - "type": "string", - "description": "The video's rating from the Bulgarian National Film Center.", - "enum": [ - "nfrcA", - "nfrcB", - "nfrcC", - "nfrcD", - "nfrcUnrated", - "nfrcX" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "nfvcbRating": { - "type": "string", - "description": "The video's rating from Nigeria's National Film and Video Censors Board.", - "enum": [ - "nfvcb12", - "nfvcb12a", - "nfvcb15", - "nfvcb18", - "nfvcbG", - "nfvcbPg", - "nfvcbRe", - "nfvcbUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "nkclvRating": { - "type": "string", - "description": "The video's rating from the Nacionãlais Kino centrs (National Film Centre of Latvia).", - "enum": [ - "nkclv12plus", - "nkclv18plus", - "nkclv7plus", - "nkclvU", - "nkclvUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "oflcRating": { - "type": "string", - "description": "The video's Office of Film and Literature Classification (OFLC - New Zealand) rating.", - "enum": [ - "oflcG", - "oflcM", - "oflcPg", - "oflcR13", - "oflcR15", - "oflcR16", - "oflcR18", - "oflcRp13", - "oflcRp16", - "oflcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "pefilmRating": { - "type": "string", - "description": "The video's rating in Peru.", - "enum": [ - "pefilm14", - "pefilm18", - "pefilmPg", - "pefilmPt", - "pefilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "rcnofRating": { - "type": "string", - "description": "The video's rating from the Hungarian Nemzeti Filmiroda, the Rating Committee of the National Office of Film.", - "enum": [ - "rcnofI", - "rcnofIi", - "rcnofIii", - "rcnofIv", - "rcnofUnrated", - "rcnofV", - "rcnofVi" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "resorteviolenciaRating": { - "type": "string", - "description": "The video's rating in Venezuela.", - "enum": [ - "resorteviolenciaA", - "resorteviolenciaB", - "resorteviolenciaC", - "resorteviolenciaD", - "resorteviolenciaE", - "resorteviolenciaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "rtcRating": { - "type": "string", - "description": "The video's General Directorate of Radio, Television and Cinematography (Mexico) rating.", - "enum": [ - "rtcA", - "rtcAa", - "rtcB", - "rtcB15", - "rtcC", - "rtcD", - "rtcUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "rteRating": { - "type": "string", - "description": "The video's rating from Ireland's Raidió Teilifís Éireann.", - "enum": [ - "rteCh", - "rteGa", - "rteMa", - "rtePs", - "rteUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "russiaRating": { - "type": "string", - "description": "The video's National Film Registry of the Russian Federation (MKRF - Russia) rating.", - "enum": [ - "russia0", - "russia12", - "russia16", - "russia18", - "russia6", - "russiaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "skfilmRating": { - "type": "string", - "description": "The video's rating in Slovakia.", - "enum": [ - "skfilmG", - "skfilmP2", - "skfilmP5", - "skfilmP8", - "skfilmUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "smaisRating": { - "type": "string", - "description": "The video's rating in Iceland.", - "enum": [ - "smais12", - "smais14", - "smais16", - "smais18", - "smais7", - "smaisL", - "smaisUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "smsaRating": { - "type": "string", - "description": "The video's rating from Statens medieråd (Sweden's National Media Council).", - "enum": [ - "smsa11", - "smsa15", - "smsa7", - "smsaA", - "smsaUnrated" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "tvpgRating": { - "type": "string", - "description": "The video's TV Parental Guidelines (TVPG) rating.", - "enum": [ - "pg14", - "tvpgG", - "tvpgMa", - "tvpgPg", - "tvpgUnrated", - "tvpgY", - "tvpgY7", - "tvpgY7Fv" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ytRating": { - "type": "string", - "description": "A rating that YouTube uses to identify age-restricted content.", - "enum": [ - "ytAgeRestricted" - ], - "enumDescriptions": [ - "" - ] - } - } - }, - "FanFundingEvent": { - "id": "FanFundingEvent", - "type": "object", - "description": "A fanFundingEvent resource represents a fan funding event on a YouTube channel. Fan funding events occur when a user gives one-time monetary support to the channel owner.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the fan funding event." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#fanFundingEvent\".", - "default": "youtube#fanFundingEvent" - }, - "snippet": { - "$ref": "FanFundingEventSnippet", - "description": "The snippet object contains basic details about the fan funding event." - } - } - }, - "FanFundingEventListResponse": { - "id": "FanFundingEventListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of fan funding events that match the request criteria.", - "items": { - "$ref": "FanFundingEvent" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#fanFundingEventListResponse\".", - "default": "youtube#fanFundingEventListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "FanFundingEventSnippet": { - "id": "FanFundingEventSnippet", - "type": "object", - "properties": { - "amountMicros": { - "type": "string", - "description": "The amount of funding in micros of fund_currency. e.g., 1 is represented", - "format": "uint64" - }, - "channelId": { - "type": "string", - "description": "Channel id where the funding event occurred." - }, - "commentText": { - "type": "string", - "description": "The text contents of the comment left by the user." - }, - "createdAt": { - "type": "string", - "description": "The date and time when the funding occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "currency": { - "type": "string", - "description": "The currency in which the fund was made. ISO 4217." - }, - "displayString": { - "type": "string", - "description": "A rendered string that displays the fund amount and currency (e.g., \"$1.00\"). The string is rendered for the given language." - }, - "supporterDetails": { - "$ref": "ChannelProfileDetails", - "description": "Details about the supporter. Only filled if the event was made public by the user." - } - } - }, - "GeoPoint": { - "id": "GeoPoint", - "type": "object", - "description": "Geographical coordinates of a point, in WGS84.", - "properties": { - "altitude": { - "type": "number", - "description": "Altitude above the reference ellipsoid, in meters.", - "format": "double" - }, - "latitude": { - "type": "number", - "description": "Latitude in degrees.", - "format": "double" - }, - "longitude": { - "type": "number", - "description": "Longitude in degrees.", - "format": "double" - } - } - }, - "GuideCategory": { - "id": "GuideCategory", - "type": "object", - "description": "A guideCategory resource identifies a category that YouTube algorithmically assigns based on a channel's content or other indicators, such as the channel's popularity. The list is similar to video categories, with the difference being that a video's uploader can assign a video category but only YouTube can assign a channel category.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the guide category." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#guideCategory\".", - "default": "youtube#guideCategory" - }, - "snippet": { - "$ref": "GuideCategorySnippet", - "description": "The snippet object contains basic details about the category, such as its title." - } - } - }, - "GuideCategoryListResponse": { - "id": "GuideCategoryListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of categories that can be associated with YouTube channels. In this map, the category ID is the map key, and its value is the corresponding guideCategory resource.", - "items": { - "$ref": "GuideCategory" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#guideCategoryListResponse\".", - "default": "youtube#guideCategoryListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "GuideCategorySnippet": { - "id": "GuideCategorySnippet", - "type": "object", - "description": "Basic details about a guide category.", - "properties": { - "channelId": { - "type": "string", - "default": "UCBR8-60-B28hp2BmDPdntcQ" - }, - "title": { - "type": "string", - "description": "Description of the guide category." - } - } - }, - "I18nLanguage": { - "id": "I18nLanguage", - "type": "object", - "description": "An i18nLanguage resource identifies a UI language currently supported by YouTube.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the i18n language." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nLanguage\".", - "default": "youtube#i18nLanguage" - }, - "snippet": { - "$ref": "I18nLanguageSnippet", - "description": "The snippet object contains basic details about the i18n language, such as language code and human-readable name." - } - } - }, - "I18nLanguageListResponse": { - "id": "I18nLanguageListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of supported i18n languages. In this map, the i18n language ID is the map key, and its value is the corresponding i18nLanguage resource.", - "items": { - "$ref": "I18nLanguage" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nLanguageListResponse\".", - "default": "youtube#i18nLanguageListResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "I18nLanguageSnippet": { - "id": "I18nLanguageSnippet", - "type": "object", - "description": "Basic details about an i18n language, such as language code and human-readable name.", - "properties": { - "hl": { - "type": "string", - "description": "A short BCP-47 code that uniquely identifies a language." - }, - "name": { - "type": "string", - "description": "The human-readable name of the language in the language itself." - } - } - }, - "I18nRegion": { - "id": "I18nRegion", - "type": "object", - "description": "A i18nRegion resource identifies a region where YouTube is available.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the i18n region." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nRegion\".", - "default": "youtube#i18nRegion" - }, - "snippet": { - "$ref": "I18nRegionSnippet", - "description": "The snippet object contains basic details about the i18n region, such as region code and human-readable name." - } - } - }, - "I18nRegionListResponse": { - "id": "I18nRegionListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of regions where YouTube is available. In this map, the i18n region ID is the map key, and its value is the corresponding i18nRegion resource.", - "items": { - "$ref": "I18nRegion" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nRegionListResponse\".", - "default": "youtube#i18nRegionListResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "I18nRegionSnippet": { - "id": "I18nRegionSnippet", - "type": "object", - "description": "Basic details about an i18n region, such as region code and human-readable name.", - "properties": { - "gl": { - "type": "string", - "description": "The region code as a 2-letter ISO country code." - }, - "name": { - "type": "string", - "description": "The human-readable name of the region." - } - } - }, - "ImageSettings": { - "id": "ImageSettings", - "type": "object", - "description": "Branding properties for images associated with the channel.", - "properties": { - "backgroundImageUrl": { - "$ref": "LocalizedProperty", - "description": "The URL for the background image shown on the video watch page. The image should be 1200px by 615px, with a maximum file size of 128k." - }, - "bannerExternalUrl": { - "type": "string", - "description": "This is used only in update requests; if it's set, we use this URL to generate all of the above banner URLs." - }, - "bannerImageUrl": { - "type": "string", - "description": "Banner image. Desktop size (1060x175)." - }, - "bannerMobileExtraHdImageUrl": { - "type": "string", - "description": "Banner image. Mobile size high resolution (1440x395)." - }, - "bannerMobileHdImageUrl": { - "type": "string", - "description": "Banner image. Mobile size high resolution (1280x360)." - }, - "bannerMobileImageUrl": { - "type": "string", - "description": "Banner image. Mobile size (640x175)." - }, - "bannerMobileLowImageUrl": { - "type": "string", - "description": "Banner image. Mobile size low resolution (320x88)." - }, - "bannerMobileMediumHdImageUrl": { - "type": "string", - "description": "Banner image. Mobile size medium/high resolution (960x263)." - }, - "bannerTabletExtraHdImageUrl": { - "type": "string", - "description": "Banner image. Tablet size extra high resolution (2560x424)." - }, - "bannerTabletHdImageUrl": { - "type": "string", - "description": "Banner image. Tablet size high resolution (2276x377)." - }, - "bannerTabletImageUrl": { - "type": "string", - "description": "Banner image. Tablet size (1707x283)." - }, - "bannerTabletLowImageUrl": { - "type": "string", - "description": "Banner image. Tablet size low resolution (1138x188)." - }, - "bannerTvHighImageUrl": { - "type": "string", - "description": "Banner image. TV size high resolution (1920x1080)." - }, - "bannerTvImageUrl": { - "type": "string", - "description": "Banner image. TV size extra high resolution (2120x1192)." - }, - "bannerTvLowImageUrl": { - "type": "string", - "description": "Banner image. TV size low resolution (854x480)." - }, - "bannerTvMediumImageUrl": { - "type": "string", - "description": "Banner image. TV size medium resolution (1280x720)." - }, - "largeBrandedBannerImageImapScript": { - "$ref": "LocalizedProperty", - "description": "The image map script for the large banner image." - }, - "largeBrandedBannerImageUrl": { - "$ref": "LocalizedProperty", - "description": "The URL for the 854px by 70px image that appears below the video player in the expanded video view of the video watch page." - }, - "smallBrandedBannerImageImapScript": { - "$ref": "LocalizedProperty", - "description": "The image map script for the small banner image." - }, - "smallBrandedBannerImageUrl": { - "$ref": "LocalizedProperty", - "description": "The URL for the 640px by 70px banner image that appears below the video player in the default view of the video watch page." - }, - "trackingImageUrl": { - "type": "string", - "description": "The URL for a 1px by 1px tracking pixel that can be used to collect statistics for views of the channel or video pages." - }, - "watchIconImageUrl": { - "type": "string", - "description": "The URL for the image that appears above the top-left corner of the video player. This is a 25-pixel-high image with a flexible width that cannot exceed 170 pixels." - } - } - }, - "IngestionInfo": { - "id": "IngestionInfo", - "type": "object", - "description": "Describes information necessary for ingesting an RTMP or an HTTP stream.", - "properties": { - "backupIngestionAddress": { - "type": "string", - "description": "The backup ingestion URL that you should use to stream video to YouTube. You have the option of simultaneously streaming the content that you are sending to the ingestionAddress to this URL." - }, - "ingestionAddress": { - "type": "string", - "description": "The primary ingestion URL that you should use to stream video to YouTube. You must stream video to this URL.\n\nDepending on which application or tool you use to encode your video stream, you may need to enter the stream URL and stream name separately or you may need to concatenate them in the following format:\n\nSTREAM_URL/STREAM_NAME" - }, - "streamName": { - "type": "string", - "description": "The HTTP or RTMP stream name that YouTube assigns to the video stream." - } - } - }, - "InvideoBranding": { - "id": "InvideoBranding", - "type": "object", - "properties": { - "imageBytes": { - "type": "string", - "format": "byte" - }, - "imageUrl": { - "type": "string" - }, - "position": { - "$ref": "InvideoPosition" - }, - "targetChannelId": { - "type": "string" - }, - "timing": { - "$ref": "InvideoTiming" - } - } - }, - "InvideoPosition": { - "id": "InvideoPosition", - "type": "object", - "description": "Describes the spatial position of a visual widget inside a video. It is a union of various position types, out of which only will be set one.", - "properties": { - "cornerPosition": { - "type": "string", - "description": "Describes in which corner of the video the visual widget will appear.", - "enum": [ - "bottomLeft", - "bottomRight", - "topLeft", - "topRight" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "type": { - "type": "string", - "description": "Defines the position type.", - "enum": [ - "corner" - ], - "enumDescriptions": [ - "" - ] - } - } - }, - "InvideoPromotion": { - "id": "InvideoPromotion", - "type": "object", - "description": "Describes an invideo promotion campaign consisting of multiple promoted items. A campaign belongs to a single channel_id.", - "properties": { - "defaultTiming": { - "$ref": "InvideoTiming", - "description": "The default temporal position within the video where the promoted item will be displayed. Can be overriden by more specific timing in the item." - }, - "items": { - "type": "array", - "description": "List of promoted items in decreasing priority.", - "items": { - "$ref": "PromotedItem" - } - }, - "position": { - "$ref": "InvideoPosition", - "description": "The spatial position within the video where the promoted item will be displayed." - }, - "useSmartTiming": { - "type": "boolean", - "description": "Indicates whether the channel's promotional campaign uses \"smart timing.\" This feature attempts to show promotions at a point in the video when they are more likely to be clicked and less likely to disrupt the viewing experience. This feature also picks up a single promotion to show on each video." - } - } - }, - "InvideoTiming": { - "id": "InvideoTiming", - "type": "object", - "description": "Describes a temporal position of a visual widget inside a video.", - "properties": { - "durationMs": { - "type": "string", - "description": "Defines the duration in milliseconds for which the promotion should be displayed. If missing, the client should use the default.", - "format": "uint64" - }, - "offsetMs": { - "type": "string", - "description": "Defines the time at which the promotion will appear. Depending on the value of type the value of the offsetMs field will represent a time offset from the start or from the end of the video, expressed in milliseconds.", - "format": "uint64" - }, - "type": { - "type": "string", - "description": "Describes a timing type. If the value is offsetFromStart, then the offsetMs field represents an offset from the start of the video. If the value is offsetFromEnd, then the offsetMs field represents an offset from the end of the video.", - "enum": [ - "offsetFromEnd", - "offsetFromStart" - ], - "enumDescriptions": [ - "", - "" - ] - } - } - }, - "LanguageTag": { - "id": "LanguageTag", - "type": "object", - "properties": { - "value": { - "type": "string" - } - } - }, - "LiveBroadcast": { - "id": "LiveBroadcast", - "type": "object", - "description": "A liveBroadcast resource represents an event that will be streamed, via live video, on YouTube.", - "properties": { - "contentDetails": { - "$ref": "LiveBroadcastContentDetails", - "description": "The contentDetails object contains information about the event's video content, such as whether the content can be shown in an embedded video player or if it will be archived and therefore available for viewing after the event has concluded." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the broadcast.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveBroadcast\".", - "default": "youtube#liveBroadcast" - }, - "snippet": { - "$ref": "LiveBroadcastSnippet", - "description": "The snippet object contains basic details about the event, including its title, description, start time, and end time." - }, - "statistics": { - "$ref": "LiveBroadcastStatistics", - "description": "The statistics object contains info about the event's current stats. These include concurrent viewers and total chat count. Statistics can change (in either direction) during the lifetime of an event. Statistics are only returned while the event is live." - }, - "status": { - "$ref": "LiveBroadcastStatus", - "description": "The status object contains information about the event's status." - }, - "topicDetails": { - "$ref": "LiveBroadcastTopicDetails" - } - } - }, - "LiveBroadcastContentDetails": { - "id": "LiveBroadcastContentDetails", - "type": "object", - "description": "Detailed settings of a broadcast.", - "properties": { - "boundStreamId": { - "type": "string", - "description": "This value uniquely identifies the live stream bound to the broadcast." - }, - "boundStreamLastUpdateTimeMs": { - "type": "string", - "description": "The date and time that the live stream referenced by boundStreamId was last updated.", - "format": "date-time" - }, - "closedCaptionsType": { - "type": "string", - "enum": [ - "closedCaptionsDisabled", - "closedCaptionsEmbedded", - "closedCaptionsHttpPost" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "enableClosedCaptions": { - "type": "boolean", - "description": "This setting indicates whether HTTP POST closed captioning is enabled for this broadcast. The ingestion URL of the closed captions is returned through the liveStreams API. This is mutually exclusive with using the closed_captions_type property, and is equivalent to setting closed_captions_type to CLOSED_CAPTIONS_HTTP_POST." - }, - "enableContentEncryption": { - "type": "boolean", - "description": "This setting indicates whether YouTube should enable content encryption for the broadcast.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "enableDvr": { - "type": "boolean", - "description": "This setting determines whether viewers can access DVR controls while watching the video. DVR controls enable the viewer to control the video playback experience by pausing, rewinding, or fast forwarding content. The default value for this property is true.\n\n\n\nImportant: You must set the value to true and also set the enableArchive property's value to true if you want to make playback available immediately after the broadcast ends.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "enableEmbed": { - "type": "boolean", - "description": "This setting indicates whether the broadcast video can be played in an embedded player. If you choose to archive the video (using the enableArchive property), this setting will also apply to the archived video.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "enableLowLatency": { - "type": "boolean", - "description": "Indicates whether this broadcast has low latency enabled." - }, - "monitorStream": { - "$ref": "MonitorStreamInfo", - "description": "The monitorStream object contains information about the monitor stream, which the broadcaster can use to review the event content before the broadcast stream is shown publicly." - }, - "projection": { - "type": "string", - "description": "The projection format of this broadcast. This defaults to rectangular.", - "enum": [ - "360", - "rectangular" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "recordFromStart": { - "type": "boolean", - "description": "Automatically start recording after the event goes live. The default value for this property is true.\n\n\n\nImportant: You must also set the enableDvr property's value to true if you want the playback to be available immediately after the broadcast ends. If you set this property's value to true but do not also set the enableDvr property to true, there may be a delay of around one day before the archived video will be available for playback.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "startWithSlate": { - "type": "boolean", - "description": "This setting indicates whether the broadcast should automatically begin with an in-stream slate when you update the broadcast's status to live. After updating the status, you then need to send a liveCuepoints.insert request that sets the cuepoint's eventState to end to remove the in-stream slate and make your broadcast stream visible to viewers.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - } - } - }, - "LiveBroadcastListResponse": { - "id": "LiveBroadcastListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of broadcasts that match the request criteria.", - "items": { - "$ref": "LiveBroadcast" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveBroadcastListResponse\".", - "default": "youtube#liveBroadcastListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "LiveBroadcastSnippet": { - "id": "LiveBroadcastSnippet", - "type": "object", - "properties": { - "actualEndTime": { - "type": "string", - "description": "The date and time that the broadcast actually ended. This information is only available once the broadcast's state is complete. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "actualStartTime": { - "type": "string", - "description": "The date and time that the broadcast actually started. This information is only available once the broadcast's state is live. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel that is publishing the broadcast." - }, - "description": { - "type": "string", - "description": "The broadcast's description. As with the title, you can set this field by modifying the broadcast resource or by setting the description field of the corresponding video resource." - }, - "isDefaultBroadcast": { - "type": "boolean" - }, - "liveChatId": { - "type": "string", - "description": "The id of the live chat for this broadcast." - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the broadcast was added to YouTube's live broadcast schedule. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "scheduledEndTime": { - "type": "string", - "description": "The date and time that the broadcast is scheduled to end. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "scheduledStartTime": { - "type": "string", - "description": "The date and time that the broadcast is scheduled to start. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time", - "annotations": { - "required": [ - "youtube.liveBroadcasts.insert", - "youtube.liveBroadcasts.update" - ] - } - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the broadcast. For each nested object in this object, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The broadcast's title. Note that the broadcast represents exactly one YouTube video. You can set this field by modifying the broadcast resource or by setting the title field of the corresponding video resource.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.insert", - "youtube.liveBroadcasts.update" - ] - } - } - } - }, - "LiveBroadcastStatistics": { - "id": "LiveBroadcastStatistics", - "type": "object", - "description": "Statistics about the live broadcast. These represent a snapshot of the values at the time of the request. Statistics are only returned for live broadcasts.", - "properties": { - "concurrentViewers": { - "type": "string", - "description": "The number of viewers currently watching the broadcast. The property and its value will be present if the broadcast has current viewers and the broadcast owner has not hidden the viewcount for the video. Note that YouTube stops tracking the number of concurrent viewers for a broadcast when the broadcast ends. So, this property would not identify the number of viewers watching an archived video of a live broadcast that already ended.", - "format": "uint64" - }, - "totalChatCount": { - "type": "string", - "description": "The total number of live chat messages currently on the broadcast. The property and its value will be present if the broadcast is public, has the live chat feature enabled, and has at least one message. Note that this field will not be filled after the broadcast ends. So this property would not identify the number of chat messages for an archived video of a completed live broadcast.", - "format": "uint64" - } - } - }, - "LiveBroadcastStatus": { - "id": "LiveBroadcastStatus", - "type": "object", - "properties": { - "lifeCycleStatus": { - "type": "string", - "description": "The broadcast's status. The status can be updated using the API's liveBroadcasts.transition method.", - "enum": [ - "abandoned", - "complete", - "completeStarting", - "created", - "live", - "liveStarting", - "ready", - "reclaimed", - "revoked", - "testStarting", - "testing" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "liveBroadcastPriority": { - "type": "string", - "description": "Priority of the live broadcast event (internal state).", - "enum": [ - "high", - "low", - "normal" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "privacyStatus": { - "type": "string", - "description": "The broadcast's privacy status. Note that the broadcast represents exactly one YouTube video, so the privacy settings are identical to those supported for videos. In addition, you can set this field by modifying the broadcast resource or by setting the privacyStatus field of the corresponding video resource.", - "enum": [ - "private", - "public", - "unlisted" - ], - "enumDescriptions": [ - "", - "", - "" - ], - "annotations": { - "required": [ - "youtube.liveBroadcasts.insert", - "youtube.liveBroadcasts.update" - ] - } - }, - "recordingStatus": { - "type": "string", - "description": "The broadcast's recording status.", - "enum": [ - "notRecording", - "recorded", - "recording" - ], - "enumDescriptions": [ - "", - "", - "" - ] - } - } - }, - "LiveBroadcastTopic": { - "id": "LiveBroadcastTopic", - "type": "object", - "properties": { - "snippet": { - "$ref": "LiveBroadcastTopicSnippet", - "description": "Information about the topic matched." - }, - "type": { - "type": "string", - "description": "The type of the topic.", - "enum": [ - "videoGame" - ], - "enumDescriptions": [ - "" - ] - }, - "unmatched": { - "type": "boolean", - "description": "If this flag is set it means that we have not been able to match the topic title and type provided to a known entity." - } - } - }, - "LiveBroadcastTopicDetails": { - "id": "LiveBroadcastTopicDetails", - "type": "object", - "properties": { - "topics": { - "type": "array", - "items": { - "$ref": "LiveBroadcastTopic" - } - } - } - }, - "LiveBroadcastTopicSnippet": { - "id": "LiveBroadcastTopicSnippet", - "type": "object", - "properties": { - "name": { - "type": "string", - "description": "The name of the topic." - }, - "releaseDate": { - "type": "string", - "description": "The date at which the topic was released. Filled for types: videoGame" - } - } - }, - "LiveChatBan": { - "id": "LiveChatBan", - "type": "object", - "description": "A liveChatBan resource represents a ban for a YouTube live chat.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the ban." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatBan\".", - "default": "youtube#liveChatBan" - }, - "snippet": { - "$ref": "LiveChatBanSnippet", - "description": "The snippet object contains basic details about the ban." - } - } - }, - "LiveChatBanSnippet": { - "id": "LiveChatBanSnippet", - "type": "object", - "properties": { - "banDurationSeconds": { - "type": "string", - "description": "The duration of a ban, only filled if the ban has type TEMPORARY.", - "format": "uint64" - }, - "bannedUserDetails": { - "$ref": "ChannelProfileDetails" - }, - "liveChatId": { - "type": "string", - "description": "The chat this ban is pertinent to." - }, - "type": { - "type": "string", - "description": "The type of ban.", - "enum": [ - "permanent", - "temporary" - ], - "enumDescriptions": [ - "", - "" - ] - } - } - }, - "LiveChatFanFundingEventDetails": { - "id": "LiveChatFanFundingEventDetails", - "type": "object", - "properties": { - "amountDisplayString": { - "type": "string", - "description": "A rendered string that displays the fund amount and currency to the user." - }, - "amountMicros": { - "type": "string", - "description": "The amount of the fund.", - "format": "uint64" - }, - "currency": { - "type": "string", - "description": "The currency in which the fund was made." - }, - "userComment": { - "type": "string", - "description": "The comment added by the user to this fan funding event." - } - } - }, - "LiveChatMessage": { - "id": "LiveChatMessage", - "type": "object", - "description": "A liveChatMessage resource represents a chat message in a YouTube Live Chat.", - "properties": { - "authorDetails": { - "$ref": "LiveChatMessageAuthorDetails", - "description": "The authorDetails object contains basic details about the user that posted this message." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the message." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatMessage\".", - "default": "youtube#liveChatMessage" - }, - "snippet": { - "$ref": "LiveChatMessageSnippet", - "description": "The snippet object contains basic details about the message." - } - } - }, - "LiveChatMessageAuthorDetails": { - "id": "LiveChatMessageAuthorDetails", - "type": "object", - "properties": { - "channelId": { - "type": "string", - "description": "The YouTube channel ID." - }, - "channelUrl": { - "type": "string", - "description": "The channel's URL." - }, - "displayName": { - "type": "string", - "description": "The channel's display name." - }, - "isChatModerator": { - "type": "boolean", - "description": "Whether the author is a moderator of the live chat." - }, - "isChatOwner": { - "type": "boolean", - "description": "Whether the author is the owner of the live chat." - }, - "isChatSponsor": { - "type": "boolean", - "description": "Whether the author is a sponsor of the live chat." - }, - "isVerified": { - "type": "boolean", - "description": "Whether the author's identity has been verified by YouTube." - }, - "profileImageUrl": { - "type": "string", - "description": "The channels's avatar URL." - } - } - }, - "LiveChatMessageDeletedDetails": { - "id": "LiveChatMessageDeletedDetails", - "type": "object", - "properties": { - "deletedMessageId": { - "type": "string" - } - } - }, - "LiveChatMessageListResponse": { - "id": "LiveChatMessageListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of live chat messages.", - "items": { - "$ref": "LiveChatMessage" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatMessageListResponse\".", - "default": "youtube#liveChatMessageListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "offlineAt": { - "type": "string", - "description": "The date and time when the underlying stream went offline. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "pollingIntervalMillis": { - "type": "integer", - "description": "The amount of time the client should wait before polling again.", - "format": "uint32" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "LiveChatMessageRetractedDetails": { - "id": "LiveChatMessageRetractedDetails", - "type": "object", - "properties": { - "retractedMessageId": { - "type": "string" - } - } - }, - "LiveChatMessageSnippet": { - "id": "LiveChatMessageSnippet", - "type": "object", - "properties": { - "authorChannelId": { - "type": "string", - "description": "The ID of the user that authored this message, this field is not always filled. textMessageEvent - the user that wrote the message fanFundingEvent - the user that funded the broadcast newSponsorEvent - the user that just became a sponsor messageDeletedEvent - the moderator that took the action messageRetractedEvent - the author that retracted their message userBannedEvent - the moderator that took the action superChatEvent - the user that made the purchase" - }, - "displayMessage": { - "type": "string", - "description": "Contains a string that can be displayed to the user. If this field is not present the message is silent, at the moment only messages of type TOMBSTONE and CHAT_ENDED_EVENT are silent." - }, - "fanFundingEventDetails": { - "$ref": "LiveChatFanFundingEventDetails", - "description": "Details about the funding event, this is only set if the type is 'fanFundingEvent'." - }, - "hasDisplayContent": { - "type": "boolean", - "description": "Whether the message has display content that should be displayed to users." - }, - "liveChatId": { - "type": "string" - }, - "messageDeletedDetails": { - "$ref": "LiveChatMessageDeletedDetails" - }, - "messageRetractedDetails": { - "$ref": "LiveChatMessageRetractedDetails" - }, - "pollClosedDetails": { - "$ref": "LiveChatPollClosedDetails" - }, - "pollEditedDetails": { - "$ref": "LiveChatPollEditedDetails" - }, - "pollOpenedDetails": { - "$ref": "LiveChatPollOpenedDetails" - }, - "pollVotedDetails": { - "$ref": "LiveChatPollVotedDetails" - }, - "publishedAt": { - "type": "string", - "description": "The date and time when the message was orignally published. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "superChatDetails": { - "$ref": "LiveChatSuperChatDetails", - "description": "Details about the Super Chat event, this is only set if the type is 'superChatEvent'." - }, - "textMessageDetails": { - "$ref": "LiveChatTextMessageDetails", - "description": "Details about the text message, this is only set if the type is 'textMessageEvent'." - }, - "type": { - "type": "string", - "description": "The type of message, this will always be present, it determines the contents of the message as well as which fields will be present.", - "enum": [ - "chatEndedEvent", - "fanFundingEvent", - "messageDeletedEvent", - "messageRetractedEvent", - "newSponsorEvent", - "pollClosedEvent", - "pollEditedEvent", - "pollOpenedEvent", - "pollVotedEvent", - "sponsorOnlyModeEndedEvent", - "sponsorOnlyModeStartedEvent", - "superChatEvent", - "textMessageEvent", - "tombstone", - "userBannedEvent" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "userBannedDetails": { - "$ref": "LiveChatUserBannedMessageDetails" - } - } - }, - "LiveChatModerator": { - "id": "LiveChatModerator", - "type": "object", - "description": "A liveChatModerator resource represents a moderator for a YouTube live chat. A chat moderator has the ability to ban/unban users from a chat, remove message, etc.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the moderator." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatModerator\".", - "default": "youtube#liveChatModerator" - }, - "snippet": { - "$ref": "LiveChatModeratorSnippet", - "description": "The snippet object contains basic details about the moderator." - } - } - }, - "LiveChatModeratorListResponse": { - "id": "LiveChatModeratorListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of moderators that match the request criteria.", - "items": { - "$ref": "LiveChatModerator" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatModeratorListResponse\".", - "default": "youtube#liveChatModeratorListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "LiveChatModeratorSnippet": { - "id": "LiveChatModeratorSnippet", - "type": "object", - "properties": { - "liveChatId": { - "type": "string", - "description": "The ID of the live chat this moderator can act on." - }, - "moderatorDetails": { - "$ref": "ChannelProfileDetails", - "description": "Details about the moderator." - } - } - }, - "LiveChatPollClosedDetails": { - "id": "LiveChatPollClosedDetails", - "type": "object", - "properties": { - "pollId": { - "type": "string", - "description": "The id of the poll that was closed." - } - } - }, - "LiveChatPollEditedDetails": { - "id": "LiveChatPollEditedDetails", - "type": "object", - "properties": { - "id": { - "type": "string" - }, - "items": { - "type": "array", - "items": { - "$ref": "LiveChatPollItem" - } - }, - "prompt": { - "type": "string" - } - } - }, - "LiveChatPollItem": { - "id": "LiveChatPollItem", - "type": "object", - "properties": { - "description": { - "type": "string", - "description": "Plain text description of the item." - }, - "itemId": { - "type": "string" - } - } - }, - "LiveChatPollOpenedDetails": { - "id": "LiveChatPollOpenedDetails", - "type": "object", - "properties": { - "id": { - "type": "string" - }, - "items": { - "type": "array", - "items": { - "$ref": "LiveChatPollItem" - } - }, - "prompt": { - "type": "string" - } - } - }, - "LiveChatPollVotedDetails": { - "id": "LiveChatPollVotedDetails", - "type": "object", - "properties": { - "itemId": { - "type": "string", - "description": "The poll item the user chose." - }, - "pollId": { - "type": "string", - "description": "The poll the user voted on." - } - } - }, - "LiveChatSuperChatDetails": { - "id": "LiveChatSuperChatDetails", - "type": "object", - "properties": { - "amountDisplayString": { - "type": "string", - "description": "A rendered string that displays the fund amount and currency to the user." - }, - "amountMicros": { - "type": "string", - "description": "The amount purchased by the user, in micros (1,750,000 micros = 1.75).", - "format": "uint64" - }, - "currency": { - "type": "string", - "description": "The currency in which the purchase was made." - }, - "tier": { - "type": "integer", - "description": "The tier in which the amount belongs to. Lower amounts belong to lower tiers. Starts at 1.", - "format": "uint32" - }, - "userComment": { - "type": "string", - "description": "The comment added by the user to this Super Chat event." - } - } - }, - "LiveChatTextMessageDetails": { - "id": "LiveChatTextMessageDetails", - "type": "object", - "properties": { - "messageText": { - "type": "string", - "description": "The user's message." - } - } - }, - "LiveChatUserBannedMessageDetails": { - "id": "LiveChatUserBannedMessageDetails", - "type": "object", - "properties": { - "banDurationSeconds": { - "type": "string", - "description": "The duration of the ban. This property is only present if the banType is temporary.", - "format": "uint64" - }, - "banType": { - "type": "string", - "description": "The type of ban.", - "enum": [ - "permanent", - "temporary" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "bannedUserDetails": { - "$ref": "ChannelProfileDetails", - "description": "The details of the user that was banned." - } - } - }, - "LiveStream": { - "id": "LiveStream", - "type": "object", - "description": "A live stream describes a live ingestion point.", - "properties": { - "cdn": { - "$ref": "CdnSettings", - "description": "The cdn object defines the live stream's content delivery network (CDN) settings. These settings provide details about the manner in which you stream your content to YouTube." - }, - "contentDetails": { - "$ref": "LiveStreamContentDetails", - "description": "The content_details object contains information about the stream, including the closed captions ingestion URL." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the stream.", - "annotations": { - "required": [ - "youtube.liveStreams.update" - ] - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveStream\".", - "default": "youtube#liveStream" - }, - "snippet": { - "$ref": "LiveStreamSnippet", - "description": "The snippet object contains basic details about the stream, including its channel, title, and description." - }, - "status": { - "$ref": "LiveStreamStatus", - "description": "The status object contains information about live stream's status." - } - } - }, - "LiveStreamConfigurationIssue": { - "id": "LiveStreamConfigurationIssue", - "type": "object", - "properties": { - "description": { - "type": "string", - "description": "The long-form description of the issue and how to resolve it." - }, - "reason": { - "type": "string", - "description": "The short-form reason for this issue." - }, - "severity": { - "type": "string", - "description": "How severe this issue is to the stream.", - "enum": [ - "error", - "info", - "warning" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "type": { - "type": "string", - "description": "The kind of error happening.", - "enum": [ - "audioBitrateHigh", - "audioBitrateLow", - "audioBitrateMismatch", - "audioCodec", - "audioCodecMismatch", - "audioSampleRate", - "audioSampleRateMismatch", - "audioStereoMismatch", - "audioTooManyChannels", - "badContainer", - "bitrateHigh", - "bitrateLow", - "frameRateHigh", - "framerateMismatch", - "gopMismatch", - "gopSizeLong", - "gopSizeOver", - "gopSizeShort", - "interlacedVideo", - "multipleAudioStreams", - "multipleVideoStreams", - "noAudioStream", - "noVideoStream", - "openGop", - "resolutionMismatch", - "videoBitrateMismatch", - "videoCodec", - "videoCodecMismatch", - "videoIngestionStarved", - "videoInterlaceMismatch", - "videoProfileMismatch", - "videoResolutionSuboptimal", - "videoResolutionUnsupported" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - } - }, - "LiveStreamContentDetails": { - "id": "LiveStreamContentDetails", - "type": "object", - "description": "Detailed settings of a stream.", - "properties": { - "closedCaptionsIngestionUrl": { - "type": "string", - "description": "The ingestion URL where the closed captions of this stream are sent." - }, - "isReusable": { - "type": "boolean", - "description": "Indicates whether the stream is reusable, which means that it can be bound to multiple broadcasts. It is common for broadcasters to reuse the same stream for many different broadcasts if those broadcasts occur at different times.\n\nIf you set this value to false, then the stream will not be reusable, which means that it can only be bound to one broadcast. Non-reusable streams differ from reusable streams in the following ways: \n- A non-reusable stream can only be bound to one broadcast. \n- A non-reusable stream might be deleted by an automated process after the broadcast ends. \n- The liveStreams.list method does not list non-reusable streams if you call the method and set the mine parameter to true. The only way to use that method to retrieve the resource for a non-reusable stream is to use the id parameter to identify the stream." - } - } - }, - "LiveStreamHealthStatus": { - "id": "LiveStreamHealthStatus", - "type": "object", - "properties": { - "configurationIssues": { - "type": "array", - "description": "The configurations issues on this stream", - "items": { - "$ref": "LiveStreamConfigurationIssue" - } - }, - "lastUpdateTimeSeconds": { - "type": "string", - "description": "The last time this status was updated (in seconds)", - "format": "uint64" - }, - "status": { - "type": "string", - "description": "The status code of this stream", - "enum": [ - "bad", - "good", - "noData", - "ok", - "revoked" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - } - } - }, - "LiveStreamListResponse": { - "id": "LiveStreamListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of live streams that match the request criteria.", - "items": { - "$ref": "LiveStream" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveStreamListResponse\".", - "default": "youtube#liveStreamListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "LiveStreamSnippet": { - "id": "LiveStreamSnippet", - "type": "object", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel that is transmitting the stream." - }, - "description": { - "type": "string", - "description": "The stream's description. The value cannot be longer than 10000 characters." - }, - "isDefaultStream": { - "type": "boolean" - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the stream was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "title": { - "type": "string", - "description": "The stream's title. The value must be between 1 and 128 characters long.", - "annotations": { - "required": [ - "youtube.liveStreams.insert", - "youtube.liveStreams.update" - ] - } - } - } - }, - "LiveStreamStatus": { - "id": "LiveStreamStatus", - "type": "object", - "description": "Brief description of the live stream status.", - "properties": { - "healthStatus": { - "$ref": "LiveStreamHealthStatus", - "description": "The health status of the stream." - }, - "streamStatus": { - "type": "string", - "enum": [ - "active", - "created", - "error", - "inactive", - "ready" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - } - } - }, - "LocalizedProperty": { - "id": "LocalizedProperty", - "type": "object", - "properties": { - "default": { - "type": "string" - }, - "defaultLanguage": { - "$ref": "LanguageTag", - "description": "The language of the default property." - }, - "localized": { - "type": "array", - "items": { - "$ref": "LocalizedString" - } - } - } - }, - "LocalizedString": { - "id": "LocalizedString", - "type": "object", - "properties": { - "language": { - "type": "string" - }, - "value": { - "type": "string" - } - } - }, - "MonitorStreamInfo": { - "id": "MonitorStreamInfo", - "type": "object", - "description": "Settings and Info of the monitor stream", - "properties": { - "broadcastStreamDelayMs": { - "type": "integer", - "description": "If you have set the enableMonitorStream property to true, then this property determines the length of the live broadcast delay.", - "format": "uint32", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - }, - "embedHtml": { - "type": "string", - "description": "HTML code that embeds a player that plays the monitor stream." - }, - "enableMonitorStream": { - "type": "boolean", - "description": "This value determines whether the monitor stream is enabled for the broadcast. If the monitor stream is enabled, then YouTube will broadcast the event content on a special stream intended only for the broadcaster's consumption. The broadcaster can use the stream to review the event content and also to identify the optimal times to insert cuepoints.\n\nYou need to set this value to true if you intend to have a broadcast delay for your event.\n\nNote: This property cannot be updated once the broadcast is in the testing or live state.", - "annotations": { - "required": [ - "youtube.liveBroadcasts.update" - ] - } - } - } - }, - "PageInfo": { - "id": "PageInfo", - "type": "object", - "description": "Paging details for lists of resources, including total number of items available and number of resources returned in a single page.", - "properties": { - "resultsPerPage": { - "type": "integer", - "description": "The number of results included in the API response.", - "format": "int32" - }, - "totalResults": { - "type": "integer", - "description": "The total number of results in the result set.", - "format": "int32" - } - } - }, - "Playlist": { - "id": "Playlist", - "type": "object", - "description": "A playlist resource represents a YouTube playlist. A playlist is a collection of videos that can be viewed sequentially and shared with other users. A playlist can contain up to 200 videos, and YouTube does not limit the number of playlists that each user creates. By default, playlists are publicly visible to other users, but playlists can be public or private.\n\nYouTube also uses playlists to identify special collections of videos for a channel, such as: \n- uploaded videos \n- favorite videos \n- positively rated (liked) videos \n- watch history \n- watch later To be more specific, these lists are associated with a channel, which is a collection of a person, group, or company's videos, playlists, and other YouTube information. You can retrieve the playlist IDs for each of these lists from the channel resource for a given channel.\n\nYou can then use the playlistItems.list method to retrieve any of those lists. You can also add or remove items from those lists by calling the playlistItems.insert and playlistItems.delete methods.", - "properties": { - "contentDetails": { - "$ref": "PlaylistContentDetails", - "description": "The contentDetails object contains information like video count." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the playlist." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlist\".", - "default": "youtube#playlist" - }, - "localizations": { - "type": "object", - "description": "Localizations for different languages", - "additionalProperties": { - "$ref": "PlaylistLocalization", - "description": "The language tag, using string since map_key require simple types." - } - }, - "player": { - "$ref": "PlaylistPlayer", - "description": "The player object contains information that you would use to play the playlist in an embedded player." - }, - "snippet": { - "$ref": "PlaylistSnippet", - "description": "The snippet object contains basic details about the playlist, such as its title and description." - }, - "status": { - "$ref": "PlaylistStatus", - "description": "The status object contains status information for the playlist." - } - } - }, - "PlaylistContentDetails": { - "id": "PlaylistContentDetails", - "type": "object", - "properties": { - "itemCount": { - "type": "integer", - "description": "The number of videos in the playlist.", - "format": "uint32" - } - } - }, - "PlaylistItem": { - "id": "PlaylistItem", - "type": "object", - "description": "A playlistItem resource identifies another resource, such as a video, that is included in a playlist. In addition, the playlistItem resource contains details about the included resource that pertain specifically to how that resource is used in that playlist.\n\nYouTube uses playlists to identify special collections of videos for a channel, such as: \n- uploaded videos \n- favorite videos \n- positively rated (liked) videos \n- watch history \n- watch later To be more specific, these lists are associated with a channel, which is a collection of a person, group, or company's videos, playlists, and other YouTube information.\n\nYou can retrieve the playlist IDs for each of these lists from the channel resource for a given channel. You can then use the playlistItems.list method to retrieve any of those lists. You can also add or remove items from those lists by calling the playlistItems.insert and playlistItems.delete methods. For example, if a user gives a positive rating to a video, you would insert that video into the liked videos playlist for that user's channel.", - "properties": { - "contentDetails": { - "$ref": "PlaylistItemContentDetails", - "description": "The contentDetails object is included in the resource if the included item is a YouTube video. The object contains additional information about the video." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the playlist item." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistItem\".", - "default": "youtube#playlistItem" - }, - "snippet": { - "$ref": "PlaylistItemSnippet", - "description": "The snippet object contains basic details about the playlist item, such as its title and position in the playlist." - }, - "status": { - "$ref": "PlaylistItemStatus", - "description": "The status object contains information about the playlist item's privacy status." - } - } - }, - "PlaylistItemContentDetails": { - "id": "PlaylistItemContentDetails", - "type": "object", - "properties": { - "endAt": { - "type": "string", - "description": "The time, measured in seconds from the start of the video, when the video should stop playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) By default, assume that the video.endTime is the end of the video." - }, - "note": { - "type": "string", - "description": "A user-generated note for this item." - }, - "startAt": { - "type": "string", - "description": "The time, measured in seconds from the start of the video, when the video should start playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) The default value is 0." - }, - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify a video. To retrieve the video resource, set the id query parameter to this value in your API request." - }, - "videoPublishedAt": { - "type": "string", - "description": "The date and time that the video was published to YouTube. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - } - } - }, - "PlaylistItemListResponse": { - "id": "PlaylistItemListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of playlist items that match the request criteria.", - "items": { - "$ref": "PlaylistItem" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistItemListResponse\".", - "default": "youtube#playlistItemListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "PlaylistItemSnippet": { - "id": "PlaylistItemSnippet", - "type": "object", - "description": "Basic details about a playlist, including title, description and thumbnails.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the user that added the item to the playlist." - }, - "channelTitle": { - "type": "string", - "description": "Channel title for the channel that the playlist item belongs to." - }, - "description": { - "type": "string", - "description": "The item's description." - }, - "playlistId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the playlist that the playlist item is in.", - "annotations": { - "required": [ - "youtube.playlistItems.insert", - "youtube.playlistItems.update" - ] - } - }, - "position": { - "type": "integer", - "description": "The order in which the item appears in the playlist. The value uses a zero-based index, so the first item has a position of 0, the second item has a position of 1, and so forth.", - "format": "uint32" - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the item was added to the playlist. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "resourceId": { - "$ref": "ResourceId", - "description": "The id object contains information that can be used to uniquely identify the resource that is included in the playlist as the playlist item.", - "annotations": { - "required": [ - "youtube.playlistItems.insert", - "youtube.playlistItems.update" - ] - } - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the playlist item. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The item's title." - } - } - }, - "PlaylistItemStatus": { - "id": "PlaylistItemStatus", - "type": "object", - "description": "Information about the playlist item's privacy status.", - "properties": { - "privacyStatus": { - "type": "string", - "description": "This resource's privacy status.", - "enum": [ - "private", - "public", - "unlisted" - ], - "enumDescriptions": [ - "", - "", - "" - ] - } - } - }, - "PlaylistListResponse": { - "id": "PlaylistListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of playlists that match the request criteria.", - "items": { - "$ref": "Playlist" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistListResponse\".", - "default": "youtube#playlistListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "PlaylistLocalization": { - "id": "PlaylistLocalization", - "type": "object", - "description": "Playlist localization setting", - "properties": { - "description": { - "type": "string", - "description": "The localized strings for playlist's description." - }, - "title": { - "type": "string", - "description": "The localized strings for playlist's title." - } - } - }, - "PlaylistPlayer": { - "id": "PlaylistPlayer", - "type": "object", - "properties": { - "embedHtml": { - "type": "string", - "description": "An \u003ciframe\u003e tag that embeds a player that will play the playlist." - } - } - }, - "PlaylistSnippet": { - "id": "PlaylistSnippet", - "type": "object", - "description": "Basic details about a playlist, including title, description and thumbnails.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel that published the playlist." - }, - "channelTitle": { - "type": "string", - "description": "The channel title of the channel that the video belongs to." - }, - "defaultLanguage": { - "type": "string", - "description": "The language of the playlist's default title and description." - }, - "description": { - "type": "string", - "description": "The playlist's description." - }, - "localized": { - "$ref": "PlaylistLocalization", - "description": "Localized title and description, read-only." - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the playlist was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "tags": { - "type": "array", - "description": "Keyword tags associated with the playlist.", - "items": { - "type": "string" - } - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the playlist. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The playlist's title.", - "annotations": { - "required": [ - "youtube.playlists.insert", - "youtube.playlists.update" - ] - } - } - } - }, - "PlaylistStatus": { - "id": "PlaylistStatus", - "type": "object", - "properties": { - "privacyStatus": { - "type": "string", - "description": "The playlist's privacy status.", - "enum": [ - "private", - "public", - "unlisted" - ], - "enumDescriptions": [ - "", - "", - "" - ] - } - } - }, - "PromotedItem": { - "id": "PromotedItem", - "type": "object", - "description": "Describes a single promoted item.", - "properties": { - "customMessage": { - "type": "string", - "description": "A custom message to display for this promotion. This field is currently ignored unless the promoted item is a website." - }, - "id": { - "$ref": "PromotedItemId", - "description": "Identifies the promoted item." - }, - "promotedByContentOwner": { - "type": "boolean", - "description": "If true, the content owner's name will be used when displaying the promotion. This field can only be set when the update is made on behalf of the content owner." - }, - "timing": { - "$ref": "InvideoTiming", - "description": "The temporal position within the video where the promoted item will be displayed. If present, it overrides the default timing." - } - } - }, - "PromotedItemId": { - "id": "PromotedItemId", - "type": "object", - "description": "Describes a single promoted item id. It is a union of various possible types.", - "properties": { - "recentlyUploadedBy": { - "type": "string", - "description": "If type is recentUpload, this field identifies the channel from which to take the recent upload. If missing, the channel is assumed to be the same channel for which the invideoPromotion is set." - }, - "type": { - "type": "string", - "description": "Describes the type of the promoted item.", - "enum": [ - "recentUpload", - "video", - "website" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "videoId": { - "type": "string", - "description": "If the promoted item represents a video, this field represents the unique YouTube ID identifying it. This field will be present only if type has the value video." - }, - "websiteUrl": { - "type": "string", - "description": "If the promoted item represents a website, this field represents the url pointing to the website. This field will be present only if type has the value website." - } - } - }, - "PropertyValue": { - "id": "PropertyValue", - "type": "object", - "description": "A pair Property / Value.", - "properties": { - "property": { - "type": "string", - "description": "A property." - }, - "value": { - "type": "string", - "description": "The property's value." - } - } - }, - "ResourceId": { - "id": "ResourceId", - "type": "object", - "description": "A resource id is a generic reference that points to another YouTube resource.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a channel. This property is only present if the resourceId.kind value is youtube#channel." - }, - "kind": { - "type": "string", - "description": "The type of the API resource." - }, - "playlistId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a playlist. This property is only present if the resourceId.kind value is youtube#playlist." - }, - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a video. This property is only present if the resourceId.kind value is youtube#video." - } - } - }, - "SearchListResponse": { - "id": "SearchListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of results that match the search criteria.", - "items": { - "$ref": "SearchResult" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#searchListResponse\".", - "default": "youtube#searchListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "regionCode": { - "type": "string" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "SearchResult": { - "id": "SearchResult", - "type": "object", - "description": "A search result contains information about a YouTube video, channel, or playlist that matches the search parameters specified in an API request. While a search result points to a uniquely identifiable resource, like a video, it does not have its own persistent data.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "$ref": "ResourceId", - "description": "The id object contains information that can be used to uniquely identify the resource that matches the search request." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#searchResult\".", - "default": "youtube#searchResult" - }, - "snippet": { - "$ref": "SearchResultSnippet", - "description": "The snippet object contains basic details about a search result, such as its title or description. For example, if the search result is a video, then the title will be the video's title and the description will be the video's description." - } - } - }, - "SearchResultSnippet": { - "id": "SearchResultSnippet", - "type": "object", - "description": "Basic details about a search result, including title, description and thumbnails of the item referenced by the search result.", - "properties": { - "channelId": { - "type": "string", - "description": "The value that YouTube uses to uniquely identify the channel that published the resource that the search result identifies." - }, - "channelTitle": { - "type": "string", - "description": "The title of the channel that published the resource that the search result identifies." - }, - "description": { - "type": "string", - "description": "A description of the search result." - }, - "liveBroadcastContent": { - "type": "string", - "description": "It indicates if the resource (video or channel) has upcoming/active live broadcast content. Or it's \"none\" if there is not any upcoming/active live broadcasts.", - "enum": [ - "live", - "none", - "upcoming" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "publishedAt": { - "type": "string", - "description": "The creation date and time of the resource that the search result identifies. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the search result. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The title of the search result." - } - } - }, - "Sponsor": { - "id": "Sponsor", - "type": "object", - "description": "A sponsor resource represents a sponsor for a YouTube channel. A sponsor provides recurring monetary support to a creator and receives special benefits.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the sponsor." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#sponsor\".", - "default": "youtube#sponsor" - }, - "snippet": { - "$ref": "SponsorSnippet", - "description": "The snippet object contains basic details about the sponsor." - } - } - }, - "SponsorListResponse": { - "id": "SponsorListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of sponsors that match the request criteria.", - "items": { - "$ref": "Sponsor" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#sponsorListResponse\".", - "default": "youtube#sponsorListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "SponsorSnippet": { - "id": "SponsorSnippet", - "type": "object", - "properties": { - "channelId": { - "type": "string", - "description": "The id of the channel being sponsored." - }, - "sponsorDetails": { - "$ref": "ChannelProfileDetails", - "description": "Details about the sponsor." - }, - "sponsorSince": { - "type": "string", - "description": "The date and time when the user became a sponsor. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - } - } - }, - "Subscription": { - "id": "Subscription", - "type": "object", - "description": "A subscription resource contains information about a YouTube user subscription. A subscription notifies a user when new videos are added to a channel or when another user takes one of several actions on YouTube, such as uploading a video, rating a video, or commenting on a video.", - "properties": { - "contentDetails": { - "$ref": "SubscriptionContentDetails", - "description": "The contentDetails object contains basic statistics about the subscription." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the subscription." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#subscription\".", - "default": "youtube#subscription" - }, - "snippet": { - "$ref": "SubscriptionSnippet", - "description": "The snippet object contains basic details about the subscription, including its title and the channel that the user subscribed to." - }, - "subscriberSnippet": { - "$ref": "SubscriptionSubscriberSnippet", - "description": "The subscriberSnippet object contains basic details about the sbuscriber." - } - } - }, - "SubscriptionContentDetails": { - "id": "SubscriptionContentDetails", - "type": "object", - "description": "Details about the content to witch a subscription refers.", - "properties": { - "activityType": { - "type": "string", - "description": "The type of activity this subscription is for (only uploads, everything).", - "enum": [ - "all", - "uploads" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "newItemCount": { - "type": "integer", - "description": "The number of new items in the subscription since its content was last read.", - "format": "uint32" - }, - "totalItemCount": { - "type": "integer", - "description": "The approximate number of items that the subscription points to.", - "format": "uint32" - } - } - }, - "SubscriptionListResponse": { - "id": "SubscriptionListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of subscriptions that match the request criteria.", - "items": { - "$ref": "Subscription" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#subscriptionListResponse\".", - "default": "youtube#subscriptionListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "SubscriptionSnippet": { - "id": "SubscriptionSnippet", - "type": "object", - "description": "Basic details about a subscription, including title, description and thumbnails of the subscribed item.", - "properties": { - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the subscriber's channel." - }, - "channelTitle": { - "type": "string", - "description": "Channel title for the channel that the subscription belongs to." - }, - "description": { - "type": "string", - "description": "The subscription's details." - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the subscription was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "resourceId": { - "$ref": "ResourceId", - "description": "The id object contains information about the channel that the user subscribed to.", - "annotations": { - "required": [ - "youtube.subscriptions.insert" - ] - } - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The subscription's title." - } - } - }, - "SubscriptionSubscriberSnippet": { - "id": "SubscriptionSubscriberSnippet", - "type": "object", - "description": "Basic details about a subscription's subscriber including title, description, channel ID and thumbnails.", - "properties": { - "channelId": { - "type": "string", - "description": "The channel ID of the subscriber." - }, - "description": { - "type": "string", - "description": "The description of the subscriber." - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "Thumbnails for this subscriber." - }, - "title": { - "type": "string", - "description": "The title of the subscriber." - } - } - }, - "SuperChatEvent": { - "id": "SuperChatEvent", - "type": "object", - "description": "A superChatEvent resource represents a Super Chat purchase on a YouTube channel.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube assigns to uniquely identify the Super Chat event." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#superChatEvent\".", - "default": "youtube#superChatEvent" - }, - "snippet": { - "$ref": "SuperChatEventSnippet", - "description": "The snippet object contains basic details about the Super Chat event." - } - } - }, - "SuperChatEventListResponse": { - "id": "SuperChatEventListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of Super Chat purchases that match the request criteria.", - "items": { - "$ref": "SuperChatEvent" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#superChatEventListResponse\".", - "default": "youtube#superChatEventListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "SuperChatEventSnippet": { - "id": "SuperChatEventSnippet", - "type": "object", - "properties": { - "amountMicros": { - "type": "string", - "description": "The purchase amount, in micros of the purchase currency. e.g., 1 is represented as 1000000.", - "format": "uint64" - }, - "channelId": { - "type": "string", - "description": "Channel id where the event occurred." - }, - "commentText": { - "type": "string", - "description": "The text contents of the comment left by the user." - }, - "createdAt": { - "type": "string", - "description": "The date and time when the event occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "currency": { - "type": "string", - "description": "The currency in which the purchase was made. ISO 4217." - }, - "displayString": { - "type": "string", - "description": "A rendered string that displays the purchase amount and currency (e.g., \"$1.00\"). The string is rendered for the given language." - }, - "messageType": { - "type": "integer", - "description": "The tier for the paid message, which is based on the amount of money spent to purchase the message.", - "format": "uint32" - }, - "supporterDetails": { - "$ref": "ChannelProfileDetails", - "description": "Details about the supporter." - } - } - }, - "Thumbnail": { - "id": "Thumbnail", - "type": "object", - "description": "A thumbnail is an image representing a YouTube resource.", - "properties": { - "height": { - "type": "integer", - "description": "(Optional) Height of the thumbnail image.", - "format": "uint32" - }, - "url": { - "type": "string", - "description": "The thumbnail image's URL." - }, - "width": { - "type": "integer", - "description": "(Optional) Width of the thumbnail image.", - "format": "uint32" - } - } - }, - "ThumbnailDetails": { - "id": "ThumbnailDetails", - "type": "object", - "description": "Internal representation of thumbnails for a YouTube resource.", - "properties": { - "default": { - "$ref": "Thumbnail", - "description": "The default image for this resource." - }, - "high": { - "$ref": "Thumbnail", - "description": "The high quality image for this resource." - }, - "maxres": { - "$ref": "Thumbnail", - "description": "The maximum resolution quality image for this resource." - }, - "medium": { - "$ref": "Thumbnail", - "description": "The medium quality image for this resource." - }, - "standard": { - "$ref": "Thumbnail", - "description": "The standard quality image for this resource." - } - } - }, - "ThumbnailSetResponse": { - "id": "ThumbnailSetResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of thumbnails.", - "items": { - "$ref": "ThumbnailDetails" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#thumbnailSetResponse\".", - "default": "youtube#thumbnailSetResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "TokenPagination": { - "id": "TokenPagination", - "type": "object", - "description": "Stub token pagination template to suppress results." - }, - "Video": { - "id": "Video", - "type": "object", - "description": "A video resource represents a YouTube video.", - "properties": { - "ageGating": { - "$ref": "VideoAgeGating", - "description": "Age restriction details related to a video. This data can only be retrieved by the video owner." - }, - "contentDetails": { - "$ref": "VideoContentDetails", - "description": "The contentDetails object contains information about the video content, including the length of the video and its aspect ratio." - }, - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "fileDetails": { - "$ref": "VideoFileDetails", - "description": "The fileDetails object encapsulates information about the video file that was uploaded to YouTube, including the file's resolution, duration, audio and video codecs, stream bitrates, and more. This data can only be retrieved by the video owner." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the video.", - "annotations": { - "required": [ - "youtube.videos.update" - ] - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#video\".", - "default": "youtube#video" - }, - "liveStreamingDetails": { - "$ref": "VideoLiveStreamingDetails", - "description": "The liveStreamingDetails object contains metadata about a live video broadcast. The object will only be present in a video resource if the video is an upcoming, live, or completed live broadcast." - }, - "localizations": { - "type": "object", - "description": "List with all localizations.", - "additionalProperties": { - "$ref": "VideoLocalization", - "description": "The language tag, using string since map_key require simple types." - } - }, - "monetizationDetails": { - "$ref": "VideoMonetizationDetails", - "description": "The monetizationDetails object encapsulates information about the monetization status of the video." - }, - "player": { - "$ref": "VideoPlayer", - "description": "The player object contains information that you would use to play the video in an embedded player." - }, - "processingDetails": { - "$ref": "VideoProcessingDetails", - "description": "The processingProgress object encapsulates information about YouTube's progress in processing the uploaded video file. The properties in the object identify the current processing status and an estimate of the time remaining until YouTube finishes processing the video. This part also indicates whether different types of data or content, such as file details or thumbnail images, are available for the video.\n\nThe processingProgress object is designed to be polled so that the video uploaded can track the progress that YouTube has made in processing the uploaded video file. This data can only be retrieved by the video owner." - }, - "projectDetails": { - "$ref": "VideoProjectDetails", - "description": "The projectDetails object contains information about the project specific video metadata." - }, - "recordingDetails": { - "$ref": "VideoRecordingDetails", - "description": "The recordingDetails object encapsulates information about the location, date and address where the video was recorded." - }, - "snippet": { - "$ref": "VideoSnippet", - "description": "The snippet object contains basic details about the video, such as its title, description, and category." - }, - "statistics": { - "$ref": "VideoStatistics", - "description": "The statistics object contains statistics about the video." - }, - "status": { - "$ref": "VideoStatus", - "description": "The status object contains information about the video's uploading, processing, and privacy statuses." - }, - "suggestions": { - "$ref": "VideoSuggestions", - "description": "The suggestions object encapsulates suggestions that identify opportunities to improve the video quality or the metadata for the uploaded video. This data can only be retrieved by the video owner." - }, - "topicDetails": { - "$ref": "VideoTopicDetails", - "description": "The topicDetails object encapsulates information about Freebase topics associated with the video." - } - } - }, - "VideoAbuseReport": { - "id": "VideoAbuseReport", - "type": "object", - "properties": { - "comments": { - "type": "string", - "description": "Additional comments regarding the abuse report." - }, - "language": { - "type": "string", - "description": "The language that the content was viewed in." - }, - "reasonId": { - "type": "string", - "description": "The high-level, or primary, reason that the content is abusive. The value is an abuse report reason ID." - }, - "secondaryReasonId": { - "type": "string", - "description": "The specific, or secondary, reason that this content is abusive (if available). The value is an abuse report reason ID that is a valid secondary reason for the primary reason." - }, - "videoId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the video." - } - } - }, - "VideoAbuseReportReason": { - "id": "VideoAbuseReportReason", - "type": "object", - "description": "A videoAbuseReportReason resource identifies a reason that a video could be reported as abusive. Video abuse report reasons are used with video.ReportAbuse.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID of this abuse report reason." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoAbuseReportReason\".", - "default": "youtube#videoAbuseReportReason" - }, - "snippet": { - "$ref": "VideoAbuseReportReasonSnippet", - "description": "The snippet object contains basic details about the abuse report reason." - } - } - }, - "VideoAbuseReportReasonListResponse": { - "id": "VideoAbuseReportReasonListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of valid abuse reasons that are used with video.ReportAbuse.", - "items": { - "$ref": "VideoAbuseReportReason" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoAbuseReportReasonListResponse\".", - "default": "youtube#videoAbuseReportReasonListResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "VideoAbuseReportReasonSnippet": { - "id": "VideoAbuseReportReasonSnippet", - "type": "object", - "description": "Basic details about a video category, such as its localized title.", - "properties": { - "label": { - "type": "string", - "description": "The localized label belonging to this abuse report reason." - }, - "secondaryReasons": { - "type": "array", - "description": "The secondary reasons associated with this reason, if any are available. (There might be 0 or more.)", - "items": { - "$ref": "VideoAbuseReportSecondaryReason" - } - } - } - }, - "VideoAbuseReportSecondaryReason": { - "id": "VideoAbuseReportSecondaryReason", - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "The ID of this abuse report secondary reason." - }, - "label": { - "type": "string", - "description": "The localized label for this abuse report secondary reason." - } - } - }, - "VideoAgeGating": { - "id": "VideoAgeGating", - "type": "object", - "properties": { - "alcoholContent": { - "type": "boolean", - "description": "Indicates whether or not the video has alcoholic beverage content. Only users of legal purchasing age in a particular country, as identified by ICAP, can view the content." - }, - "restricted": { - "type": "boolean", - "description": "Age-restricted trailers. For redband trailers and adult-rated video-games. Only users aged 18+ can view the content. The the field is true the content is restricted to viewers aged 18+. Otherwise The field won't be present." - }, - "videoGameRating": { - "type": "string", - "description": "Video game rating, if any.", - "enum": [ - "anyone", - "m15Plus", - "m16Plus", - "m17Plus" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - } - } - }, - "VideoCategory": { - "id": "VideoCategory", - "type": "object", - "description": "A videoCategory resource identifies a category that has been or could be associated with uploaded videos.", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "id": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the video category." - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoCategory\".", - "default": "youtube#videoCategory" - }, - "snippet": { - "$ref": "VideoCategorySnippet", - "description": "The snippet object contains basic details about the video category, including its title." - } - } - }, - "VideoCategoryListResponse": { - "id": "VideoCategoryListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of video categories that can be associated with YouTube videos. In this map, the video category ID is the map key, and its value is the corresponding videoCategory resource.", - "items": { - "$ref": "VideoCategory" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoCategoryListResponse\".", - "default": "youtube#videoCategoryListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "VideoCategorySnippet": { - "id": "VideoCategorySnippet", - "type": "object", - "description": "Basic details about a video category, such as its localized title.", - "properties": { - "assignable": { - "type": "boolean" - }, - "channelId": { - "type": "string", - "description": "The YouTube channel that created the video category.", - "default": "UCBR8-60-B28hp2BmDPdntcQ" - }, - "title": { - "type": "string", - "description": "The video category's title." - } - } - }, - "VideoContentDetails": { - "id": "VideoContentDetails", - "type": "object", - "description": "Details about the content of a YouTube Video.", - "properties": { - "caption": { - "type": "string", - "description": "The value of captions indicates whether the video has captions or not.", - "enum": [ - "false", - "true" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "contentRating": { - "$ref": "ContentRating", - "description": "Specifies the ratings that the video received under various rating schemes." - }, - "countryRestriction": { - "$ref": "AccessPolicy", - "description": "The countryRestriction object contains information about the countries where a video is (or is not) viewable." - }, - "definition": { - "type": "string", - "description": "The value of definition indicates whether the video is available in high definition or only in standard definition.", - "enum": [ - "hd", - "sd" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "dimension": { - "type": "string", - "description": "The value of dimension indicates whether the video is available in 3D or in 2D." - }, - "duration": { - "type": "string", - "description": "The length of the video. The tag value is an ISO 8601 duration in the format PT#M#S, in which the letters PT indicate that the value specifies a period of time, and the letters M and S refer to length in minutes and seconds, respectively. The # characters preceding the M and S letters are both integers that specify the number of minutes (or seconds) of the video. For example, a value of PT15M51S indicates that the video is 15 minutes and 51 seconds long." - }, - "hasCustomThumbnail": { - "type": "boolean", - "description": "Indicates whether the video uploader has provided a custom thumbnail image for the video. This property is only visible to the video uploader." - }, - "licensedContent": { - "type": "boolean", - "description": "The value of is_license_content indicates whether the video is licensed content." - }, - "projection": { - "type": "string", - "description": "Specifies the projection format of the video.", - "enum": [ - "360", - "rectangular" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "regionRestriction": { - "$ref": "VideoContentDetailsRegionRestriction", - "description": "The regionRestriction object contains information about the countries where a video is (or is not) viewable. The object will contain either the contentDetails.regionRestriction.allowed property or the contentDetails.regionRestriction.blocked property." - } - } - }, - "VideoContentDetailsRegionRestriction": { - "id": "VideoContentDetailsRegionRestriction", - "type": "object", - "description": "DEPRECATED Region restriction of the video.", - "properties": { - "allowed": { - "type": "array", - "description": "A list of region codes that identify countries where the video is viewable. If this property is present and a country is not listed in its value, then the video is blocked from appearing in that country. If this property is present and contains an empty list, the video is blocked in all countries.", - "items": { - "type": "string" - } - }, - "blocked": { - "type": "array", - "description": "A list of region codes that identify countries where the video is blocked. If this property is present and a country is not listed in its value, then the video is viewable in that country. If this property is present and contains an empty list, the video is viewable in all countries.", - "items": { - "type": "string" - } - } - } - }, - "VideoFileDetails": { - "id": "VideoFileDetails", - "type": "object", - "description": "Describes original video file properties, including technical details about audio and video streams, but also metadata information like content length, digitization time, or geotagging information.", - "properties": { - "audioStreams": { - "type": "array", - "description": "A list of audio streams contained in the uploaded video file. Each item in the list contains detailed metadata about an audio stream.", - "items": { - "$ref": "VideoFileDetailsAudioStream" - } - }, - "bitrateBps": { - "type": "string", - "description": "The uploaded video file's combined (video and audio) bitrate in bits per second.", - "format": "uint64" - }, - "container": { - "type": "string", - "description": "The uploaded video file's container format." - }, - "creationTime": { - "type": "string", - "description": "The date and time when the uploaded video file was created. The value is specified in ISO 8601 format. Currently, the following ISO 8601 formats are supported: \n- Date only: YYYY-MM-DD \n- Naive time: YYYY-MM-DDTHH:MM:SS \n- Time with timezone: YYYY-MM-DDTHH:MM:SS+HH:MM" - }, - "durationMs": { - "type": "string", - "description": "The length of the uploaded video in milliseconds.", - "format": "uint64" - }, - "fileName": { - "type": "string", - "description": "The uploaded file's name. This field is present whether a video file or another type of file was uploaded." - }, - "fileSize": { - "type": "string", - "description": "The uploaded file's size in bytes. This field is present whether a video file or another type of file was uploaded.", - "format": "uint64" - }, - "fileType": { - "type": "string", - "description": "The uploaded file's type as detected by YouTube's video processing engine. Currently, YouTube only processes video files, but this field is present whether a video file or another type of file was uploaded.", - "enum": [ - "archive", - "audio", - "document", - "image", - "other", - "project", - "video" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - }, - "videoStreams": { - "type": "array", - "description": "A list of video streams contained in the uploaded video file. Each item in the list contains detailed metadata about a video stream.", - "items": { - "$ref": "VideoFileDetailsVideoStream" - } - } - } - }, - "VideoFileDetailsAudioStream": { - "id": "VideoFileDetailsAudioStream", - "type": "object", - "description": "Information about an audio stream.", - "properties": { - "bitrateBps": { - "type": "string", - "description": "The audio stream's bitrate, in bits per second.", - "format": "uint64" - }, - "channelCount": { - "type": "integer", - "description": "The number of audio channels that the stream contains.", - "format": "uint32" - }, - "codec": { - "type": "string", - "description": "The audio codec that the stream uses." - }, - "vendor": { - "type": "string", - "description": "A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code." - } - } - }, - "VideoFileDetailsVideoStream": { - "id": "VideoFileDetailsVideoStream", - "type": "object", - "description": "Information about a video stream.", - "properties": { - "aspectRatio": { - "type": "number", - "description": "The video content's display aspect ratio, which specifies the aspect ratio in which the video should be displayed.", - "format": "double" - }, - "bitrateBps": { - "type": "string", - "description": "The video stream's bitrate, in bits per second.", - "format": "uint64" - }, - "codec": { - "type": "string", - "description": "The video codec that the stream uses." - }, - "frameRateFps": { - "type": "number", - "description": "The video stream's frame rate, in frames per second.", - "format": "double" - }, - "heightPixels": { - "type": "integer", - "description": "The encoded video content's height in pixels.", - "format": "uint32" - }, - "rotation": { - "type": "string", - "description": "The amount that YouTube needs to rotate the original source content to properly display the video.", - "enum": [ - "clockwise", - "counterClockwise", - "none", - "other", - "upsideDown" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - }, - "vendor": { - "type": "string", - "description": "A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code." - }, - "widthPixels": { - "type": "integer", - "description": "The encoded video content's width in pixels. You can calculate the video's encoding aspect ratio as width_pixels / height_pixels.", - "format": "uint32" - } - } - }, - "VideoGetRatingResponse": { - "id": "VideoGetRatingResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of ratings that match the request criteria.", - "items": { - "$ref": "VideoRating" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoGetRatingResponse\".", - "default": "youtube#videoGetRatingResponse" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "VideoListResponse": { - "id": "VideoListResponse", - "type": "object", - "properties": { - "etag": { - "type": "string", - "description": "Etag of this resource." - }, - "eventId": { - "type": "string", - "description": "Serialized EventId of the request which produced this response." - }, - "items": { - "type": "array", - "description": "A list of videos that match the request criteria.", - "items": { - "$ref": "Video" - } - }, - "kind": { - "type": "string", - "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoListResponse\".", - "default": "youtube#videoListResponse" - }, - "nextPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set." - }, - "pageInfo": { - "$ref": "PageInfo" - }, - "prevPageToken": { - "type": "string", - "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set." - }, - "tokenPagination": { - "$ref": "TokenPagination" - }, - "visitorId": { - "type": "string", - "description": "The visitorId identifies the visitor." - } - } - }, - "VideoLiveStreamingDetails": { - "id": "VideoLiveStreamingDetails", - "type": "object", - "description": "Details about the live streaming metadata.", - "properties": { - "activeLiveChatId": { - "type": "string", - "description": "The ID of the currently active live chat attached to this video. This field is filled only if the video is a currently live broadcast that has live chat. Once the broadcast transitions to complete this field will be removed and the live chat closed down. For persistent broadcasts that live chat id will no longer be tied to this video but rather to the new video being displayed at the persistent page." - }, - "actualEndTime": { - "type": "string", - "description": "The time that the broadcast actually ended. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. This value will not be available until the broadcast is over.", - "format": "date-time" - }, - "actualStartTime": { - "type": "string", - "description": "The time that the broadcast actually started. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. This value will not be available until the broadcast begins.", - "format": "date-time" - }, - "concurrentViewers": { - "type": "string", - "description": "The number of viewers currently watching the broadcast. The property and its value will be present if the broadcast has current viewers and the broadcast owner has not hidden the viewcount for the video. Note that YouTube stops tracking the number of concurrent viewers for a broadcast when the broadcast ends. So, this property would not identify the number of viewers watching an archived video of a live broadcast that already ended.", - "format": "uint64" - }, - "scheduledEndTime": { - "type": "string", - "description": "The time that the broadcast is scheduled to end. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. If the value is empty or the property is not present, then the broadcast is scheduled to continue indefinitely.", - "format": "date-time" - }, - "scheduledStartTime": { - "type": "string", - "description": "The time that the broadcast is scheduled to begin. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - } - } - }, - "VideoLocalization": { - "id": "VideoLocalization", - "type": "object", - "description": "Localized versions of certain video properties (e.g. title).", - "properties": { - "description": { - "type": "string", - "description": "Localized version of the video's description." - }, - "title": { - "type": "string", - "description": "Localized version of the video's title." - } - } - }, - "VideoMonetizationDetails": { - "id": "VideoMonetizationDetails", - "type": "object", - "description": "Details about monetization of a YouTube Video.", - "properties": { - "access": { - "$ref": "AccessPolicy", - "description": "The value of access indicates whether the video can be monetized or not." - } - } - }, - "VideoPlayer": { - "id": "VideoPlayer", - "type": "object", - "description": "Player to be used for a video playback.", - "properties": { - "embedHeight": { - "type": "string", - "format": "int64" - }, - "embedHtml": { - "type": "string", - "description": "An \u003ciframe\u003e tag that embeds a player that will play the video." - }, - "embedWidth": { - "type": "string", - "description": "The embed width", - "format": "int64" - } - } - }, - "VideoProcessingDetails": { - "id": "VideoProcessingDetails", - "type": "object", - "description": "Describes processing status and progress and availability of some other Video resource parts.", - "properties": { - "editorSuggestionsAvailability": { - "type": "string", - "description": "This value indicates whether video editing suggestions, which might improve video quality or the playback experience, are available for the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request." - }, - "fileDetailsAvailability": { - "type": "string", - "description": "This value indicates whether file details are available for the uploaded video. You can retrieve a video's file details by requesting the fileDetails part in your videos.list() request." - }, - "processingFailureReason": { - "type": "string", - "description": "The reason that YouTube failed to process the video. This property will only have a value if the processingStatus property's value is failed.", - "enum": [ - "other", - "streamingFailed", - "transcodeFailed", - "uploadFailed" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "processingIssuesAvailability": { - "type": "string", - "description": "This value indicates whether the video processing engine has generated suggestions that might improve YouTube's ability to process the the video, warnings that explain video processing problems, or errors that cause video processing problems. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request." - }, - "processingProgress": { - "$ref": "VideoProcessingDetailsProcessingProgress", - "description": "The processingProgress object contains information about the progress YouTube has made in processing the video. The values are really only relevant if the video's processing status is processing." - }, - "processingStatus": { - "type": "string", - "description": "The video's processing status. This value indicates whether YouTube was able to process the video or if the video is still being processed.", - "enum": [ - "failed", - "processing", - "succeeded", - "terminated" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "tagSuggestionsAvailability": { - "type": "string", - "description": "This value indicates whether keyword (tag) suggestions are available for the video. Tags can be added to a video's metadata to make it easier for other users to find the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request." - }, - "thumbnailsAvailability": { - "type": "string", - "description": "This value indicates whether thumbnail images have been generated for the video." - } - } - }, - "VideoProcessingDetailsProcessingProgress": { - "id": "VideoProcessingDetailsProcessingProgress", - "type": "object", - "description": "Video processing progress and completion time estimate.", - "properties": { - "partsProcessed": { - "type": "string", - "description": "The number of parts of the video that YouTube has already processed. You can estimate the percentage of the video that YouTube has already processed by calculating:\n100 * parts_processed / parts_total\n\nNote that since the estimated number of parts could increase without a corresponding increase in the number of parts that have already been processed, it is possible that the calculated progress could periodically decrease while YouTube processes a video.", - "format": "uint64" - }, - "partsTotal": { - "type": "string", - "description": "An estimate of the total number of parts that need to be processed for the video. The number may be updated with more precise estimates while YouTube processes the video.", - "format": "uint64" - }, - "timeLeftMs": { - "type": "string", - "description": "An estimate of the amount of time, in millseconds, that YouTube needs to finish processing the video.", - "format": "uint64" - } - } - }, - "VideoProjectDetails": { - "id": "VideoProjectDetails", - "type": "object", - "description": "Project specific details about the content of a YouTube Video.", - "properties": { - "tags": { - "type": "array", - "description": "A list of project tags associated with the video during the upload.", - "items": { - "type": "string" - } - } - } - }, - "VideoRating": { - "id": "VideoRating", - "type": "object", - "properties": { - "rating": { - "type": "string", - "enum": [ - "dislike", - "like", - "none", - "unspecified" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - }, - "videoId": { - "type": "string" - } - } - }, - "VideoRecordingDetails": { - "id": "VideoRecordingDetails", - "type": "object", - "description": "Recording information associated with the video.", - "properties": { - "location": { - "$ref": "GeoPoint", - "description": "The geolocation information associated with the video." - }, - "locationDescription": { - "type": "string", - "description": "The text description of the location where the video was recorded." - }, - "recordingDate": { - "type": "string", - "description": "The date and time when the video was recorded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sssZ) format.", - "format": "date-time" - } - } - }, - "VideoSnippet": { - "id": "VideoSnippet", - "type": "object", - "description": "Basic details about a video, including title, description, uploader, thumbnails and category.", - "properties": { - "categoryId": { - "type": "string", - "description": "The YouTube video category associated with the video." - }, - "channelId": { - "type": "string", - "description": "The ID that YouTube uses to uniquely identify the channel that the video was uploaded to." - }, - "channelTitle": { - "type": "string", - "description": "Channel title for the channel that the video belongs to." - }, - "defaultAudioLanguage": { - "type": "string", - "description": "The default_audio_language property specifies the language spoken in the video's default audio track." - }, - "defaultLanguage": { - "type": "string", - "description": "The language of the videos's default snippet." - }, - "description": { - "type": "string", - "description": "The video's description." - }, - "liveBroadcastContent": { - "type": "string", - "description": "Indicates if the video is an upcoming/active live broadcast. Or it's \"none\" if the video is not an upcoming/active live broadcast.", - "enum": [ - "live", - "none", - "upcoming" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "localized": { - "$ref": "VideoLocalization", - "description": "Localized snippet selected with the hl parameter. If no such localization exists, this field is populated with the default snippet. (Read-only)" - }, - "publishedAt": { - "type": "string", - "description": "The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "tags": { - "type": "array", - "description": "A list of keyword tags associated with the video. Tags may contain spaces.", - "items": { - "type": "string" - } - }, - "thumbnails": { - "$ref": "ThumbnailDetails", - "description": "A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail." - }, - "title": { - "type": "string", - "description": "The video's title." - } - } - }, - "VideoStatistics": { - "id": "VideoStatistics", - "type": "object", - "description": "Statistics about the video, such as the number of times the video was viewed or liked.", - "properties": { - "commentCount": { - "type": "string", - "description": "The number of comments for the video.", - "format": "uint64" - }, - "dislikeCount": { - "type": "string", - "description": "The number of users who have indicated that they disliked the video by giving it a negative rating.", - "format": "uint64" - }, - "favoriteCount": { - "type": "string", - "description": "The number of users who currently have the video marked as a favorite video.", - "format": "uint64" - }, - "likeCount": { - "type": "string", - "description": "The number of users who have indicated that they liked the video by giving it a positive rating.", - "format": "uint64" - }, - "viewCount": { - "type": "string", - "description": "The number of times the video has been viewed.", - "format": "uint64" - } - } - }, - "VideoStatus": { - "id": "VideoStatus", - "type": "object", - "description": "Basic details about a video category, such as its localized title.", - "properties": { - "embeddable": { - "type": "boolean", - "description": "This value indicates if the video can be embedded on another website." - }, - "failureReason": { - "type": "string", - "description": "This value explains why a video failed to upload. This property is only present if the uploadStatus property indicates that the upload failed.", - "enum": [ - "codec", - "conversion", - "emptyFile", - "invalidFile", - "tooSmall", - "uploadAborted" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "" - ] - }, - "license": { - "type": "string", - "description": "The video's license.", - "enum": [ - "creativeCommon", - "youtube" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "privacyStatus": { - "type": "string", - "description": "The video's privacy status.", - "enum": [ - "private", - "public", - "unlisted" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "publicStatsViewable": { - "type": "boolean", - "description": "This value indicates if the extended video statistics on the watch page can be viewed by everyone. Note that the view count, likes, etc will still be visible if this is disabled." - }, - "publishAt": { - "type": "string", - "description": "The date and time when the video is scheduled to publish. It can be set only if the privacy status of the video is private. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time" - }, - "rejectionReason": { - "type": "string", - "description": "This value explains why YouTube rejected an uploaded video. This property is only present if the uploadStatus property indicates that the upload was rejected.", - "enum": [ - "claim", - "copyright", - "duplicate", - "inappropriate", - "legal", - "length", - "termsOfUse", - "trademark", - "uploaderAccountClosed", - "uploaderAccountSuspended" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "uploadStatus": { - "type": "string", - "description": "The status of the uploaded video.", - "enum": [ - "deleted", - "failed", - "processed", - "rejected", - "uploaded" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - } - } - }, - "VideoSuggestions": { - "id": "VideoSuggestions", - "type": "object", - "description": "Specifies suggestions on how to improve video content, including encoding hints, tag suggestions, and editor suggestions.", - "properties": { - "editorSuggestions": { - "type": "array", - "description": "A list of video editing operations that might improve the video quality or playback experience of the uploaded video.", - "items": { - "type": "string", - "enum": [ - "audioQuietAudioSwap", - "videoAutoLevels", - "videoCrop", - "videoStabilize" - ], - "enumDescriptions": [ - "", - "", - "", - "" - ] - } - }, - "processingErrors": { - "type": "array", - "description": "A list of errors that will prevent YouTube from successfully processing the uploaded video video. These errors indicate that, regardless of the video's current processing status, eventually, that status will almost certainly be failed.", - "items": { - "type": "string", - "enum": [ - "archiveFile", - "audioFile", - "docFile", - "imageFile", - "notAVideoFile", - "projectFile", - "unsupportedSpatialAudioLayout" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "" - ] - } - }, - "processingHints": { - "type": "array", - "description": "A list of suggestions that may improve YouTube's ability to process the video.", - "items": { - "type": "string", - "enum": [ - "nonStreamableMov", - "sendBestQualityVideo", - "spatialAudio", - "sphericalVideo", - "vrVideo" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "" - ] - } - }, - "processingWarnings": { - "type": "array", - "description": "A list of reasons why YouTube may have difficulty transcoding the uploaded video or that might result in an erroneous transcoding. These warnings are generated before YouTube actually processes the uploaded video file. In addition, they identify issues that are unlikely to cause the video processing to fail but that might cause problems such as sync issues, video artifacts, or a missing audio track.", - "items": { - "type": "string", - "enum": [ - "hasEditlist", - "inconsistentResolution", - "problematicAudioCodec", - "problematicVideoCodec", - "unknownAudioCodec", - "unknownContainer", - "unknownVideoCodec", - "unsupportedSphericalProjectionType", - "unsupportedVrStereoMode" - ], - "enumDescriptions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - } - }, - "tagSuggestions": { - "type": "array", - "description": "A list of keyword tags that could be added to the video's metadata to increase the likelihood that users will locate your video when searching or browsing on YouTube.", - "items": { - "$ref": "VideoSuggestionsTagSuggestion" - } - } - } - }, - "VideoSuggestionsTagSuggestion": { - "id": "VideoSuggestionsTagSuggestion", - "type": "object", - "description": "A single tag suggestion with it's relevance information.", - "properties": { - "categoryRestricts": { - "type": "array", - "description": "A set of video categories for which the tag is relevant. You can use this information to display appropriate tag suggestions based on the video category that the video uploader associates with the video. By default, tag suggestions are relevant for all categories if there are no restricts defined for the keyword.", - "items": { - "type": "string" - } - }, - "tag": { - "type": "string", - "description": "The keyword tag suggested for the video." - } - } - }, - "VideoTopicDetails": { - "id": "VideoTopicDetails", - "type": "object", - "description": "Freebase topic information related to the video.", - "properties": { - "relevantTopicIds": { - "type": "array", - "description": "Similar to topic_id, except that these topics are merely relevant to the video. These are topics that may be mentioned in, or appear in the video. You can retrieve information about each topic using Freebase Topic API.", - "items": { - "type": "string" - } - }, - "topicCategories": { - "type": "array", - "description": "A list of Wikipedia URLs that provide a high-level description of the video's content.", - "items": { - "type": "string" - } - }, - "topicIds": { - "type": "array", - "description": "A list of Freebase topic IDs that are centrally associated with the video. These are topics that are centrally featured in the video, and it can be said that the video is mainly about each of these. You can retrieve information about each topic using the Freebase Topic API.", - "items": { - "type": "string" - } - } - } - }, - "WatchSettings": { - "id": "WatchSettings", - "type": "object", - "description": "Branding properties for the watch. All deprecated.", - "properties": { - "backgroundColor": { - "type": "string", - "description": "The text color for the video watch page's branded area." - }, - "featuredPlaylistId": { - "type": "string", - "description": "An ID that uniquely identifies a playlist that displays next to the video player." - }, - "textColor": { - "type": "string", - "description": "The background color for the video watch page's branded area." - } - } - } - }, - "resources": { - "activities": { - "methods": { - "insert": { - "id": "youtube.activities.insert", - "path": "activities", - "httpMethod": "POST", - "description": "Posts a bulletin for a specific channel. (The user submitting the request must be authorized to act on the channel's behalf.)\n\nNote: Even though an activity resource can contain information about actions like a user rating a video or marking a video as a favorite, you need to use other API methods to generate those activity resources. For example, you would use the API's videos.rate() method to rate a video and the playlistItems.insert() method to mark a video as a favorite.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Activity" - }, - "response": { - "$ref": "Activity" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.activities.list", - "path": "activities", - "httpMethod": "GET", - "description": "Returns a list of channel activity events that match the request criteria. For example, you can retrieve events associated with a particular channel, events associated with the user's subscriptions and Google+ friends, or the YouTube home page feed, which is customized for each user.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter specifies a unique YouTube channel ID. The API will then return a list of that channel's activities.", - "location": "query" - }, - "home": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve the activity feed that displays on the YouTube home page for the currently authenticated user.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's activities.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more activity resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in an activity resource, the snippet property contains other properties that identify the type of activity, a display title for the activity, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.", - "required": true, - "location": "query" - }, - "publishedAfter": { - "type": "string", - "description": "The publishedAfter parameter specifies the earliest date and time that an activity could have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be included in the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time", - "location": "query" - }, - "publishedBefore": { - "type": "string", - "description": "The publishedBefore parameter specifies the date and time before which an activity must have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be excluded from the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.", - "format": "date-time", - "location": "query" - }, - "regionCode": { - "type": "string", - "description": "The regionCode parameter instructs the API to return results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code. YouTube uses this value when the authorized user's previous activity on YouTube does not provide enough information to generate the activity feed.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "ActivityListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "captions": { - "methods": { - "delete": { - "id": "youtube.captions.delete", - "path": "captions", - "httpMethod": "DELETE", - "description": "Deletes a specified caption track.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter identifies the caption track that is being deleted. The value is a caption track ID as identified by the id property in a caption resource.", - "required": true, - "location": "query" - }, - "onBehalfOf": { - "type": "string", - "description": "ID of the Google+ Page for the channel that the request is be on behalf of", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "download": { - "id": "youtube.captions.download", - "path": "captions/{id}", - "httpMethod": "GET", - "description": "Downloads a caption track. The caption track is returned in its original format unless the request specifies a value for the tfmt parameter and in its original language unless the request specifies a value for the tlang parameter.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter identifies the caption track that is being retrieved. The value is a caption track ID as identified by the id property in a caption resource.", - "required": true, - "location": "path" - }, - "onBehalfOf": { - "type": "string", - "description": "ID of the Google+ Page for the channel that the request is be on behalf of", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "tfmt": { - "type": "string", - "description": "The tfmt parameter specifies that the caption track should be returned in a specific format. If the parameter is not included in the request, the track is returned in its original format.", - "enum": [ - "sbv", - "scc", - "srt", - "ttml", - "vtt" - ], - "enumDescriptions": [ - "SubViewer subtitle.", - "Scenarist Closed Caption format.", - "SubRip subtitle.", - "Timed Text Markup Language caption.", - "Web Video Text Tracks caption." - ], - "location": "query" - }, - "tlang": { - "type": "string", - "description": "The tlang parameter specifies that the API response should return a translation of the specified caption track. The parameter value is an ISO 639-1 two-letter language code that identifies the desired caption language. The translation is generated by using machine translation, such as Google Translate.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaDownload": true - }, - "insert": { - "id": "youtube.captions.insert", - "path": "captions", - "httpMethod": "POST", - "description": "Uploads a caption track.", - "parameters": { - "onBehalfOf": { - "type": "string", - "description": "ID of the Google+ Page for the channel that the request is be on behalf of", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the caption resource parts that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - }, - "sync": { - "type": "boolean", - "description": "The sync parameter indicates whether YouTube should automatically synchronize the caption file with the audio track of the video. If you set the value to true, YouTube will disregard any time codes that are in the uploaded caption file and generate new time codes for the captions.\n\nYou should set the sync parameter to true if you are uploading a transcript, which has no time codes, or if you suspect the time codes in your file are incorrect and want YouTube to try to fix them.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Caption" - }, - "response": { - "$ref": "Caption" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "*/*", - "application/octet-stream", - "text/xml" - ], - "maxSize": "100MB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/captions" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/captions" - } - } - } - }, - "list": { - "id": "youtube.captions.list", - "path": "captions", - "httpMethod": "GET", - "description": "Returns a list of caption tracks that are associated with a specified video. Note that the API response does not contain the actual captions and that the captions.download method provides the ability to retrieve a caption track.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of IDs that identify the caption resources that should be retrieved. Each ID must identify a caption track associated with the specified video.", - "location": "query" - }, - "onBehalfOf": { - "type": "string", - "description": "ID of the Google+ Page for the channel that the request is on behalf of.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more caption resource parts that the API response will include. The part names that you can include in the parameter value are id and snippet.", - "required": true, - "location": "query" - }, - "videoId": { - "type": "string", - "description": "The videoId parameter specifies the YouTube video ID of the video for which the API should return caption tracks.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part", - "videoId" - ], - "response": { - "$ref": "CaptionListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "update": { - "id": "youtube.captions.update", - "path": "captions", - "httpMethod": "PUT", - "description": "Updates a caption track. When updating a caption track, you can change the track's draft status, upload a new caption file for the track, or both.", - "parameters": { - "onBehalfOf": { - "type": "string", - "description": "ID of the Google+ Page for the channel that the request is be on behalf of", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. Set the property value to snippet if you are updating the track's draft status. Otherwise, set the property value to id.", - "required": true, - "location": "query" - }, - "sync": { - "type": "boolean", - "description": "Note: The API server only processes the parameter value if the request contains an updated caption file.\n\nThe sync parameter indicates whether YouTube should automatically synchronize the caption file with the audio track of the video. If you set the value to true, YouTube will automatically synchronize the caption track with the audio track.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Caption" - }, - "response": { - "$ref": "Caption" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "*/*", - "application/octet-stream", - "text/xml" - ], - "maxSize": "100MB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/captions" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/captions" - } - } - } - } - } - }, - "channelBanners": { - "methods": { - "insert": { - "id": "youtube.channelBanners.insert", - "path": "channelBanners/insert", - "httpMethod": "POST", - "description": "Uploads a channel banner image to YouTube. This method represents the first two steps in a three-step process to update the banner image for a channel:\n\n- Call the channelBanners.insert method to upload the binary image data to YouTube. The image must have a 16:9 aspect ratio and be at least 2120x1192 pixels.\n- Extract the url property's value from the response that the API returns for step 1.\n- Call the channels.update method to update the channel's branding settings. Set the brandingSettings.image.bannerExternalUrl property's value to the URL obtained in step 2.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "request": { - "$ref": "ChannelBannerResource" - }, - "response": { - "$ref": "ChannelBannerResource" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.upload" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "application/octet-stream", - "image/jpeg", - "image/png" - ], - "maxSize": "6MB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/channelBanners/insert" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/channelBanners/insert" - } - } - } - } - } - }, - "channelSections": { - "methods": { - "delete": { - "id": "youtube.channelSections.delete", - "path": "channelSections", - "httpMethod": "DELETE", - "description": "Deletes a channelSection.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube channelSection ID for the resource that is being deleted. In a channelSection resource, the id property specifies the YouTube channelSection ID.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "insert": { - "id": "youtube.channelSections.insert", - "path": "channelSections", - "httpMethod": "POST", - "description": "Adds a channelSection for the authenticated user's channel.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part names that you can include in the parameter value are snippet and contentDetails.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "ChannelSection" - }, - "response": { - "$ref": "ChannelSection" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "list": { - "id": "youtube.channelSections.list", - "path": "channelSections", - "httpMethod": "GET", - "description": "Returns channelSection resources that match the API request criteria.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter specifies a YouTube channel ID. The API will only return that channel's channelSections.", - "location": "query" - }, - "hl": { - "type": "string", - "description": "The hl parameter indicates that the snippet.localized property values in the returned channelSection resources should be in the specified language if localized values for that language are available. For example, if the API request specifies hl=de, the snippet.localized properties in the API response will contain German titles if German titles are available. Channel owners can provide localized channel section titles using either the channelSections.insert or channelSections.update method.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube channelSection ID(s) for the resource(s) that are being retrieved. In a channelSection resource, the id property specifies the YouTube channelSection ID.", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's channelSections.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more channelSection resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channelSection resource, the snippet property contains other properties, such as a display title for the channelSection. If you set part=snippet, the API response will also contain all of those nested properties.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "ChannelSectionListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "update": { - "id": "youtube.channelSections.update", - "path": "channelSections", - "httpMethod": "PUT", - "description": "Update a channelSection.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part names that you can include in the parameter value are snippet and contentDetails.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "ChannelSection" - }, - "response": { - "$ref": "ChannelSection" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "channels": { - "methods": { - "list": { - "id": "youtube.channels.list", - "path": "channels", - "httpMethod": "GET", - "description": "Returns a collection of zero or more channel resources that match the request criteria.", - "parameters": { - "categoryId": { - "type": "string", - "description": "The categoryId parameter specifies a YouTube guide category, thereby requesting YouTube channels associated with that category.", - "location": "query" - }, - "forUsername": { - "type": "string", - "description": "The forUsername parameter specifies a YouTube username, thereby requesting the channel associated with that username.", - "location": "query" - }, - "hl": { - "type": "string", - "description": "The hl parameter should be used for filter out the properties that are not in the given language. Used for the brandingSettings part.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube channel ID(s) for the resource(s) that are being retrieved. In a channel resource, the id property specifies the channel's YouTube channel ID.", - "location": "query" - }, - "managedByMe": { - "type": "boolean", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nSet this parameter's value to true to instruct the API to only return channels managed by the content owner that the onBehalfOfContentOwner parameter specifies. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "Set this parameter's value to true to instruct the API to only return channels owned by the authenticated user.", - "location": "query" - }, - "mySubscribers": { - "type": "boolean", - "description": "Use the subscriptions.list method and its mySubscribers parameter to retrieve a list of subscribers to the authenticated user's channel.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more channel resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channel resource, the contentDetails property contains other properties, such as the uploads properties. As such, if you set part=contentDetails, the API response will also contain all of those nested properties.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "ChannelListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner", - "https://www.googleapis.com/auth/youtubepartner-channel-audit" - ] - }, - "update": { - "id": "youtube.channels.update", - "path": "channels", - "httpMethod": "PUT", - "description": "Updates a channel's metadata. Note that this method currently only supports updates to the channel resource's brandingSettings and invideoPromotion objects and their child properties.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe API currently only allows the parameter value to be set to either brandingSettings or invideoPromotion. (You cannot update both of those parts with a single request.)\n\nNote that this method overrides the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Channel" - }, - "response": { - "$ref": "Channel" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "commentThreads": { - "methods": { - "insert": { - "id": "youtube.commentThreads.insert", - "path": "commentThreads", - "httpMethod": "POST", - "description": "Creates a new top-level comment. To add a reply to an existing comment, use the comments.insert method instead.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter identifies the properties that the API response will include. Set the parameter value to snippet. The snippet part has a quota cost of 2 units.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "CommentThread" - }, - "response": { - "$ref": "CommentThread" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.commentThreads.list", - "path": "commentThreads", - "httpMethod": "GET", - "description": "Returns a list of comment threads that match the API request parameters.", - "parameters": { - "allThreadsRelatedToChannelId": { - "type": "string", - "description": "The allThreadsRelatedToChannelId parameter instructs the API to return all comment threads associated with the specified channel. The response can include comments about the channel or about the channel's videos.", - "location": "query" - }, - "channelId": { - "type": "string", - "description": "The channelId parameter instructs the API to return comment threads containing comments about the specified channel. (The response will not include comments left on videos that the channel uploaded.)", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of comment thread IDs for the resources that should be retrieved.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "default": "20", - "format": "uint32", - "minimum": "1", - "maximum": "100", - "location": "query" - }, - "moderationStatus": { - "type": "string", - "description": "Set this parameter to limit the returned comment threads to a particular moderation state.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "default": "MODERATION_STATUS_PUBLISHED", - "enum": [ - "heldForReview", - "likelySpam", - "published" - ], - "enumDescriptions": [ - "Retrieve comment threads that are awaiting review by a moderator. A comment thread can be included in the response if the top-level comment or at least one of the replies to that comment are awaiting review.", - "Retrieve comment threads classified as likely to be spam. A comment thread can be included in the response if the top-level comment or at least one of the replies to that comment is considered likely to be spam.", - "Retrieve threads of published comments. This is the default value. A comment thread can be included in the response if its top-level comment has been published." - ], - "location": "query" - }, - "order": { - "type": "string", - "description": "The order parameter specifies the order in which the API response should list comment threads. Valid values are: \n- time - Comment threads are ordered by time. This is the default behavior.\n- relevance - Comment threads are ordered by relevance.Note: This parameter is not supported for use in conjunction with the id parameter.", - "default": "true", - "enum": [ - "relevance", - "time" - ], - "enumDescriptions": [ - "Order by relevance.", - "Order by time." - ], - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identifies the next page of the result that can be retrieved.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more commentThread resource properties that the API response will include.", - "required": true, - "location": "query" - }, - "searchTerms": { - "type": "string", - "description": "The searchTerms parameter instructs the API to limit the API response to only contain comments that contain the specified search terms.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "location": "query" - }, - "textFormat": { - "type": "string", - "description": "Set this parameter's value to html or plainText to instruct the API to return the comments left by users in html formatted or in plain text.", - "default": "FORMAT_HTML", - "enum": [ - "html", - "plainText" - ], - "enumDescriptions": [ - "Returns the comments in HTML format. This is the default value.", - "Returns the comments in plain text format." - ], - "location": "query" - }, - "videoId": { - "type": "string", - "description": "The videoId parameter instructs the API to return comment threads associated with the specified video ID.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "CommentThreadListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "update": { - "id": "youtube.commentThreads.update", - "path": "commentThreads", - "httpMethod": "PUT", - "description": "Modifies the top-level comment in a comment thread.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of commentThread resource properties that the API response will include. You must at least include the snippet part in the parameter value since that part contains all of the properties that the API request can update.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "CommentThread" - }, - "response": { - "$ref": "CommentThread" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - } - } - }, - "comments": { - "methods": { - "delete": { - "id": "youtube.comments.delete", - "path": "comments", - "httpMethod": "DELETE", - "description": "Deletes a comment.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the comment ID for the resource that is being deleted.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.comments.insert", - "path": "comments", - "httpMethod": "POST", - "description": "Creates a reply to an existing comment. Note: To create a top-level comment, use the commentThreads.insert method.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter identifies the properties that the API response will include. Set the parameter value to snippet. The snippet part has a quota cost of 2 units.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Comment" - }, - "response": { - "$ref": "Comment" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.comments.list", - "path": "comments", - "httpMethod": "GET", - "description": "Returns a list of comments that match the API request parameters.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of comment IDs for the resources that are being retrieved. In a comment resource, the id property specifies the comment's ID.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "default": "20", - "format": "uint32", - "minimum": "1", - "maximum": "100", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identifies the next page of the result that can be retrieved.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.", - "location": "query" - }, - "parentId": { - "type": "string", - "description": "The parentId parameter specifies the ID of the comment for which replies should be retrieved.\n\nNote: YouTube currently supports replies only for top-level comments. However, replies to replies may be supported in the future.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more comment resource properties that the API response will include.", - "required": true, - "location": "query" - }, - "textFormat": { - "type": "string", - "description": "This parameter indicates whether the API should return comments formatted as HTML or as plain text.", - "default": "FORMAT_HTML", - "enum": [ - "html", - "plainText" - ], - "enumDescriptions": [ - "Returns the comments in HTML format. This is the default value.", - "Returns the comments in plain text format." - ], - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "CommentListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "markAsSpam": { - "id": "youtube.comments.markAsSpam", - "path": "comments/markAsSpam", - "httpMethod": "POST", - "description": "Expresses the caller's opinion that one or more comments should be flagged as spam.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of IDs of comments that the caller believes should be classified as spam.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "setModerationStatus": { - "id": "youtube.comments.setModerationStatus", - "path": "comments/setModerationStatus", - "httpMethod": "POST", - "description": "Sets the moderation status of one or more comments. The API request must be authorized by the owner of the channel or video associated with the comments.", - "parameters": { - "banAuthor": { - "type": "boolean", - "description": "The banAuthor parameter lets you indicate that you want to automatically reject any additional comments written by the comment's author. Set the parameter value to true to ban the author.\n\nNote: This parameter is only valid if the moderationStatus parameter is also set to rejected.", - "default": "false", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of IDs that identify the comments for which you are updating the moderation status.", - "required": true, - "location": "query" - }, - "moderationStatus": { - "type": "string", - "description": "Identifies the new moderation status of the specified comments.", - "required": true, - "enum": [ - "heldForReview", - "published", - "rejected" - ], - "enumDescriptions": [ - "Marks a comment as awaiting review by a moderator.", - "Clears a comment for public display.", - "Rejects a comment as being unfit for display. This action also effectively hides all replies to the rejected comment.\n\nNote: The API does not currently provide a way to list or otherwise discover rejected comments. However, you can change the moderation status of a rejected comment if you still know its ID. If you were to change the moderation status of a rejected comment, the comment replies would subsequently be discoverable again as well." - ], - "location": "query" - } - }, - "parameterOrder": [ - "id", - "moderationStatus" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "update": { - "id": "youtube.comments.update", - "path": "comments", - "httpMethod": "PUT", - "description": "Modifies a comment.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter identifies the properties that the API response will include. You must at least include the snippet part in the parameter value since that part contains all of the properties that the API request can update.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Comment" - }, - "response": { - "$ref": "Comment" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - } - } - }, - "fanFundingEvents": { - "methods": { - "list": { - "id": "youtube.fanFundingEvents.list", - "path": "fanFundingEvents", - "httpMethod": "GET", - "description": "Lists fan funding events for a channel.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the fanFundingEvent resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "FanFundingEventListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "guideCategories": { - "methods": { - "list": { - "id": "youtube.guideCategories.list", - "path": "guideCategories", - "httpMethod": "GET", - "description": "Returns a list of categories that can be associated with YouTube channels.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter specifies the language that will be used for text values in the API response.", - "default": "en-US", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube channel category ID(s) for the resource(s) that are being retrieved. In a guideCategory resource, the id property specifies the YouTube channel category ID.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the guideCategory resource properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - }, - "regionCode": { - "type": "string", - "description": "The regionCode parameter instructs the API to return the list of guide categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "GuideCategoryListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "i18nLanguages": { - "methods": { - "list": { - "id": "youtube.i18nLanguages.list", - "path": "i18nLanguages", - "httpMethod": "GET", - "description": "Returns a list of application languages that the YouTube website supports.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter specifies the language that should be used for text values in the API response.", - "default": "en_US", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the i18nLanguage resource properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "I18nLanguageListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "i18nRegions": { - "methods": { - "list": { - "id": "youtube.i18nRegions.list", - "path": "i18nRegions", - "httpMethod": "GET", - "description": "Returns a list of content regions that the YouTube website supports.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter specifies the language that should be used for text values in the API response.", - "default": "en_US", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the i18nRegion resource properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "I18nRegionListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "liveBroadcasts": { - "methods": { - "bind": { - "id": "youtube.liveBroadcasts.bind", - "path": "liveBroadcasts/bind", - "httpMethod": "POST", - "description": "Binds a YouTube broadcast to a stream or removes an existing binding between a broadcast and a stream. A broadcast can only be bound to one video stream, though a video stream may be bound to more than one broadcast.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the unique ID of the broadcast that is being bound to a video stream.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.", - "required": true, - "location": "query" - }, - "streamId": { - "type": "string", - "description": "The streamId parameter specifies the unique ID of the video stream that is being bound to a broadcast. If this parameter is omitted, the API will remove any existing binding between the broadcast and a video stream.", - "location": "query" - } - }, - "parameterOrder": [ - "id", - "part" - ], - "response": { - "$ref": "LiveBroadcast" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "control": { - "id": "youtube.liveBroadcasts.control", - "path": "liveBroadcasts/control", - "httpMethod": "POST", - "description": "Controls the settings for a slate that can be displayed in the broadcast stream.", - "parameters": { - "displaySlate": { - "type": "boolean", - "description": "The displaySlate parameter specifies whether the slate is being enabled or disabled.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube live broadcast ID that uniquely identifies the broadcast in which the slate is being updated.", - "required": true, - "location": "query" - }, - "offsetTimeMs": { - "type": "string", - "description": "The offsetTimeMs parameter specifies a positive time offset when the specified slate change will occur. The value is measured in milliseconds from the beginning of the broadcast's monitor stream, which is the time that the testing phase for the broadcast began. Even though it is specified in milliseconds, the value is actually an approximation, and YouTube completes the requested action as closely as possible to that time.\n\nIf you do not specify a value for this parameter, then YouTube performs the action as soon as possible. See the Getting started guide for more details.\n\nImportant: You should only specify a value for this parameter if your broadcast stream is delayed.", - "format": "uint64", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.", - "required": true, - "location": "query" - }, - "walltime": { - "type": "string", - "description": "The walltime parameter specifies the wall clock time at which the specified slate change will occur. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sssZ) format.", - "format": "date-time", - "location": "query" - } - }, - "parameterOrder": [ - "id", - "part" - ], - "response": { - "$ref": "LiveBroadcast" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "delete": { - "id": "youtube.liveBroadcasts.delete", - "path": "liveBroadcasts", - "httpMethod": "DELETE", - "description": "Deletes a broadcast.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube live broadcast ID for the resource that is being deleted.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.liveBroadcasts.insert", - "path": "liveBroadcasts", - "httpMethod": "POST", - "description": "Creates a broadcast.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, contentDetails, and status.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveBroadcast" - }, - "response": { - "$ref": "LiveBroadcast" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.liveBroadcasts.list", - "path": "liveBroadcasts", - "httpMethod": "GET", - "description": "Returns a list of YouTube broadcasts that match the API request parameters.", - "parameters": { - "broadcastStatus": { - "type": "string", - "description": "The broadcastStatus parameter filters the API response to only include broadcasts with the specified status.", - "enum": [ - "active", - "all", - "completed", - "upcoming" - ], - "enumDescriptions": [ - "Return current live broadcasts.", - "Return all broadcasts.", - "Return broadcasts that have already ended.", - "Return broadcasts that have not yet started." - ], - "location": "query" - }, - "broadcastType": { - "type": "string", - "description": "The broadcastType parameter filters the API response to only include broadcasts with the specified type. This is only compatible with the mine filter for now.", - "default": "BROADCAST_TYPE_FILTER_EVENT", - "enum": [ - "all", - "event", - "persistent" - ], - "enumDescriptions": [ - "Return all broadcasts.", - "Return only scheduled event broadcasts.", - "Return only persistent broadcasts." - ], - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of YouTube broadcast IDs that identify the broadcasts being retrieved. In a liveBroadcast resource, the id property specifies the broadcast's ID.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "The mine parameter can be used to instruct the API to only return broadcasts owned by the authenticated user. Set the parameter value to true to only retrieve your own broadcasts.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "LiveBroadcastListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - }, - "transition": { - "id": "youtube.liveBroadcasts.transition", - "path": "liveBroadcasts/transition", - "httpMethod": "POST", - "description": "Changes the status of a YouTube live broadcast and initiates any processes associated with the new status. For example, when you transition a broadcast's status to testing, YouTube starts to transmit video to that broadcast's monitor stream. Before calling this method, you should confirm that the value of the status.streamStatus property for the stream bound to your broadcast is active.", - "parameters": { - "broadcastStatus": { - "type": "string", - "description": "The broadcastStatus parameter identifies the state to which the broadcast is changing. Note that to transition a broadcast to either the testing or live state, the status.streamStatus must be active for the stream that the broadcast is bound to.", - "required": true, - "enum": [ - "complete", - "live", - "testing" - ], - "enumDescriptions": [ - "The broadcast is over. YouTube stops transmitting video.", - "The broadcast is visible to its audience. YouTube transmits video to the broadcast's monitor stream and its broadcast stream.", - "Start testing the broadcast. YouTube transmits video to the broadcast's monitor stream. Note that you can only transition a broadcast to the testing state if its contentDetails.monitorStream.enableMonitorStream property is set to true." - ], - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies the unique ID of the broadcast that is transitioning to another status.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "broadcastStatus", - "id", - "part" - ], - "response": { - "$ref": "LiveBroadcast" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "update": { - "id": "youtube.liveBroadcasts.update", - "path": "liveBroadcasts", - "httpMethod": "PUT", - "description": "Updates a broadcast. For example, you could modify the broadcast settings defined in the liveBroadcast resource's contentDetails object.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, contentDetails, and status.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a broadcast's privacy status is defined in the status part. As such, if your request is updating a private or unlisted broadcast, and the request's part parameter value includes the status part, the broadcast's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the broadcast will revert to the default privacy setting.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveBroadcast" - }, - "response": { - "$ref": "LiveBroadcast" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - } - } - }, - "liveChatBans": { - "methods": { - "delete": { - "id": "youtube.liveChatBans.delete", - "path": "liveChat/bans", - "httpMethod": "DELETE", - "description": "Removes a chat ban.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter identifies the chat ban to remove. The value uniquely identifies both the ban and the chat.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.liveChatBans.insert", - "path": "liveChat/bans", - "httpMethod": "POST", - "description": "Adds a new ban to the chat.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response returns. Set the parameter value to snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveChatBan" - }, - "response": { - "$ref": "LiveChatBan" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - } - } - }, - "liveChatMessages": { - "methods": { - "delete": { - "id": "youtube.liveChatMessages.delete", - "path": "liveChat/messages", - "httpMethod": "DELETE", - "description": "Deletes a chat message.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube chat message ID of the resource that is being deleted.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.liveChatMessages.insert", - "path": "liveChat/messages", - "httpMethod": "POST", - "description": "Adds a message to a live chat.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter serves two purposes. It identifies the properties that the write operation will set as well as the properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveChatMessage" - }, - "response": { - "$ref": "LiveChatMessage" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.liveChatMessages.list", - "path": "liveChat/messages", - "httpMethod": "GET", - "description": "Lists live chat messages for a specific chat.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.", - "location": "query" - }, - "liveChatId": { - "type": "string", - "description": "The liveChatId parameter specifies the ID of the chat whose messages will be returned.", - "required": true, - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of messages that should be returned in the result set.", - "default": "500", - "format": "uint32", - "minimum": "200", - "maximum": "2000", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the liveChatComment resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - }, - "profileImageSize": { - "type": "integer", - "description": "The profileImageSize parameter specifies the size of the user profile pictures that should be returned in the result set. Default: 88.", - "format": "uint32", - "minimum": "16", - "maximum": "720", - "location": "query" - } - }, - "parameterOrder": [ - "liveChatId", - "part" - ], - "response": { - "$ref": "LiveChatMessageListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "liveChatModerators": { - "methods": { - "delete": { - "id": "youtube.liveChatModerators.delete", - "path": "liveChat/moderators", - "httpMethod": "DELETE", - "description": "Removes a chat moderator.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter identifies the chat moderator to remove. The value uniquely identifies both the moderator and the chat.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.liveChatModerators.insert", - "path": "liveChat/moderators", - "httpMethod": "POST", - "description": "Adds a new moderator for the chat.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response returns. Set the parameter value to snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveChatModerator" - }, - "response": { - "$ref": "LiveChatModerator" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.liveChatModerators.list", - "path": "liveChat/moderators", - "httpMethod": "GET", - "description": "Lists moderators for a live chat.", - "parameters": { - "liveChatId": { - "type": "string", - "description": "The liveChatId parameter specifies the YouTube live chat for which the API should return moderators.", - "required": true, - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the liveChatModerator resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "liveChatId", - "part" - ], - "response": { - "$ref": "LiveChatModeratorListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "liveStreams": { - "methods": { - "delete": { - "id": "youtube.liveStreams.delete", - "path": "liveStreams", - "httpMethod": "DELETE", - "description": "Deletes a video stream.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube live stream ID for the resource that is being deleted.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "insert": { - "id": "youtube.liveStreams.insert", - "path": "liveStreams", - "httpMethod": "POST", - "description": "Creates a video stream. The stream enables you to send your video to YouTube, which can then broadcast the video to your audience.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, cdn, and status.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveStream" - }, - "response": { - "$ref": "LiveStream" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - }, - "list": { - "id": "youtube.liveStreams.list", - "path": "liveStreams", - "httpMethod": "GET", - "description": "Returns a list of video streams that match the API request parameters.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of YouTube stream IDs that identify the streams being retrieved. In a liveStream resource, the id property specifies the stream's ID.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "The mine parameter can be used to instruct the API to only return streams owned by the authenticated user. Set the parameter value to true to only retrieve your own streams.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more liveStream resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, cdn, and status.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "LiveStreamListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - }, - "update": { - "id": "youtube.liveStreams.update", - "path": "liveStreams", - "httpMethod": "PUT", - "description": "Updates a video stream. If the properties that you want to change cannot be updated, then you need to create a new stream with the proper settings.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, cdn, and status.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. If the request body does not specify a value for a mutable property, the existing value for that property will be removed.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "LiveStream" - }, - "response": { - "$ref": "LiveStream" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl" - ] - } - } - }, - "playlistItems": { - "methods": { - "delete": { - "id": "youtube.playlistItems.delete", - "path": "playlistItems", - "httpMethod": "DELETE", - "description": "Deletes a playlist item.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube playlist item ID for the playlist item that is being deleted. In a playlistItem resource, the id property specifies the playlist item's ID.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "insert": { - "id": "youtube.playlistItems.insert", - "path": "playlistItems", - "httpMethod": "POST", - "description": "Adds a resource to a playlist.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "PlaylistItem" - }, - "response": { - "$ref": "PlaylistItem" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "list": { - "id": "youtube.playlistItems.list", - "path": "playlistItems", - "httpMethod": "GET", - "description": "Returns a collection of playlist items that match the API request parameters. You can retrieve all of the playlist items in a specified playlist or retrieve one or more playlist items by their unique IDs.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of one or more unique playlist item IDs.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more playlistItem resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlistItem resource, the snippet property contains numerous fields, including the title, description, position, and resourceId properties. As such, if you set part=snippet, the API response will contain all of those properties.", - "required": true, - "location": "query" - }, - "playlistId": { - "type": "string", - "description": "The playlistId parameter specifies the unique ID of the playlist for which you want to retrieve playlist items. Note that even though this is an optional parameter, every request to retrieve playlist items must specify a value for either the id parameter or the playlistId parameter.", - "location": "query" - }, - "videoId": { - "type": "string", - "description": "The videoId parameter specifies that the request should return only the playlist items that contain the specified video.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "PlaylistItemListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsSubscription": true - }, - "update": { - "id": "youtube.playlistItems.update", - "path": "playlistItems", - "httpMethod": "PUT", - "description": "Modifies a playlist item. For example, you could update the item's position in the playlist.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist item can specify a start time and end time, which identify the times portion of the video that should play when users watch the video in the playlist. If your request is updating a playlist item that sets these values, and the request's part parameter value includes the contentDetails part, the playlist item's start and end times will be updated to whatever value the request body specifies. If the request body does not specify values, the existing start and end times will be removed and replaced with the default settings.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "PlaylistItem" - }, - "response": { - "$ref": "PlaylistItem" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "playlists": { - "methods": { - "delete": { - "id": "youtube.playlists.delete", - "path": "playlists", - "httpMethod": "DELETE", - "description": "Deletes a playlist.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube playlist ID for the playlist that is being deleted. In a playlist resource, the id property specifies the playlist's ID.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "insert": { - "id": "youtube.playlists.insert", - "path": "playlists", - "httpMethod": "POST", - "description": "Creates a playlist.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Playlist" - }, - "response": { - "$ref": "Playlist" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "list": { - "id": "youtube.playlists.list", - "path": "playlists", - "httpMethod": "GET", - "description": "Returns a collection of playlists that match the API request parameters. For example, you can retrieve all playlists that the authenticated user owns, or you can retrieve one or more playlists by their unique IDs.", - "parameters": { - "channelId": { - "type": "string", - "description": "This value indicates that the API should only return the specified channel's playlists.", - "location": "query" - }, - "hl": { - "type": "string", - "description": "The hl parameter should be used for filter out the properties that are not in the given language. Used for the snippet part.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube playlist ID(s) for the resource(s) that are being retrieved. In a playlist resource, the id property specifies the playlist's YouTube playlist ID.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "Set this parameter's value to true to instruct the API to only return playlists owned by the authenticated user.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more playlist resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlist resource, the snippet property contains properties like author, title, description, tags, and timeCreated. As such, if you set part=snippet, the API response will contain all of those properties.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "PlaylistListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "update": { - "id": "youtube.playlists.update", - "path": "playlists", - "httpMethod": "PUT", - "description": "Modifies a playlist. For example, you could change a playlist's title, description, or privacy status.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for mutable properties that are contained in any parts that the request body specifies. For example, a playlist's description is contained in the snippet part, which must be included in the request body. If the request does not specify a value for the snippet.description property, the playlist's existing description will be deleted.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Playlist" - }, - "response": { - "$ref": "Playlist" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "search": { - "methods": { - "list": { - "id": "youtube.search.list", - "path": "search", - "httpMethod": "GET", - "description": "Returns a collection of search results that match the query parameters specified in the API request. By default, a search result set identifies matching video, channel, and playlist resources, but you can also configure queries to only retrieve a specific type of resource.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter indicates that the API response should only contain resources created by the channel", - "location": "query" - }, - "channelType": { - "type": "string", - "description": "The channelType parameter lets you restrict a search to a particular type of channel.", - "enum": [ - "any", - "show" - ], - "enumDescriptions": [ - "Return all channels.", - "Only retrieve shows." - ], - "location": "query" - }, - "eventType": { - "type": "string", - "description": "The eventType parameter restricts a search to broadcast events. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "completed", - "live", - "upcoming" - ], - "enumDescriptions": [ - "Only include completed broadcasts.", - "Only include active broadcasts.", - "Only include upcoming broadcasts." - ], - "location": "query" - }, - "forContentOwner": { - "type": "boolean", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe forContentOwner parameter restricts the search to only retrieve resources owned by the content owner specified by the onBehalfOfContentOwner parameter. The user must be authenticated using a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.", - "location": "query" - }, - "forDeveloper": { - "type": "boolean", - "description": "The forDeveloper parameter restricts the search to only retrieve videos uploaded via the developer's application or website. The API server uses the request's authorization credentials to identify the developer. Therefore, a developer can restrict results to videos uploaded through the developer's own app or website but not to videos uploaded through other apps or sites.", - "location": "query" - }, - "forMine": { - "type": "boolean", - "description": "The forMine parameter restricts the search to only retrieve videos owned by the authenticated user. If you set this parameter to true, then the type parameter's value must also be set to video.", - "location": "query" - }, - "location": { - "type": "string", - "description": "The location parameter, in conjunction with the locationRadius parameter, defines a circular geographic area and also restricts a search to videos that specify, in their metadata, a geographic location that falls within that area. The parameter value is a string that specifies latitude/longitude coordinates e.g. (37.42307,-122.08427).\n\n\n- The location parameter value identifies the point at the center of the area.\n- The locationRadius parameter specifies the maximum distance that the location associated with a video can be from that point for the video to still be included in the search results.The API returns an error if your request specifies a value for the location parameter but does not also specify a value for the locationRadius parameter.", - "location": "query" - }, - "locationRadius": { - "type": "string", - "description": "The locationRadius parameter, in conjunction with the location parameter, defines a circular geographic area.\n\nThe parameter value must be a floating point number followed by a measurement unit. Valid measurement units are m, km, ft, and mi. For example, valid parameter values include 1500m, 5km, 10000ft, and 0.75mi. The API does not support locationRadius parameter values larger than 1000 kilometers.\n\nNote: See the definition of the location parameter for more information.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "order": { - "type": "string", - "description": "The order parameter specifies the method that will be used to order resources in the API response.", - "default": "SEARCH_SORT_RELEVANCE", - "enum": [ - "date", - "rating", - "relevance", - "title", - "videoCount", - "viewCount" - ], - "enumDescriptions": [ - "Resources are sorted in reverse chronological order based on the date they were created.", - "Resources are sorted from highest to lowest rating.", - "Resources are sorted based on their relevance to the search query. This is the default value for this parameter.", - "Resources are sorted alphabetically by title.", - "Channels are sorted in descending order of their number of uploaded videos.", - "Resources are sorted from highest to lowest number of views." - ], - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more search resource properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - }, - "publishedAfter": { - "type": "string", - "description": "The publishedAfter parameter indicates that the API response should only contain resources created after the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).", - "format": "date-time", - "location": "query" - }, - "publishedBefore": { - "type": "string", - "description": "The publishedBefore parameter indicates that the API response should only contain resources created before the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).", - "format": "date-time", - "location": "query" - }, - "q": { - "type": "string", - "description": "The q parameter specifies the query term to search for.\n\nYour request can also use the Boolean NOT (-) and OR (|) operators to exclude videos or to find videos that are associated with one of several search terms. For example, to search for videos matching either \"boating\" or \"sailing\", set the q parameter value to boating|sailing. Similarly, to search for videos matching either \"boating\" or \"sailing\" but not \"fishing\", set the q parameter value to boating|sailing -fishing. Note that the pipe character must be URL-escaped when it is sent in your API request. The URL-escaped value for the pipe character is %7C.", - "location": "query" - }, - "regionCode": { - "type": "string", - "description": "The regionCode parameter instructs the API to return search results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.", - "location": "query" - }, - "relatedToVideoId": { - "type": "string", - "description": "The relatedToVideoId parameter retrieves a list of videos that are related to the video that the parameter value identifies. The parameter value must be set to a YouTube video ID and, if you are using this parameter, the type parameter must be set to video.", - "location": "query" - }, - "relevanceLanguage": { - "type": "string", - "description": "The relevanceLanguage parameter instructs the API to return search results that are most relevant to the specified language. The parameter value is typically an ISO 639-1 two-letter language code. However, you should use the values zh-Hans for simplified Chinese and zh-Hant for traditional Chinese. Please note that results in other languages will still be returned if they are highly relevant to the search query term.", - "location": "query" - }, - "safeSearch": { - "type": "string", - "description": "The safeSearch parameter indicates whether the search results should include restricted content as well as standard content.", - "enum": [ - "moderate", - "none", - "strict" - ], - "enumDescriptions": [ - "YouTube will filter some content from search results and, at the least, will filter content that is restricted in your locale. Based on their content, search results could be removed from search results or demoted in search results. This is the default parameter value.", - "YouTube will not filter the search result set.", - "YouTube will try to exclude all restricted content from the search result set. Based on their content, search results could be removed from search results or demoted in search results." - ], - "location": "query" - }, - "topicId": { - "type": "string", - "description": "The topicId parameter indicates that the API response should only contain resources associated with the specified topic. The value identifies a Freebase topic ID.", - "location": "query" - }, - "type": { - "type": "string", - "description": "The type parameter restricts a search query to only retrieve a particular type of resource. The value is a comma-separated list of resource types.", - "default": "video,channel,playlist", - "location": "query" - }, - "videoCaption": { - "type": "string", - "description": "The videoCaption parameter indicates whether the API should filter video search results based on whether they have captions. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "closedCaption", - "none" - ], - "enumDescriptions": [ - "Do not filter results based on caption availability.", - "Only include videos that have captions.", - "Only include videos that do not have captions." - ], - "location": "query" - }, - "videoCategoryId": { - "type": "string", - "description": "The videoCategoryId parameter filters video search results based on their category. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "location": "query" - }, - "videoDefinition": { - "type": "string", - "description": "The videoDefinition parameter lets you restrict a search to only include either high definition (HD) or standard definition (SD) videos. HD videos are available for playback in at least 720p, though higher resolutions, like 1080p, might also be available. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "high", - "standard" - ], - "enumDescriptions": [ - "Return all videos, regardless of their resolution.", - "Only retrieve HD videos.", - "Only retrieve videos in standard definition." - ], - "location": "query" - }, - "videoDimension": { - "type": "string", - "description": "The videoDimension parameter lets you restrict a search to only retrieve 2D or 3D videos. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "2d", - "3d", - "any" - ], - "enumDescriptions": [ - "Restrict search results to exclude 3D videos.", - "Restrict search results to only include 3D videos.", - "Include both 3D and non-3D videos in returned results. This is the default value." - ], - "location": "query" - }, - "videoDuration": { - "type": "string", - "description": "The videoDuration parameter filters video search results based on their duration. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "long", - "medium", - "short" - ], - "enumDescriptions": [ - "Do not filter video search results based on their duration. This is the default value.", - "Only include videos longer than 20 minutes.", - "Only include videos that are between four and 20 minutes long (inclusive).", - "Only include videos that are less than four minutes long." - ], - "location": "query" - }, - "videoEmbeddable": { - "type": "string", - "description": "The videoEmbeddable parameter lets you to restrict a search to only videos that can be embedded into a webpage. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "true" - ], - "enumDescriptions": [ - "Return all videos, embeddable or not.", - "Only retrieve embeddable videos." - ], - "location": "query" - }, - "videoLicense": { - "type": "string", - "description": "The videoLicense parameter filters search results to only include videos with a particular license. YouTube lets video uploaders choose to attach either the Creative Commons license or the standard YouTube license to each of their videos. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "creativeCommon", - "youtube" - ], - "enumDescriptions": [ - "Return all videos, regardless of which license they have, that match the query parameters.", - "Only return videos that have a Creative Commons license. Users can reuse videos with this license in other videos that they create. Learn more.", - "Only return videos that have the standard YouTube license." - ], - "location": "query" - }, - "videoSyndicated": { - "type": "string", - "description": "The videoSyndicated parameter lets you to restrict a search to only videos that can be played outside youtube.com. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "true" - ], - "enumDescriptions": [ - "Return all videos, syndicated or not.", - "Only retrieve syndicated videos." - ], - "location": "query" - }, - "videoType": { - "type": "string", - "description": "The videoType parameter lets you restrict a search to a particular type of videos. If you specify a value for this parameter, you must also set the type parameter's value to video.", - "enum": [ - "any", - "episode", - "movie" - ], - "enumDescriptions": [ - "Return all videos.", - "Only retrieve episodes of shows.", - "Only retrieve movies." - ], - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "SearchListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "sponsors": { - "methods": { - "list": { - "id": "youtube.sponsors.list", - "path": "sponsors", - "httpMethod": "GET", - "description": "Lists sponsors for a channel.", - "parameters": { - "filter": { - "type": "string", - "description": "The filter parameter specifies which channel sponsors to return.", - "default": "POLL_NEWEST", - "enum": [ - "all", - "newest" - ], - "enumDescriptions": [ - "Return all sponsors, from newest to oldest.", - "Return the most recent sponsors, from newest to oldest." - ], - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the sponsor resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "SponsorListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "subscriptions": { - "methods": { - "delete": { - "id": "youtube.subscriptions.delete", - "path": "subscriptions", - "httpMethod": "DELETE", - "description": "Deletes a subscription.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube subscription ID for the resource that is being deleted. In a subscription resource, the id property specifies the YouTube subscription ID.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "insert": { - "id": "youtube.subscriptions.insert", - "path": "subscriptions", - "httpMethod": "POST", - "description": "Adds a subscription for the authenticated user's channel.", - "parameters": { - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Subscription" - }, - "response": { - "$ref": "Subscription" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "list": { - "id": "youtube.subscriptions.list", - "path": "subscriptions", - "httpMethod": "GET", - "description": "Returns subscription resources that match the API request criteria.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter specifies a YouTube channel ID. The API will only return that channel's subscriptions.", - "location": "query" - }, - "forChannelId": { - "type": "string", - "description": "The forChannelId parameter specifies a comma-separated list of channel IDs. The API response will then only contain subscriptions matching those channels.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube subscription ID(s) for the resource(s) that are being retrieved. In a subscription resource, the id property specifies the YouTube subscription ID.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "mine": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's subscriptions.", - "location": "query" - }, - "myRecentSubscribers": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user in reverse chronological order (newest first).", - "location": "query" - }, - "mySubscribers": { - "type": "boolean", - "description": "Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user in no particular order.", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "order": { - "type": "string", - "description": "The order parameter specifies the method that will be used to sort resources in the API response.", - "default": "SUBSCRIPTION_ORDER_RELEVANCE", - "enum": [ - "alphabetical", - "relevance", - "unread" - ], - "enumDescriptions": [ - "Sort alphabetically.", - "Sort by relevance.", - "Sort by order of activity." - ], - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more subscription resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a subscription resource, the snippet property contains other properties, such as a display title for the subscription. If you set part=snippet, the API response will also contain all of those nested properties.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "SubscriptionListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "superChatEvents": { - "methods": { - "list": { - "id": "youtube.superChatEvents.list", - "path": "superChatEvents", - "httpMethod": "GET", - "description": "Lists Super Chat events for a channel.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.", - "default": "5", - "format": "uint32", - "minimum": "0", - "maximum": "50", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the superChatEvent resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "SuperChatEventListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "thumbnails": { - "methods": { - "set": { - "id": "youtube.thumbnails.set", - "path": "thumbnails/set", - "httpMethod": "POST", - "description": "Uploads a custom video thumbnail to YouTube and sets it for a video.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "videoId": { - "type": "string", - "description": "The videoId parameter specifies a YouTube video ID for which the custom video thumbnail is being provided.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "videoId" - ], - "response": { - "$ref": "ThumbnailSetResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.upload", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "application/octet-stream", - "image/jpeg", - "image/png" - ], - "maxSize": "2MB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/thumbnails/set" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/thumbnails/set" - } - } - } - } - } - }, - "videoAbuseReportReasons": { - "methods": { - "list": { - "id": "youtube.videoAbuseReportReasons.list", - "path": "videoAbuseReportReasons", - "httpMethod": "GET", - "description": "Returns a list of abuse reasons that can be used for reporting abusive videos.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter specifies the language that should be used for text values in the API response.", - "default": "en_US", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the videoCategory resource parts that the API response will include. Supported values are id and snippet.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "VideoAbuseReportReasonListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly" - ] - } - } - }, - "videoCategories": { - "methods": { - "list": { - "id": "youtube.videoCategories.list", - "path": "videoCategories", - "httpMethod": "GET", - "description": "Returns a list of categories that can be associated with YouTube videos.", - "parameters": { - "hl": { - "type": "string", - "description": "The hl parameter specifies the language that should be used for text values in the API response.", - "default": "en_US", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of video category IDs for the resources that you are retrieving.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies the videoCategory resource properties that the API response will include. Set the parameter value to snippet.", - "required": true, - "location": "query" - }, - "regionCode": { - "type": "string", - "description": "The regionCode parameter instructs the API to return the list of video categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "VideoCategoryListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "videos": { - "methods": { - "delete": { - "id": "youtube.videos.delete", - "path": "videos", - "httpMethod": "DELETE", - "description": "Deletes a YouTube video.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube video ID for the resource that is being deleted. In a video resource, the id property specifies the video's ID.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "getRating": { - "id": "youtube.videos.getRating", - "path": "videos/getRating", - "httpMethod": "GET", - "description": "Retrieves the ratings that the authorized user gave to a list of specified videos.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) for which you are retrieving rating data. In a video resource, the id property specifies the video's ID.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "id" - ], - "response": { - "$ref": "VideoGetRatingResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "insert": { - "id": "youtube.videos.insert", - "path": "videos", - "httpMethod": "POST", - "description": "Uploads a video to YouTube and optionally sets the video's metadata.", - "parameters": { - "autoLevels": { - "type": "boolean", - "description": "The autoLevels parameter indicates whether YouTube should automatically enhance the video's lighting and color.", - "location": "query" - }, - "notifySubscribers": { - "type": "boolean", - "description": "The notifySubscribers parameter indicates whether YouTube should send a notification about the new video to users who subscribe to the video's channel. A parameter value of True indicates that subscribers will be notified of newly uploaded videos. However, a channel owner who is uploading many videos might prefer to set the value to False to avoid sending a notification about each new video to the channel's subscribers.", - "default": "true", - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "onBehalfOfContentOwnerChannel": { - "type": "string", - "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that not all parts contain properties that can be set when inserting or updating a video. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.", - "required": true, - "location": "query" - }, - "stabilize": { - "type": "boolean", - "description": "The stabilize parameter indicates whether YouTube should adjust the video to remove shaky camera motions.", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Video" - }, - "response": { - "$ref": "Video" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.upload", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "application/octet-stream", - "video/*" - ], - "maxSize": "64GB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/videos" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/videos" - } - } - } - }, - "list": { - "id": "youtube.videos.list", - "path": "videos", - "httpMethod": "GET", - "description": "Returns a list of videos that match the API request parameters.", - "parameters": { - "chart": { - "type": "string", - "description": "The chart parameter identifies the chart that you want to retrieve.", - "enum": [ - "mostPopular" - ], - "enumDescriptions": [ - "Return the most popular videos for the specified content region and video category." - ], - "location": "query" - }, - "hl": { - "type": "string", - "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.", - "location": "query" - }, - "id": { - "type": "string", - "description": "The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.", - "location": "query" - }, - "locale": { - "type": "string", - "description": "DEPRECATED", - "location": "query" - }, - "maxHeight": { - "type": "integer", - "description": "The maxHeight parameter specifies a maximum height of the embedded player. If maxWidth is provided, maxHeight may not be reached in order to not violate the width request.", - "format": "uint32", - "minimum": "72", - "maximum": "8192", - "location": "query" - }, - "maxResults": { - "type": "integer", - "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is supported for use in conjunction with the myRating and chart parameters, but it is not supported for use in conjunction with the id parameter.", - "default": "5", - "format": "uint32", - "minimum": "1", - "maximum": "50", - "location": "query" - }, - "maxWidth": { - "type": "integer", - "description": "The maxWidth parameter specifies a maximum width of the embedded player. If maxHeight is provided, maxWidth may not be reached in order to not violate the height request.", - "format": "uint32", - "minimum": "72", - "maximum": "8192", - "location": "query" - }, - "myRating": { - "type": "string", - "description": "Set this parameter's value to like or dislike to instruct the API to only return videos liked or disliked by the authenticated user.", - "enum": [ - "dislike", - "like" - ], - "enumDescriptions": [ - "Returns only videos disliked by the authenticated user.", - "Returns only video liked by the authenticated user." - ], - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "pageToken": { - "type": "string", - "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.\n\nNote: This parameter is supported for use in conjunction with the myRating and chart parameters, but it is not supported for use in conjunction with the id parameter.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter specifies a comma-separated list of one or more video resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a video resource, the snippet property contains the channelId, title, description, tags, and categoryId properties. As such, if you set part=snippet, the API response will contain all of those properties.", - "required": true, - "location": "query" - }, - "regionCode": { - "type": "string", - "description": "The regionCode parameter instructs the API to select a video chart available in the specified region. This parameter can only be used in conjunction with the chart parameter. The parameter value is an ISO 3166-1 alpha-2 country code.", - "location": "query" - }, - "videoCategoryId": { - "type": "string", - "description": "The videoCategoryId parameter identifies the video category for which the chart should be retrieved. This parameter can only be used in conjunction with the chart parameter. By default, charts are not restricted to a particular category.", - "default": "0", - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "response": { - "$ref": "VideoListResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.readonly", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "rate": { - "id": "youtube.videos.rate", - "path": "videos/rate", - "httpMethod": "POST", - "description": "Add a like or dislike rating to a video or remove a rating from a video.", - "parameters": { - "id": { - "type": "string", - "description": "The id parameter specifies the YouTube video ID of the video that is being rated or having its rating removed.", - "required": true, - "location": "query" - }, - "rating": { - "type": "string", - "description": "Specifies the rating to record.", - "required": true, - "enum": [ - "dislike", - "like", - "none" - ], - "enumDescriptions": [ - "Records that the authenticated user disliked the video.", - "Records that the authenticated user liked the video.", - "Removes any rating that the authenticated user had previously set for the video." - ], - "location": "query" - } - }, - "parameterOrder": [ - "id", - "rating" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "reportAbuse": { - "id": "youtube.videos.reportAbuse", - "path": "videos/reportAbuse", - "httpMethod": "POST", - "description": "Report abuse for a video.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "request": { - "$ref": "VideoAbuseReport" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - }, - "update": { - "id": "youtube.videos.update", - "path": "videos", - "httpMethod": "PUT", - "description": "Updates a video's metadata.", - "parameters": { - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - }, - "part": { - "type": "string", - "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a video's privacy setting is contained in the status part. As such, if your request is updating a private video, and the request's part parameter value includes the status part, the video's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the video will revert to the default privacy setting.\n\nIn addition, not all parts contain properties that can be set when inserting or updating a video. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.", - "required": true, - "location": "query" - } - }, - "parameterOrder": [ - "part" - ], - "request": { - "$ref": "Video" - }, - "response": { - "$ref": "Video" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - }, - "watermarks": { - "methods": { - "set": { - "id": "youtube.watermarks.set", - "path": "watermarks/set", - "httpMethod": "POST", - "description": "Uploads a watermark image to YouTube and sets it for a channel.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter specifies the YouTube channel ID for which the watermark is being provided.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "channelId" - ], - "request": { - "$ref": "InvideoBranding" - }, - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtube.upload", - "https://www.googleapis.com/auth/youtubepartner" - ], - "supportsMediaUpload": true, - "mediaUpload": { - "accept": [ - "application/octet-stream", - "image/jpeg", - "image/png" - ], - "maxSize": "10MB", - "protocols": { - "simple": { - "multipart": true, - "path": "/upload/youtube/v3/watermarks/set" - }, - "resumable": { - "multipart": true, - "path": "/resumable/upload/youtube/v3/watermarks/set" - } - } - } - }, - "unset": { - "id": "youtube.watermarks.unset", - "path": "watermarks/unset", - "httpMethod": "POST", - "description": "Deletes a channel's watermark image.", - "parameters": { - "channelId": { - "type": "string", - "description": "The channelId parameter specifies the YouTube channel ID for which the watermark is being unset.", - "required": true, - "location": "query" - }, - "onBehalfOfContentOwner": { - "type": "string", - "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.", - "location": "query" - } - }, - "parameterOrder": [ - "channelId" - ], - "scopes": [ - "https://www.googleapis.com/auth/youtube", - "https://www.googleapis.com/auth/youtube.force-ssl", - "https://www.googleapis.com/auth/youtubepartner" - ] - } - } - } - } -} diff --git a/test/data/youtube-playlistid.json b/test/data/youtube-playlistid.json deleted file mode 100644 index b69205f4342..00000000000 --- a/test/data/youtube-playlistid.json +++ /dev/null @@ -1 +0,0 @@ -{"regionCode": "US", "kind": "youtube#searchListResponse", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/eoV8llUEbIu5LXnwqBaLOkOK0Hg\"", "pageInfo": {"resultsPerPage": 1, "totalResults": 1}, "items": [{"snippet": {"thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/mqdefault.jpg", "width": 320, "height": 180}}, "title": "IETF98", "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-03-30T12:41:04.000Z", "liveBroadcastContent": "none", "channelTitle": "IETF - Internet Engineering Task Force", "description": "Videos from the IETF 98 Meeting held in Chicago, Illinois, United States 26-31 March 2017."}, "kind": "youtube#searchResult", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/X3dbZGRvgpvedtOP0KLGhZLg5UI\"", "id": {"kind": "youtube#playlist", "playlistId": "PLC86T-test"}}]} diff --git a/test/data/youtube-playlistitems.json b/test/data/youtube-playlistitems.json deleted file mode 100644 index 4b42e3d21b9..00000000000 --- a/test/data/youtube-playlistitems.json +++ /dev/null @@ -1 +0,0 @@ -{"items": [{"snippet": {"playlistId": "PLC86T-6ZTP5jo6kIuqdyeYYhsKv9sUwG1", "thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/mqdefault.jpg", "width": 320, "height": 180}, "maxres": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/maxresdefault.jpg", "width": 1280, "height": 720}, "standard": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/sddefault.jpg", "width": 640, "height": 480}}, "title": "IETF98 Wrap Up", "resourceId": {"kind": "youtube#video", "videoId": "lhYWB5FFkg4"}, "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-04-06T13:32:39.000Z", "channelTitle": "IETF - Internet Engineering Task Force", "position": 0, "description": "Jari Arkko and Alissa Cooper recap some highlights the IETF 98 meeting held 26-31 March 2017 in Chicago, Illinois, United States"}, "kind": "youtube#playlistItem", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/eW_De3gQF2fRzN_rPBbX-kY7oBI\"", "id": "UExDODZULTZaVFA1am82a0l1cWR5ZVlZaHNLdjlzVXdHMS40OTQ5QjlEMDgzN0FBNUIw"}, {"snippet": {"playlistId": "PLC86T-6ZTP5jo6kIuqdyeYYhsKv9sUwG1", "thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/mqdefault.jpg", "width": 320, "height": 180}}, "title": "IETF 98 - QUIC Tutorial", "resourceId": {"kind": "youtube#video", "videoId": "lPSTcBITbvs"}, "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-03-30T12:41:35.000Z", "channelTitle": "IETF - Internet Engineering Task Force", "position": 1, "description": "A tutorial about the new QUIC protocol"}, "kind": "youtube#playlistItem", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/GhKVt6zTuEpFavgtf9GWlWuzX9s\"", "id": "UExDODZULTZaVFA1am82a0l1cWR5ZVlZaHNLdjlzVXdHMS41NkI0NEY2RDEwNTU3Q0M2"}], "kind": "youtube#playlistItemListResponse", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/jlFue-jZVpFMOuLUXQZH4Y0Lh3Y\"", "pageInfo": {"resultsPerPage": 2, "totalResults": 110}} diff --git a/test/lib/.gitignore b/test/lib/.gitignore deleted file mode 100644 index 330b0c2b644..00000000000 --- a/test/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/django diff --git a/test/lib/README b/test/lib/README deleted file mode 100644 index 2dda507f05a..00000000000 --- a/test/lib/README +++ /dev/null @@ -1,9 +0,0 @@ -This directory will be used to set up packages used for testing if they need any -special handling which should not be applied to the system-wide setup. - -For instance, many of the tests to be run on the Django application should be run -with a standard Django environment; but there are some Django test features which -are broken in 0.9.6, and need patching in order to do the testing, like the ability -to create a test database to run unit tests, according to this issue and patch: -http://code.djangoproject.com/changeset/5106 - diff --git a/test/media/floor/.gitignore b/test/media/floor/.gitignore deleted file mode 100644 index 33662f5545b..00000000000 --- a/test/media/floor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/* diff --git a/test/media/photo/.gitignore b/test/media/photo/.gitignore deleted file mode 100644 index 33662f5545b..00000000000 --- a/test/media/photo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/* diff --git a/test/settings_local_test.py b/test/settings_local_test.py index 06d810e4af4..7097f76459e 100644 --- a/test/settings_local_test.py +++ b/test/settings_local_test.py @@ -5,6 +5,5 @@ SERVER_MODE = 'test' -IPR_DOCUMENT_PATH = '/home/ietf/adm/IPR/' SITE_ID = 1 diff --git a/vite.config.js b/vite.config.js index 41a2cb02e03..bde2b9ed575 100644 --- a/vite.config.js +++ b/vite.config.js @@ -16,7 +16,8 @@ export default defineConfig(({ command, mode }) => { main: 'client/main.js', embedded: 'client/embedded.js' } - } + }, + sourcemap: true }, cacheDir: '.vite', plugins: [ diff --git a/yarn.lock b/yarn.lock index 9f9514f6c8f..54768ac3913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 6 cacheKey: 8 +"@aashutoshrathi/word-wrap@npm:^1.2.3": + version: 1.2.6 + resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" + checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.0, @babel/code-frame@npm:^7.16.0": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -32,7 +39,16 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6": +"@babel/parser@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/parser@npm:7.23.9" + bin: + parser: ./bin/babel-parser.js + checksum: e7cd4960ac8671774e13803349da88d512f9292d7baa952173260d3e8f15620a28a3701f14f709d769209022f9e7b79965256b8be204fc550cfe783cdcabe7c7 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6": version: 7.18.4 resolution: "@babel/parser@npm:7.18.4" bin: @@ -41,6 +57,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.21.0": + version: 7.23.2 + resolution: "@babel/runtime@npm:7.23.2" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb + languageName: node + linkType: hard + "@babel/types@npm:^7.6.1, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6": version: 7.18.4 resolution: "@babel/types@npm:7.18.4" @@ -58,12 +83,12 @@ __metadata: languageName: node linkType: hard -"@css-render/plugin-bem@npm:^0.15.10": - version: 0.15.10 - resolution: "@css-render/plugin-bem@npm:0.15.10" +"@css-render/plugin-bem@npm:^0.15.12": + version: 0.15.12 + resolution: "@css-render/plugin-bem@npm:0.15.12" peerDependencies: - css-render: ~0.15.10 - checksum: cbab72a7b5e6cec84041f8ea01b4e5c6d83e44f2a5c8e6cbba3b2a41a8b5ed5faf22390336d70648b5e471d7aab6b13123c0cdaea1bd21c6678d18abd399a203 + css-render: ~0.15.12 + checksum: 9fa7ddd62b19beefa1280d731bc45f26f016e0f4f4535025247b4de831b3a37f72f7eaa7098c10fac784a5f1eb723078ee293068e77c04e6e40953f260e4fc14 languageName: node linkType: hard @@ -76,6 +101,15 @@ __metadata: languageName: node linkType: hard +"@css-render/vue3-ssr@npm:^0.15.12": + version: 0.15.12 + resolution: "@css-render/vue3-ssr@npm:0.15.12" + peerDependencies: + vue: ^3.0.11 + checksum: a5505ae1619827dd2f2d1e294f58c927e8e292c93aa6750ffcb8690cc57e797a01c23c828dd4c9a3bde3add500c2385bd85905bb7f3280c76be2010f1c15537d + languageName: node + linkType: hard + "@emotion/hash@npm:~0.8.0": version: 0.8.0 resolution: "@emotion/hash@npm:0.8.0" @@ -83,161 +117,161 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/android-arm64@npm:0.17.13" +"@esbuild/android-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-arm64@npm:0.18.20" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/android-arm@npm:0.17.13" +"@esbuild/android-arm@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-arm@npm:0.18.20" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/android-x64@npm:0.17.13" +"@esbuild/android-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/android-x64@npm:0.18.20" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/darwin-arm64@npm:0.17.13" +"@esbuild/darwin-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/darwin-arm64@npm:0.18.20" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/darwin-x64@npm:0.17.13" +"@esbuild/darwin-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/darwin-x64@npm:0.18.20" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/freebsd-arm64@npm:0.17.13" +"@esbuild/freebsd-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/freebsd-arm64@npm:0.18.20" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/freebsd-x64@npm:0.17.13" +"@esbuild/freebsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/freebsd-x64@npm:0.18.20" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-arm64@npm:0.17.13" +"@esbuild/linux-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-arm64@npm:0.18.20" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-arm@npm:0.17.13" +"@esbuild/linux-arm@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-arm@npm:0.18.20" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-ia32@npm:0.17.13" +"@esbuild/linux-ia32@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-ia32@npm:0.18.20" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-loong64@npm:0.17.13" +"@esbuild/linux-loong64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-loong64@npm:0.18.20" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-mips64el@npm:0.17.13" +"@esbuild/linux-mips64el@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-mips64el@npm:0.18.20" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-ppc64@npm:0.17.13" +"@esbuild/linux-ppc64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-ppc64@npm:0.18.20" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-riscv64@npm:0.17.13" +"@esbuild/linux-riscv64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-riscv64@npm:0.18.20" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-s390x@npm:0.17.13" +"@esbuild/linux-s390x@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-s390x@npm:0.18.20" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/linux-x64@npm:0.17.13" +"@esbuild/linux-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/linux-x64@npm:0.18.20" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/netbsd-x64@npm:0.17.13" +"@esbuild/netbsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/netbsd-x64@npm:0.18.20" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/openbsd-x64@npm:0.17.13" +"@esbuild/openbsd-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/openbsd-x64@npm:0.18.20" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/sunos-x64@npm:0.17.13" +"@esbuild/sunos-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/sunos-x64@npm:0.18.20" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/win32-arm64@npm:0.17.13" +"@esbuild/win32-arm64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-arm64@npm:0.18.20" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/win32-ia32@npm:0.17.13" +"@esbuild/win32-ia32@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-ia32@npm:0.18.20" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.17.13": - version: 0.17.13 - resolution: "@esbuild/win32-x64@npm:0.17.13" +"@esbuild/win32-x64@npm:0.18.20": + version: 0.18.20 + resolution: "@esbuild/win32-x64@npm:0.18.20" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.3.0": +"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -248,143 +282,153 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0": - version: 4.4.1 - resolution: "@eslint-community/regexpp@npm:4.4.1" - checksum: db97d8d08e784147b55ab0dda5892503c1a0eebad94d1c4646d89a94f02ca70b25f05d8e021fc05a075e7eb312e03e21f63d84f0b327719f8cf3bb64e66917cb +"@eslint-community/regexpp@npm:^4.6.0": + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.0.2": - version: 2.0.2 - resolution: "@eslint/eslintrc@npm:2.0.2" +"@eslint-community/regexpp@npm:^4.6.1": + version: 4.8.0 + resolution: "@eslint-community/regexpp@npm:4.8.0" + checksum: 601e6d033d556e98e8c929905bef335f20d7389762812df4d0f709d9b4d2631610dda975fb272e23b5b68e24a163b3851b114c8080a0a19fb4c141a1eff6305b + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.5.1 + espree: ^9.6.0 globals: ^13.19.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: cfcf5e12c7b2c4476482e7f12434e76eae16fcd163ee627309adb10b761e5caa4a4e52ed7be464423320ff3d11eca5b50de5bf8be3e25834222470835dd5c801 + checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127 languageName: node linkType: hard -"@eslint/js@npm:8.39.0": - version: 8.39.0 - resolution: "@eslint/js@npm:8.39.0" - checksum: 63fe36e2bfb5ff5705d1c1a8ccecd8eb2f81d9af239713489e767b0e398759c0177fcc75ad62581d02942f2776903a8496d5fae48dc2d883dff1b96fcb19e9e2 +"@eslint/js@npm:8.57.0": + version: 8.57.0 + resolution: "@eslint/js@npm:8.57.0" + checksum: 315dc65b0e9893e2bff139bddace7ea601ad77ed47b4550e73da8c9c2d2766c7a575c3cddf17ef85b8fd6a36ff34f91729d0dcca56e73ca887c10df91a41b0bb languageName: node linkType: hard -"@faker-js/faker@npm:7.6.0": - version: 7.6.0 - resolution: "@faker-js/faker@npm:7.6.0" - checksum: 942af6221774e8c98a0eb6bc75265e05fb81a941170377666c3439aab9495dd321d6beedc5406f07e6ad44262b3e43c20961f666d116ad150b78e7437dd1bb2b +"@floating-ui/core@npm:^1.4.1": + version: 1.4.1 + resolution: "@floating-ui/core@npm:1.4.1" + dependencies: + "@floating-ui/utils": ^0.1.1 + checksum: be4ab864fe17eeba5e205bd554c264b9a4895a57c573661bbf638357fa3108677fed7ba3269ec15b4da90e29274c9b626d5a15414e8d1fe691e210d02a03695c languageName: node linkType: hard -"@floating-ui/core@npm:^1.2.6": - version: 1.2.6 - resolution: "@floating-ui/core@npm:1.2.6" - checksum: e4aa96c435277f1720d4bc939e17a79b1e1eebd589c20b622d3c646a5273590ff889b8c6e126f7be61873cf8c4d7db7d418895986ea19b8b0d0530de32504c3a +"@floating-ui/dom@npm:^1.5.1": + version: 1.5.2 + resolution: "@floating-ui/dom@npm:1.5.2" + dependencies: + "@floating-ui/core": ^1.4.1 + "@floating-ui/utils": ^0.1.1 + checksum: 3c71eed50bb22cec8f1f31750ad3d42b3b7b4b29dc6e4351100ff05a62445a5404abb71c733320f8376a8c5e78852e1cfba1b81e22bfc4ca0728f50ca8998dc5 languageName: node linkType: hard -"@floating-ui/dom@npm:^1.2.5": - version: 1.2.6 - resolution: "@floating-ui/dom@npm:1.2.6" - dependencies: - "@floating-ui/core": ^1.2.6 - checksum: 2226c6c244b96ae75ab14cc35bb119c8d7b83a85e2ff04e9d9800cffdb17faf4a7cf82db741dd045242ced56e31c8a08e33c8c512c972309a934d83b1f410441 +"@floating-ui/utils@npm:^0.1.1": + version: 0.1.2 + resolution: "@floating-ui/utils@npm:0.1.2" + checksum: 3e29fd3c69be2d27bb95ebe54129a6a29ea2d8112b2cbb568168cf2f1e787e6ed6305d743598469476bec28122b7ea3ea4b54a1a2d59d30dc4b4307391472299 languageName: node linkType: hard -"@fullcalendar/bootstrap5@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/bootstrap5@npm:6.1.6" +"@fullcalendar/bootstrap5@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/bootstrap5@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 - checksum: 09f2bdf7dc6811c6069e76edf8455e0ef833da1859ab91aa4d97ca1dbd652219e81f0332fa5d311edac35231bd6fa022f1c0607b995299a1b17357b317f8c1e8 + "@fullcalendar/core": ~6.1.11 + checksum: a0c3b9434668f0ba9b19765d13ff53bbc536ac530dc4303ed7a0812f1dafd7ed094073328cdfd58608ff00e13fe9e42f38d8314372642a14e17fb582bfb6eb24 languageName: node linkType: hard -"@fullcalendar/core@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/core@npm:6.1.6" +"@fullcalendar/core@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/core@npm:6.1.11" dependencies: preact: ~10.12.1 - checksum: 72ec698bd226ea76cef106b9eecd4391a0434b13f9f02f663a84720d5b1e0ca8db21f1ace72278d22814cc4d1dfb1374f17532abde0ae99210bfd5ad7468e17f + checksum: 0078a6f96b06a637de08ba28a317bbcbf7768f53ce7891faa2a656ca2bed0e887e555d6f3203b77d6c271ccb128fa85d592411fcfd87746514a5cec68376ad87 languageName: node linkType: hard -"@fullcalendar/daygrid@npm:6.1.6, @fullcalendar/daygrid@npm:~6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/daygrid@npm:6.1.6" +"@fullcalendar/daygrid@npm:6.1.11, @fullcalendar/daygrid@npm:~6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/daygrid@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 - checksum: e7b60e359b620091c834fe3472761b9f4ebf3cd8d65a2ae56ead10dcb65a898c4c86770046dc3addff86002df9972a58395b7916502e8a4ec8d7b83a74b150b9 + "@fullcalendar/core": ~6.1.11 + checksum: 6eb5606de58b7a8ec30d96618a6d15b2c0d7108c94593ff94e81a8d87ce8efb1f29f3849c6c3f2b8ae56198ffe6235e2ec0e4a1270993c022dc194016e595685 languageName: node linkType: hard -"@fullcalendar/icalendar@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/icalendar@npm:6.1.6" +"@fullcalendar/icalendar@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/icalendar@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 + "@fullcalendar/core": ~6.1.11 ical.js: ^1.4.0 - checksum: 50d290346aa9ba0cb36e6072d05b2ffe1dd1d3b89975eaf89c6309e58adafd7e2ce1ca3e3063634218c5c29207e39c75530ebe6908f66f12bc8782eaba57d52d + checksum: 4e6eff15a81dda9d275ba555a0b4648a1410c1504694915a1669eb3c1c2299e1bce2817b78dbf33378621972bb0bc90a1d1f53515dc071b5f5abf79d10d1854a languageName: node linkType: hard -"@fullcalendar/interaction@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/interaction@npm:6.1.6" +"@fullcalendar/interaction@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/interaction@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 - checksum: b7dea490592cdaf902788825ebea122816185657bb37f82dd78ba8129d10fff0c1c45a70d819dd44b5b7088d8b51588899e8e2332652fd939e263160912940dd + "@fullcalendar/core": ~6.1.11 + checksum: c67d4cfa0b158b848fb482835c5f44c52650037a4b912e16e2ea1955bf476c847d0ec95aea79b37b78207b2da3a7c4d2b37bd5c8b15a89bdd5e3b7ae3b7af9ba languageName: node linkType: hard -"@fullcalendar/list@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/list@npm:6.1.6" +"@fullcalendar/list@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/list@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 - checksum: e5beb01c624b9994490ef0e8e3cb4e9f97efd4a0be6539191f912a27df4cd56bbf4124f558536618f18889b8133920fadf0962994a7345fb089fd4245bcbcf15 + "@fullcalendar/core": ~6.1.11 + checksum: 84a8cd6e63407e8fb95b4b2810a49c8815d9491a298a4761b9399cc8384abebf6227cc5ec93b942783f6ea6c6bcb4e94844fd5a12d73700e535f4f15ee02b7d6 languageName: node linkType: hard -"@fullcalendar/luxon2@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/luxon2@npm:6.1.6" +"@fullcalendar/luxon3@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/luxon3@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 - luxon: ^2.0.0 - checksum: 48d76dc556960e3ac18fc7b0afd7da5c7fb2dd2817afaba8bdf6423999aaaa174dfe8464813e79d3e5d717b0a92f793260a227f848af2427c902ed7506a01ffa + "@fullcalendar/core": ~6.1.11 + luxon: ^3.0.0 + checksum: 8e7f45aab2e2235b2027ca99aeabb35a91f0b2fcb608d52357abb582b4640ed8a0d7a4569ffa25628fbe04d2ee13051ec66304c6abef7cd7a364fa173db09ab7 languageName: node linkType: hard -"@fullcalendar/timegrid@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/timegrid@npm:6.1.6" +"@fullcalendar/timegrid@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/timegrid@npm:6.1.11" dependencies: - "@fullcalendar/daygrid": ~6.1.6 + "@fullcalendar/daygrid": ~6.1.11 peerDependencies: - "@fullcalendar/core": ~6.1.6 - checksum: ef79183dad0a49f86f43b3eb58fabfd48312ec0abf03b690094be72c3d8821a488038f8308cb0e136c0f716648409dc33c8a5fc77192c7c0d93cd9962cb4c814 + "@fullcalendar/core": ~6.1.11 + checksum: 4a11e6dd908e7d7f660149e6d61eff847efa14d0dcf532f8793de6b035d1a573ef7423fea0df791b6dc5f3d9792df77b72c7e6a1150289d04eca3ff9959a80ec languageName: node linkType: hard -"@fullcalendar/vue3@npm:6.1.6": - version: 6.1.6 - resolution: "@fullcalendar/vue3@npm:6.1.6" +"@fullcalendar/vue3@npm:6.1.11": + version: 6.1.11 + resolution: "@fullcalendar/vue3@npm:6.1.11" peerDependencies: - "@fullcalendar/core": ~6.1.6 + "@fullcalendar/core": ~6.1.11 vue: ^3.0.11 - checksum: 68fe3ce2049173a46c85d60d2f344644da5f50603455cc0838917449d5daae406e32995834384a02c1d741aea0ec19446ec9feb1d9c0f19b466b83336b98c8ae + checksum: 5891a596e92269151cb62feaaffdc87ac8ad55b277e8bbad435855ab872fabb2f88766b8bc0659745c5205e3550a2c8923c5fc990ade8401de2ed6a2a9c5701e languageName: node linkType: hard @@ -395,23 +439,23 @@ __metadata: languageName: node linkType: hard -"@html-validate/stylish@npm:^4.0.1": - version: 4.0.1 - resolution: "@html-validate/stylish@npm:4.0.1" +"@html-validate/stylish@npm:^4.1.0": + version: 4.1.0 + resolution: "@html-validate/stylish@npm:4.1.0" dependencies: kleur: ^4.0.0 - checksum: 89c83ea1ae5ccbee5b172d65c1cf17bb784724fbbca539528304098862353f76da7eafe1928ccea7daa7528a17adea179e34bcf9a936cd8b235217147d759eee + checksum: 4af90db4f9e8855e9b411e9bec9cd6644a5026c49383621a9257e814823fa2deac9eb65ab89b36bb327071a0669560994ec9831a6fbd883428200d0d36e2f9a9 languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.8": - version: 0.11.8 - resolution: "@humanwhocodes/config-array@npm:0.11.8" +"@humanwhocodes/config-array@npm:^0.11.14": + version: 0.11.14 + resolution: "@humanwhocodes/config-array@npm:0.11.14" dependencies: - "@humanwhocodes/object-schema": ^1.2.1 - debug: ^4.1.1 + "@humanwhocodes/object-schema": ^2.0.2 + debug: ^4.3.1 minimatch: ^3.0.5 - checksum: 0fd6b3c54f1674ce0a224df09b9c2f9846d20b9e54fabae1281ecfc04f2e6ad69bf19e1d6af6a28f88e8aa3990168b6cb9e1ef755868c3256a630605ec2cb1d3 + checksum: 861ccce9eaea5de19546653bccf75bf09fe878bc39c3aab00aeee2d2a0e654516adad38dd1098aab5e3af0145bbcbf3f309bdf4d964f8dab9dcd5834ae4c02f2 languageName: node linkType: hard @@ -422,10 +466,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.2": + version: 2.0.2 + resolution: "@humanwhocodes/object-schema@npm:2.0.2" + checksum: 2fc11503361b5fb4f14714c700c02a3f4c7c93e9acd6b87a29f62c522d90470f364d6161b03d1cc618b979f2ae02aed1106fd29d302695d8927e2fc8165ba8ee languageName: node linkType: hard @@ -450,48 +494,27 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.0": - version: 0.3.2 - resolution: "@jridgewell/gen-mapping@npm:0.3.2" - dependencies: - "@jridgewell/set-array": ^1.0.1 - "@jridgewell/sourcemap-codec": ^1.4.10 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3": +"@jridgewell/resolve-uri@npm:^3.0.3": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 languageName: node linkType: hard -"@jridgewell/set-array@npm:^1.0.1": - version: 1.1.2 - resolution: "@jridgewell/set-array@npm:1.1.2" - checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e - languageName: node - linkType: hard - -"@jridgewell/source-map@npm:^0.3.2": - version: 0.3.2 - resolution: "@jridgewell/source-map@npm:0.3.2" - dependencies: - "@jridgewell/gen-mapping": ^0.3.0 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10": +"@jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.4.15": + version: 1.4.15 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" + checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:^0.3.12": version: 0.3.14 resolution: "@jridgewell/trace-mapping@npm:0.3.14" @@ -502,16 +525,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.17 - resolution: "@jridgewell/trace-mapping@npm:0.3.17" - dependencies: - "@jridgewell/resolve-uri": 3.1.0 - "@jridgewell/sourcemap-codec": 1.4.14 - checksum: 9d703b859cff5cd83b7308fd457a431387db5db96bd781a63bf48e183418dd9d3d44e76b9e4ae13237f6abeeb25d739ec9215c1d5bfdd08f66f750a50074a339 - languageName: node - linkType: hard - "@juggle/resize-observer@npm:^3.3.1": version: 3.3.1 resolution: "@juggle/resize-observer@npm:3.3.1" @@ -542,6 +555,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-darwin-arm64@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-darwin-arm64@npm:2.8.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@lmdb/lmdb-darwin-x64@npm:2.5.2": version: 2.5.2 resolution: "@lmdb/lmdb-darwin-x64@npm:2.5.2" @@ -549,6 +569,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-darwin-x64@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-darwin-x64@npm:2.8.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@lmdb/lmdb-linux-arm64@npm:2.5.2": version: 2.5.2 resolution: "@lmdb/lmdb-linux-arm64@npm:2.5.2" @@ -556,6 +583,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-linux-arm64@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-linux-arm64@npm:2.8.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@lmdb/lmdb-linux-arm@npm:2.5.2": version: 2.5.2 resolution: "@lmdb/lmdb-linux-arm@npm:2.5.2" @@ -563,6 +597,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-linux-arm@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-linux-arm@npm:2.8.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@lmdb/lmdb-linux-x64@npm:2.5.2": version: 2.5.2 resolution: "@lmdb/lmdb-linux-x64@npm:2.5.2" @@ -570,6 +611,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-linux-x64@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-linux-x64@npm:2.8.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@lmdb/lmdb-win32-x64@npm:2.5.2": version: 2.5.2 resolution: "@lmdb/lmdb-win32-x64@npm:2.5.2" @@ -577,6 +625,13 @@ __metadata: languageName: node linkType: hard +"@lmdb/lmdb-win32-x64@npm:2.8.5": + version: 2.8.5 + resolution: "@lmdb/lmdb-win32-x64@npm:2.8.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@mischnic/json-sourcemap@npm:^0.1.0": version: 0.1.0 resolution: "@mischnic/json-sourcemap@npm:0.1.0" @@ -595,6 +650,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.2" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:2.0.2": version: 2.0.2 resolution: "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:2.0.2" @@ -602,6 +664,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.2" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:2.0.2": version: 2.0.2 resolution: "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:2.0.2" @@ -609,6 +678,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.2" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@msgpackr-extract/msgpackr-extract-linux-arm@npm:2.0.2": version: 2.0.2 resolution: "@msgpackr-extract/msgpackr-extract-linux-arm@npm:2.0.2" @@ -616,6 +692,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@msgpackr-extract/msgpackr-extract-linux-x64@npm:2.0.2": version: 2.0.2 resolution: "@msgpackr-extract/msgpackr-extract-linux-x64@npm:2.0.2" @@ -623,6 +706,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@msgpackr-extract/msgpackr-extract-win32-x64@npm:2.0.2": version: 2.0.2 resolution: "@msgpackr-extract/msgpackr-extract-win32-x64@npm:2.0.2" @@ -630,6 +720,13 @@ __metadata: languageName: node linkType: hard +"@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2": + version: 3.0.2 + resolution: "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -677,17 +774,31 @@ __metadata: languageName: node linkType: hard -"@parcel/bundler-default@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/bundler-default@npm:2.8.3" +"@parcel/bundler-default@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/bundler-default@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/graph": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/graph": 3.2.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 - checksum: 219b2be341cad20991659b7a3031454a081ce0787c161a4da8a73ae8a4af4468667b284caea9488e869b162763d308cfd6495ab35fe386413b14325d6667ea86 + checksum: f211a76f55dc34918715c5f1911660cfe0461a55a975929fd419a57423c97eeb4f6db9c14775fc078f6879916cef185f468a1e97077d13a76cf735dc1c885892 + languageName: node + linkType: hard + +"@parcel/cache@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/cache@npm:2.12.0" + dependencies: + "@parcel/fs": 2.12.0 + "@parcel/logger": 2.12.0 + "@parcel/utils": 2.12.0 + lmdb: 2.8.5 + peerDependencies: + "@parcel/core": ^2.12.0 + checksum: a45e7998098c4ad31e8a55ea242b50ec638fb3d4614293cf1910a6f227ccc8e324ab56a7486d66d88a6e6d9f2a68621450e42d95dde3d1e986f4918e8f8e0912 languageName: node linkType: hard @@ -705,17 +816,12 @@ __metadata: languageName: node linkType: hard -"@parcel/cache@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/cache@npm:2.8.3" +"@parcel/codeframe@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/codeframe@npm:2.12.0" dependencies: - "@parcel/fs": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/utils": 2.8.3 - lmdb: 2.5.2 - peerDependencies: - "@parcel/core": ^2.8.3 - checksum: cd679053d229f8d06536a8fc9d857e5fa58905492e1a97c4f6b1da82de0dcef202a609c1e36206d3cdb32e5da3a214525f868b98dfd7aa671a53dacceb004fd9 + chalk: ^4.1.0 + checksum: 265c4d7ebee57323c0ff6f28f9cbb1a4b988409a6317eddc1d98d779f3221338739513106f2247d4cd3d6f6edd642f0719e7663d6a2fd98361fdb87bc72666f0 languageName: node linkType: hard @@ -728,61 +834,86 @@ __metadata: languageName: node linkType: hard -"@parcel/codeframe@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/codeframe@npm:2.8.3" - dependencies: - chalk: ^4.1.0 - checksum: a6e82c30e6251dcae14f247a14f6cb265f766b8bf18b62dd6a1c4a103cfae364a08897b36c5c379d0d867169647cb72962266f77571f718ff68ef70a16b81c02 - languageName: node - linkType: hard - -"@parcel/compressor-raw@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/compressor-raw@npm:2.8.3" - dependencies: - "@parcel/plugin": 2.8.3 - checksum: ca3b8a4f60e5193cffaa8041e709513df9c6cb54f32c9d20fef993a9af2d84f1e2d8bf8f4092220a8abaec24679498f854e683511876187f35b4f94a5852cf85 - languageName: node - linkType: hard - -"@parcel/config-default@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/config-default@npm:2.8.3" - dependencies: - "@parcel/bundler-default": 2.8.3 - "@parcel/compressor-raw": 2.8.3 - "@parcel/namer-default": 2.8.3 - "@parcel/optimizer-css": 2.8.3 - "@parcel/optimizer-htmlnano": 2.8.3 - "@parcel/optimizer-image": 2.8.3 - "@parcel/optimizer-svgo": 2.8.3 - "@parcel/optimizer-terser": 2.8.3 - "@parcel/packager-css": 2.8.3 - "@parcel/packager-html": 2.8.3 - "@parcel/packager-js": 2.8.3 - "@parcel/packager-raw": 2.8.3 - "@parcel/packager-svg": 2.8.3 - "@parcel/reporter-dev-server": 2.8.3 - "@parcel/resolver-default": 2.8.3 - "@parcel/runtime-browser-hmr": 2.8.3 - "@parcel/runtime-js": 2.8.3 - "@parcel/runtime-react-refresh": 2.8.3 - "@parcel/runtime-service-worker": 2.8.3 - "@parcel/transformer-babel": 2.8.3 - "@parcel/transformer-css": 2.8.3 - "@parcel/transformer-html": 2.8.3 - "@parcel/transformer-image": 2.8.3 - "@parcel/transformer-js": 2.8.3 - "@parcel/transformer-json": 2.8.3 - "@parcel/transformer-postcss": 2.8.3 - "@parcel/transformer-posthtml": 2.8.3 - "@parcel/transformer-raw": 2.8.3 - "@parcel/transformer-react-refresh-wrap": 2.8.3 - "@parcel/transformer-svg": 2.8.3 +"@parcel/compressor-raw@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/compressor-raw@npm:2.12.0" + dependencies: + "@parcel/plugin": 2.12.0 + checksum: 16c56704f33a91f7694a1a6b7ab157d731331123cbb32faf1ab09356327f7214fd2eb3c54babc120f7f41dded8742a6e58b524b5f410d3ef1bc47aaf47bc75c8 + languageName: node + linkType: hard + +"@parcel/config-default@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/config-default@npm:2.12.0" + dependencies: + "@parcel/bundler-default": 2.12.0 + "@parcel/compressor-raw": 2.12.0 + "@parcel/namer-default": 2.12.0 + "@parcel/optimizer-css": 2.12.0 + "@parcel/optimizer-htmlnano": 2.12.0 + "@parcel/optimizer-image": 2.12.0 + "@parcel/optimizer-svgo": 2.12.0 + "@parcel/optimizer-swc": 2.12.0 + "@parcel/packager-css": 2.12.0 + "@parcel/packager-html": 2.12.0 + "@parcel/packager-js": 2.12.0 + "@parcel/packager-raw": 2.12.0 + "@parcel/packager-svg": 2.12.0 + "@parcel/packager-wasm": 2.12.0 + "@parcel/reporter-dev-server": 2.12.0 + "@parcel/resolver-default": 2.12.0 + "@parcel/runtime-browser-hmr": 2.12.0 + "@parcel/runtime-js": 2.12.0 + "@parcel/runtime-react-refresh": 2.12.0 + "@parcel/runtime-service-worker": 2.12.0 + "@parcel/transformer-babel": 2.12.0 + "@parcel/transformer-css": 2.12.0 + "@parcel/transformer-html": 2.12.0 + "@parcel/transformer-image": 2.12.0 + "@parcel/transformer-js": 2.12.0 + "@parcel/transformer-json": 2.12.0 + "@parcel/transformer-postcss": 2.12.0 + "@parcel/transformer-posthtml": 2.12.0 + "@parcel/transformer-raw": 2.12.0 + "@parcel/transformer-react-refresh-wrap": 2.12.0 + "@parcel/transformer-svg": 2.12.0 peerDependencies: - "@parcel/core": ^2.8.3 - checksum: 08c700a7a253f39e84e1d341b3e0f558a2410bb27bf8a128113d8d157c32a7ef6b6ebd95e2c26d9f35c1040b98ff229ab56782247746189b4c41b925d1efd251 + "@parcel/core": ^2.12.0 + checksum: 72877c5dc432d6f6a8ffe8dba1342a6c0c2f615d9346f78f654adc61b62cecb4cc425726ee7a088d86894742397b4fb25cfeee7abd1ad6cbe2cfd5d77cd5a781 + languageName: node + linkType: hard + +"@parcel/core@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/core@npm:2.12.0" + dependencies: + "@mischnic/json-sourcemap": ^0.1.0 + "@parcel/cache": 2.12.0 + "@parcel/diagnostic": 2.12.0 + "@parcel/events": 2.12.0 + "@parcel/fs": 2.12.0 + "@parcel/graph": 3.2.0 + "@parcel/logger": 2.12.0 + "@parcel/package-manager": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/profiler": 2.12.0 + "@parcel/rust": 2.12.0 + "@parcel/source-map": ^2.1.1 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 + "@parcel/workers": 2.12.0 + abortcontroller-polyfill: ^1.1.9 + base-x: ^3.0.8 + browserslist: ^4.6.6 + clone: ^2.1.1 + dotenv: ^7.0.0 + dotenv-expand: ^5.1.0 + json5: ^2.2.0 + msgpackr: ^1.9.9 + nullthrows: ^1.1.1 + semver: ^7.5.2 + checksum: 5bf674630833a157867a5d0b5448cb36ab82fcabdc8f0486efbf896f6321e7b224d6e2b724cebdca2f227690a55d085bd1c89cb1430e2ebcd3583876e33cacce languageName: node linkType: hard @@ -818,35 +949,13 @@ __metadata: languageName: node linkType: hard -"@parcel/core@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/core@npm:2.8.3" +"@parcel/diagnostic@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/diagnostic@npm:2.12.0" dependencies: "@mischnic/json-sourcemap": ^0.1.0 - "@parcel/cache": 2.8.3 - "@parcel/diagnostic": 2.8.3 - "@parcel/events": 2.8.3 - "@parcel/fs": 2.8.3 - "@parcel/graph": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/package-manager": 2.8.3 - "@parcel/plugin": 2.8.3 - "@parcel/source-map": ^2.1.1 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 - "@parcel/workers": 2.8.3 - abortcontroller-polyfill: ^1.1.9 - base-x: ^3.0.8 - browserslist: ^4.6.6 - clone: ^2.1.1 - dotenv: ^7.0.0 - dotenv-expand: ^5.1.0 - json5: ^2.2.0 - msgpackr: ^1.5.4 nullthrows: ^1.1.1 - semver: ^5.7.1 - checksum: 68adceb1b041208fe922bb52da218e6be90d6e016322f4eac5a5dbfbac72838080cf9bbce51785d65556a258293c02dffba4482217dbd9b723258101d925fb0e + checksum: a4b918c1a00406de73755b5bb5c7d862c69e49e2cd1837889a85279f9e5be1f8f7b8f96e66f358e30e7dbc7a3919ebe5dafeeb9771db2b682ed9ecf60daba431 languageName: node linkType: hard @@ -860,13 +969,10 @@ __metadata: languageName: node linkType: hard -"@parcel/diagnostic@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/diagnostic@npm:2.8.3" - dependencies: - "@mischnic/json-sourcemap": ^0.1.0 - nullthrows: ^1.1.1 - checksum: c24d98a2dbf068ef334c595d51504cd063310c0327477b5d7bcf817af3f8ad79d56593cdf91d8d45cb4a41a48baf9090ae4100a96d2c197d4ed20bc5db9df2d9 +"@parcel/events@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/events@npm:2.12.0" + checksum: 136a8a2921fbc84f9228fd133eec87fbd5cde2beaf974f1aef47fab1a99f11c2919a5d7507b4fc8da81b5c00a474a4808c05b178fca9f8c0c897044d3f5ff342 languageName: node linkType: hard @@ -877,13 +983,6 @@ __metadata: languageName: node linkType: hard -"@parcel/events@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/events@npm:2.8.3" - checksum: 9d23c6663e9afce1d1094c46d38eba0b0171835201140258c1dcd33f63cfbc20bb1abdc163cbb7a01d407a8cf06c8742c10035c8a835ebca261b19d8ee0fbf7e - languageName: node - linkType: hard - "@parcel/fs-search@npm:2.6.2": version: 2.6.2 resolution: "@parcel/fs-search@npm:2.6.2" @@ -893,12 +992,18 @@ __metadata: languageName: node linkType: hard -"@parcel/fs-search@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/fs-search@npm:2.8.3" +"@parcel/fs@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/fs@npm:2.12.0" dependencies: - detect-libc: ^1.0.3 - checksum: 25e8eda6942fbf28e02cef1f5e94acafb3e33275a20b0a3e553402f04d2d24026be796b645728e872949dc8555b03a7d26d615a4f8eeed03a3af76aed535cc10 + "@parcel/rust": 2.12.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 + "@parcel/watcher": ^2.0.7 + "@parcel/workers": 2.12.0 + peerDependencies: + "@parcel/core": ^2.12.0 + checksum: 43d454d55da6ed14f5c422ade547485fe3d31a58a0e10c502f96dd8bb933f4402979c0ae252776d6ae83b3d0a27873390f892337a8fe78ddbc3729e531254007 languageName: node linkType: hard @@ -917,21 +1022,6 @@ __metadata: languageName: node linkType: hard -"@parcel/fs@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/fs@npm:2.8.3" - dependencies: - "@parcel/fs-search": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 - "@parcel/watcher": ^2.0.7 - "@parcel/workers": 2.8.3 - peerDependencies: - "@parcel/core": ^2.8.3 - checksum: cc421552daef3c7676030867a1b4ed45d64d5f4221b0b12d487a86183a39544290fd3e7ed9104b1b58c05f2a6b5ec0698ce37a9cd49c484d94ed6b445f26d598 - languageName: node - linkType: hard - "@parcel/graph@npm:2.6.2": version: 2.6.2 resolution: "@parcel/graph@npm:2.6.2" @@ -942,12 +1032,12 @@ __metadata: languageName: node linkType: hard -"@parcel/graph@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/graph@npm:2.8.3" +"@parcel/graph@npm:3.2.0": + version: 3.2.0 + resolution: "@parcel/graph@npm:3.2.0" dependencies: nullthrows: ^1.1.1 - checksum: ceed8445f5a23396cca001a54ee0620bd7d6ecbb455977c16bd2f446da14c1791817ed715a4cf70d6ba66310991eeee44d692f15f70ff52e75b98b629da25a88 + checksum: b4d31624fc684aab053721b1bdcd3ba4ca465159a4253725a32393aac473eb6016fe7d1a2742f123b6b67437c8af89ee36291220dae51d807833f61ab60744f3 languageName: node linkType: hard @@ -961,13 +1051,13 @@ __metadata: languageName: node linkType: hard -"@parcel/hash@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/hash@npm:2.8.3" +"@parcel/logger@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/logger@npm:2.12.0" dependencies: - detect-libc: ^1.0.3 - xxhash-wasm: ^0.4.2 - checksum: 29cef199feda672756c930a8b45ee91e46607aa1b6659c38658758fe2f88870c20e0d4e8738d96ca8b44df60c1b767b5593110e2d24b99382214158c759258d0 + "@parcel/diagnostic": 2.12.0 + "@parcel/events": 2.12.0 + checksum: be3fe9d9eaec60d8f2546a5f521048629b9206cd37b9863c9311fcd021b4748c57479490f1e7188a36e6eabfb42cda7d4eaf60bc11664ef9b87d164487774a23 languageName: node linkType: hard @@ -981,13 +1071,12 @@ __metadata: languageName: node linkType: hard -"@parcel/logger@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/logger@npm:2.8.3" +"@parcel/markdown-ansi@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/markdown-ansi@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/events": 2.8.3 - checksum: 04fd46313138ea8e38c5bd051cd79ee245ad0a7bb6d5d12a892cafa79755af81ec1b6ddc83a79224bb74170bc1323f016cf849981326adb391f43920976ec9dc + chalk: ^4.1.0 + checksum: 850ee665d934ef059d914e15d2dce601618db5d28ac700da9ac1197455135b7cb8ebe560ecae4905f2225ce37c5b5dad86fbe6210afb10d46c513b64ea6faec7 languageName: node linkType: hard @@ -1000,114 +1089,129 @@ __metadata: languageName: node linkType: hard -"@parcel/markdown-ansi@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/markdown-ansi@npm:2.8.3" +"@parcel/namer-default@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/namer-default@npm:2.12.0" dependencies: - chalk: ^4.1.0 - checksum: 1985f149b2ac08347f954230922fdcc45d7ceedba9b7f458078843a018d950a56cb512fb951537b4f995e861b9290b0757cfc0eadf542a13b124175b5ef02945 - languageName: node - linkType: hard - -"@parcel/namer-default@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/namer-default@npm:2.8.3" - dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 nullthrows: ^1.1.1 - checksum: 7c2c3434460d8fa6c9d482a9bfc681e47322ad82c8beef193eee9e45831374860d0f89de4c69e2e5cf41301cad19c7e87f5b536ca7d684aa383e783bcce02ef1 + checksum: dc92ec094595658aad21ec668290ee158f71a400783188292ebf00240b81c2041afda1749a1a6081a465943d03cf26a92cf549cbead95f2873450d063361677f languageName: node linkType: hard -"@parcel/node-resolver-core@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/node-resolver-core@npm:2.8.3" +"@parcel/node-resolver-core@npm:3.3.0": + version: 3.3.0 + resolution: "@parcel/node-resolver-core@npm:3.3.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/utils": 2.8.3 + "@mischnic/json-sourcemap": ^0.1.0 + "@parcel/diagnostic": 2.12.0 + "@parcel/fs": 2.12.0 + "@parcel/rust": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 - semver: ^5.7.1 - checksum: 4976d3ecc9acc6ee05c7709291f4576c269bc84f896c8bf9e6171ce6f9fbd9c2dd7e3db4e11542b3b29093c73f5451724c94bf7b0735b9920ddcdeecf1809968 + semver: ^7.5.2 + checksum: acc3721678d88b20f0bd6c90520e495a4032039332eb1155b69dc093ddb2ab7890240eb553f243f1383bd4e441c64a9870f5b5f84a2bb783b94574f859a813fd languageName: node linkType: hard -"@parcel/optimizer-css@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-css@npm:2.8.3" +"@parcel/optimizer-css@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-css@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/utils": 2.12.0 browserslist: ^4.6.6 - lightningcss: ^1.16.1 + lightningcss: ^1.22.1 nullthrows: ^1.1.1 - checksum: ffac43a2c20243d57b8627257b5a74462ebc0f4aa780b3117237240c9c3e9ca37ddcc8312296be9fe571a78f5a44cc14fa47ca9490d3796d673d8313d6cd8c9a + checksum: abcdf58c2999b53931274528ad5763a05202c65a5251b978f4989230430b5ecc620dbd6527de1a1970db80f993a6052eacea9c8b7d9d738335cce7f01a016751 languageName: node linkType: hard -"@parcel/optimizer-data-url@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-data-url@npm:2.8.3" +"@parcel/optimizer-data-url@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-data-url@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 isbinaryfile: ^4.0.2 mime: ^2.4.4 - checksum: 5df8d888269f7f3dfaa7bd3fb4f11d2d02ab8665404c50e99534231664fb4fd0b5be3f80cab513ef217e29cda9f91d77f5c649cfe6d227c34d48d422df52901f + checksum: 03972939615d2c8fddc6df223bd8f17d26b24712ed165ec60a95feda4759f3fe1b5ee25f295a02933022bbf8ef480211490c34c412e7e8e53fee7c4b970291a0 languageName: node linkType: hard -"@parcel/optimizer-htmlnano@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-htmlnano@npm:2.8.3" +"@parcel/optimizer-htmlnano@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-htmlnano@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 + "@parcel/plugin": 2.12.0 htmlnano: ^2.0.0 nullthrows: ^1.1.1 posthtml: ^0.16.5 svgo: ^2.4.0 - checksum: ca1cab7b1ecc16f209ad867fbdd8b2f446fd831d8688db068491fa22786a5aa3a0debb4290e0f003830c6b06c6f3a4c3a3cd9cdb033e7fa6cded8a19887d5f23 + checksum: 64e571f56f959c4cf1fd724e3b50e741b57f90acf035ca5a6908cf7186c42993bfb372db9ac39f9a9dd9bd57be4bba12a527da451893547f6da27db55d63ff13 languageName: node linkType: hard -"@parcel/optimizer-image@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-image@npm:2.8.3" +"@parcel/optimizer-image@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-image@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 - "@parcel/workers": 2.8.3 - detect-libc: ^1.0.3 - checksum: 72c5acffaea833237f62e23c8fb183eb85863ccddeb11304b2299b28973b957daba1e34854d347314edf35d83cba695c0d7600e1ae125dec4cc3151abd8f2e31 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 + "@parcel/utils": 2.12.0 + "@parcel/workers": 2.12.0 + peerDependencies: + "@parcel/core": ^2.12.0 + checksum: 7d28379bf1619d6ea0c70fbfef8b6b05941ac2cc0c1de46f2639ec5c40b53a984985538dfeefd35ba20cde31778502631ace1294c9bc0bcce36607ac53c5a3a8 languageName: node linkType: hard -"@parcel/optimizer-svgo@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-svgo@npm:2.8.3" +"@parcel/optimizer-svgo@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-svgo@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 svgo: ^2.4.0 - checksum: b3544c08fac4009de1ec6f88136a58cdec70b072433b13fb99f9e6584dc4731afea82ae13d27e4121ed5aaec9e4481225a54251ce52b6ece835908300c26fa33 + checksum: d3a4d2de9f77b4b084e88b611f1f431d4651f8b819122c92f9d9c1479b5936962a85bf1297e15e07823c3521dffec6083f4b1f4d962392f481dfb7b2a148e7f7 languageName: node linkType: hard -"@parcel/optimizer-terser@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/optimizer-terser@npm:2.8.3" +"@parcel/optimizer-swc@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/optimizer-swc@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/utils": 2.12.0 + "@swc/core": ^1.3.36 nullthrows: ^1.1.1 - terser: ^5.2.0 - checksum: ee1959f5965c7eee8ad1519f9d2554810030f326e959dd5e44aa014c29a51c2ab777dfbbf604a6b4436b75176a8694b7b8c9d99f945d57dea7828225762c8823 + checksum: 0b7fdf3df1e1fff3ed821d7e73f8cd7df4e8e96abd5b12f4e695d762d37736b24eb5bbf365f217ccb04e7a2b5807afec9af9d8c8ab7a97130d74cdc1347c3951 + languageName: node + linkType: hard + +"@parcel/package-manager@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/package-manager@npm:2.12.0" + dependencies: + "@parcel/diagnostic": 2.12.0 + "@parcel/fs": 2.12.0 + "@parcel/logger": 2.12.0 + "@parcel/node-resolver-core": 3.3.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 + "@parcel/workers": 2.12.0 + "@swc/core": ^1.3.36 + semver: ^7.5.2 + peerDependencies: + "@parcel/core": ^2.12.0 + checksum: a517e9efe1330a34ead2758b2c44ac4e635450dccad87051dcc98b6090ba76f472de4de91f1de8151027397286b11e000faf4c80d34a2bc06a4c7f7bd23e97f5 languageName: node linkType: hard @@ -1128,81 +1232,85 @@ __metadata: languageName: node linkType: hard -"@parcel/package-manager@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/package-manager@npm:2.8.3" - dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/fs": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 - "@parcel/workers": 2.8.3 - semver: ^5.7.1 - peerDependencies: - "@parcel/core": ^2.8.3 - checksum: 572a5aacfd7bc545d9aa35ff2125f1231226b550f9b0fe2c36d68a82ec8ffb047035e25fdb883bc2331a6eaf69c98bb5d6752644546d962de7bf544c6243a959 - languageName: node - linkType: hard - -"@parcel/packager-css@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/packager-css@npm:2.8.3" +"@parcel/packager-css@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-css@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/utils": 2.12.0 + lightningcss: ^1.22.1 nullthrows: ^1.1.1 - checksum: bb28fc9f02df83a1fd8eac7043466debb67398190819282a40a52ff299b0f4c3f474bfa7806be776ce36a66cc89574128a9fa210d2c0c9cb905bbb4dbbd2b926 + checksum: 684aaa1d8551e65c0af0d44905f1c08f1c0247d05b1af224abaf5007e197e12facb2b511bf2eee66c432613f31e04753d94dd23773c08fe77eb0f2b8ee41799f languageName: node linkType: hard -"@parcel/packager-html@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/packager-html@npm:2.8.3" +"@parcel/packager-html@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-html@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 posthtml: ^0.16.5 - checksum: 631f98fca0fdd3f11fe4cfbc1e0ad73b86f7fb00be7164fef5633c600a13282ae592b8f7d9aa31d4f66bd645ae57ce27e67db51a81b2a91c286ed5c8b36a4a87 + checksum: ee558ad616a21b94781a922c7ac8ee6da831cc8f7c4e4642a43027ce6df32ea93f4addabf573b9a955f4aa5cc5462bf8a42fc33809fab68249044e4ab2900a14 languageName: node linkType: hard -"@parcel/packager-js@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/packager-js@npm:2.8.3" +"@parcel/packager-js@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-js@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 globals: ^13.2.0 nullthrows: ^1.1.1 - checksum: 92ac88244b6104c5905ab95d882b755134042654ab48106ca84ab18441fb7240b66f049e407146958aead0812345823da729a4a37f32be17afd2b44cbdebc926 + checksum: 2189b7ff152ddb80739f65f5dffbcce12dbaeb9c8ef5b702e0c253c9b57e390f055b46e8874017b43313b67cfb4e89675a49854a844fcbed6bd1f7885e193cd5 languageName: node linkType: hard -"@parcel/packager-raw@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/packager-raw@npm:2.8.3" +"@parcel/packager-raw@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-raw@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - checksum: 26236dd64624a25fc1d749fb96b1bc3a6854b14d4386109670572f55feda4bb6affde19b1c9e971c4e50bfb53fd88e32da8303c83a3cb18ceaf12dd310685c34 + "@parcel/plugin": 2.12.0 + checksum: 39ce2fc7aede5b81be4bcd1939c49d9166250bedf8c408687c9a125154cc4fcfcd7181e38faa3137817144f75f070c5eaa40472f68ec0aaa9bd2a070674a1093 languageName: node linkType: hard -"@parcel/packager-svg@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/packager-svg@npm:2.8.3" +"@parcel/packager-svg@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-svg@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 posthtml: ^0.16.4 - checksum: 45c966ad8e6dbb25049adca66d761089a09cda83558d8767b46501a023b8d94b050f1a2899b1c8b18eac6cf87d2605ad5aa9a4cb2f9d90474794576dafb2e4fc + checksum: 436ac9ea3988ed79e637f6c8990f5f3de75816edc912d26388deeee94ef49b782ced25f427e15b4e721c9e25da6e90ca19f1efd85c3a8aedb1850cb293250b9f + languageName: node + linkType: hard + +"@parcel/packager-wasm@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/packager-wasm@npm:2.12.0" + dependencies: + "@parcel/plugin": 2.12.0 + checksum: a10e1cd9885a48ad1153b2ca83ef3c852f4a2ed48c67df4f1677da8660878faa1ee3d9da16f0b820f33d17f9181d845d6038f0ea3470c937f973fbe2dd3b86b6 + languageName: node + linkType: hard + +"@parcel/plugin@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/plugin@npm:2.12.0" + dependencies: + "@parcel/types": 2.12.0 + checksum: 0b52f1dd0675ea4f597a3f882f47434b7c5dabc997a875d07f1cf178e37adc927ed86e084502030a04ac6c9b548152741dfdeb8b6d730f7d8af2bfe3465a77d3 languageName: node linkType: hard @@ -1215,89 +1323,111 @@ __metadata: languageName: node linkType: hard -"@parcel/plugin@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/plugin@npm:2.8.3" +"@parcel/profiler@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/profiler@npm:2.12.0" dependencies: - "@parcel/types": 2.8.3 - checksum: a69ac66f5cc28197cf689f1c4144398457d62a086621a22b3b45fe863909a094b616dad415ec01673a9eb731b05fe9060bcb340c07efcd48343577a540fbfdf7 + "@parcel/diagnostic": 2.12.0 + "@parcel/events": 2.12.0 + chrome-trace-event: ^1.0.2 + checksum: b683b74e10ca469d34588e6a15fe5abbeae66f844c75eaf8aaa588912c41f3668bcff087f6c4ff931a861731443f3addf5a16cfad644827e1daa89e020cf0fb3 languageName: node linkType: hard -"@parcel/reporter-cli@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/reporter-cli@npm:2.8.3" +"@parcel/reporter-cli@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/reporter-cli@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 chalk: ^4.1.0 term-size: ^2.2.1 - checksum: 791dd4706aac706427a563455d9db5fa330b77e94fe4226b3751cd527327d8540d62400a8040e85a5fd29ecb6e673507e9d4a1fa754c093f1c005078670eef85 + checksum: 8cc524fa155fa0b9cf0f084cdc184f8cacdaf439d4ac7a74cf431ab9a2a6d0f6c238563efa30e3d49da01e78b61c31a81879c510bb05d44c226e7fcde553994d + languageName: node + linkType: hard + +"@parcel/reporter-dev-server@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/reporter-dev-server@npm:2.12.0" + dependencies: + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 + checksum: 43957b4656442f4609f29a74cd07b1c358dba263faa622c18841dbd4065e251a959b1e2675de45cf0e42f17a52f27594d4ae83f86e30b59e53f143ce6fe13c52 languageName: node linkType: hard -"@parcel/reporter-dev-server@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/reporter-dev-server@npm:2.8.3" +"@parcel/reporter-tracer@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/reporter-tracer@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 - checksum: 329db9fd0cdc3ddc36d8156a7d67747335c76b1368116c98e266218f1e1ce4ea108981441bcb78961f64e2067a2d8a1745d8aa069398d50e67278e1333293723 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 + chrome-trace-event: ^1.0.3 + nullthrows: ^1.1.1 + checksum: 24cddacd19f2f5dfde30133fbc1d484666a59cc384013a81e7eb1ba8517ad362e0f92d81e7b42f909657eb4df0d7519a3ed51e0de36a9f3f7c9a3b703054a20f languageName: node linkType: hard -"@parcel/resolver-default@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/resolver-default@npm:2.8.3" +"@parcel/resolver-default@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/resolver-default@npm:2.12.0" dependencies: - "@parcel/node-resolver-core": 2.8.3 - "@parcel/plugin": 2.8.3 - checksum: 40515a62c1a301050144e1427ac7a591afedea50e89baff0ab4ed05ad8424f5df6ad4a7b5e413956a199ecef18bf8220b353fb115af72fac4187a62e8a997d1d + "@parcel/node-resolver-core": 3.3.0 + "@parcel/plugin": 2.12.0 + checksum: f3652eea094151f8a820c0214251209c625ac80ecc086b1869893a14620ad9b6bc86d65496a7687929484ade6db61e375647811d23a114509b4a16e7caf40408 languageName: node linkType: hard -"@parcel/runtime-browser-hmr@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/runtime-browser-hmr@npm:2.8.3" +"@parcel/runtime-browser-hmr@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/runtime-browser-hmr@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 - checksum: 56c276c7b03bb4c301d7dbe94c5183404af4064286f67682399e848ff894bfb5ea783dad11082290d40f2f07be64252dd236b993baf2e3e8fbb30a572f95a0dc + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 + checksum: bbba57ecee5668fe2316fc8961f559d2c9296f05fb0feee002dfc1010aa1f2bc4a4ae2ab7778f132ed793e3ebcae05c558552ff86871b37ed25bfab572499191 languageName: node linkType: hard -"@parcel/runtime-js@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/runtime-js@npm:2.8.3" +"@parcel/runtime-js@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/runtime-js@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 - checksum: ee5e04f84d522a6f53753c3956d37cacb2bdabb2539e2f40e640762b3cc43b20efc495331fe254d92d82a06c3e1b4690c17125090a12300d75ad7c3a9ca3e2f0 + checksum: 6afa3e7eb27c11b4fdb2236d3f2e3f07c284927217b5811ebb0d73cd24dfdc8718a6bbb6f43be0d86bb9473f0493bc207d35ce25beaa1ba384b3141ced7ff3bc languageName: node linkType: hard -"@parcel/runtime-react-refresh@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/runtime-react-refresh@npm:2.8.3" +"@parcel/runtime-react-refresh@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/runtime-react-refresh@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 react-error-overlay: 6.0.9 react-refresh: ^0.9.0 - checksum: 327159be0c8183f1cff139de973e8e8ca6b83dc2fc94846a89415fabf8cd8535e95ed3ae9750ac08e73a303de57c18c4e5da959ecbe73af75f1d3c9a98f5c20b + checksum: 41aee9a87484575b67dcce07d676a4e26bf0bb79ddea5328ef4a8d729a74da29f0c625b0a7a479c5086e5c79e4616e89034138aad3c97a6db2cf059f1a19d1c9 languageName: node linkType: hard -"@parcel/runtime-service-worker@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/runtime-service-worker@npm:2.8.3" +"@parcel/runtime-service-worker@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/runtime-service-worker@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 - checksum: 0646fee9a9378c0844c223d0eaf1c46e817738e70b2e993434717fb6aab998339b37a32c5bd9db891fcb8bc44dc3d7530564f84a5cd978d6dd47f204f18bd44a + checksum: c71246428e1ba69649fe4ecc1ed272f34fb52ff14f364c159e6f979332bb1280483b4eb7633bfe3ab3b3d7c381b524f669e356d9705ba4764bc149977e965c53 + languageName: node + linkType: hard + +"@parcel/rust@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/rust@npm:2.12.0" + checksum: 51c5b67b9ee83e12d544774dad705d500dda52948f65cdb6c7bfa4275a9692561aa141c68be9c8fd29a8cd795a1fe4f3537bc2f1f91a80163d0bb5a0bd223ad0 languageName: node linkType: hard @@ -1319,183 +1449,198 @@ __metadata: languageName: node linkType: hard -"@parcel/transformer-babel@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-babel@npm:2.8.3" +"@parcel/transformer-babel@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-babel@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/utils": 2.12.0 browserslist: ^4.6.6 json5: ^2.2.0 nullthrows: ^1.1.1 - semver: ^5.7.0 - checksum: a27bbe8d893854a77d9a8c9b45490728b2db81ad0782b7d9085d00c50155840477dd4ada8e382e0b02f9f5f8761da48bd6d3feb62ddd582e6608f92d4468df80 + semver: ^7.5.2 + checksum: b8c457c0be7662d8262671469fa7e7cc69dcf72e67a7abeadfd41a71c193f10eae857e1ea6d5db9842cd3f471f9b299c5d716c99dbc0929d537c7d050a995e6e languageName: node linkType: hard -"@parcel/transformer-css@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-css@npm:2.8.3" +"@parcel/transformer-css@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-css@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 + "@parcel/utils": 2.12.0 browserslist: ^4.6.6 - lightningcss: ^1.16.1 + lightningcss: ^1.22.1 nullthrows: ^1.1.1 - checksum: 31375a140550968a36f7a8eb998c03f20200d202b7c62c98fb49b05f719777ca545d08f356dec9ca6d9a601ba0020abce5cf4672fe425bc99a540dccf262a6cc + checksum: 3a6f16321d4759b17e13db8953c43cf9ed00aad8ef4354bea04647be60c0b6d36c8a28765a78c79038cbcbb2b32e9cc955f8bc6bddf0e59aa30cae6b89f8a8e9 languageName: node linkType: hard -"@parcel/transformer-html@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-html@npm:2.8.3" +"@parcel/transformer-html@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-html@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 nullthrows: ^1.1.1 posthtml: ^0.16.5 posthtml-parser: ^0.10.1 posthtml-render: ^3.0.0 - semver: ^5.7.1 + semver: ^7.5.2 srcset: 4 - checksum: 21600a3e0ac9e05aa6f6066ef94f8ba7e0de62a8ae59a812230907f5731dcf73dc5308fb74b32bfb6dab16089d13f72043965e1e87e8c4daec8447a9081af8eb + checksum: 7fcfac62ca73f239b1a4a4b049c1ef5eb6831a625e873a784c51c9f28957f7c8c7d5f8e86b8e98b9f8a0f7c8f27c3782f5a620931e96c400a0e6e9c203a200bb languageName: node linkType: hard -"@parcel/transformer-image@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-image@npm:2.8.3" +"@parcel/transformer-image@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-image@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 - "@parcel/workers": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 + "@parcel/workers": 2.12.0 nullthrows: ^1.1.1 peerDependencies: - "@parcel/core": ^2.8.3 - checksum: f4b3464828e1b3d44e7da5c7a71272f5f53f830d9bb371e8dd8b2f32040f4426f3efeae12949947e34b39f7755a253f0b48c6eeec6d86ad43baf0b30717f1f47 + "@parcel/core": ^2.12.0 + checksum: 0a1581eaccd9c26fbc83da6b576c2b3dc07080d694744b6224ed35a8d77d30a2c3231061f67700281e6963f8a0d23d67f67c73553ea5b94ebfbbbc9c34f60ba3 languageName: node linkType: hard -"@parcel/transformer-inline-string@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-inline-string@npm:2.8.3" +"@parcel/transformer-inline-string@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-inline-string@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - checksum: 23fa279e1fb0acb0439bfa03d908362796f2c81e911c52f38b8818f4240f4c35b4c236e4e46550def9140c4269456bba104f63ed8f1b713d08ef0276f2758e6b + "@parcel/plugin": 2.12.0 + checksum: 5f63c086956b64cf67ca006efe99048e2b2ce7d23df7703d2709da1971f391f62620dc9186ae604d00918345718656af438f3d681a312fbdcc05fd0477499c83 languageName: node linkType: hard -"@parcel/transformer-js@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-js@npm:2.8.3" +"@parcel/transformer-js@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-js@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/utils": 2.8.3 - "@parcel/workers": 2.8.3 - "@swc/helpers": ^0.4.12 + "@parcel/utils": 2.12.0 + "@parcel/workers": 2.12.0 + "@swc/helpers": ^0.5.0 browserslist: ^4.6.6 - detect-libc: ^1.0.3 nullthrows: ^1.1.1 regenerator-runtime: ^0.13.7 - semver: ^5.7.1 + semver: ^7.5.2 peerDependencies: - "@parcel/core": ^2.8.3 - checksum: 29fb203502309e11452837e4ae60589300c0d91fae35cf4774e70959e9f4532960ef4619959ce9c95f0060020faabbcfd024b076f41c7d5f7e126c3547244ff6 + "@parcel/core": ^2.12.0 + checksum: b9fe4c887b08d5032a2dc87e529dbcf19b75e1274d6fcbe5e7e8d92bae0186c063e93b93747e49eb67763c29232f1b2411f237c64d5af782d2f6ff663f98a9fd languageName: node linkType: hard -"@parcel/transformer-json@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-json@npm:2.8.3" +"@parcel/transformer-json@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-json@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 + "@parcel/plugin": 2.12.0 json5: ^2.2.0 - checksum: 04da28b0f0ff1ec1d7c6383b880daa2918f85ba1375351690a9a07ea4de102531d5f6addb3091ae5109623e270e1d2cdf582661f4a0805bd982a653a06d26890 + checksum: a711cb65a8bfa4bcffcced0a8ecc91c4e4ddc65d77d2328a7ca8800170f2fa4e6316df06ad55816c65852f45092bcb4e42f8125d179d3223abe4d0650306c134 languageName: node linkType: hard -"@parcel/transformer-postcss@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-postcss@npm:2.8.3" +"@parcel/transformer-postcss@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-postcss@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 + "@parcel/utils": 2.12.0 clone: ^2.1.1 nullthrows: ^1.1.1 postcss-value-parser: ^4.2.0 - semver: ^5.7.1 - checksum: 2c75cb5cec7112d12a28ac5cddc9f2e939f76e006929757804431b266e7541aae5df6ba8601727c33c7b53f0f971a6df5dfb4394fa0baf284bd2c6fc9b507650 + semver: ^7.5.2 + checksum: b210044a7f13078ed5acf1d02c0169f1daab3e5134de5cfb4aa4900c70a0e19b7cef08e1f03793a1e9af6e625b0ae0b0598803cfa8338e13ba6e8cc792fbba0b languageName: node linkType: hard -"@parcel/transformer-posthtml@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-posthtml@npm:2.8.3" +"@parcel/transformer-posthtml@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-posthtml@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 nullthrows: ^1.1.1 posthtml: ^0.16.5 posthtml-parser: ^0.10.1 posthtml-render: ^3.0.0 - semver: ^5.7.1 - checksum: 130c95782aebb2491f2d89685db573b3b85ed1f7d9862684db2ab9d11fe8148995185a4e144b818de06d596cf687c5bd57b6b8648d2856cf830a9674c2ec3237 + semver: ^7.5.2 + checksum: b62582ae7e0af9e3fbca8baf589261548c994c8fbfa45ca57901faa1a1cf23122035784a92688fdad9f8b626d26d877f3f465bb5799d56eef264314ecfe74b1d languageName: node linkType: hard -"@parcel/transformer-raw@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-raw@npm:2.8.3" +"@parcel/transformer-raw@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-raw@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - checksum: 371263bb526373c229aa3e730f2a1d6687bd6b771203d73237c04da3a3ada86c4fcf0b534d3fb366a7b3842df0cf98ae1e033602613cafd9f702f47a6568a83c + "@parcel/plugin": 2.12.0 + checksum: de6681e2e723d9877f3e2fd3c4983ac4de8ecae26f5d0c51ce6d231bd29d644f86db9558426cd69adfdbb89edd824c08ef92ada09aaceaa66dd1f44d1c027d60 languageName: node linkType: hard -"@parcel/transformer-react-refresh-wrap@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-react-refresh-wrap@npm:2.8.3" +"@parcel/transformer-react-refresh-wrap@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-react-refresh-wrap@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/plugin": 2.12.0 + "@parcel/utils": 2.12.0 react-refresh: ^0.9.0 - checksum: e9648e04b7f9b29f47ec7baedfba9cc36bbb7e44be6ad4b6b4433c20d1b5a3184a3043b712add16a5cc06300289305d5fa9ebb73c6dc926d04df7c52d9bc3316 + checksum: 9aba8c1ab0e7a3dc4da735f093b38e6bcda04385b5ba3373d2b2d09f8099c5dd40493d4b77ca697f499d8d204b6288fd1a5dc1b6c717041d612dcdc501908937 languageName: node linkType: hard -"@parcel/transformer-sass@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-sass@npm:2.8.3" +"@parcel/transformer-sass@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-sass@npm:2.12.0" dependencies: - "@parcel/plugin": 2.8.3 + "@parcel/plugin": 2.12.0 "@parcel/source-map": ^2.1.1 sass: ^1.38.0 - checksum: 9cb32b3906afce4f8ed1f53c4a4c5f016867d101654778c6646db4097fa602a3b0eeeab0ee713c386e79604c61ebd02a495afea4827833109a5c74d752c8f8ac + checksum: ce6b4d329b60dd4766a47b064cb10d18406ce569488b7f7c6fe561e9180786b813194935d9679bbe4b9afa43877a034d57a4b61e1166a2801af3889196a1e3d8 languageName: node linkType: hard -"@parcel/transformer-svg@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/transformer-svg@npm:2.8.3" +"@parcel/transformer-svg@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/transformer-svg@npm:2.12.0" dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/plugin": 2.8.3 + "@parcel/diagnostic": 2.12.0 + "@parcel/plugin": 2.12.0 + "@parcel/rust": 2.12.0 nullthrows: ^1.1.1 posthtml: ^0.16.5 posthtml-parser: ^0.10.1 posthtml-render: ^3.0.0 - semver: ^5.7.1 - checksum: 1f3db309e47d07849a2b4ffe11b508fd7ae792c0c0ce7b03e442fffb25f5e7425c5027428729bf2b587309265bba0be6da635d62c51ae8ab7e54483eff3f575e + semver: ^7.5.2 + checksum: 92b7c6589477e93f8ded857924dee82c498a83641c03b1ce3f836219ca3e8e543b9281128f8647529e561eb5212a1f173d2cb1a1eed5d7cc9487b782db82158c + languageName: node + linkType: hard + +"@parcel/types@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/types@npm:2.12.0" + dependencies: + "@parcel/cache": 2.12.0 + "@parcel/diagnostic": 2.12.0 + "@parcel/fs": 2.12.0 + "@parcel/package-manager": 2.12.0 + "@parcel/source-map": ^2.1.1 + "@parcel/workers": 2.12.0 + utility-types: ^3.10.0 + checksum: 250f95580cd441ee9c5178d65088da9eb105d4b300b753fb6c4b54383e8fa6272eb6273ff45cd223c7eb02fefdee17a18997116f1da26b9a24455c51a8aaf6b2 languageName: node linkType: hard @@ -1514,18 +1659,19 @@ __metadata: languageName: node linkType: hard -"@parcel/types@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/types@npm:2.8.3" +"@parcel/utils@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/utils@npm:2.12.0" dependencies: - "@parcel/cache": 2.8.3 - "@parcel/diagnostic": 2.8.3 - "@parcel/fs": 2.8.3 - "@parcel/package-manager": 2.8.3 + "@parcel/codeframe": 2.12.0 + "@parcel/diagnostic": 2.12.0 + "@parcel/logger": 2.12.0 + "@parcel/markdown-ansi": 2.12.0 + "@parcel/rust": 2.12.0 "@parcel/source-map": ^2.1.1 - "@parcel/workers": 2.8.3 - utility-types: ^3.10.0 - checksum: ece0abdd5c7cce32a246155f6828f6a92830341dfbceb81c9aaf7da44e0733b87ea8a607412dfe4b5ec59d7c9a3c1b1463b94ec8a5a82b745541881952003a16 + chalk: ^4.1.0 + nullthrows: ^1.1.1 + checksum: ba80a60fed98c572a4e1dc81f87e0d63fc570221f6759e980b04eff88d3c92a83411a787a08da2720a7e541e52cc6890b1122f59ad7f4fc444f9dbfa8beba818 languageName: node linkType: hard @@ -1544,21 +1690,6 @@ __metadata: languageName: node linkType: hard -"@parcel/utils@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/utils@npm:2.8.3" - dependencies: - "@parcel/codeframe": 2.8.3 - "@parcel/diagnostic": 2.8.3 - "@parcel/hash": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/markdown-ansi": 2.8.3 - "@parcel/source-map": ^2.1.1 - chalk: ^4.1.0 - checksum: 69edf3e7c3ef1ccd4caa6ca838a64b27b27668b213212579111405824ed969e6555857b33f0b9e793e97399a60f034904addde19b98628b37a2fcbbb9141cafa - languageName: node - linkType: hard - "@parcel/watcher@npm:^2.0.0": version: 2.0.5 resolution: "@parcel/watcher@npm:2.0.5" @@ -1581,6 +1712,22 @@ __metadata: languageName: node linkType: hard +"@parcel/workers@npm:2.12.0": + version: 2.12.0 + resolution: "@parcel/workers@npm:2.12.0" + dependencies: + "@parcel/diagnostic": 2.12.0 + "@parcel/logger": 2.12.0 + "@parcel/profiler": 2.12.0 + "@parcel/types": 2.12.0 + "@parcel/utils": 2.12.0 + nullthrows: ^1.1.1 + peerDependencies: + "@parcel/core": ^2.12.0 + checksum: e19c3c0a6651a9cef760aca3210356cff36c29d1472b544bec298bc4ffa9aa7429749cf6ce0b1009d034d8a086412833e3af48b3a88f95bb1700e09a8e62ca2f + languageName: node + linkType: hard + "@parcel/workers@npm:2.6.2": version: 2.6.2 resolution: "@parcel/workers@npm:2.6.2" @@ -1597,22 +1744,6 @@ __metadata: languageName: node linkType: hard -"@parcel/workers@npm:2.8.3": - version: 2.8.3 - resolution: "@parcel/workers@npm:2.8.3" - dependencies: - "@parcel/diagnostic": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/types": 2.8.3 - "@parcel/utils": 2.8.3 - chrome-trace-event: ^1.0.2 - nullthrows: ^1.1.1 - peerDependencies: - "@parcel/core": ^2.8.3 - checksum: e3168b3e9ee6bd8e92472e11af9228aca689c5d31841410c908ab31f2a11adf939481d9f4d945ae44d7d3ec1e07980fb3ca5c2f87be82e31a02a94f4655c8e01 - languageName: node - linkType: hard - "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -1627,47 +1758,161 @@ __metadata: languageName: node linkType: hard -"@popperjs/core@npm:2.11.7": - version: 2.11.7 - resolution: "@popperjs/core@npm:2.11.7" - checksum: 5b6553747899683452a1d28898c1b39173a4efd780e74360bfcda8eb42f1c5e819602769c81a10920fc68c881d07fb40429604517d499567eac079cfa6470f19 +"@popperjs/core@npm:2.11.8": + version: 2.11.8 + resolution: "@popperjs/core@npm:2.11.8" + checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0 languageName: node linkType: hard -"@rollup/pluginutils@npm:5.0.2": - version: 5.0.2 - resolution: "@rollup/pluginutils@npm:5.0.2" +"@rollup/pluginutils@npm:5.1.0": + version: 5.1.0 + resolution: "@rollup/pluginutils@npm:5.1.0" dependencies: "@types/estree": ^1.0.0 estree-walker: ^2.0.2 picomatch: ^2.3.1 peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - checksum: edea15e543bebc7dcac3b0ac8bc7b8e8e6dbd46e2864dbe5dd28072de1fbd5b0e10d545a610c0edaa178e8a7ac432e2a2a52e547ece1308471412caba47db8ce + checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8 languageName: node linkType: hard -"@sidvind/better-ajv-errors@npm:^2.0.0": - version: 2.0.0 - resolution: "@sidvind/better-ajv-errors@npm:2.0.0" +"@sidvind/better-ajv-errors@npm:2.1.3": + version: 2.1.3 + resolution: "@sidvind/better-ajv-errors@npm:2.1.3" dependencies: "@babel/code-frame": ^7.16.0 chalk: ^4.1.0 peerDependencies: ajv: 4.11.8 - 8 - checksum: 12b0d87855737d1f36e869f9a55c706fa9eb232dfebaca5209c21d8d5caf7fa25671238064d68e619492c68591a73b6f49fcc1dff182fd77d2370e277033bd60 + checksum: 949cb805a130a61c00895231aa33c1c9e51b72ae21bd59fe088fc9671b0e921b99183d816d34a02fe5d07647477c570a92d7d327c5e99670605e92b0d2ef163b + languageName: node + linkType: hard + +"@swc/core-darwin-arm64@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-darwin-arm64@npm:1.3.62" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@swc/core-darwin-x64@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-darwin-x64@npm:1.3.62" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@swc/core-linux-arm-gnueabihf@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.62" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@swc/core-linux-arm64-gnu@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-linux-arm64-gnu@npm:1.3.62" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@swc/core-linux-arm64-musl@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-linux-arm64-musl@npm:1.3.62" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@swc/core-linux-x64-gnu@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-linux-x64-gnu@npm:1.3.62" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@swc/core-linux-x64-musl@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-linux-x64-musl@npm:1.3.62" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@swc/core-win32-arm64-msvc@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-win32-arm64-msvc@npm:1.3.62" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@swc/core-win32-ia32-msvc@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-win32-ia32-msvc@npm:1.3.62" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@swc/core-win32-x64-msvc@npm:1.3.62": + version: 1.3.62 + resolution: "@swc/core-win32-x64-msvc@npm:1.3.62" + conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/helpers@npm:^0.4.12": - version: 0.4.14 - resolution: "@swc/helpers@npm:0.4.14" +"@swc/core@npm:^1.3.36": + version: 1.3.62 + resolution: "@swc/core@npm:1.3.62" + dependencies: + "@swc/core-darwin-arm64": 1.3.62 + "@swc/core-darwin-x64": 1.3.62 + "@swc/core-linux-arm-gnueabihf": 1.3.62 + "@swc/core-linux-arm64-gnu": 1.3.62 + "@swc/core-linux-arm64-musl": 1.3.62 + "@swc/core-linux-x64-gnu": 1.3.62 + "@swc/core-linux-x64-musl": 1.3.62 + "@swc/core-win32-arm64-msvc": 1.3.62 + "@swc/core-win32-ia32-msvc": 1.3.62 + "@swc/core-win32-x64-msvc": 1.3.62 + peerDependencies: + "@swc/helpers": ^0.5.0 + dependenciesMeta: + "@swc/core-darwin-arm64": + optional: true + "@swc/core-darwin-x64": + optional: true + "@swc/core-linux-arm-gnueabihf": + optional: true + "@swc/core-linux-arm64-gnu": + optional: true + "@swc/core-linux-arm64-musl": + optional: true + "@swc/core-linux-x64-gnu": + optional: true + "@swc/core-linux-x64-musl": + optional: true + "@swc/core-win32-arm64-msvc": + optional: true + "@swc/core-win32-ia32-msvc": + optional: true + "@swc/core-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@swc/helpers": + optional: true + checksum: a7a0d9ffdb8a2b0050e0ff89fdb86fe189d9bcb7f91cb6847f1bfe3e2b520a87ea2e83692dfd80b6d541fb5addb2194769484516b8ca6d3c62ad80f1c79a9368 + languageName: node + linkType: hard + +"@swc/helpers@npm:^0.5.0": + version: 0.5.1 + resolution: "@swc/helpers@npm:0.5.1" dependencies: tslib: ^2.4.0 - checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5 + checksum: 71e0e27234590435e4c62b97ef5e796f88e786841a38c7116a5e27a3eafa7b9ead7cdec5249b32165902076de78446945311c973e59bddf77c1e24f33a8f272a languageName: node linkType: hard @@ -1706,16 +1951,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^27.0.1": - version: 27.4.1 - resolution: "@types/jest@npm:27.4.1" - dependencies: - jest-matcher-utils: ^27.0.0 - pretty-format: ^27.0.0 - checksum: 5184f3eef4832d01ee8f59bed15eec45ccc8e29c724a5e6ce37bf74396b37bdf04f557000f45ba4fc38ae6075cf9cfcce3d7a75abc981023c61ceb27230a93e4 - languageName: node - linkType: hard - "@types/json5@npm:^0.0.29": version: 0.0.29 resolution: "@types/json5@npm:0.0.29" @@ -1723,29 +1958,36 @@ __metadata: languageName: node linkType: hard -"@types/katex@npm:^0.14.0": - version: 0.14.0 - resolution: "@types/katex@npm:0.14.0" - checksum: 330e0d0337ba48c87f5b793965fbad673653789bf6e50dfe8d726a7b0cbefd37195055e31503aae629814aa79447e4f23a4b87ad1ac565c0d9a9d9978836f39b +"@types/katex@npm:^0.16.2": + version: 0.16.5 + resolution: "@types/katex@npm:0.16.5" + checksum: a1ce22cd87acd9b32891931f2bc4355c3540cc0a423e161a2e5b040d3e50812cb85ce1fd09f23d42324b19f9da30ded6b1807114f215624f670d79bb46c47cc8 languageName: node linkType: hard -"@types/lodash-es@npm:^4.17.6": - version: 4.17.6 - resolution: "@types/lodash-es@npm:4.17.6" +"@types/lodash-es@npm:^4.17.9": + version: 4.17.10 + resolution: "@types/lodash-es@npm:4.17.10" dependencies: "@types/lodash": "*" - checksum: 9bd239dd525086e278821949ce12fbdd4f100a060fed9323fc7ad5661113e1641f28a7ebab617230ed3474680d8f4de705c1928b48252bb684be6ec9eed715db + checksum: 129e9dde830815a72f9bd17c3a7b7ffb10a9cf76d65c7bb4f14df13b38411ed3ebe9ebbc2f9059c4e61198e784d499e48d0a281e27a4defbbba748dd8a4cfd9d languageName: node linkType: hard -"@types/lodash@npm:*, @types/lodash@npm:^4.14.181": +"@types/lodash@npm:*": version: 4.14.182 resolution: "@types/lodash@npm:4.14.182" checksum: 7dd137aa9dbabd632408bd37009d984655164fa1ecc3f2b6eb94afe35bf0a5852cbab6183148d883e9c73a958b7fec9a9bcf7c8e45d41195add6a18c34958209 languageName: node linkType: hard +"@types/lodash@npm:^4.14.198": + version: 4.14.200 + resolution: "@types/lodash@npm:4.14.200" + checksum: 6471f8bb5da692a6ecf03a8da4935bfbc341e67ee9bcb4f5730bfacff0c367232548f0a01e8ac5ea18c6fe78fb085d502494e33ccb47a7ee87cbdee03b47d00d + languageName: node + linkType: hard + "@types/node@npm:~17.0.5": version: 17.0.29 resolution: "@types/node@npm:17.0.29" @@ -1760,70 +2002,107 @@ __metadata: languageName: node linkType: hard -"@vitejs/plugin-vue@npm:4.2.1": - version: 4.2.1 - resolution: "@vitejs/plugin-vue@npm:4.2.1" +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524 + languageName: node + linkType: hard + +"@vitejs/plugin-vue@npm:4.6.2": + version: 4.6.2 + resolution: "@vitejs/plugin-vue@npm:4.6.2" peerDependencies: - vite: ^4.0.0 + vite: ^4.0.0 || ^5.0.0 vue: ^3.2.25 - checksum: a7266a45378d5fd7813699cf97dfac0e313dc63bd245a1c932848b2b5dc58aede922231d5a534baeeb7e2842c7172f17194a4833bd6a7a6ed61dc0a31d60c7c9 + checksum: 01bc4ed64319444f7dcad89f2c8da209f2a2fae1b7b9308c5f8593b5a307287d23178e7b252e1e6f89b20b69ae6629479e06adb7b49c70f5c409401d657e909b languageName: node linkType: hard -"@vue/compiler-core@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/compiler-core@npm:3.2.47" +"@volar/language-core@npm:2.1.4": + version: 2.1.4 + resolution: "@volar/language-core@npm:2.1.4" dependencies: - "@babel/parser": ^7.16.4 - "@vue/shared": 3.2.47 - estree-walker: ^2.0.2 - source-map: ^0.6.1 - checksum: 9ccc2a0b897b59eea56ca4f92ed29c14cd1184f68532edf5fb0fe5cb2833bcf9e4836029effb6eb9a7c872e9e0350fafdcd96ff00c0b5b79e17ded0c068b5f84 + "@volar/source-map": 2.1.4 + checksum: 7430f651431ed00eb7489d48c0596f4653fe70da3c779acfaa5807051db4491c9e4e154e9f0de3c9d863a3b4b1194a517a75395ca9134ea2b1b8af5ff637b204 languageName: node linkType: hard -"@vue/compiler-dom@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/compiler-dom@npm:3.2.47" +"@volar/language-service@npm:~2.1.0": + version: 2.1.4 + resolution: "@volar/language-service@npm:2.1.4" dependencies: - "@vue/compiler-core": 3.2.47 - "@vue/shared": 3.2.47 - checksum: 1eced735f865e6df0c2d7fa041f9f27996ff4c0d4baf5fad0f67e65e623215f4394c49bba337b78427c6e71f2cc2db12b19ec6b865b4c057c0a15ccedeb20752 + "@volar/language-core": 2.1.4 + vscode-languageserver-protocol: ^3.17.5 + vscode-languageserver-textdocument: ^1.0.11 + vscode-uri: ^3.0.8 + checksum: 06cdcfacf0fab22cee652cab1ae1729628d7ebf68f5f9e791e19e3715b2a4775c0bd2ec2e7a9b0815d93f244d7a745f3ea41aa5084923b10e9258a5f54c1107b languageName: node linkType: hard -"@vue/compiler-sfc@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/compiler-sfc@npm:3.2.47" +"@volar/source-map@npm:2.1.4, @volar/source-map@npm:~2.1.3": + version: 2.1.4 + resolution: "@volar/source-map@npm:2.1.4" dependencies: - "@babel/parser": ^7.16.4 - "@vue/compiler-core": 3.2.47 - "@vue/compiler-dom": 3.2.47 - "@vue/compiler-ssr": 3.2.47 - "@vue/reactivity-transform": 3.2.47 - "@vue/shared": 3.2.47 + muggle-string: ^0.4.0 + checksum: e2f65bcfd667a02ee5cfe49e612b12e75c05fdaecf3b3590fdd7a0255dce7e51d09e8d4c390c2098ca7321cea219c16a8ea3f6c0f36ca9c0edff3975990b458b + languageName: node + linkType: hard + +"@vscode/l10n@npm:^0.0.18": + version: 0.0.18 + resolution: "@vscode/l10n@npm:0.0.18" + checksum: c33876cebdef0385359619200ecb5d7c46d7f9abffb80f9fab1f83abb5d6bfdb44cc6d792d1b1b9c736c729121274733bbdcd5d2d2eea0d157bdf662d521edef + languageName: node + linkType: hard + +"@vue/compiler-core@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/compiler-core@npm:3.4.21" + dependencies: + "@babel/parser": ^7.23.9 + "@vue/shared": 3.4.21 + entities: ^4.5.0 estree-walker: ^2.0.2 - magic-string: ^0.25.7 - postcss: ^8.1.10 - source-map: ^0.6.1 - checksum: 4588a513310b9319a00adfdbe789cfe60d5ec19c51e8f2098152b9e81f54be170e16c40463f6b5e4c7ab79796fc31e2de93587a9dd1af136023fa03712b62e68 + source-map-js: ^1.0.2 + checksum: 0d6b7732bc5ca5b4561526bbe646f9acd09cd70561b6c822d15856347f21a009ebf30f2f85b1b7500f24f7c0333a2af8ee645c389abe52485c1f4724c982b306 + languageName: node + linkType: hard + +"@vue/compiler-dom@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/compiler-dom@npm:3.4.21" + dependencies: + "@vue/compiler-core": 3.4.21 + "@vue/shared": 3.4.21 + checksum: f53e4f4e0afc954cede91a8cbeb3a4e053531a43a0f5999d1b18da443ca3f1f6fc9344a8741c72c5719a61bb34e18004ac88e16747bcf145ebc8a31188263690 languageName: node linkType: hard -"@vue/compiler-ssr@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/compiler-ssr@npm:3.2.47" +"@vue/compiler-sfc@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/compiler-sfc@npm:3.4.21" dependencies: - "@vue/compiler-dom": 3.2.47 - "@vue/shared": 3.2.47 - checksum: 91bc6e46744d5405713c08d8e576971aa6d13a0cde84ec592d3221bf6ee228e49ce12233af8c18dc39723455b420df2951f3616ceb99758eb432485475fa7bc2 + "@babel/parser": ^7.23.9 + "@vue/compiler-core": 3.4.21 + "@vue/compiler-dom": 3.4.21 + "@vue/compiler-ssr": 3.4.21 + "@vue/shared": 3.4.21 + estree-walker: ^2.0.2 + magic-string: ^0.30.7 + postcss: ^8.4.35 + source-map-js: ^1.0.2 + checksum: 226dc404be96a2811777825918d971feb42650e262159183548d64a463c4153fab97cdc2647224c609c89dbc0d930c6d9dbe6528ef52a1396b4b22163c20569a languageName: node linkType: hard -"@vue/devtools-api@npm:^6.4.5": - version: 6.4.5 - resolution: "@vue/devtools-api@npm:6.4.5" - checksum: 40c5adc8788cb283972ce09ba7ce105fa894f4decec9168829cc8e6211462763402442e6c31be76f9da62b0e74ae724971b924571367b4ac89b94dc6894e2d07 +"@vue/compiler-ssr@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/compiler-ssr@npm:3.4.21" + dependencies: + "@vue/compiler-dom": 3.4.21 + "@vue/shared": 3.4.21 + checksum: c510bee68b1a5b7f8ae3fe771c10ce9c397f876a234ced9df89e4a8353f3874870857e929cbb37e6d785d355b43f2264dc3a7fd5cb6867dc5b39ddca607ea3ed languageName: node linkType: hard @@ -1834,65 +2113,69 @@ __metadata: languageName: node linkType: hard -"@vue/reactivity-transform@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/reactivity-transform@npm:3.2.47" +"@vue/devtools-api@npm:^6.5.1": + version: 6.6.1 + resolution: "@vue/devtools-api@npm:6.6.1" + checksum: cf12b5ebcc7729725087072289410107b55bb82e0b86b8442e4e85516977110a8a3f4e1dec763be8b567a59173703b4e9c0ac1b0489bb2bb81363af7ea258a27 + languageName: node + linkType: hard + +"@vue/language-plugin-pug@npm:2.0.7": + version: 2.0.7 + resolution: "@vue/language-plugin-pug@npm:2.0.7" dependencies: - "@babel/parser": ^7.16.4 - "@vue/compiler-core": 3.2.47 - "@vue/shared": 3.2.47 - estree-walker: ^2.0.2 - magic-string: ^0.25.7 - checksum: 6fe54374aa8c080c0c421e18134e84e723e2d3e53178cf084c1cd75bc8b1ffaaf07756801f3aa4e1e7ad1ba76356c28bbab4bc1b676159db8fc10f10f2cbd405 + "@volar/source-map": ~2.1.3 + volar-service-pug: 0.0.34 + checksum: 11cc96eb5f240144e91b27fe06fcd48de4ef1e4c7fe666d1173b346ed64b7edfa922bd4eb2e512a91a0c6b907975afcaf69cfee4c91af11168590142b3aba4c3 languageName: node linkType: hard -"@vue/reactivity@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/reactivity@npm:3.2.47" +"@vue/reactivity@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/reactivity@npm:3.4.21" dependencies: - "@vue/shared": 3.2.47 - checksum: bd61134e4b2f281067e78b23b34d17f1290a0b3fdb0cd7f06424570b4428c899389451a396694144b0af2fc6dbb1459c38e79151119f12c4f818f4c5004b7d16 + "@vue/shared": 3.4.21 + checksum: 79c7ebe3ec9295cdcb4d762e3a4c0e3eb67d7f12c9deb37baf372c4f48cd5914cdeeba14add433c3149b9c4dd890dc9891ee76e9d13c8ebcd521b5a754a8cc0d languageName: node linkType: hard -"@vue/runtime-core@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/runtime-core@npm:3.2.47" +"@vue/runtime-core@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/runtime-core@npm:3.4.21" dependencies: - "@vue/reactivity": 3.2.47 - "@vue/shared": 3.2.47 - checksum: 56fd41368cb56ac83d88ef93ffb9e8d2cdad30adf8395351c38ac744691dfe50c0add0bd14e8aa817cd59afd2534213eb2aaabf46b03aacce9a4af7497af2e69 + "@vue/reactivity": 3.4.21 + "@vue/shared": 3.4.21 + checksum: 4eb9b5d91fe58bc5b3f38293099d704ba7699a16d4ce68de03fbe5fc703e521ebfe3cefc156ef866d2ce0cbd1c2af1795674b39ab2b764bfedc069aa05233231 languageName: node linkType: hard -"@vue/runtime-dom@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/runtime-dom@npm:3.2.47" +"@vue/runtime-dom@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/runtime-dom@npm:3.4.21" dependencies: - "@vue/runtime-core": 3.2.47 - "@vue/shared": 3.2.47 - csstype: ^2.6.8 - checksum: 8987d7276174120ed346c456752cdb3633c400432ae89a1a866e342c964b7ed2f9e3e09926f2b4b81fe175b1e4fb3935fe3920c113bcc71464ff39b4e50931f5 + "@vue/runtime-core": 3.4.21 + "@vue/shared": 3.4.21 + csstype: ^3.1.3 + checksum: ebfdaa081fb7f18214a4e3324a7b58cc1bfe9b585cfc9dc5cf2ee480f233f992c32a6a3a3b595040babf26570ca18e748049d9284c42beceac8665e8f4ce5383 languageName: node linkType: hard -"@vue/server-renderer@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/server-renderer@npm:3.2.47" +"@vue/server-renderer@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/server-renderer@npm:3.4.21" dependencies: - "@vue/compiler-ssr": 3.2.47 - "@vue/shared": 3.2.47 + "@vue/compiler-ssr": 3.4.21 + "@vue/shared": 3.4.21 peerDependencies: - vue: 3.2.47 - checksum: 482fe3c9bbb0e154864259a976bac50f5a6cbbb86bc4376c5942a6108919466e57d9830c65060abff6ecb6a9ff1d5e3e4fede165f4312edf25b0088b8c0e26af + vue: 3.4.21 + checksum: faa3dc48767fc4308ffa031d07a6dbb362f26b0b8893f82747e6d879f046c373978402d1c15ed08267ebc0f090809cd3d554e6a4f582affcefb5239be5d4860c languageName: node linkType: hard -"@vue/shared@npm:3.2.47": - version: 3.2.47 - resolution: "@vue/shared@npm:3.2.47" - checksum: 0aa711dc9160fa0e476e6e94eea4e019398adf2211352d0e4a672cfb6b65b104bbd5d234807d1c091107bdc0f5d818d0f12378987eb7861d39be3aa9f6cd6e3e +"@vue/shared@npm:3.4.21": + version: 3.4.21 + resolution: "@vue/shared@npm:3.4.21" + checksum: 5f30a408911f339c647baa88c45c3a2f6d58dbdaf2bd404753690f24b612717bdfe9050401d8ffb02613a9a06dd0b43c8307420cd69fda6e92e6d65bf9bc0c6f languageName: node linkType: hard @@ -1919,13 +2202,6 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.0.0": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 - languageName: node - linkType: hard - "acorn@npm:^7.1.1": version: 7.4.1 resolution: "acorn@npm:7.4.1" @@ -1935,7 +2211,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.5.0, acorn@npm:^8.7.1": +"acorn@npm:^8.7.1": version: 8.7.1 resolution: "acorn@npm:8.7.1" bin: @@ -1944,12 +2220,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.8.0": - version: 8.8.0 - resolution: "acorn@npm:8.8.0" +"acorn@npm:^8.9.0": + version: 8.10.0 + resolution: "acorn@npm:8.10.0" bin: acorn: bin/acorn - checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc + checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d languageName: node linkType: hard @@ -1983,7 +2259,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.4": +"ajv@npm:^6.12.4": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -2039,13 +2315,6 @@ __metadata: languageName: node linkType: hard -"ansi-styles@npm:^5.0.0": - version: 5.2.0 - resolution: "ansi-styles@npm:5.2.0" - checksum: d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469 - languageName: node - linkType: hard - "ansi-styles@npm:^6.1.0": version: 6.2.1 resolution: "ansi-styles@npm:6.2.1" @@ -2087,40 +2356,78 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.6": - version: 3.1.6 - resolution: "array-includes@npm:3.1.6" +"array-buffer-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "array-buffer-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + is-array-buffer: ^3.0.1 + checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3 + languageName: node + linkType: hard + +"array-includes@npm:^3.1.7": + version: 3.1.7 + resolution: "array-includes@npm:3.1.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + is-string: ^1.0.7 + checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc + languageName: node + linkType: hard + +"array.prototype.findlastindex@npm:^1.2.3": + version: 1.2.3 + resolution: "array.prototype.findlastindex@npm:1.2.3" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + get-intrinsic: ^1.2.1 + checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e + languageName: node + linkType: hard + +"array.prototype.flat@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flat@npm:1.3.2" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 - is-string: ^1.0.7 - checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b languageName: node linkType: hard -"array.prototype.flat@npm:^1.3.1": - version: 1.3.1 - resolution: "array.prototype.flat@npm:1.3.1" +"array.prototype.flatmap@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flatmap@npm:1.3.2" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 es-shim-unscopables: ^1.0.0 - checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b + checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3 languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1": - version: 1.3.1 - resolution: "array.prototype.flatmap@npm:1.3.1" +"arraybuffer.prototype.slice@npm:^1.0.2": + version: 1.0.2 + resolution: "arraybuffer.prototype.slice@npm:1.0.2" dependencies: + array-buffer-byte-length: ^1.0.0 call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3 languageName: node linkType: hard @@ -2138,10 +2445,10 @@ __metadata: languageName: node linkType: hard -"async-validator@npm:^4.0.7": - version: 4.1.1 - resolution: "async-validator@npm:4.1.1" - checksum: 88590ab8ad1db6e3f6e01136d5313d4e91e269e74b7d4017aa16c64dac5be2697dbd1ff3de18f0e000d12073626475de9f77ba41808af38b0ea23eb0e6e8a361 +"async-validator@npm:^4.2.5": + version: 4.2.5 + resolution: "async-validator@npm:4.2.5" + checksum: 3e3d891a2e21497c8a646afeb7b1e6ed5f98de5f58ce3600732080f327cb581e65d8d8ff184273f1461dc84105d49f5cf31422a67ce50e787967c306838b6f40 languageName: node linkType: hard @@ -2191,19 +2498,19 @@ __metadata: languageName: node linkType: hard -"bootstrap-icons@npm:1.10.5": - version: 1.10.5 - resolution: "bootstrap-icons@npm:1.10.5" - checksum: 8a0cfbd237723793dfb04106fdeed7f86bb59249a01a1623b325bf84d61306c22bb46d3df0795f80f0e77d43cd7485273571c253ee7910eb67fae9489691daad +"bootstrap-icons@npm:1.11.3": + version: 1.11.3 + resolution: "bootstrap-icons@npm:1.11.3" + checksum: d5cdb90fe37af9051f369cbced8aa25bde9c29895f6ab47cbadcfdca71ae5b49093fceb4261c910a84d4352a5a4f998fdae4f1c245897bc6a1042321f4380c07 languageName: node linkType: hard -"bootstrap@npm:5.2.3": - version: 5.2.3 - resolution: "bootstrap@npm:5.2.3" +"bootstrap@npm:5.3.3": + version: 5.3.3 + resolution: "bootstrap@npm:5.3.3" peerDependencies: - "@popperjs/core": ^2.11.6 - checksum: 0211805dec6a190c0911d142966df30fdb4b4139a04cc6c23dd83c6045ea3cb0a966b360ab2e701e7b3ad96ff01e05fdc0914be97b41bd876b11e457a8bdc6a3 + "@popperjs/core": ^2.11.8 + checksum: 537b68db30150075614310e9ebdf1be9b4affdf89ca226d59f4352e82a368b203af13ed0ce5ccfa4e06f141ecd233f7432ca3817e9c1a39863a05fbe13c73c4b languageName: node linkType: hard @@ -2244,10 +2551,10 @@ __metadata: languageName: node linkType: hard -"browser-fs-access@npm:0.33.1": - version: 0.33.1 - resolution: "browser-fs-access@npm:0.33.1" - checksum: 2fb595c2d28e2da3a5772c0c4da01e8bd4ea2d812693a5ccc8675b59c7658ac82d3e16780e4b7746ca45350b0e873f09597256a524b9e9e80fe67c91bcddffa0 +"browser-fs-access@npm:0.35.0": + version: 0.35.0 + resolution: "browser-fs-access@npm:0.35.0" + checksum: 5f3bf1ec17ffc2c991af7d92e2100f0b3d6cdd638a4dbf59e72c86a6de534816d7ad40cd25b63bf8f15d2ae47f1cd46ad27f13104029e62f8f101722dabf3a37 languageName: node linkType: hard @@ -2277,10 +2584,10 @@ browserlist@latest: languageName: node linkType: hard -"buffer-from@npm:^1.0.0": - version: 1.1.2 - resolution: "buffer-from@npm:1.1.2" - checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb +"builtin-modules@npm:^3.3.0": + version: 3.3.0 + resolution: "builtin-modules@npm:3.3.0" + checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d languageName: node linkType: hard @@ -2302,25 +2609,24 @@ browserlist@latest: languageName: node linkType: hard -"c8@npm:7.13.0": - version: 7.13.0 - resolution: "c8@npm:7.13.0" +"c8@npm:9.1.0": + version: 9.1.0 + resolution: "c8@npm:9.1.0" dependencies: "@bcoe/v8-coverage": ^0.2.3 "@istanbuljs/schema": ^0.1.3 find-up: ^5.0.0 - foreground-child: ^2.0.0 + foreground-child: ^3.1.1 istanbul-lib-coverage: ^3.2.0 - istanbul-lib-report: ^3.0.0 - istanbul-reports: ^3.1.4 - rimraf: ^3.0.2 + istanbul-lib-report: ^3.0.1 + istanbul-reports: ^3.1.6 test-exclude: ^6.0.0 v8-to-istanbul: ^9.0.0 - yargs: ^16.2.0 - yargs-parser: ^20.2.9 + yargs: ^17.7.2 + yargs-parser: ^21.1.1 bin: c8: bin/c8.js - checksum: 491abf4cf3097cdcfd24dbac49162f1383861c22c77fdd9280bcd38240e1e07d2c6a59da5d4df59a61a8204e2fc297d31fd526e495faf8d2f20dcc12a37b144c + checksum: c5249bf9c390784a33b05f5e930f5301793c15105c874a0130839dbf3309ce8832376f77be5e325a40cc2955f455f1d7aea754858befd07eee535dd42b287bbe languageName: node linkType: hard @@ -2360,6 +2666,17 @@ browserlist@latest: languageName: node linkType: hard +"call-bind@npm:^1.0.4, call-bind@npm:^1.0.5": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" + dependencies: + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -2367,10 +2684,10 @@ browserlist@latest: languageName: node linkType: hard -"caniuse-lite@npm:1.0.30001481": - version: 1.0.30001481 - resolution: "caniuse-lite@npm:1.0.30001481" - checksum: 8200a043c191b4fd4fe0beda37a58fd61869c895ab93f87bdd0420e5927453f48434d716ce9da8552ff6c3ecc4dcd1366354cda3a134f3cc844af741574a7cab +"caniuse-lite@npm:1.0.30001603": + version: 1.0.30001603 + resolution: "caniuse-lite@npm:1.0.30001603" + checksum: e66e0d24b899c2ed3fdcc2dd44df29c4fc06d74fa8f43abe81fc7cff4a72b092d438e0fb5b7daeb252ee267519f32c6c7d229a15e7a4f4263afef6ea3832b661 languageName: node linkType: hard @@ -2437,7 +2754,7 @@ browserlist@latest: languageName: node linkType: hard -"chrome-trace-event@npm:^1.0.2": +"chrome-trace-event@npm:^1.0.2, chrome-trace-event@npm:^1.0.3": version: 1.0.3 resolution: "chrome-trace-event@npm:1.0.3" checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97 @@ -2451,14 +2768,14 @@ browserlist@latest: languageName: node linkType: hard -"cliui@npm:^7.0.2": - version: 7.0.4 - resolution: "cliui@npm:7.0.4" +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" dependencies: string-width: ^4.2.0 - strip-ansi: ^6.0.0 + strip-ansi: ^6.0.1 wrap-ansi: ^7.0.0 - checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 languageName: node linkType: hard @@ -2517,13 +2834,6 @@ browserlist@latest: languageName: node linkType: hard -"commander@npm:^2.20.0": - version: 2.20.3 - resolution: "commander@npm:2.20.3" - checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e - languageName: node - linkType: hard - "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -2592,6 +2902,16 @@ browserlist@latest: languageName: node linkType: hard +"css-render@npm:^0.15.12": + version: 0.15.12 + resolution: "css-render@npm:0.15.12" + dependencies: + "@emotion/hash": ~0.8.0 + csstype: ~3.0.5 + checksum: 80265c5055e3a77b7ee357c16e3090f84f19a2f4e0917425c430f987e0af62c2491121832c7e0c7b0037eaff4291dc0385b1e6ef068c6088a704973e971defd0 + languageName: node + linkType: hard + "css-select@npm:^4.1.3": version: 4.3.0 resolution: "css-select@npm:4.3.0" @@ -2640,10 +2960,10 @@ browserlist@latest: languageName: node linkType: hard -"csstype@npm:^2.6.8": - version: 2.6.20 - resolution: "csstype@npm:2.6.20" - checksum: cb5d5ded49c3390909e93b20b285d4a63d0ba5b10294bdfbc4cf911f80e91d6cf367ea671f99f09570762535c14ea7074a2c7fa73f02008203f01328dea8968b +"csstype@npm:^3.1.3": + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 languageName: node linkType: hard @@ -2943,9 +3263,9 @@ browserlist@latest: languageName: node linkType: hard -"d3@npm:7.8.4": - version: 7.8.4 - resolution: "d3@npm:7.8.4" +"d3@npm:7.9.0": + version: 7.9.0 + resolution: "d3@npm:7.9.0" dependencies: d3-array: 3 d3-axis: 3 @@ -2977,23 +3297,25 @@ browserlist@latest: d3-timer: 3 d3-transition: 3 d3-zoom: 3 - checksum: 8dfea4d026e5597ab9c46035df7f0ca4f3891b2b52b21b181bd8660fc61d85f0bbe3cc2b8f1e922978084156cb017cbbfa350a8e42349310642023a9f1517471 + checksum: 1c0e9135f1fb78aa32b187fafc8b56ae6346102bd0e4e5e5a5339611a51e6038adbaa293fae373994228100eddd87320e930b1be922baeadc07c9fd43d26d99b languageName: node linkType: hard -"date-fns-tz@npm:^1.3.3": - version: 1.3.3 - resolution: "date-fns-tz@npm:1.3.3" +"date-fns-tz@npm:^2.0.0": + version: 2.0.0 + resolution: "date-fns-tz@npm:2.0.0" peerDependencies: date-fns: ">=2.0.0" - checksum: 52111dffb44f9f419df00b325ed510b8d4723190cb47e2efaaf9704c2dc510f39d5f9c32263bff9599c5218f31a9c7775731bd8a9365d3ce6042059897110101 + checksum: a6553603a9d26dd9669326c99a58a2335ac550bc060c74b86a5ad9e1de73c9d4e3e5236f0f552f990e616e4e8dcc2b6a637913a04d2e04396e6a9f8ae83c73da languageName: node linkType: hard -"date-fns@npm:^2.28.0": - version: 2.28.0 - resolution: "date-fns@npm:2.28.0" - checksum: a0516b2e4f99b8bffc6cc5193349f185f195398385bdcaf07f17c2c4a24473c99d933eb0018be4142a86a6d46cb0b06be6440ad874f15e795acbedd6fd727a1f +"date-fns@npm:^2.30.0": + version: 2.30.0 + resolution: "date-fns@npm:2.30.0" + dependencies: + "@babel/runtime": ^7.21.0 + checksum: f7be01523282e9bb06c0cd2693d34f245247a29098527d4420628966a2d9aad154bd0e90a6b1cf66d37adcb769cd108cf8a7bd49d76db0fb119af5cdd13644f4 languageName: node linkType: hard @@ -3006,7 +3328,7 @@ browserlist@latest: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -3034,20 +3356,24 @@ browserlist@latest: languageName: node linkType: hard -"deepmerge@npm:^4.2.0": - version: 4.2.2 - resolution: "deepmerge@npm:4.2.2" - checksum: a8c43a1ed8d6d1ed2b5bf569fa4c8eb9f0924034baf75d5d406e47e157a451075c4db353efea7b6bcc56ec48116a8ce72fccf867b6e078e7c561904b5897530b - languageName: node - linkType: hard - -"deepmerge@npm:^4.3.1": +"deepmerge@npm:4.3.1, deepmerge@npm:^4.3.1": version: 4.3.1 resolution: "deepmerge@npm:4.3.1" checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052 languageName: node linkType: hard +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": + version: 1.1.1 + resolution: "define-data-property@npm:1.1.1" + dependencies: + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d + languageName: node + linkType: hard + "define-properties@npm:^1.1.3, define-properties@npm:^1.1.4": version: 1.1.4 resolution: "define-properties@npm:1.1.4" @@ -3058,6 +3384,16 @@ browserlist@latest: languageName: node linkType: hard +"define-properties@npm:^1.2.0": + version: 1.2.0 + resolution: "define-properties@npm:1.2.0" + dependencies: + has-property-descriptors: ^1.0.0 + object-keys: ^1.1.1 + checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6 + languageName: node + linkType: hard + "delaunator@npm:5": version: 5.0.0 resolution: "delaunator@npm:5.0.0" @@ -3104,10 +3440,10 @@ browserlist@latest: languageName: node linkType: hard -"diff-sequences@npm:^27.5.1": - version: 27.5.1 - resolution: "diff-sequences@npm:27.5.1" - checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca +"detect-libc@npm:^2.0.1": + version: 2.0.2 + resolution: "detect-libc@npm:2.0.2" + checksum: 2b2cd3649b83d576f4be7cc37eb3b1815c79969c8b1a03a40a4d55d83bc74d010753485753448eacb98784abf22f7dbd3911fd3b60e29fda28fed2d1a997944d languageName: node linkType: hard @@ -3253,6 +3589,13 @@ browserlist@latest: languageName: node linkType: hard +"entities@npm:^4.5.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7 + languageName: node + linkType: hard + "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -3276,44 +3619,50 @@ browserlist@latest: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": - version: 1.21.1 - resolution: "es-abstract@npm:1.21.1" +"es-abstract@npm:^1.22.1": + version: 1.22.3 + resolution: "es-abstract@npm:1.22.3" dependencies: + array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.2 available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + call-bind: ^1.0.5 es-set-tostringtag: ^2.0.1 es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 - function.prototype.name: ^1.1.5 - get-intrinsic: ^1.1.3 + function.prototype.name: ^1.1.6 + get-intrinsic: ^1.2.2 get-symbol-description: ^1.0.0 globalthis: ^1.0.3 gopd: ^1.0.1 - has: ^1.0.3 has-property-descriptors: ^1.0.0 has-proto: ^1.0.1 has-symbols: ^1.0.3 - internal-slot: ^1.0.4 - is-array-buffer: ^3.0.1 + hasown: ^2.0.0 + internal-slot: ^1.0.5 + is-array-buffer: ^3.0.2 is-callable: ^1.2.7 is-negative-zero: ^2.0.2 is-regex: ^1.1.4 is-shared-array-buffer: ^1.0.2 is-string: ^1.0.7 - is-typed-array: ^1.1.10 + is-typed-array: ^1.1.12 is-weakref: ^1.0.2 - object-inspect: ^1.12.2 + object-inspect: ^1.13.1 object-keys: ^1.1.1 object.assign: ^4.1.4 - regexp.prototype.flags: ^1.4.3 + regexp.prototype.flags: ^1.5.1 + safe-array-concat: ^1.0.1 safe-regex-test: ^1.0.0 - string.prototype.trimend: ^1.0.6 - string.prototype.trimstart: ^1.0.6 + string.prototype.trim: ^1.2.8 + string.prototype.trimend: ^1.0.7 + string.prototype.trimstart: ^1.0.7 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 + typed-array-byte-offset: ^1.0.0 typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 - which-typed-array: ^1.1.9 - checksum: 23ff60d42d17a55d150e7bcedbdb065d4077a8b98c436e0e2e1ef4dd532a6d78a56028673de0bd8ed464a43c46ba781c50d9af429b6a17e44dbd14c7d7fb7926 + which-typed-array: ^1.1.13 + checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a languageName: node linkType: hard @@ -3348,32 +3697,32 @@ browserlist@latest: languageName: node linkType: hard -"esbuild@npm:^0.17.5": - version: 0.17.13 - resolution: "esbuild@npm:0.17.13" - dependencies: - "@esbuild/android-arm": 0.17.13 - "@esbuild/android-arm64": 0.17.13 - "@esbuild/android-x64": 0.17.13 - "@esbuild/darwin-arm64": 0.17.13 - "@esbuild/darwin-x64": 0.17.13 - "@esbuild/freebsd-arm64": 0.17.13 - "@esbuild/freebsd-x64": 0.17.13 - "@esbuild/linux-arm": 0.17.13 - "@esbuild/linux-arm64": 0.17.13 - "@esbuild/linux-ia32": 0.17.13 - "@esbuild/linux-loong64": 0.17.13 - "@esbuild/linux-mips64el": 0.17.13 - "@esbuild/linux-ppc64": 0.17.13 - "@esbuild/linux-riscv64": 0.17.13 - "@esbuild/linux-s390x": 0.17.13 - "@esbuild/linux-x64": 0.17.13 - "@esbuild/netbsd-x64": 0.17.13 - "@esbuild/openbsd-x64": 0.17.13 - "@esbuild/sunos-x64": 0.17.13 - "@esbuild/win32-arm64": 0.17.13 - "@esbuild/win32-ia32": 0.17.13 - "@esbuild/win32-x64": 0.17.13 +"esbuild@npm:^0.18.10": + version: 0.18.20 + resolution: "esbuild@npm:0.18.20" + dependencies: + "@esbuild/android-arm": 0.18.20 + "@esbuild/android-arm64": 0.18.20 + "@esbuild/android-x64": 0.18.20 + "@esbuild/darwin-arm64": 0.18.20 + "@esbuild/darwin-x64": 0.18.20 + "@esbuild/freebsd-arm64": 0.18.20 + "@esbuild/freebsd-x64": 0.18.20 + "@esbuild/linux-arm": 0.18.20 + "@esbuild/linux-arm64": 0.18.20 + "@esbuild/linux-ia32": 0.18.20 + "@esbuild/linux-loong64": 0.18.20 + "@esbuild/linux-mips64el": 0.18.20 + "@esbuild/linux-ppc64": 0.18.20 + "@esbuild/linux-riscv64": 0.18.20 + "@esbuild/linux-s390x": 0.18.20 + "@esbuild/linux-x64": 0.18.20 + "@esbuild/netbsd-x64": 0.18.20 + "@esbuild/openbsd-x64": 0.18.20 + "@esbuild/sunos-x64": 0.18.20 + "@esbuild/win32-arm64": 0.18.20 + "@esbuild/win32-ia32": 0.18.20 + "@esbuild/win32-x64": 0.18.20 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -3421,7 +3770,7 @@ browserlist@latest: optional: true bin: esbuild: bin/esbuild - checksum: c3be8d41a36504fbfee7ad1206df5cf3464dc9a057a417b66dbf1cdf9a180d299df8eee5d2ffa428ad0303f5f4e3ea238bd50087876daa28f709722035165c8c + checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b languageName: node linkType: hard @@ -3453,49 +3802,71 @@ browserlist@latest: languageName: node linkType: hard -"eslint-config-standard@npm:17.0.0": - version: 17.0.0 - resolution: "eslint-config-standard@npm:17.0.0" +"eslint-compat-utils@npm:^0.1.2": + version: 0.1.2 + resolution: "eslint-compat-utils@npm:0.1.2" + peerDependencies: + eslint: ">=6.0.0" + checksum: 2315d9db81efb7f58808053bf32a1d5970b38e01cd8244f4f1b5aa05d883255c5c93fc184e9c29a0e7e2dcf16ff16330977302474d3fa870e41c5bed9c66f76b + languageName: node + linkType: hard + +"eslint-config-standard@npm:17.1.0": + version: 17.1.0 + resolution: "eslint-config-standard@npm:17.1.0" peerDependencies: eslint: ^8.0.1 eslint-plugin-import: ^2.25.2 - eslint-plugin-n: ^15.0.0 + eslint-plugin-n: "^15.0.0 || ^16.0.0 " eslint-plugin-promise: ^6.0.0 - checksum: dc0ed51e186fd963ff2c0819d33ef580afce11b11036cbcf5e74427e26e514c2b1be96b8ffe74fd2fd00263554a0d49cc873fcf76f17c3dfdba614b45d7fd7da + checksum: 8ed14ffe424b8a7e67b85e44f75c46dc4c6954f7c474c871c56fb0daf40b6b2a7af2db55102b12a440158b2be898e1fb8333b05e3dbeaeaef066fdbc863eaa88 languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.7": - version: 0.3.7 - resolution: "eslint-import-resolver-node@npm:0.3.7" +"eslint-import-resolver-node@npm:^0.3.9": + version: 0.3.9 + resolution: "eslint-import-resolver-node@npm:0.3.9" dependencies: debug: ^3.2.7 - is-core-module: ^2.11.0 - resolve: ^1.22.1 - checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e + is-core-module: ^2.13.0 + resolve: ^1.22.4 + checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22 languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.4": - version: 2.7.4 - resolution: "eslint-module-utils@npm:2.7.4" +"eslint-module-utils@npm:^2.8.0": + version: 2.8.0 + resolution: "eslint-module-utils@npm:2.8.0" dependencies: debug: ^3.2.7 peerDependenciesMeta: eslint: optional: true - checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7 + checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2 languageName: node linkType: hard -"eslint-plugin-cypress@npm:2.13.3": - version: 2.13.3 - resolution: "eslint-plugin-cypress@npm:2.13.3" +"eslint-plugin-cypress@npm:2.15.1": + version: 2.15.1 + resolution: "eslint-plugin-cypress@npm:2.15.1" dependencies: - globals: ^11.12.0 + globals: ^13.20.0 peerDependencies: eslint: ">= 3.2.1" - checksum: 9affbcee29e030a4251c4794f7533e8e8c0e3b98ab3470a2c730ed059f733c5857a04c7ac214cc0ca7aeef1b11242e72595de7fc1f6b8b4d4578d9eca10af203 + checksum: 3e66fa9a943fff52eaf3758250a63c2a0f8ffd60c50572beaf3688b33a55fbf0060d18ef32bc26abb57aef070517db827c22fd3d607582861d464970f95e550e + languageName: node + linkType: hard + +"eslint-plugin-es-x@npm:^7.5.0": + version: 7.5.0 + resolution: "eslint-plugin-es-x@npm:7.5.0" + dependencies: + "@eslint-community/eslint-utils": ^4.1.2 + "@eslint-community/regexpp": ^4.6.0 + eslint-compat-utils: ^0.1.2 + peerDependencies: + eslint: ">=8" + checksum: e770e57df78c3c38582de9bc4b9632ec5101a6dae8ac84f6ac219e8d8eb137f943db9730e037cfbc82f5d3ab6358e1b494fa6c628f425ebfc7e3094d5aa9d223 languageName: node linkType: hard @@ -3523,28 +3894,30 @@ browserlist@latest: languageName: node linkType: hard -"eslint-plugin-import@npm:2.27.5": - version: 2.27.5 - resolution: "eslint-plugin-import@npm:2.27.5" +"eslint-plugin-import@npm:2.29.1": + version: 2.29.1 + resolution: "eslint-plugin-import@npm:2.29.1" dependencies: - array-includes: ^3.1.6 - array.prototype.flat: ^1.3.1 - array.prototype.flatmap: ^1.3.1 + array-includes: ^3.1.7 + array.prototype.findlastindex: ^1.2.3 + array.prototype.flat: ^1.3.2 + array.prototype.flatmap: ^1.3.2 debug: ^3.2.7 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.7 - eslint-module-utils: ^2.7.4 - has: ^1.0.3 - is-core-module: ^2.11.0 + eslint-import-resolver-node: ^0.3.9 + eslint-module-utils: ^2.8.0 + hasown: ^2.0.0 + is-core-module: ^2.13.1 is-glob: ^4.0.3 minimatch: ^3.1.2 - object.values: ^1.1.6 - resolve: ^1.22.1 - semver: ^6.3.0 - tsconfig-paths: ^3.14.1 + object.fromentries: ^2.0.7 + object.groupby: ^1.0.1 + object.values: ^1.1.7 + semver: ^6.3.1 + tsconfig-paths: ^3.15.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d + checksum: e65159aef808136d26d029b71c8c6e4cb5c628e65e5de77f1eb4c13a379315ae55c9c3afa847f43f4ff9df7e54515c77ffc6489c6a6f81f7dd7359267577468c languageName: node linkType: hard @@ -3566,21 +3939,24 @@ browserlist@latest: languageName: node linkType: hard -"eslint-plugin-n@npm:15.7.0": - version: 15.7.0 - resolution: "eslint-plugin-n@npm:15.7.0" +"eslint-plugin-n@npm:16.6.2": + version: 16.6.2 + resolution: "eslint-plugin-n@npm:16.6.2" dependencies: + "@eslint-community/eslint-utils": ^4.4.0 builtins: ^5.0.1 - eslint-plugin-es: ^4.1.0 - eslint-utils: ^3.0.0 - ignore: ^5.1.1 - is-core-module: ^2.11.0 + eslint-plugin-es-x: ^7.5.0 + get-tsconfig: ^4.7.0 + globals: ^13.24.0 + ignore: ^5.2.4 + is-builtin-module: ^3.2.1 + is-core-module: ^2.12.1 minimatch: ^3.1.2 - resolve: ^1.22.1 - semver: ^7.3.8 + resolve: ^1.22.2 + semver: ^7.5.3 peerDependencies: eslint: ">=7.0.0" - checksum: cfbcc67e62adf27712afdeadf13223cb9717f95d4af8442056d9d4c97a8b88af76b7969f75deaac26fa98481023d6b7c9e43a28909e7f0468f40b3024b7bcfae + checksum: 3b468da0038cf25af582608983491b33ac2d481b6a94a0ff2e715d3b85e1ff8cb93df4cd67b689d520bea1bfb8f2b717f01606bf6b2ea19fe8f9c0999ea7057d languageName: node linkType: hard @@ -3609,20 +3985,21 @@ browserlist@latest: languageName: node linkType: hard -"eslint-plugin-vue@npm:9.11.0": - version: 9.11.0 - resolution: "eslint-plugin-vue@npm:9.11.0" +"eslint-plugin-vue@npm:9.24.0": + version: 9.24.0 + resolution: "eslint-plugin-vue@npm:9.24.0" dependencies: - "@eslint-community/eslint-utils": ^4.3.0 + "@eslint-community/eslint-utils": ^4.4.0 + globals: ^13.24.0 natural-compare: ^1.4.0 - nth-check: ^2.0.1 - postcss-selector-parser: ^6.0.9 - semver: ^7.3.5 - vue-eslint-parser: ^9.0.1 + nth-check: ^2.1.1 + postcss-selector-parser: ^6.0.15 + semver: ^7.6.0 + vue-eslint-parser: ^9.4.2 xml-name-validator: ^4.0.0 peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 - checksum: 1bcb6cf76831419dbb18b9ef7a71831b69325eab1f83137af7a7ffe2800962af2afae30d5eb94210597e70e9503b698d31af210f0d36c0b3fd9cafc77d2a1895 + checksum: 2309b919d8fced6210c11e09107f443990063c0392843909cf50fad682e820c48bf5cc28b82a1239c03fd7ceeb4239e1baa653370c4c76689ec5fb8a970cd303 languageName: node linkType: hard @@ -3636,13 +4013,13 @@ browserlist@latest: languageName: node linkType: hard -"eslint-scope@npm:^7.2.0": - version: 7.2.0 - resolution: "eslint-scope@npm:7.2.0" +"eslint-scope@npm:^7.2.2": + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae + checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e languageName: node linkType: hard @@ -3687,33 +4064,41 @@ browserlist@latest: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.4.0": - version: 3.4.0 - resolution: "eslint-visitor-keys@npm:3.4.0" - checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c +"eslint-visitor-keys@npm:^3.4.1": + version: 3.4.1 + resolution: "eslint-visitor-keys@npm:3.4.1" + checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 languageName: node linkType: hard -"eslint@npm:8.39.0": - version: 8.39.0 - resolution: "eslint@npm:8.39.0" +"eslint@npm:8.57.0": + version: 8.57.0 + resolution: "eslint@npm:8.57.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 - "@eslint-community/regexpp": ^4.4.0 - "@eslint/eslintrc": ^2.0.2 - "@eslint/js": 8.39.0 - "@humanwhocodes/config-array": ^0.11.8 + "@eslint-community/regexpp": ^4.6.1 + "@eslint/eslintrc": ^2.1.4 + "@eslint/js": 8.57.0 + "@humanwhocodes/config-array": ^0.11.14 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 - ajv: ^6.10.0 + "@ungap/structured-clone": ^1.2.0 + ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.2.0 - eslint-visitor-keys: ^3.4.0 - espree: ^9.5.1 + eslint-scope: ^7.2.2 + eslint-visitor-keys: ^3.4.3 + espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -3721,30 +4106,27 @@ browserlist@latest: find-up: ^5.0.0 glob-parent: ^6.0.2 globals: ^13.19.0 - grapheme-splitter: ^1.0.4 + graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 is-path-inside: ^3.0.3 - js-sdsl: ^4.1.4 js-yaml: ^4.1.0 json-stable-stringify-without-jsonify: ^1.0.1 levn: ^0.4.1 lodash.merge: ^4.6.2 minimatch: ^3.1.2 natural-compare: ^1.4.0 - optionator: ^0.9.1 + optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: d7a074ff326e7ea482500dc0427a7d4b0260460f0f812d19b46b1cca681806b67309f23da9d17cd3de8eb74dd3c14cb549c4d58b05b140564d14cc1a391122a0 + checksum: 3a48d7ff85ab420a8447e9810d8087aea5b1df9ef68c9151732b478de698389ee656fd895635b5f2871c89ee5a2652b3f343d11e9db6f8486880374ebc74a2d9 languageName: node linkType: hard -"espree@npm:^9.0.0, espree@npm:^9.3.1": +"espree@npm:^9.3.1": version: 9.3.2 resolution: "espree@npm:9.3.2" dependencies: @@ -3755,14 +4137,14 @@ browserlist@latest: languageName: node linkType: hard -"espree@npm:^9.5.1": - version: 9.5.1 - resolution: "espree@npm:9.5.1" +"espree@npm:^9.6.0, espree@npm:^9.6.1": + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: - acorn: ^8.8.0 + acorn: ^8.9.0 acorn-jsx: ^5.3.2 - eslint-visitor-keys: ^3.4.0 - checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88 + eslint-visitor-keys: ^3.4.1 + checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9 languageName: node linkType: hard @@ -3926,17 +4308,7 @@ browserlist@latest: languageName: node linkType: hard -"foreground-child@npm:^2.0.0": - version: 2.0.0 - resolution: "foreground-child@npm:2.0.0" - dependencies: - cross-spawn: ^7.0.0 - signal-exit: ^3.0.2 - checksum: f77ec9aff621abd6b754cb59e690743e7639328301fbea6ff09df27d2befaf7dd5b77cec51c32323d73a81a7d91caaf9413990d305cbe3d873eec4fe58960956 - languageName: node - linkType: hard - -"foreground-child@npm:^3.1.0": +"foreground-child@npm:^3.1.0, foreground-child@npm:^3.1.1": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" dependencies: @@ -3995,19 +4367,26 @@ browserlist@latest: languageName: node linkType: hard -"function.prototype.name@npm:^1.1.5": - version: 1.1.5 - resolution: "function.prototype.name@npm:1.1.5" +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 + languageName: node + linkType: hard + +"function.prototype.name@npm:^1.1.6": + version: 1.1.6 + resolution: "function.prototype.name@npm:1.1.6" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.0 - functions-have-names: ^1.2.2 - checksum: acd21d733a9b649c2c442f067567743214af5fa248dbeee69d8278ce7df3329ea5abac572be9f7470b4ec1cd4d8f1040e3c5caccf98ebf2bf861a0deab735c27 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + functions-have-names: ^1.2.3 + checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479 languageName: node linkType: hard -"functions-have-names@npm:^1.2.2": +"functions-have-names@npm:^1.2.3": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5 @@ -4059,6 +4438,30 @@ browserlist@latest: languageName: node linkType: hard +"get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": + version: 1.2.1 + resolution: "get-intrinsic@npm:1.2.1" + dependencies: + function-bind: ^1.1.1 + has: ^1.0.3 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.2.2": + version: 1.2.2 + resolution: "get-intrinsic@npm:1.2.2" + dependencies: + function-bind: ^1.1.2 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417 + languageName: node + linkType: hard + "get-port@npm:^4.2.0": version: 4.2.0 resolution: "get-port@npm:4.2.0" @@ -4076,6 +4479,15 @@ browserlist@latest: languageName: node linkType: hard +"get-tsconfig@npm:^4.7.0": + version: 4.7.2 + resolution: "get-tsconfig@npm:4.7.2" + dependencies: + resolve-pkg-maps: ^1.0.0 + checksum: 172358903250eff0103943f816e8a4e51d29b8e5449058bdf7266714a908a48239f6884308bd3a6ff28b09f692b9533dbebfd183ab63e4e14f073cda91f1bca9 + languageName: node + linkType: hard + "glob-parent@npm:^6.0.2": version: 6.0.2 resolution: "glob-parent@npm:6.0.2" @@ -4136,13 +4548,6 @@ browserlist@latest: languageName: node linkType: hard -"globals@npm:^11.12.0": - version: 11.12.0 - resolution: "globals@npm:11.12.0" - checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e - languageName: node - linkType: hard - "globals@npm:^13.19.0": version: 13.19.0 resolution: "globals@npm:13.19.0" @@ -4161,6 +4566,24 @@ browserlist@latest: languageName: node linkType: hard +"globals@npm:^13.20.0": + version: 13.21.0 + resolution: "globals@npm:13.21.0" + dependencies: + type-fest: ^0.20.2 + checksum: 86c92ca8a04efd864c10852cd9abb1ebe6d447dcc72936783e66eaba1087d7dba5c9c3421a48d6ca722c319378754dbcc3f3f732dbe47592d7de908edf58a773 + languageName: node + linkType: hard + +"globals@npm:^13.24.0": + version: 13.24.0 + resolution: "globals@npm:13.24.0" + dependencies: + type-fest: ^0.20.2 + checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c + languageName: node + linkType: hard + "globalthis@npm:^1.0.3": version: 1.0.3 resolution: "globalthis@npm:1.0.3" @@ -4186,10 +4609,10 @@ browserlist@latest: languageName: node linkType: hard -"grapheme-splitter@npm:^1.0.4": - version: 1.0.4 - resolution: "grapheme-splitter@npm:1.0.4" - checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620 +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673 languageName: node linkType: hard @@ -4262,17 +4685,26 @@ browserlist@latest: languageName: node linkType: hard -"highcharts@npm:11.0.1": - version: 11.0.1 - resolution: "highcharts@npm:11.0.1" - checksum: 773a7b876502d616b7c5f522610b061cc714233a6ecdd7f7d073151fdf53bc597c01a758fbda5bba9069a0ee487e7defddfbdb1de73a78db6267a9257250137c +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + +"highcharts@npm:11.4.0": + version: 11.4.0 + resolution: "highcharts@npm:11.4.0" + checksum: 873e6619148d346223f7a98e3d23c1d58975ef4143d67d57ef88898c967495519b76b47c1f546c48535362bf4542cbe4f9f3423cc4339db152454f86e7887ddf languageName: node linkType: hard -"highlight.js@npm:^11.5.0": - version: 11.5.1 - resolution: "highlight.js@npm:11.5.1" - checksum: bff556101d7691c6275ad19318e368fc971cd0621ef3d86222f5373df7d8191a2fc1ffd47f118138cbcf85e5fe91cfeefaecd6184f49a3ec18090955efc9edef +"highlight.js@npm:^11.8.0": + version: 11.9.0 + resolution: "highlight.js@npm:11.9.0" + checksum: 4043d31c5de9d27d13387d9a9e5e1939557254b7b85f0fab85d9cae0e420e131a3456ebf6148552020a1d8a216d671d583f2433d6c4de6179b8a66487a8325cb languageName: node linkType: hard @@ -4283,27 +4715,26 @@ browserlist@latest: languageName: node linkType: hard -"html-validate@npm:7.16.0": - version: 7.16.0 - resolution: "html-validate@npm:7.16.0" +"html-validate@npm:8.18.1": + version: 8.18.1 + resolution: "html-validate@npm:8.18.1" dependencies: "@babel/code-frame": ^7.10.0 - "@html-validate/stylish": ^4.0.1 - "@sidvind/better-ajv-errors": ^2.0.0 - acorn-walk: ^8.0.0 + "@html-validate/stylish": ^4.1.0 + "@sidvind/better-ajv-errors": 2.1.3 ajv: ^8.0.0 - deepmerge: ^4.2.0 - espree: ^9.0.0 + deepmerge: 4.3.1 glob: ^10.0.0 - ignore: ^5.0.0 + ignore: 5.3.1 kleur: ^4.1.0 minimist: ^1.2.0 prompts: ^2.0.0 semver: ^7.0.0 peerDependencies: - jest: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3 - jest-diff: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3 - jest-snapshot: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3 + jest: ^27.1 || ^28.1.3 || ^29.0.3 + jest-diff: ^27.1 || ^28.1.3 || ^29.0.3 + jest-snapshot: ^27.1 || ^28.1.3 || ^29.0.3 + vitest: ^0.34 || ^1 peerDependenciesMeta: jest: optional: true @@ -4311,9 +4742,11 @@ browserlist@latest: optional: true jest-snapshot: optional: true + vitest: + optional: true bin: html-validate: bin/html-validate.js - checksum: cce9a9e8f7a740c01e90a93407fc752ff0576e7f24704d83c5e7f22e9e6d4518a63ee9f93ee90199540af73fed9403955fcf136e7d3d8cd705a7d5ca435b2d7e + checksum: 53479bf75bcb6ad748a6543583de6a26bfb55d85c0ae793bd6619c0079795f482c01b4168a7dea2584219f31b8a05c3ea2a0d5ebfd639099caf623263d3ac536 languageName: node linkType: hard @@ -4432,13 +4865,27 @@ browserlist@latest: languageName: node linkType: hard -"ignore@npm:^5.0.0, ignore@npm:^5.1.1, ignore@npm:^5.2.0": +"ignore@npm:5.3.1": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 + languageName: node + linkType: hard + +"ignore@npm:^5.1.1, ignore@npm:^5.2.0": version: 5.2.0 resolution: "ignore@npm:5.2.0" checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77 languageName: node linkType: hard +"ignore@npm:^5.2.4": + version: 5.2.4 + resolution: "ignore@npm:5.2.4" + checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef + languageName: node + linkType: hard + "immutable@npm:^4.0.0": version: 4.0.0 resolution: "immutable@npm:4.0.0" @@ -4446,7 +4893,7 @@ browserlist@latest: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -4494,14 +4941,14 @@ browserlist@latest: languageName: node linkType: hard -"internal-slot@npm:^1.0.4": - version: 1.0.4 - resolution: "internal-slot@npm:1.0.4" +"internal-slot@npm:^1.0.5": + version: 1.0.5 + resolution: "internal-slot@npm:1.0.5" dependencies: - get-intrinsic: ^1.1.3 + get-intrinsic: ^1.2.0 has: ^1.0.3 side-channel: ^1.0.4 - checksum: 8974588d06bab4f675573a3b52975370facf6486df51bc0567a982c7024fa29495f10b76c0d4dc742dd951d1b72024fdc1e31bb0bedf1678dc7aacacaf5a4f73 + checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a languageName: node linkType: hard @@ -4530,6 +4977,17 @@ browserlist@latest: languageName: node linkType: hard +"is-array-buffer@npm:^3.0.2": + version: 3.0.2 + resolution: "is-array-buffer@npm:3.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + is-typed-array: ^1.1.10 + checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -4565,6 +5023,15 @@ browserlist@latest: languageName: node linkType: hard +"is-builtin-module@npm:^3.2.1": + version: 3.2.1 + resolution: "is-builtin-module@npm:3.2.1" + dependencies: + builtin-modules: ^3.3.0 + checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88 + languageName: node + linkType: hard + "is-callable@npm:^1.1.3, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -4579,30 +5046,39 @@ browserlist@latest: languageName: node linkType: hard -"is-core-module@npm:^2.11.0": - version: 2.11.0 - resolution: "is-core-module@npm:2.11.0" +"is-core-module@npm:^2.12.0, is-core-module@npm:^2.12.1": + version: 2.12.1 + resolution: "is-core-module@npm:2.12.1" dependencies: has: ^1.0.3 - checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab + checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468 languageName: node linkType: hard -"is-core-module@npm:^2.3.0, is-core-module@npm:^2.8.1": - version: 2.9.0 - resolution: "is-core-module@npm:2.9.0" +"is-core-module@npm:^2.13.0": + version: 2.13.0 + resolution: "is-core-module@npm:2.13.0" dependencies: has: ^1.0.3 - checksum: b27034318b4b462f1c8f1dfb1b32baecd651d891a4e2d1922135daeff4141dfced2b82b07aef83ef54275c4a3526aa38da859223664d0868ca24182badb784ce + checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355 + languageName: node + linkType: hard + +"is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c languageName: node linkType: hard -"is-core-module@npm:^2.9.0": - version: 2.10.0 - resolution: "is-core-module@npm:2.10.0" +"is-core-module@npm:^2.3.0, is-core-module@npm:^2.8.1": + version: 2.9.0 + resolution: "is-core-module@npm:2.9.0" dependencies: has: ^1.0.3 - checksum: 0f3f77811f430af3256fa7bbc806f9639534b140f8ee69476f632c3e1eb4e28a38be0b9d1b8ecf596179c841b53576129279df95e7051d694dac4ceb6f967593 + checksum: b27034318b4b462f1c8f1dfb1b32baecd651d891a4e2d1922135daeff4141dfced2b82b07aef83ef54275c4a3526aa38da859223664d0868ca24182badb784ce languageName: node linkType: hard @@ -4749,6 +5225,15 @@ browserlist@latest: languageName: node linkType: hard +"is-typed-array@npm:^1.1.12": + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" + dependencies: + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 + languageName: node + linkType: hard + "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -4758,6 +5243,13 @@ browserlist@latest: languageName: node linkType: hard +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + "isbinaryfile@npm:^4.0.2": version: 4.0.10 resolution: "isbinaryfile@npm:4.0.10" @@ -4790,13 +5282,24 @@ browserlist@latest: languageName: node linkType: hard -"istanbul-reports@npm:^3.1.4": - version: 3.1.4 - resolution: "istanbul-reports@npm:3.1.4" +"istanbul-lib-report@npm:^3.0.1": + version: 3.0.1 + resolution: "istanbul-lib-report@npm:3.0.1" + dependencies: + istanbul-lib-coverage: ^3.0.0 + make-dir: ^4.0.0 + supports-color: ^7.1.0 + checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21 + languageName: node + linkType: hard + +"istanbul-reports@npm:^3.1.6": + version: 3.1.6 + resolution: "istanbul-reports@npm:3.1.6" dependencies: html-escaper: ^2.0.0 istanbul-lib-report: ^3.0.0 - checksum: 2132983355710c522f6b26808015cab9a0ee8b9f5ae0db0d3edeff40b886dd83cb670fb123cb7b32dbe59473d7c00cdde2ba6136bc0acdb20a865fccea64dfe1 + checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6 languageName: node linkType: hard @@ -4813,37 +5316,6 @@ browserlist@latest: languageName: node linkType: hard -"jest-diff@npm:^27.5.1": - version: 27.5.1 - resolution: "jest-diff@npm:27.5.1" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^27.5.1 - jest-get-type: ^27.5.1 - pretty-format: ^27.5.1 - checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865 - languageName: node - linkType: hard - -"jest-get-type@npm:^27.5.1": - version: 27.5.1 - resolution: "jest-get-type@npm:27.5.1" - checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0 - languageName: node - linkType: hard - -"jest-matcher-utils@npm:^27.0.0": - version: 27.5.1 - resolution: "jest-matcher-utils@npm:27.5.1" - dependencies: - chalk: ^4.0.0 - jest-diff: ^27.5.1 - jest-get-type: ^27.5.1 - pretty-format: ^27.5.1 - checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a - languageName: node - linkType: hard - "jquery-migrate@npm:3.4.1": version: 3.4.1 resolution: "jquery-migrate@npm:3.4.1" @@ -4853,10 +5325,10 @@ browserlist@latest: languageName: node linkType: hard -"jquery@npm:3.6.4": - version: 3.6.4 - resolution: "jquery@npm:3.6.4" - checksum: 8354f7bd0a0424aa714ee1b6b1ef74b410f834eb5c8501682289b358bc151f11677f11188b544f3bb49309d6ec4d15d1a5de175661250c206b06185a252f706f +"jquery@npm:3.7.1": + version: 3.7.1 + resolution: "jquery@npm:3.7.1" + checksum: 4370b8139d6ae82867eb6f7f21d1edccf1d1bdf41c0840920ea80d366c2cd5dbe1ceebb110ee9772aa839b04400faa1572c5c560b507c688ed7b61cea26c0e27 languageName: node linkType: hard @@ -4867,13 +5339,6 @@ browserlist@latest: languageName: node linkType: hard -"js-sdsl@npm:^4.1.4": - version: 4.1.5 - resolution: "js-sdsl@npm:4.1.5" - checksum: 695f657ddc5be462b97cac4e8e60f37de28d628ee0e23016baecff0bb584a18dddb5caeac537a775030f180b5afd62133ac4481e7024c8d03a62d73e4da0713e - languageName: node - linkType: hard - "js-stringify@npm:^1.0.2": version: 1.0.2 resolution: "js-stringify@npm:1.0.2" @@ -4927,7 +5392,7 @@ browserlist@latest: languageName: node linkType: hard -"json5@npm:^1.0.1": +"json5@npm:^1.0.2": version: 1.0.2 resolution: "json5@npm:1.0.2" dependencies: @@ -5120,6 +5585,41 @@ browserlist@latest: languageName: node linkType: hard +"lmdb@npm:2.8.5": + version: 2.8.5 + resolution: "lmdb@npm:2.8.5" + dependencies: + "@lmdb/lmdb-darwin-arm64": 2.8.5 + "@lmdb/lmdb-darwin-x64": 2.8.5 + "@lmdb/lmdb-linux-arm": 2.8.5 + "@lmdb/lmdb-linux-arm64": 2.8.5 + "@lmdb/lmdb-linux-x64": 2.8.5 + "@lmdb/lmdb-win32-x64": 2.8.5 + msgpackr: ^1.9.5 + node-addon-api: ^6.1.0 + node-gyp: latest + node-gyp-build-optional-packages: 5.1.1 + ordered-binary: ^1.4.1 + weak-lru-cache: ^1.2.2 + dependenciesMeta: + "@lmdb/lmdb-darwin-arm64": + optional: true + "@lmdb/lmdb-darwin-x64": + optional: true + "@lmdb/lmdb-linux-arm": + optional: true + "@lmdb/lmdb-linux-arm64": + optional: true + "@lmdb/lmdb-linux-x64": + optional: true + "@lmdb/lmdb-win32-x64": + optional: true + bin: + download-lmdb-prebuilds: bin/download-prebuilds.js + checksum: b1ec76650d3b19d4c966cd7a4ee2324270c7d20f46b569d23bc287c7c7e7da667d3d330aa78be1aa2717af63b3531cd1d53a5ee4faf1c293c038513e4f3aa832 + languageName: node + linkType: hard + "locate-path@npm:^6.0.0": version: 6.0.0 resolution: "locate-path@npm:6.0.0" @@ -5173,19 +5673,19 @@ browserlist@latest: languageName: node linkType: hard -"luxon@npm:3.3.0": - version: 3.3.0 - resolution: "luxon@npm:3.3.0" - checksum: 50cf17a0dc155c3dcacbeae8c0b7e80db425e0ba97b9cbdf12a7fc142d841ff1ab1560919f033af46240ed44e2f70c49f76e3422524c7fc8bb8d81ca47c66187 +"luxon@npm:3.4.4": + version: 3.4.4 + resolution: "luxon@npm:3.4.4" + checksum: 36c1f99c4796ee4bfddf7dc94fa87815add43ebc44c8934c924946260a58512f0fd2743a629302885df7f35ccbd2d13f178c15df046d0e3b6eb71db178f1c60c languageName: node linkType: hard -"magic-string@npm:^0.25.7": - version: 0.25.9 - resolution: "magic-string@npm:0.25.9" +"magic-string@npm:^0.30.7": + version: 0.30.7 + resolution: "magic-string@npm:0.30.7" dependencies: - sourcemap-codec: ^1.4.8 - checksum: 9a0e55a15c7303fc360f9572a71cffba1f61451bc92c5602b1206c9d17f492403bf96f946dfce7483e66822d6b74607262e24392e87b0ac27b786e69a40e9b1a + "@jridgewell/sourcemap-codec": ^1.4.15 + checksum: bdf102e36a44d1728ec61b69d655caba3f66ca58898e292f6debe57dc30896bd37908bfe3464a7464a435831a9e44aa905cebd681e21c2f44bbe4dddf225619f languageName: node linkType: hard @@ -5198,6 +5698,15 @@ browserlist@latest: languageName: node linkType: hard +"make-dir@npm:^4.0.0": + version: 4.0.0 + resolution: "make-dir@npm:4.0.0" + dependencies: + semver: ^7.5.3 + checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a + languageName: node + linkType: hard + "make-fetch-happen@npm:^10.0.3": version: 10.1.5 resolution: "make-fetch-happen@npm:10.1.5" @@ -5367,16 +5876,23 @@ browserlist@latest: languageName: node linkType: hard -"moment-timezone@npm:0.5.43": - version: 0.5.43 - resolution: "moment-timezone@npm:0.5.43" +"moment-timezone@npm:0.5.45": + version: 0.5.45 + resolution: "moment-timezone@npm:0.5.45" dependencies: moment: ^2.29.4 - checksum: 8075c897ed8a044f992ef26fe8cdbcad80caf974251db424cae157473cca03be2830de8c74d99341b76edae59f148c9d9d19c1c1d9363259085688ec1cf508d0 + checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0 + languageName: node + linkType: hard + +"moment@npm:2.30.1": + version: 2.30.1 + resolution: "moment@npm:2.30.1" + checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6 languageName: node linkType: hard -"moment@npm:2.29.4, moment@npm:^2.29.4": +"moment@npm:^2.29.4": version: 2.29.4 resolution: "moment@npm:2.29.4" checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e @@ -5415,7 +5931,36 @@ browserlist@latest: "@msgpackr-extract/msgpackr-extract-linux-x64": 2.0.2 "@msgpackr-extract/msgpackr-extract-win32-x64": 2.0.2 node-gyp: latest - node-gyp-build-optional-packages: 5.0.2 + node-gyp-build-optional-packages: 5.0.2 + dependenciesMeta: + "@msgpackr-extract/msgpackr-extract-darwin-arm64": + optional: true + "@msgpackr-extract/msgpackr-extract-darwin-x64": + optional: true + "@msgpackr-extract/msgpackr-extract-linux-arm": + optional: true + "@msgpackr-extract/msgpackr-extract-linux-arm64": + optional: true + "@msgpackr-extract/msgpackr-extract-linux-x64": + optional: true + "@msgpackr-extract/msgpackr-extract-win32-x64": + optional: true + checksum: 6b24c0e89eae881012484787082a50290f78d2dc69df28c28838c65f9cda3f585272c73b9ebbf386f9958c16a9956f0cabddf2ccfc1229ee612a6b88e9519c68 + languageName: node + linkType: hard + +"msgpackr-extract@npm:^3.0.2": + version: 3.0.2 + resolution: "msgpackr-extract@npm:3.0.2" + dependencies: + "@msgpackr-extract/msgpackr-extract-darwin-arm64": 3.0.2 + "@msgpackr-extract/msgpackr-extract-darwin-x64": 3.0.2 + "@msgpackr-extract/msgpackr-extract-linux-arm": 3.0.2 + "@msgpackr-extract/msgpackr-extract-linux-arm64": 3.0.2 + "@msgpackr-extract/msgpackr-extract-linux-x64": 3.0.2 + "@msgpackr-extract/msgpackr-extract-win32-x64": 3.0.2 + node-gyp: latest + node-gyp-build-optional-packages: 5.0.7 dependenciesMeta: "@msgpackr-extract/msgpackr-extract-darwin-arm64": optional: true @@ -5429,7 +5974,9 @@ browserlist@latest: optional: true "@msgpackr-extract/msgpackr-extract-win32-x64": optional: true - checksum: 6b24c0e89eae881012484787082a50290f78d2dc69df28c28838c65f9cda3f585272c73b9ebbf386f9958c16a9956f0cabddf2ccfc1229ee612a6b88e9519c68 + bin: + download-msgpackr-prebuilds: bin/download-prebuilds.js + checksum: 5adb809b965bac41c310e60373d54c955fe78e4d134ab036d0f9ee5b322cec0a739878d395e17c1ac82d840705896b2dafae6a8cc04ad34c14d2de4b06b58330 languageName: node linkType: hard @@ -5445,6 +5992,37 @@ browserlist@latest: languageName: node linkType: hard +"msgpackr@npm:^1.9.5": + version: 1.9.9 + resolution: "msgpackr@npm:1.9.9" + dependencies: + msgpackr-extract: ^3.0.2 + dependenciesMeta: + msgpackr-extract: + optional: true + checksum: b63182d99f479d79f0d082fd2688ce7cf699b1aee71e20f28591c30b48743bb57868fdd72656759a892891072d186d864702c756434520709e8fe7e0d350a119 + languageName: node + linkType: hard + +"msgpackr@npm:^1.9.9": + version: 1.10.1 + resolution: "msgpackr@npm:1.10.1" + dependencies: + msgpackr-extract: ^3.0.2 + dependenciesMeta: + msgpackr-extract: + optional: true + checksum: e422d18b01051598b23701eebeb4b9e2c686b9c7826b20f564724837ba2b5cd4af74c91a549eaeaf8186645cc95e8196274a4a19442aa3286ac611b98069c194 + languageName: node + linkType: hard + +"muggle-string@npm:^0.4.0": + version: 0.4.1 + resolution: "muggle-string@npm:0.4.1" + checksum: 85fe1766d18d43cf22b6da7d047203a65b2e2b1ccfac505b699c2a459644f95ebb3c854a96db5be559eea0e213f6ee32b986b8c2f73c48e6c89e1fd829616532 + languageName: node + linkType: hard + "murmurhash-js@npm:1.0.0": version: 1.0.0 resolution: "murmurhash-js@npm:1.0.0" @@ -5452,49 +6030,41 @@ browserlist@latest: languageName: node linkType: hard -"naive-ui@npm:2.34.3": - version: 2.34.3 - resolution: "naive-ui@npm:2.34.3" +"naive-ui@npm:2.38.1": + version: 2.38.1 + resolution: "naive-ui@npm:2.38.1" dependencies: - "@css-render/plugin-bem": ^0.15.10 - "@css-render/vue3-ssr": ^0.15.10 - "@types/katex": ^0.14.0 - "@types/lodash": ^4.14.181 - "@types/lodash-es": ^4.17.6 - async-validator: ^4.0.7 - css-render: ^0.15.10 - date-fns: ^2.28.0 - date-fns-tz: ^1.3.3 + "@css-render/plugin-bem": ^0.15.12 + "@css-render/vue3-ssr": ^0.15.12 + "@types/katex": ^0.16.2 + "@types/lodash": ^4.14.198 + "@types/lodash-es": ^4.17.9 + async-validator: ^4.2.5 + css-render: ^0.15.12 + csstype: ^3.1.3 + date-fns: ^2.30.0 + date-fns-tz: ^2.0.0 evtd: ^0.2.4 - highlight.js: ^11.5.0 + highlight.js: ^11.8.0 lodash: ^4.17.21 lodash-es: ^4.17.21 - seemly: ^0.3.6 + seemly: ^0.3.8 treemate: ^0.3.11 vdirs: ^0.1.8 vooks: ^0.2.12 - vueuc: ^0.4.47 + vueuc: ^0.4.58 peerDependencies: vue: ^3.0.0 - checksum: 792d9e6c51c5f577b787dedf90d60ea02bbb9c962bf58aac140aab18dcde8f1717d49a417a77a54e2959a3a743442d55b32152a3134ce8b7d29880ec2ae7cb55 + checksum: 88a8f981dec2ebcdfe0f06d9123d46069e22f881e3286441d6396ea80ee56079d7f93e731321d2320156196e442df77a9ae45f8599b98b144af458d12b29d88c languageName: node linkType: hard -"nanoid@npm:^3.3.1": - version: 3.3.3 - resolution: "nanoid@npm:3.3.3" +"nanoid@npm:^3.3.7": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" bin: nanoid: bin/nanoid.cjs - checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0 - languageName: node - linkType: hard - -"nanoid@npm:^3.3.6": - version: 3.3.6 - resolution: "nanoid@npm:3.3.6" - bin: - nanoid: bin/nanoid.cjs - checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3 + checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 languageName: node linkType: hard @@ -5530,6 +6100,15 @@ browserlist@latest: languageName: node linkType: hard +"node-addon-api@npm:^6.1.0": + version: 6.1.0 + resolution: "node-addon-api@npm:6.1.0" + dependencies: + node-gyp: latest + checksum: 3a539510e677cfa3a833aca5397300e36141aca064cdc487554f2017110709a03a95da937e98c2a14ec3c626af7b2d1b6dabe629a481f9883143d0d5bff07bf2 + languageName: node + linkType: hard + "node-gyp-build-optional-packages@npm:5.0.2": version: 5.0.2 resolution: "node-gyp-build-optional-packages@npm:5.0.2" @@ -5552,6 +6131,30 @@ browserlist@latest: languageName: node linkType: hard +"node-gyp-build-optional-packages@npm:5.0.7": + version: 5.0.7 + resolution: "node-gyp-build-optional-packages@npm:5.0.7" + bin: + node-gyp-build-optional-packages: bin.js + node-gyp-build-optional-packages-optional: optional.js + node-gyp-build-optional-packages-test: build-test.js + checksum: bcb4537af15bcb3811914ea0db8f69284ca10db1cc7543a167a4c41ae4b9b5044b133f789fdadad0b7adc6931f6ae7def3c75b0bc7b05836881aae52400163e6 + languageName: node + linkType: hard + +"node-gyp-build-optional-packages@npm:5.1.1": + version: 5.1.1 + resolution: "node-gyp-build-optional-packages@npm:5.1.1" + dependencies: + detect-libc: ^2.0.1 + bin: + node-gyp-build-optional-packages: bin.js + node-gyp-build-optional-packages-optional: optional.js + node-gyp-build-optional-packages-test: build-test.js + checksum: f3cb197862516e6879377adaa58142ae9013ab69c86cf2645f8b008db339354145d8ebd9140a13ec7ece5ce28a372ca7e14660379d3a3dd7b908a6f2743606e9 + languageName: node + linkType: hard + "node-gyp-build@npm:^4.3.0": version: 4.4.0 resolution: "node-gyp-build@npm:4.4.0" @@ -5620,7 +6223,7 @@ browserlist@latest: languageName: node linkType: hard -"nth-check@npm:^2.0.1": +"nth-check@npm:^2.0.1, nth-check@npm:^2.1.1": version: 2.1.1 resolution: "nth-check@npm:2.1.1" dependencies: @@ -5643,10 +6246,10 @@ browserlist@latest: languageName: node linkType: hard -"object-inspect@npm:^1.12.2": - version: 1.12.3 - resolution: "object-inspect@npm:1.12.3" - checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db +"object-inspect@npm:^1.13.1": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f languageName: node linkType: hard @@ -5676,14 +6279,37 @@ browserlist@latest: languageName: node linkType: hard -"object.values@npm:^1.1.6": - version: 1.1.6 - resolution: "object.values@npm:1.1.6" +"object.fromentries@npm:^2.0.7": + version: 2.0.7 + resolution: "object.fromentries@npm:2.0.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: f6fff9fd817c24cfd8107f50fb33061d81cd11bacc4e3dbb3852e9ff7692fde4dbce823d4333ea27cd9637ef1b6690df5fbb61f1ed314fa2959598dc3ae23d8e + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065 + languageName: node + linkType: hard + +"object.groupby@npm:^1.0.1": + version: 1.0.1 + resolution: "object.groupby@npm:1.0.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5 + languageName: node + linkType: hard + +"object.values@npm:^1.1.7": + version: 1.1.7 + resolution: "object.values@npm:1.1.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777 languageName: node linkType: hard @@ -5705,17 +6331,17 @@ browserlist@latest: languageName: node linkType: hard -"optionator@npm:^0.9.1": - version: 0.9.1 - resolution: "optionator@npm:0.9.1" +"optionator@npm:^0.9.3": + version: 0.9.3 + resolution: "optionator@npm:0.9.3" dependencies: + "@aashutoshrathi/word-wrap": ^1.2.3 deep-is: ^0.1.3 fast-levenshtein: ^2.0.6 levn: ^0.4.1 prelude-ls: ^1.2.1 type-check: ^0.4.0 - word-wrap: ^1.2.3 - checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0 + checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a languageName: node linkType: hard @@ -5726,6 +6352,13 @@ browserlist@latest: languageName: node linkType: hard +"ordered-binary@npm:^1.4.1": + version: 1.4.1 + resolution: "ordered-binary@npm:1.4.1" + checksum: 274940b4ef983562e11371c84415c265432a4e1337ab85f8e7669eeab6afee8f655c6c12ecee1cd121aaf399c32f5c781b0d50e460bd42da004eba16dcc66574 + languageName: node + linkType: hard + "p-limit@npm:^3.0.2": version: 3.1.0 resolution: "p-limit@npm:3.1.0" @@ -5753,27 +6386,27 @@ browserlist@latest: languageName: node linkType: hard -"parcel@npm:2.8.3": - version: 2.8.3 - resolution: "parcel@npm:2.8.3" +"parcel@npm:2.12.0": + version: 2.12.0 + resolution: "parcel@npm:2.12.0" dependencies: - "@parcel/config-default": 2.8.3 - "@parcel/core": 2.8.3 - "@parcel/diagnostic": 2.8.3 - "@parcel/events": 2.8.3 - "@parcel/fs": 2.8.3 - "@parcel/logger": 2.8.3 - "@parcel/package-manager": 2.8.3 - "@parcel/reporter-cli": 2.8.3 - "@parcel/reporter-dev-server": 2.8.3 - "@parcel/utils": 2.8.3 + "@parcel/config-default": 2.12.0 + "@parcel/core": 2.12.0 + "@parcel/diagnostic": 2.12.0 + "@parcel/events": 2.12.0 + "@parcel/fs": 2.12.0 + "@parcel/logger": 2.12.0 + "@parcel/package-manager": 2.12.0 + "@parcel/reporter-cli": 2.12.0 + "@parcel/reporter-dev-server": 2.12.0 + "@parcel/reporter-tracer": 2.12.0 + "@parcel/utils": 2.12.0 chalk: ^4.1.0 commander: ^7.0.0 get-port: ^4.2.0 - v8-compile-cache: ^2.0.0 bin: parcel: lib/bin.js - checksum: 09cd2dc23c2ec0417e9de93face185a08679d744c6cbb627fce6ffb507f8af1f8d0642f063e0cf771b699419a29db8ee7ca60cdb32966a65dd3b03da35473bfa + checksum: d8e6cb690a26999e4b9be0f433d5b72060fdfbb22a9aae26b4705f7eaf3983906ba719e41a5ed102ca617135823931a6559d08a11fb48cdfea7ac333e9aebaef languageName: node linkType: hard @@ -5873,32 +6506,32 @@ browserlist@latest: languageName: node linkType: hard -"pinia@npm:2.0.35": - version: 2.0.35 - resolution: "pinia@npm:2.0.35" +"pinia@npm:2.1.7": + version: 2.1.7 + resolution: "pinia@npm:2.1.7" dependencies: "@vue/devtools-api": ^6.5.0 - vue-demi: "*" + vue-demi: ">=0.14.5" peerDependencies: "@vue/composition-api": ^1.4.0 typescript: ">=4.4.4" - vue: ^2.6.14 || ^3.2.0 + vue: ^2.6.14 || ^3.3.0 peerDependenciesMeta: "@vue/composition-api": optional: true typescript: optional: true - checksum: cecb1e1e97ed77f69166dc3815dfd05f712ac725763eb74059f5e4804b5902976c278a3d14ab5227892459e8d0b6d9645104e1d049e733228b696be98de450f0 + checksum: 1b7882aab2828ad209d3e76e06918c8811d04699c9308d372094cde6df485d7e7785f25a3bb5c6a3724aeaee3fb0082fae03c41a6657acd3486c7965a0a09d34 languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.9": - version: 6.0.10 - resolution: "postcss-selector-parser@npm:6.0.10" +"postcss-selector-parser@npm:^6.0.15": + version: 6.0.15 + resolution: "postcss-selector-parser@npm:6.0.15" dependencies: cssesc: ^3.0.0 util-deprecate: ^1.0.2 - checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608 + checksum: 57decb94152111004f15e27b9c61131eb50ee10a3288e7fcf424cebbb4aba82c2817517ae718f8b5d704ee9e02a638d4a2acff8f47685c295a33ecee4fd31055 languageName: node linkType: hard @@ -5909,25 +6542,25 @@ browserlist@latest: languageName: node linkType: hard -"postcss@npm:^8.1.10": - version: 8.4.12 - resolution: "postcss@npm:8.4.12" +"postcss@npm:^8.4.27": + version: 8.4.33 + resolution: "postcss@npm:8.4.33" dependencies: - nanoid: ^3.3.1 + nanoid: ^3.3.7 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 248e3d0f9bbb8efaafcfda7f91627a29bdc9a19f456896886330beb28c5abea0e14c7901b35191928602e2eccbed496b1e94097d27a0b2a980854cd00c7a835f + checksum: 6f98b2af4b76632a3de20c4f47bf0e984a1ce1a531cf11adcb0b1d63a6cbda0aae4165e578b66c32ca4879038e3eaad386a6be725a8fb4429c78e3c1ab858fe9 languageName: node linkType: hard -"postcss@npm:^8.4.23": - version: 8.4.23 - resolution: "postcss@npm:8.4.23" +"postcss@npm:^8.4.35": + version: 8.4.35 + resolution: "postcss@npm:8.4.35" dependencies: - nanoid: ^3.3.6 + nanoid: ^3.3.7 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 8bb9d1b2ea6e694f8987d4f18c94617971b2b8d141602725fedcc2222fdc413b776a6e1b969a25d627d7b2681ca5aabb56f59e727ef94072e1b6ac8412105a2f + checksum: cf3c3124d3912a507603f6d9a49b3783f741075e9aa73eb592a6dd9194f9edab9d20a8875d16d137d4f779fe7b6fbd1f5727e39bfd1c3003724980ee4995e1da languageName: node linkType: hard @@ -5982,17 +6615,6 @@ browserlist@latest: languageName: node linkType: hard -"pretty-format@npm:^27.0.0, pretty-format@npm:^27.5.1": - version: 27.5.1 - resolution: "pretty-format@npm:27.5.1" - dependencies: - ansi-regex: ^5.0.1 - ansi-styles: ^5.0.0 - react-is: ^17.0.1 - checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088 - languageName: node - linkType: hard - "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -6184,13 +6806,6 @@ browserlist@latest: languageName: node linkType: hard -"react-is@npm:^17.0.1": - version: 17.0.2 - resolution: "react-is@npm:17.0.2" - checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8 - languageName: node - linkType: hard - "react-refresh@npm:^0.9.0": version: 0.9.0 resolution: "react-refresh@npm:0.9.0" @@ -6225,14 +6840,21 @@ browserlist@latest: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.3": - version: 1.4.3 - resolution: "regexp.prototype.flags@npm:1.4.3" +"regenerator-runtime@npm:^0.14.0": + version: 0.14.0 + resolution: "regenerator-runtime@npm:0.14.0" + checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 + languageName: node + linkType: hard + +"regexp.prototype.flags@npm:^1.5.1": + version: 1.5.1 + resolution: "regexp.prototype.flags@npm:1.5.1" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - functions-have-names: ^1.2.2 - checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6 + define-properties: ^1.2.0 + set-function-name: ^2.0.0 + checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47 languageName: node linkType: hard @@ -6264,6 +6886,13 @@ browserlist@latest: languageName: node linkType: hard +"resolve-pkg-maps@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-pkg-maps@npm:1.0.0" + checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977 + languageName: node + linkType: hard + "resolve@npm:^1.10.1, resolve@npm:^1.15.1": version: 1.22.0 resolution: "resolve@npm:1.22.0" @@ -6277,16 +6906,29 @@ browserlist@latest: languageName: node linkType: hard -"resolve@npm:^1.22.1": - version: 1.22.1 - resolution: "resolve@npm:1.22.1" +"resolve@npm:^1.22.2": + version: 1.22.3 + resolution: "resolve@npm:1.22.3" + dependencies: + is-core-module: ^2.12.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: fb834b81348428cb545ff1b828a72ea28feb5a97c026a1cf40aa1008352c72811ff4d4e71f2035273dc536dcfcae20c13604ba6283c612d70fa0b6e44519c374 + languageName: node + linkType: hard + +"resolve@npm:^1.22.4": + version: 1.22.8 + resolution: "resolve@npm:1.22.8" dependencies: - is-core-module: ^2.9.0 + is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e + checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c languageName: node linkType: hard @@ -6303,16 +6945,29 @@ browserlist@latest: languageName: node linkType: hard -"resolve@patch:resolve@^1.22.1#~builtin": - version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" +"resolve@patch:resolve@^1.22.2#~builtin": + version: 1.22.3 + resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=07638b" + dependencies: + is-core-module: ^2.12.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: ad59734723b596d0891321c951592ed9015a77ce84907f89c9d9307dd0c06e11a67906a3e628c4cae143d3e44898603478af0ddeb2bba3f229a9373efe342665 + languageName: node + linkType: hard + +"resolve@patch:resolve@^1.22.4#~builtin": + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b" dependencies: - is-core-module: ^2.9.0 + is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b + checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847 languageName: node linkType: hard @@ -6348,9 +7003,9 @@ browserlist@latest: languageName: node linkType: hard -"rollup@npm:^3.21.0": - version: 3.21.6 - resolution: "rollup@npm:3.21.6" +"rollup@npm:^3.27.1": + version: 3.29.4 + resolution: "rollup@npm:3.29.4" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -6358,7 +7013,7 @@ browserlist@latest: optional: true bin: rollup: dist/bin/rollup - checksum: bb6786ee0d755f253d3aa3820b05806a482abe9c9fd6dad14df83b386a370d48af20c4be66f732a15b5e89c0ae6269a7b82736b64f34ae61552c58de0eecedeb + checksum: 8bb20a39c8d91130825159c3823eccf4dc2295c9a0a5c4ed851a5bf2167dbf24d9a29f23461a54c955e5506395e6cc188eafc8ab0e20399d7489fb33793b184e languageName: node linkType: hard @@ -6366,70 +7021,70 @@ browserlist@latest: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@faker-js/faker": 7.6.0 - "@fullcalendar/bootstrap5": 6.1.6 - "@fullcalendar/core": 6.1.6 - "@fullcalendar/daygrid": 6.1.6 - "@fullcalendar/icalendar": 6.1.6 - "@fullcalendar/interaction": 6.1.6 - "@fullcalendar/list": 6.1.6 - "@fullcalendar/luxon2": 6.1.6 - "@fullcalendar/timegrid": 6.1.6 - "@fullcalendar/vue3": 6.1.6 - "@parcel/optimizer-data-url": 2.8.3 - "@parcel/transformer-inline-string": 2.8.3 - "@parcel/transformer-sass": 2.8.3 - "@popperjs/core": 2.11.7 - "@rollup/pluginutils": 5.0.2 + "@fullcalendar/bootstrap5": 6.1.11 + "@fullcalendar/core": 6.1.11 + "@fullcalendar/daygrid": 6.1.11 + "@fullcalendar/icalendar": 6.1.11 + "@fullcalendar/interaction": 6.1.11 + "@fullcalendar/list": 6.1.11 + "@fullcalendar/luxon3": 6.1.11 + "@fullcalendar/timegrid": 6.1.11 + "@fullcalendar/vue3": 6.1.11 + "@parcel/optimizer-data-url": 2.12.0 + "@parcel/transformer-inline-string": 2.12.0 + "@parcel/transformer-sass": 2.12.0 + "@popperjs/core": 2.11.8 + "@rollup/pluginutils": 5.1.0 "@twuni/emojify": 1.0.2 - "@vitejs/plugin-vue": 4.2.1 - bootstrap: 5.2.3 - bootstrap-icons: 1.10.5 - browser-fs-access: 0.33.1 + "@vitejs/plugin-vue": 4.6.2 + "@vue/language-plugin-pug": 2.0.7 + bootstrap: 5.3.3 + bootstrap-icons: 1.11.3 + browser-fs-access: 0.35.0 browserlist: latest - c8: 7.13.0 - caniuse-lite: 1.0.30001481 - d3: 7.8.4 - eslint: 8.39.0 - eslint-config-standard: 17.0.0 - eslint-plugin-cypress: 2.13.3 - eslint-plugin-import: 2.27.5 - eslint-plugin-n: 15.7.0 + c8: 9.1.0 + caniuse-lite: 1.0.30001603 + d3: 7.9.0 + eslint: 8.57.0 + eslint-config-standard: 17.1.0 + eslint-plugin-cypress: 2.15.1 + eslint-plugin-import: 2.29.1 + eslint-plugin-n: 16.6.2 eslint-plugin-node: 11.1.0 eslint-plugin-promise: 6.1.1 - eslint-plugin-vue: 9.11.0 + eslint-plugin-vue: 9.24.0 file-saver: 2.0.5 - highcharts: 11.0.1 - html-validate: 7.16.0 + highcharts: 11.4.0 + html-validate: 8.18.1 ical.js: 1.5.0 - jquery: 3.6.4 + jquery: 3.7.1 jquery-migrate: 3.4.1 js-cookie: 3.0.5 list.js: 2.3.1 lodash: 4.17.21 lodash-es: 4.17.21 - luxon: 3.3.0 - moment: 2.29.4 - moment-timezone: 0.5.43 + luxon: 3.4.4 + moment: 2.30.1 + moment-timezone: 0.5.45 ms: 2.1.3 murmurhash-js: 1.0.0 - naive-ui: 2.34.3 - parcel: 2.8.3 - pinia: 2.0.35 + naive-ui: 2.38.1 + parcel: 2.12.0 + pinia: 2.1.7 pinia-plugin-persist: 1.0.0 pug: 3.0.2 - sass: 1.62.1 + sass: 1.72.0 seedrandom: 3.0.5 select2: 4.1.0-rc.0 select2-bootstrap-5-theme: 1.3.0 send: 0.18.0 - shepherd.js: 11.1.1 + shepherd.js: 11.2.0 slugify: 1.6.6 - sortablejs: 1.15.0 - vanillajs-datepicker: 1.3.1 - vite: 4.3.4 - vue: 3.2.47 - vue-router: 4.1.6 + sortablejs: 1.15.2 + vanillajs-datepicker: 1.3.4 + vite: 4.5.3 + vue: 3.4.21 + vue-router: 4.3.0 zxcvbn: 4.4.2 languageName: unknown linkType: soft @@ -6450,6 +7105,18 @@ browserlist@latest: languageName: node linkType: hard +"safe-array-concat@npm:^1.0.1": + version: 1.0.1 + resolution: "safe-array-concat@npm:1.0.1" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581 + languageName: node + linkType: hard + "safe-buffer@npm:^5.0.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -6482,16 +7149,16 @@ browserlist@latest: languageName: node linkType: hard -"sass@npm:1.62.1": - version: 1.62.1 - resolution: "sass@npm:1.62.1" +"sass@npm:1.72.0": + version: 1.72.0 + resolution: "sass@npm:1.72.0" dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 source-map-js: ">=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 1b1b3584b38a63dd94156b65f13b90e3f84b170a38c3d5e3fa578b7a32a37aeb349b4926b0eaf9448d48e955e86b1ee01b13993f19611dad8068af07a607c13b + checksum: f420079c7d51660b7256ee52463c1499ede36f7fd5c8ef50c687451777ad641509001454dea45244073cedd7c00e7a3bc1c362e55206ac6686171b994edb41e4 languageName: node linkType: hard @@ -6515,15 +7182,6 @@ browserlist@latest: languageName: node linkType: hard -"seemly@npm:^0.3.1": - version: 0.3.3 - resolution: "seemly@npm:0.3.3" - dependencies: - "@types/jest": ^27.0.1 - checksum: b6445553f8e7b19310a5ea0240c80981aa669a6826e1ddbd62449cb1119236913607f6874759247bb6de8e22f3db966b5a498b5e8ac7682e42035951125fbea4 - languageName: node - linkType: hard - "seemly@npm:^0.3.6": version: 0.3.6 resolution: "seemly@npm:0.3.6" @@ -6531,6 +7189,13 @@ browserlist@latest: languageName: node linkType: hard +"seemly@npm:^0.3.8": + version: 0.3.8 + resolution: "seemly@npm:0.3.8" + checksum: 98171fd4d9e3a03f49f695885499883c85cc00b8d88bc4a12576d5069b46ebe269d2dfc58a7e6cec8887bf2b2511d074376eb837c14b476918f9a8706ed5977a + languageName: node + linkType: hard + "select2-bootstrap-5-theme@npm:1.3.0": version: 1.3.0 resolution: "select2-bootstrap-5-theme@npm:1.3.0" @@ -6547,7 +7212,7 @@ browserlist@latest: languageName: node linkType: hard -"semver@npm:^5.7.0, semver@npm:^5.7.1": +"semver@npm:^5.7.1": version: 5.7.1 resolution: "semver@npm:5.7.1" bin: @@ -6565,6 +7230,15 @@ browserlist@latest: languageName: node linkType: hard +"semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" + bin: + semver: bin/semver.js + checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2 + languageName: node + linkType: hard + "semver@npm:^7.0.0, semver@npm:^7.3.5, semver@npm:^7.3.6": version: 7.3.7 resolution: "semver@npm:7.3.7" @@ -6576,14 +7250,36 @@ browserlist@latest: languageName: node linkType: hard -"semver@npm:^7.3.8": - version: 7.3.8 - resolution: "semver@npm:7.3.8" +"semver@npm:^7.5.2": + version: 7.5.4 + resolution: "semver@npm:7.5.4" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 + languageName: node + linkType: hard + +"semver@npm:^7.5.3": + version: 7.5.3 + resolution: "semver@npm:7.5.3" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 + checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7 + languageName: node + linkType: hard + +"semver@npm:^7.6.0": + version: 7.6.0 + resolution: "semver@npm:7.6.0" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c languageName: node linkType: hard @@ -6615,6 +7311,29 @@ browserlist@latest: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.1.1 + resolution: "set-function-length@npm:1.1.1" + dependencies: + define-data-property: ^1.1.1 + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06 + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.0": + version: 2.0.1 + resolution: "set-function-name@npm:2.0.1" + dependencies: + define-data-property: ^1.0.1 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.0 + checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + languageName: node + linkType: hard + "setprototypeof@npm:1.2.0": version: 1.2.0 resolution: "setprototypeof@npm:1.2.0" @@ -6638,13 +7357,13 @@ browserlist@latest: languageName: node linkType: hard -"shepherd.js@npm:11.1.1": - version: 11.1.1 - resolution: "shepherd.js@npm:11.1.1" +"shepherd.js@npm:11.2.0": + version: 11.2.0 + resolution: "shepherd.js@npm:11.2.0" dependencies: - "@floating-ui/dom": ^1.2.5 + "@floating-ui/dom": ^1.5.1 deepmerge: ^4.3.1 - checksum: 1d2a0563b642a71d545e7e7fbca3b0ee7b41a9793833af1eb326bdaace7061c71753415a4480130ce3686496a193572bbbaaf4a08a28d0b37ec003791780ed31 + checksum: 0e71e63e51b25aaec83c835ecbe33227e6e583a204b347357ce70092e0024b6eb546f3d0cfd9ee4ac704f2baa81a37ab1a3c449312f495c73f2eadc1310f6f42 languageName: node linkType: hard @@ -6659,7 +7378,7 @@ browserlist@latest: languageName: node linkType: hard -"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -6715,10 +7434,10 @@ browserlist@latest: languageName: node linkType: hard -"sortablejs@npm:1.15.0": - version: 1.15.0 - resolution: "sortablejs@npm:1.15.0" - checksum: bb82223a663484640d317cad510ac987f26b7a443631040407224de1be069afcc6c39048b6d8527f10f269e33595e8128d7de2fac23517c8260470f77f932d55 +"sortablejs@npm:1.15.2": + version: 1.15.2 + resolution: "sortablejs@npm:1.15.2" + checksum: 36b20b144ff5fd2d078aed0eba3349aaef5691e4830ba9a28d69ca023d4583ca15e5eacb3c09c1d9924675388400d1219def1121e514badfb0f41463cc844da7 languageName: node linkType: hard @@ -6729,30 +7448,13 @@ browserlist@latest: languageName: node linkType: hard -"source-map-support@npm:~0.5.20": - version: 0.5.21 - resolution: "source-map-support@npm:0.5.21" - dependencies: - buffer-from: ^1.0.0 - source-map: ^0.6.0 - checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137 - languageName: node - linkType: hard - -"source-map@npm:^0.6.0, source-map@npm:^0.6.1": +"source-map@npm:^0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2 languageName: node linkType: hard -"sourcemap-codec@npm:^1.4.8": - version: 1.4.8 - resolution: "sourcemap-codec@npm:1.4.8" - checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316 - languageName: node - linkType: hard - "srcset@npm:4": version: 4.0.0 resolution: "srcset@npm:4.0.0" @@ -6812,25 +7514,36 @@ browserlist@latest: languageName: node linkType: hard -"string.prototype.trimend@npm:^1.0.6": - version: 1.0.6 - resolution: "string.prototype.trimend@npm:1.0.6" +"string.prototype.trim@npm:^1.2.8": + version: 1.2.8 + resolution: "string.prototype.trim@npm:1.2.8" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07 languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.6": - version: 1.0.6 - resolution: "string.prototype.trimstart@npm:1.0.6" +"string.prototype.trimend@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimend@npm:1.0.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c + languageName: node + linkType: hard + +"string.prototype.trimstart@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimstart@npm:1.0.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613 languageName: node linkType: hard @@ -6868,7 +7581,7 @@ browserlist@latest: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 @@ -6938,20 +7651,6 @@ browserlist@latest: languageName: node linkType: hard -"terser@npm:^5.2.0": - version: 5.16.5 - resolution: "terser@npm:5.16.5" - dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser - checksum: f2c1a087fac7f4ff04b1b4e79bffc52e2fc0b068b98912bfcc0b341184c284c30c19ed73f76ac92b225b71668f7f8fc586d99a7e50a29cdc1c916cb1265522ec - languageName: node - linkType: hard - "test-exclude@npm:^6.0.0": version: 6.0.0 resolution: "test-exclude@npm:6.0.0" @@ -7014,15 +7713,15 @@ browserlist@latest: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.1": - version: 3.14.1 - resolution: "tsconfig-paths@npm:3.14.1" +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" dependencies: "@types/json5": ^0.0.29 - json5: ^1.0.1 + json5: ^1.0.2 minimist: ^1.2.6 strip-bom: ^3.0.0 - checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d + checksum: 59f35407a390d9482b320451f52a411a256a130ff0e7543d18c6f20afab29ac19fbe55c360a93d6476213cc335a4d76ce90f67df54c4e9037f7d240920832201 languageName: node linkType: hard @@ -7049,6 +7748,42 @@ browserlist@latest: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + is-typed-array: ^1.1.10 + checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3 + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-offset@npm:1.0.0" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b + languageName: node + linkType: hard + "typed-array-length@npm:^1.0.4": version: 1.0.4 resolution: "typed-array-length@npm:1.0.4" @@ -7113,13 +7848,6 @@ browserlist@latest: languageName: node linkType: hard -"v8-compile-cache@npm:^2.0.0": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.0.0": version: 9.0.1 resolution: "v8-to-istanbul@npm:9.0.1" @@ -7131,10 +7859,10 @@ browserlist@latest: languageName: node linkType: hard -"vanillajs-datepicker@npm:1.3.1": - version: 1.3.1 - resolution: "vanillajs-datepicker@npm:1.3.1" - checksum: c01ea7ec70de94441a3b7760ff6ce8a06b38c6197c2cc68568e69afc8c80f4e45419358ab99e328daf58663ff2a42bb818314f4279095db7aaec18a9e995d5f2 +"vanillajs-datepicker@npm:1.3.4": + version: 1.3.4 + resolution: "vanillajs-datepicker@npm:1.3.4" + checksum: 830958f8af5c586ee81ba2b75a76771db425d4eddb68ec08d1b49ac898674376ef3517a0d40eefaf4926a815c23179c54e1637d7327df090f22cdb98056074cf languageName: node linkType: hard @@ -7149,17 +7877,18 @@ browserlist@latest: languageName: node linkType: hard -"vite@npm:4.3.4": - version: 4.3.4 - resolution: "vite@npm:4.3.4" +"vite@npm:4.5.3": + version: 4.5.3 + resolution: "vite@npm:4.5.3" dependencies: - esbuild: ^0.17.5 + esbuild: ^0.18.10 fsevents: ~2.3.2 - postcss: ^8.4.23 - rollup: ^3.21.0 + postcss: ^8.4.27 + rollup: ^3.27.1 peerDependencies: "@types/node": ">= 14" less: "*" + lightningcss: ^1.21.0 sass: "*" stylus: "*" sugarss: "*" @@ -7172,6 +7901,8 @@ browserlist@latest: optional: true less: optional: true + lightningcss: + optional: true sass: optional: true stylus: @@ -7182,7 +7913,7 @@ browserlist@latest: optional: true bin: vite: bin/vite.js - checksum: 90ce3923ef3e9a491851fb34effece43858d0ba915db17ea6ad0eb649bd77d81c69a71aafc55a6fbd11e4134b1a79eb7e2e3553f055d390d32ca0ff7c645acf6 + checksum: fd3f512ce48ca2a1fe60ad0376283b832de9272725fdbc65064ae9248f792de87b0f27a89573115e23e26784800daca329f8a9234d298ba6f60e808a9c63883c languageName: node linkType: hard @@ -7193,6 +7924,36 @@ browserlist@latest: languageName: node linkType: hard +"volar-service-html@npm:0.0.34": + version: 0.0.34 + resolution: "volar-service-html@npm:0.0.34" + dependencies: + vscode-html-languageservice: ^5.1.0 + vscode-languageserver-textdocument: ^1.0.11 + vscode-uri: ^3.0.8 + peerDependencies: + "@volar/language-service": ~2.1.0 + peerDependenciesMeta: + "@volar/language-service": + optional: true + checksum: 83b50cd805680c77b5632e9534b23cddb85bf7e0cd425624d474981d173ddf07a66fcce6348f675c9d5c2551df9ae1e58206c2ed1c32052f8a70940fb7f5fe50 + languageName: node + linkType: hard + +"volar-service-pug@npm:0.0.34": + version: 0.0.34 + resolution: "volar-service-pug@npm:0.0.34" + dependencies: + "@volar/language-service": ~2.1.0 + pug-lexer: ^5.0.1 + pug-parser: ^6.0.0 + volar-service-html: 0.0.34 + vscode-html-languageservice: ^5.1.0 + vscode-languageserver-textdocument: ^1.0.11 + checksum: 4691aa1c8ea9039e1b5ce4218445309575c2cb4bc08ad5341a8af6f0db1a60711f26cc905e124c3485cc780eb58b895332fbb6a2ccf427a9d0e08012f2c5ad4a + languageName: node + linkType: hard + "vooks@npm:^0.2.12, vooks@npm:^0.2.4": version: 0.2.12 resolution: "vooks@npm:0.2.12" @@ -7204,9 +7965,59 @@ browserlist@latest: languageName: node linkType: hard -"vue-demi@npm:*": - version: 0.13.1 - resolution: "vue-demi@npm:0.13.1" +"vscode-html-languageservice@npm:^5.1.0": + version: 5.1.2 + resolution: "vscode-html-languageservice@npm:5.1.2" + dependencies: + "@vscode/l10n": ^0.0.18 + vscode-languageserver-textdocument: ^1.0.11 + vscode-languageserver-types: ^3.17.5 + vscode-uri: ^3.0.8 + checksum: 3a2a5ee5ad4ea429e85f4fb8f45da5b47d50541784d703fc9ccd009f68426034a48be6c04f8c420dc7236de07df93ccc28873da3395db5f5626fe169f18f1ac6 + languageName: node + linkType: hard + +"vscode-jsonrpc@npm:8.2.0": + version: 8.2.0 + resolution: "vscode-jsonrpc@npm:8.2.0" + checksum: f302a01e59272adc1ae6494581fa31c15499f9278df76366e3b97b2236c7c53ebfc71efbace9041cfd2caa7f91675b9e56f2407871a1b3c7f760a2e2ee61484a + languageName: node + linkType: hard + +"vscode-languageserver-protocol@npm:^3.17.5": + version: 3.17.5 + resolution: "vscode-languageserver-protocol@npm:3.17.5" + dependencies: + vscode-jsonrpc: 8.2.0 + vscode-languageserver-types: 3.17.5 + checksum: dfb42d276df5dfea728267885b99872ecff62f6c20448b8539fae71bb196b420f5351c5aca7c1047bf8fb1f89fa94a961dce2bc5bf7e726198f4be0bb86a1e71 + languageName: node + linkType: hard + +"vscode-languageserver-textdocument@npm:^1.0.11": + version: 1.0.11 + resolution: "vscode-languageserver-textdocument@npm:1.0.11" + checksum: ea7cdc9d4ffaae5952071fa11d17d714215a76444e6936c9359f94b9ba3222a52a55edb5bd5928bd3e9712b900a9f175bb3565ec1c8923234fe3bd327584bafb + languageName: node + linkType: hard + +"vscode-languageserver-types@npm:3.17.5, vscode-languageserver-types@npm:^3.17.5": + version: 3.17.5 + resolution: "vscode-languageserver-types@npm:3.17.5" + checksum: 79b420e7576398d396579ca3a461c9ed70e78db4403cd28bbdf4d3ed2b66a2b4114031172e51fad49f0baa60a2180132d7cb2ea35aa3157d7af3c325528210ac + languageName: node + linkType: hard + +"vscode-uri@npm:^3.0.8": + version: 3.0.8 + resolution: "vscode-uri@npm:3.0.8" + checksum: 514249126850c0a41a7d8c3c2836cab35983b9dc1938b903cfa253b9e33974c1416d62a00111385adcfa2b98df456437ab704f709a2ecca76a90134ef5eb4832 + languageName: node + linkType: hard + +"vue-demi@npm:>=0.14.5": + version: 0.14.5 + resolution: "vue-demi@npm:0.14.5" peerDependencies: "@vue/composition-api": ^1.0.0-rc.1 vue: ^3.0.0-0 || ^2.6.0 @@ -7216,7 +8027,7 @@ browserlist@latest: bin: vue-demi-fix: bin/vue-demi-fix.js vue-demi-switch: bin/vue-demi-switch.js - checksum: d26b0602587f4dbd81f975f8f2de39910239805f0f2d72cafed0c7349c512f5363daf57e2761ba6a7ac66331a4cfa3dc857d6f7f62c57adbae85752d270118c8 + checksum: ff44b9372b8224590514252a2f73363cced6062205f9628a6b130dccb80e2023d55cd9d1da94aeb68d5539b7ea9eedcecf88ab281a3a9ff48b8db4c5366b9643 languageName: node linkType: hard @@ -7236,9 +8047,9 @@ browserlist@latest: languageName: node linkType: hard -"vue-eslint-parser@npm:^9.0.1": - version: 9.0.3 - resolution: "vue-eslint-parser@npm:9.0.3" +"vue-eslint-parser@npm:^9.4.2": + version: 9.4.2 + resolution: "vue-eslint-parser@npm:9.4.2" dependencies: debug: ^4.3.4 eslint-scope: ^7.1.1 @@ -7249,48 +8060,53 @@ browserlist@latest: semver: ^7.3.6 peerDependencies: eslint: ">=6.0.0" - checksum: 61248eb504b8d0cbc95ed3f7ec6b11b72782cd76e4049798626f9c09031d620691a967231985c79d8ece8b04864797e465b7f47bcf91828e18344ae3691d9066 + checksum: 67f14c8ea19b578077a878864a5ec438ab4c597381923c9814fac39b3772da8654ac2a543467b5880607f694131f8ff34b87bd24c10bbc5f99fa2fcac49ff2e6 languageName: node linkType: hard -"vue-router@npm:4.1.6": - version: 4.1.6 - resolution: "vue-router@npm:4.1.6" +"vue-router@npm:4.3.0": + version: 4.3.0 + resolution: "vue-router@npm:4.3.0" dependencies: - "@vue/devtools-api": ^6.4.5 + "@vue/devtools-api": ^6.5.1 peerDependencies: vue: ^3.2.0 - checksum: c7f0156ac03a9561d110f5ff778121eee7c8c154be6ec5064558ba22ab5237db36f29ffffc95cc16d692cc68a26df0c434f395401c0e3b48f782c7bed51391c6 + checksum: 0059261d39c8a6f61d3cdf4b74cfcd6a109062e0562f2db5a387cdf4d1b186dfdd2dddcacbf83ce2842d7c3ec9a63d8a6d427c4cec1db61372f4a06048496354 languageName: node linkType: hard -"vue@npm:3.2.47": - version: 3.2.47 - resolution: "vue@npm:3.2.47" +"vue@npm:3.4.21": + version: 3.4.21 + resolution: "vue@npm:3.4.21" dependencies: - "@vue/compiler-dom": 3.2.47 - "@vue/compiler-sfc": 3.2.47 - "@vue/runtime-dom": 3.2.47 - "@vue/server-renderer": 3.2.47 - "@vue/shared": 3.2.47 - checksum: 3b586f61fd2cdfdd24459a946a2831c0f164056993cc005badde4fea10d53e430f1cedf1b62d52a6992b58fe656fc5fc67b32f594a2832dfe440c6db46d6f158 + "@vue/compiler-dom": 3.4.21 + "@vue/compiler-sfc": 3.4.21 + "@vue/runtime-dom": 3.4.21 + "@vue/server-renderer": 3.4.21 + "@vue/shared": 3.4.21 + peerDependencies: + typescript: "*" + peerDependenciesMeta: + typescript: + optional: true + checksum: 3c477982a0a9aadfa512eb625b67f35809f123e98a268ace52e3ee738b23a9b8d9461cfc1f2b314fb098047ab3aab50f8beea657a2d3ebe5aae0e02aa4f903d2 languageName: node linkType: hard -"vueuc@npm:^0.4.47": - version: 0.4.47 - resolution: "vueuc@npm:0.4.47" +"vueuc@npm:^0.4.58": + version: 0.4.58 + resolution: "vueuc@npm:0.4.58" dependencies: "@css-render/vue3-ssr": ^0.15.10 "@juggle/resize-observer": ^3.3.1 css-render: ^0.15.10 - evtd: ^0.2.2 - seemly: ^0.3.1 + evtd: ^0.2.4 + seemly: ^0.3.6 vdirs: ^0.1.4 vooks: ^0.2.4 peerDependencies: vue: ^3.0.11 - checksum: b82b77a882d29f8f6e432cabaf1ce3cefda1a87f5b956655e4f38a96351fa4ec17472608eb8ba30b5aa5edf894cfbad15447ddf4b46d46d9caf2c02b679a5cab + checksum: fb0b9a69be553ccbdc314eec22433d99022ef065d6e6add4b1177ebada6de6d05b4ece36af4ee37a750687215ec966880c17d6b6dd2d0ea38a7958f584da74b9 languageName: node linkType: hard @@ -7314,17 +8130,16 @@ browserlist@latest: languageName: node linkType: hard -"which-typed-array@npm:^1.1.9": - version: 1.1.9 - resolution: "which-typed-array@npm:1.1.9" +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13": + version: 1.1.13 + resolution: "which-typed-array@npm:1.1.13" dependencies: available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + call-bind: ^1.0.4 for-each: ^0.3.3 gopd: ^1.0.1 has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.10 - checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef + checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309 languageName: node linkType: hard @@ -7360,13 +8175,6 @@ browserlist@latest: languageName: node linkType: hard -"word-wrap@npm:^1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f - languageName: node - linkType: hard - "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0" @@ -7431,25 +8239,25 @@ browserlist@latest: languageName: node linkType: hard -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9": - version: 20.2.9 - resolution: "yargs-parser@npm:20.2.9" - checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3 +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c languageName: node linkType: hard -"yargs@npm:^16.2.0": - version: 16.2.0 - resolution: "yargs@npm:16.2.0" +"yargs@npm:^17.7.2": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" dependencies: - cliui: ^7.0.2 + cliui: ^8.0.1 escalade: ^3.1.1 get-caller-file: ^2.0.5 require-directory: ^2.1.1 - string-width: ^4.2.0 + string-width: ^4.2.3 y18n: ^5.0.5 - yargs-parser: ^20.2.2 - checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59 + yargs-parser: ^21.1.1 + checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a languageName: node linkType: hard