Code

Develop merging to v5.4.1#1160

Code

Merged

tpurschke merged 156 commits intomainCactuseSecurity/firewall-orchestrator:mainfrom developCactuseSecurity/firewall-orchestrator:developCopy head branch name to clipboardSep 10, 2021

+3,922-837

Commits

Commits on Jul 3, 2021

• removing some sample/test data

  tpurschke

  committed
  f84ed2a

  Copy full SHA for f84ed2a

• adjust dev docu

  tpurschke

  committed
  33ebb7f

  Copy full SHA for 33ebb7f

• adding some audit logging

  tpurschke

  committed
  2347be2

  Copy full SHA for 2347be2

• prevent audit_user pwd setting in upgrade mode

  Show description for 1a359ac
  tpurschke

  committed
  1a359ac

  Copy full SHA for 1a359ac

• typo

  tpurschke

  committed
  f60e214

  Copy full SHA for f60e214

Commits on Jul 4, 2021

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  002335e

  Copy full SHA for 002335e

Commits on Jul 5, 2021

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  d24f204

  Copy full SHA for d24f204

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  e88a4a1

  Copy full SHA for e88a4a1

Commits on Jul 6, 2021

• Merge pull request #1 from CactuseSecurity/main

  Show description for 70903b8
  tpurschke

  authored
  70903b8

  Copy full SHA for 70903b8

• Merge pull request #2 from CactuseSecurity/develop

  Show description for 6f9671a
  tpurschke

  authored
  6f9671a

  Copy full SHA for 6f9671a

• fixing bug with long / int change

  Show description for b357bec
  tpurschke

  committed
  b357bec

  Copy full SHA for b357bec

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  40ccc8c

  Copy full SHA for 40ccc8c

Commits on Jul 9, 2021

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  02cb72b

  Copy full SHA for 02cb72b

Commits on Jul 14, 2021

• redesign add user first steps (#1115)

  Show description for 06749f6
  abarz722

  authored
  06749f6

  Copy full SHA for 06749f6

• doc changes

  tpurschke

  committed
  ddc145b

  Copy full SHA for ddc145b

• docker proxy cleanup

  tpurschke

  committed
  da4bea5

  Copy full SHA for da4bea5

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  23adbd1

  Copy full SHA for 23adbd1

• Merge pull request #2 from CactuseSecurity/develop

  Show description for a78b985
  alf-cactus

  authored
  a78b985

  Copy full SHA for a78b985

• doku

  alf-cactus

  committed
  fb019ef

  Copy full SHA for fb019ef

• handler

  alf-cactus

  committed
  aa97fe3

  Copy full SHA for aa97fe3

• handler

  alf-cactus

  committed
  bdc45fd

  Copy full SHA for bdc45fd

• hjandler

  alf-cactus

  committed
  b455341

  Copy full SHA for b455341

Commits on Jul 15, 2021

• Add user with groups and roles + fixes (#1118)

  Show description for 778e3c9
  abarz722

  authored
  778e3c9

  Copy full SHA for 778e3c9

• add test-install workflow for develop branch

  tpurschke

  committed
  2bf511a

  Copy full SHA for 2bf511a

• api help pages start

  tpurschke

  committed
  c97d6fc

  Copy full SHA for c97d6fc

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  20b235c

  Copy full SHA for 20b235c

• text review

  tpurschke

  committed
  23249a8

  Copy full SHA for 23249a8

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  07eb110

  Copy full SHA for 07eb110

• Merge pull request #1119 from tpurschke/develop

  Show description for cb43606
  abarz722

  authored
  cb43606

  Copy full SHA for cb43606

• some changes for fortinet vdom settings

  tpurschke

  committed
  ed7dfd1

  Copy full SHA for ed7dfd1

• Merge branch 'CactuseSecurity:develop' into develop

  tpurschke

  authored
  858de02

  Copy full SHA for 858de02

Commits on Jul 16, 2021

• Merge pull request #1120 from tpurschke/develop

  Show description for 8af4d48
  abarz722

  authored
  8af4d48

  Copy full SHA for 8af4d48

• some improvements group/role/user handling (#1122)

  Show description for 54a1102
  abarz722

  authored
  54a1102

  Copy full SHA for 54a1102

Commits on Jul 19, 2021

• handlers final

  alf-cactus

  committed
  81afff1

  Copy full SHA for 81afff1

• directory copy bug

  alf-cactus

  committed
  9198916

  Copy full SHA for 9198916

Commits on Jul 20, 2021

• minor fixes, webhook develop

  tpurschke

  committed
  f5ce591

  Copy full SHA for f5ce591

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  7db0604

  Copy full SHA for 7db0604

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  f862864

  Copy full SHA for f862864

• minor fixes, webhook develop (#1126)

  tpurschke

  authored
  0a0a7ac

  Copy full SHA for 0a0a7ac

Commits on Jul 21, 2021

• typo

  alf-cactus

  authored
  0470f85

  Copy full SHA for 0470f85

• syncronize for fast copy

  alf-cactus

  committed
  873c451

  Copy full SHA for 873c451

• formating

  alf-cactus

  committed
  42eeda4

  Copy full SHA for 42eeda4

• handler backup

  alf-cactus

  committed
  530ac5b

  Copy full SHA for 530ac5b

• delegate to middleware servers

  alf-cactus

  committed
  1fdafb5

  Copy full SHA for 1fdafb5

• server syntax

  alf-cactus

  committed
  359dea3

  Copy full SHA for 359dea3

• api handler

  alf-cactus

  committed
  505eda7

  Copy full SHA for 505eda7

• importer handler

  alf-cactus

  committed
  ec66bdd

  Copy full SHA for ec66bdd

• database handler

  alf-cactus

  committed
  d07a102

  Copy full SHA for d07a102

• ui handler

  alf-cactus

  committed
  7bb4173

  Copy full SHA for 7bb4173

• lib handler

  alf-cactus

  committed
  061189d

  Copy full SHA for 061189d

• remove dir in case of upgrade

  alf-cactus

  committed
  6ea3641

  Copy full SHA for 6ea3641

Commits on Jul 22, 2021

• error message for upgrade handler

  alf-cactus

  committed
  61e824d

  Copy full SHA for 61e824d

• error msg conditional

  alf-cactus

  committed
  f83eb6f

  Copy full SHA for f83eb6f

Commits on Jul 23, 2021

• Merge pull request #1125 from alf-cactus/develop

  Show description for 5ae02d1
  alf-cactus

  authored
  5ae02d1

  Copy full SHA for 5ae02d1

Commits on Jul 24, 2021

• adding get rules API query

  tpurschke

  committed
  ea1ce19

  Copy full SHA for ea1ce19

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  b66e0e0

  Copy full SHA for b66e0e0

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  cf79fb7

  Copy full SHA for cf79fb7

Commits on Jul 25, 2021

• Develop adding get rules API query to help page (#1129)

  Show description for ac9a143
  tpurschke

  authored
  ac9a143

  Copy full SHA for ac9a143

• Merge branch 'main' into develop

  tpurschke

  authored
  78b88c3

  Copy full SHA for 78b88c3

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  cbee2b0

  Copy full SHA for cbee2b0

• Merge branch 'main' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  702c9c4

  Copy full SHA for 702c9c4

Commits on Jul 28, 2021

• api v2 upgrade v1

  tpurschke

  committed
  8d68ff7

  Copy full SHA for 8d68ff7

• upgrade v2

  tpurschke

  committed
  81444bf

  Copy full SHA for 81444bf

• removing yaml

  tpurschke

  committed
  04a99bf

  Copy full SHA for 04a99bf

• removing api dir again

  tpurschke

  committed
  9537fa1

  Copy full SHA for 9537fa1

• adding dbname for force option

  tpurschke

  committed
  300d76e

  Copy full SHA for 300d76e

Commits on Jul 29, 2021

• metadata ok

  tpurschke

  committed
  480f30b

  Copy full SHA for 480f30b

• importing metadata via new api

  tpurschke

  committed
  e921268

  Copy full SHA for e921268

• fixes

  tpurschke

  committed
  36a7fc0

  Copy full SHA for 36a7fc0

• more fixes

  tpurschke

  committed
  8d4bef2

  Copy full SHA for 8d4bef2

• working install

  Show description for 084fbaf
  tpurschke

  committed
  084fbaf

  Copy full SHA for 084fbaf

• HASURA_GRAPHQL_V1_BOOLEAN_NULL_COLLAPSE true

  tpurschke

  committed
  b5ec696

  Copy full SHA for b5ec696

Commits on Jul 30, 2021

• cleanup & documentation

  tpurschke

  committed
  3e259dd

  Copy full SHA for 3e259dd

• minor doc fix

  tpurschke

  committed
  abda32e

  Copy full SHA for abda32e

• revert metadata version from 3 to 2

  tpurschke

  committed
  21f2a9a

  Copy full SHA for 21f2a9a

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  f3b2af0

  Copy full SHA for f3b2af0

• Develop migrating to hasura 2.0 (#1131)

  Show description for 7b09d5b
  tpurschke

  authored
  7b09d5b

  Copy full SHA for 7b09d5b

Commits on Jul 31, 2021

• reading pwd from file

  tpurschke

  committed
  adade33

  Copy full SHA for adade33

• fixes

  tpurschke

  committed
  5e9ad5a

  Copy full SHA for 5e9ad5a

• changing name of secret file

  tpurschke

  committed
  1eb36f0

  Copy full SHA for 1eb36f0

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  6f5f576

  Copy full SHA for 6f5f576

• Develop moving CPR8x import user password to file (#1135)

  Show description for 5b4bb81
  

  3 peopleauthored
  5b4bb81

  Copy full SHA for 5b4bb81

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  bfe5b28

  Copy full SHA for bfe5b28

• generating ui_admin pwd only once

  Show description for 8848ad9
  tpurschke

  committed
  8848ad9

  Copy full SHA for 8848ad9

Commits on Aug 3, 2021

• move importer to end

  alf-cactus

  committed
  587f540

  Copy full SHA for 587f540

• backup of importer changes

  alf-cactus

  committed
  040fbf1

  Copy full SHA for 040fbf1

Commits on Aug 5, 2021

• import-test debug

  alf-cactus

  committed
  c0bf48e

  Copy full SHA for c0bf48e

• typo

  alf-cactus

  committed
  ab87a22

  Copy full SHA for ab87a22

• more imorter testing

  alf-cactus

  committed
  b680527

  Copy full SHA for b680527

• comments

  alf-cactus

  committed
  75bec73

  Copy full SHA for 75bec73

• Db testing first database unit tests (#1139)

  Show description for 5144cb6
  

  3 peopleauthored
  5144cb6

  Copy full SHA for 5144cb6

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  b322601

  Copy full SHA for b322601

• permissions

  alf-cactus

  committed
  65ea326

  Copy full SHA for 65ea326

• remove debug

  alf-cactus

  committed
  66e3c57

  Copy full SHA for 66e3c57

• use sample-data role for test role

  alf-cactus

  committed
  343584a

  Copy full SHA for 343584a

• starting api business palo & forti

  tpurschke

  committed
  9f7e566

  Copy full SHA for 9f7e566

Commits on Aug 6, 2021

• test import debug

  alf-cactus

  committed
  2d9a6e2

  Copy full SHA for 2d9a6e2

• no extra file copying

  alf-cactus

  committed
  3710521

  Copy full SHA for 3710521

• v9.1 with working apps

  tpurschke

  committed
  ce8aa35

  Copy full SHA for ce8aa35

Commits on Aug 9, 2021

• remove test data

  alf-cactus

  committed
  86e97df

  Copy full SHA for 86e97df

• test import

  alf-cactus

  committed
  1e93374

  Copy full SHA for 1e93374

• typo

  alf-cactus

  committed
  2362bf9

  Copy full SHA for 2362bf9

• permissions

  alf-cactus

  committed
  95dd7be

  Copy full SHA for 95dd7be

• syntax

  alf-cactus

  committed
  749e597

  Copy full SHA for 749e597

Commits on Aug 12, 2021

• Merge pull request #3 from CactuseSecurity/develop

  Show description for ed1ba68
  alf-cactus

  authored
  ed1ba68

  Copy full SHA for ed1ba68

Commits on Aug 19, 2021

• ansible 2.10 support for postgresql_query

  Show description for fa61202
  tpurschke

  committed
  fa61202

  Copy full SHA for fa61202

Commits on Aug 20, 2021

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  1b77e39

  Copy full SHA for 1b77e39

Commits on Aug 22, 2021

• Develop debian 11 preps and fortiManager start (#1145)

  Show description for 9dc51b0
  

  3 peopleauthored
  9dc51b0

  Copy full SHA for 9dc51b0

Commits on Aug 24, 2021

• debug output fixes

  tpurschke

  committed
  5f6374b

  Copy full SHA for 5f6374b

• updating to hasura 2.0.7

  tpurschke

  committed
  67bb946

  Copy full SHA for 67bb946

Commits on Aug 26, 2021

• fix typo on German start page

  tpurschke

  committed
  8a22b77

  Copy full SHA for 8a22b77

• fortiManager cont.

  tpurschke

  committed
  e36db7c

  Copy full SHA for e36db7c

Commits on Aug 27, 2021

• adding csv escaping of "

  Show description for 96f4dea
  tpurschke

  committed
  96f4dea

  Copy full SHA for 96f4dea

• get basics ok

  tpurschke

  committed
  21e9443

  Copy full SHA for 21e9443

Commits on Aug 30, 2021

• starting 5.4.1 api importer

  tpurschke

  committed
  7c129ba

  Copy full SHA for 7c129ba

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  f7d665f

  Copy full SHA for f7d665f

• fix importer ldap entry

  tpurschke

  committed
  b07ca5c

  Copy full SHA for b07ca5c

Commits on Aug 31, 2021

• fixing metadata for importer role

  tpurschke

  committed
  e2d8f01

  Copy full SHA for e2d8f01

• ldap and common

  Show description for 01edf8f
  tpurschke

  committed
  01edf8f

  Copy full SHA for 01edf8f

• Merge pull request #4 from CactuseSecurity/develop

  Show description for 0c26594
  alf-cactus

  authored
  0c26594

  Copy full SHA for 0c26594

• last tuning for import test

  alf-cactus

  committed
  3d162ad

  Copy full SHA for 3d162ad

• adding upgrade 5.4.1 code

  tpurschke

  committed
  7e01462

  Copy full SHA for 7e01462

• ansible cfg change to allow tmpfiles for unpriveledeged users

  alf-cactus

  committed
  53654ab

  Copy full SHA for 53654ab

• fixing cpcommon

  tpurschke

  committed
  c640beb

  Copy full SHA for c640beb

• removing " instead of escaping

  tpurschke

  committed
  de23a90

  Copy full SHA for de23a90

• debug

  alf-cactus

  committed
  a217b9e

  Copy full SHA for a217b9e

• config path

  alf-cactus

  committed
  854b117

  Copy full SHA for 854b117

• cleanup

  alf-cactus

  committed
  2decbe2

  Copy full SHA for 2decbe2

• fix svc negate

  tpurschke

  committed
  df0c35d

  Copy full SHA for df0c35d

• fix range

  tpurschke

  committed
  41805ad

  Copy full SHA for 41805ad

Commits on Sep 2, 2021

• Merge branch 'CactuseSecurity:main' into main

  tpurschke

  authored
  c4497fd

  Copy full SHA for c4497fd

• cont. python parsing

  tpurschke

  committed
  b6f4ad2

  Copy full SHA for b6f4ad2

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  4ee18f3

  Copy full SHA for 4ee18f3

• deleting dpulicated files fortimanager

  tpurschke

  committed
  c207798

  Copy full SHA for c207798

• ansible.cfg piplineing

  alf-cactus

  committed
  ec970b3

  Copy full SHA for ec970b3

• Test Importer (#1140)

  Show description for e675c3b
  alf-cactus

  authored
  e675c3b

  Copy full SHA for e675c3b

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  f90312a

  Copy full SHA for f90312a

• Merge pull request #1151 from alf-cactus/develop

  Show description for c4f94f8
  alf-cactus

  authored
  c4f94f8

  Copy full SHA for c4f94f8

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  9e3e09c

  Copy full SHA for 9e3e09c

• fixing version number

  tpurschke

  committed
  729e421

  Copy full SHA for 729e421

Commits on Sep 6, 2021

• 5.4.1 cont.

  tpurschke

  committed
  d293999

  Copy full SHA for d293999

• upgrade role importer

  tpurschke

  committed
  0ab4975

  Copy full SHA for 0ab4975

Commits on Sep 7, 2021

• services & users working

  tpurschke

  committed
  8d180e3

  Copy full SHA for 8d180e3

• working without rules

  tpurschke

  committed
  274e6b4

  Copy full SHA for 274e6b4

• before adding rule import

  tpurschke

  committed
  422b2bb

  Copy full SHA for 422b2bb

• fixed typo

  tpurschke

  committed
  9f19ef5

  Copy full SHA for 9f19ef5

• .

  tpurschke

  committed
  916555f

  Copy full SHA for 916555f

Commits on Sep 8, 2021

• Merge branch 'main' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  f2e382c

  Copy full SHA for f2e382c

• Merge branch 'main' of https://github.com/tpurschke/firewall-orchestrator into develop

  tpurschke

  committed
  6240997

  Copy full SHA for 6240997

• rules working

  Show description for 34a785e
  tpurschke

  committed
  34a785e

  Copy full SHA for 34a785e

Commits on Sep 10, 2021

• import working api2api

  tpurschke

  committed
  2d09ccc

  Copy full SHA for 2d09ccc

• fixing unlock issue

  tpurschke

  committed
  c42b9be

  Copy full SHA for c42b9be

• final touches

  tpurschke

  committed
  93cab3b

  Copy full SHA for 93cab3b

• v5.4.1 - Develop importer python & api version plus various others (#1150)

  Show description for 028c3b7
  

  4 peopleauthored
  028c3b7

  Copy full SHA for 028c3b7

• Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

  tpurschke

  committed
  3eb6f1a

  Copy full SHA for 3eb6f1a

• fixing merge conflicts (#1158)

  tpurschke

  authored
  a092698

  Copy full SHA for a092698