Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ansible/artifactory] JA-7492- Fixed a security issue whereby, interacting with specially c… #356

Merged
merged 4 commits into from
Dec 21, 2023
Merged

[ansible/artifactory] JA-7492- Fixed a security issue whereby, interacting with specially c… #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db1f994
JA-7492- Fixed a security issue whereby, interacting with specially c…
bbaassssiiee Dec 18, 2023
147eeae
Version 7.71.8 of Artifactory
bbaassssiiee Dec 18, 2023
91c4f0f
Determine the running_version and compare to desired artifactory_version
bbaassssiiee Dec 19, 2023
7b1c30c
compare stdout wihtout newline. changed_when: false for read operation.
bbaassssiiee Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Ansible/ansible_collections/jfrog/platform/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# JFrog Platform Ansible Collection Changelog
All changes to this collection will be documented in this file.

## [10.16.4] - Dec 18, 2023
* Changed default Artifactory version to 7.71.8

## [10.16.3] - Dec 6, 2023
* Added How to avoid IPv6 binding in Readme [GH-349](https://github.com/jfrog/JFrog-Cloud-Installers/pull/349)
* Product Updates/fixes
Expand Down
4 changes: 2 additions & 2 deletions Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defaults file for artifactory

# The version of artifactory to install
artifactory_version: 7.71.5
artifactory_version: 7.71.8

# Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role )
artifactory_nginx_ssl_enabled: false
Expand Down Expand Up @@ -112,4 +112,4 @@ artifactory_binarystore: |-
artifactory_systemyaml_override: false

# Allow artifactory user to create crontab rules
artifactory_allow_crontab: false
artifactory_allow_crontab: false
15 changes: 13 additions & 2 deletions Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,28 @@
path: "{{ jfrog_home_directory }}"
state: directory

- name: Check artifactory version
ansible.builtin.shell: |
set -o pipefail;
grep artifactory.product.version "{{ artifactory_home }}/app/artifactory.product.version.properties" |cut -d= -f2
register: check_version_cmd
changed_when: false

- name: Set running_version
ansible.builtin.set_fact:
running_version: "{{ check_version_cmd.stdout }}"

- name: Delete artifactory app directory
become: true
ansible.builtin.file:
path: "{{ artifactory_home }}/app"
state: absent
when: (download_artifactory.changed) or (unarchived_artifactory.changed)
when: running_version != artifactory_version

- name: Copy new app to artifactory app
become: true
ansible.builtin.command: "cp -r {{ artifactory_untar_home }}/app/. {{ artifactory_home }}/app"
when: (download_artifactory.changed) or (unarchived_artifactory.changed)
when: running_version != artifactory_version
notify: Restart artifactory

- name: Configure artifactory license(s)
Expand Down
Loading