cmdbox 0.6.1__py3-none-any.whl → 0.6.1.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of cmdbox might be problematic. Click here for more details.

Files changed (10) hide show
  1. cmdbox/app/auth/azure_signin.py +5 -1
  2. cmdbox/app/features/cli/cmdbox_web_start.py +1 -1
  3. cmdbox/version.py +2 -2
  4. cmdbox/web/signin.html +30 -7
  5. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/METADATA +1 -1
  6. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/RECORD +10 -10
  7. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/LICENSE +0 -0
  8. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/WHEEL +0 -0
  9. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/entry_points.txt +0 -0
  10. {cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/top_level.txt +0 -0
cmdbox/app/auth/azure_signin.py CHANGED
@@ -13,6 +13,8 @@ class AzureSignin(Signin):
13
13
  #url='https://graph.microsoft.com/v1.0/me/transitiveMemberOf?$Top=999',
14
14
  headers={'Authorization': f'Bearer {data}'}
15
15
  )
16
+ if not user_info_resp.ok and user_info_resp.text:
17
+ raise requests.exceptions.HTTPError(user_info_resp.text, response=user_info_resp)
16
18
  user_info_resp.raise_for_status()
17
19
  user_info_json = user_info_resp.json()
18
20
  if isinstance(user_info_json, dict):
@@ -27,12 +29,14 @@ class AzureSignin(Signin):
27
29
  'code': req.query_params['code'],
28
30
  'scope': " ".join(conf['scope']),
29
31
  'client_id': conf['client_id'],
30
- #'client_secret': conf['client_secret'],
32
+ 'client_secret': conf['client_secret'],
31
33
  'redirect_uri': conf['redirect_uri'],
32
34
  'grant_type': 'authorization_code'}
33
35
  query = '&'.join([f'{k}={urllib.parse.quote(v)}' for k, v in data.items()])
34
36
  # アクセストークン取得
35
37
  token_resp = requests.post(url=f'https://login.microsoftonline.com/{conf["tenant_id"]}/oauth2/v2.0/token', headers=headers, data=query)
38
+ if not token_resp.ok and token_resp.text:
39
+ raise requests.exceptions.HTTPError(token_resp.text, response=token_resp)
36
40
  token_resp.raise_for_status()
37
41
  token_json = token_resp.json()
38
42
  return token_json['access_token']
cmdbox/app/features/cli/cmdbox_web_start.py CHANGED
@@ -208,7 +208,7 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
208
208
  from cmdbox.app import mcp
209
209
  self.mcp = mcp.Mcp(logger, args.data, w.signin, self.appcls, self.ver)
210
210
  if args.agent_session_store == 'sqlite':
211
- args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
211
+ args.agent_session_dburl = "sqlite:" + pathname2url(str(w.agent_path / 'session.db'))
212
212
  elif args.agent_session_store == 'postgresql':
213
213
  args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
214
214
  else:
cmdbox/version.py CHANGED
@@ -1,9 +1,9 @@
1
1
  import datetime
2
2
 
3
- dt_now = datetime.datetime(2025, 6, 29)
3
+ dt_now = datetime.datetime(2025, 7, 4)
4
4
  __appid__ = 'cmdbox'
5
5
  __title__ = 'cmdbox (Command Development Application)'
6
- __version__ = '0.6.1'
6
+ __version__ = '0.6.1.1'
7
7
  __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
8
8
  __pypiurl__ = 'https://pypi.org/project/cmdbox/'
9
9
  __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'
cmdbox/web/signin.html CHANGED
@@ -8,9 +8,30 @@
8
8
  cursor: pointer;
9
9
  }
10
10
  </style>
11
+ <script type="text/javascript">
12
+ const self_name = 'signin';
13
+ var write_script_Tag = (src, type) => {
14
+ const ctx_path = window.location.pathname;
15
+ if (ctx_path.indexOf('dosignin') >= 0) {
16
+ src = `../${ctx_path}`;
17
+ }
18
+ if (type === 'css') {
19
+ const link = document.createElement('link');
20
+ link.href = src;
21
+ link.rel = 'stylesheet';
22
+ link.type = 'text/css';
23
+ document.write(link.outerHTML);
24
+ return;
25
+ }
26
+ const script = document.createElement('script');
27
+ script.src = src;
28
+ script.type = 'text/javascript';
29
+ document.write(script.outerHTML);
30
+ };
31
+ </script>
11
32
  </head>
12
33
  <body lang="ja" class="overflow-hidden p-2" style="background-color:rgb(33, 37, 41)">
13
- <script type="text/javascript" src="../assets/cmdbox/svgicon.js"></script>
34
+ <script type="text/javascript">write_script_Tag("../assets/cmdbox/svgicon.js")</script>
14
35
  <div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 bd-mode-toggle">
15
36
  <button class="btn btn-primary py-2 dropdown-toggle d-flex align-items-center" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (auto)">
16
37
  <svg class="bi my-1 theme-icon-active" width="1em" height="1em"><use href="#circle-half"></use></svg>
@@ -122,10 +143,12 @@
122
143
  document.querySelector(`body`).style.setProperty(`--bs-secondary-bg`, null);
123
144
  });
124
145
  </script>
125
- <link rel="stylesheet" href="../assets/bootstrap/bootstrap.min.5.3.0.css">
126
- <link rel="stylesheet" href="../assets/cmdbox/color_mode.css">
127
- <script type="text/javascript" src="../assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>
128
- <script type="text/javascript" src="../assets/jquery/jquery.min.3.2.0.js"></script>
129
- <script type="text/javascript" src="../assets/cmdbox/common.js"></script>
130
- <script type="text/javascript" src="../assets/cmdbox/signin.js"></script>
146
+ <script type="text/javascript">
147
+ write_script_Tag("../assets/bootstrap/bootstrap.min.5.3.0.css", "css");
148
+ write_script_Tag("../assets/cmdbox/color_mode.css", "css");
149
+ write_script_Tag("../assets/bootstrap/bootstrap.bundle.min.5.3.0.js");
150
+ write_script_Tag("../assets/jquery/jquery.min.3.2.0.js");
151
+ write_script_Tag("../assets/cmdbox/common.js");
152
+ write_script_Tag("../assets/cmdbox/signin.js");
153
+ </script>
131
154
  </html>
{cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cmdbox
3
- Version: 0.6.1
3
+ Version: 0.6.1.1
4
4
  Summary: cmdbox: It is a command line application with a plugin mechanism.
5
5
  Home-page: https://github.com/hamacom2004jp/cmdbox
6
6
  Download-URL: https://github.com/hamacom2004jp/cmdbox
{cmdbox-0.6.1.dist-info → cmdbox-0.6.1.1.dist-info}/RECORD RENAMED
@@ -10,7 +10,7 @@ cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
10
10
  cmdbox/logconf_mcp.yml,sha256=pED0i1iKP8UoyXE0amFMA5kjV7Qc6_eJCUDVen3L4AU,1069
11
11
  cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
12
12
  cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
13
- cmdbox/version.py,sha256=D0TfgD5GFKpgvyXdlVAyEnB3Igf7F7zoApT62-WIsyo,2030
13
+ cmdbox/version.py,sha256=xBJPxUsBxsscfojEAWb7WLJcuropdHo83XQBFTVE_M0,2031
14
14
  cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  cmdbox/app/app.py,sha256=rWjvGF09Vtwhysf6F0pOGdSa0_pch32W88lWmNdA-ys,9186
16
16
  cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
@@ -24,7 +24,7 @@ cmdbox/app/options.py,sha256=DCF8AVNzZbHLQUSgNHgr6vYzqjNK3mz_68cyqu2fD9Q,46073
24
24
  cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
25
25
  cmdbox/app/web.py,sha256=5eUtb60Vb_6RK62IWbJDPFNvAVsf1THw7knp3uGmMGg,53559
26
26
  cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
27
- cmdbox/app/auth/azure_signin.py,sha256=ZVJTeZwdgM4y2loKiTMEPiXxbJwbdoTVMWciyJhgqc8,1666
27
+ cmdbox/app/auth/azure_signin.py,sha256=jJlIZJIGLZCngnJgoxBajaD2s8nM7QoszuN6-FT-5h8,1953
28
28
  cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
29
29
  cmdbox/app/auth/github_signin.py,sha256=dg_3eu7iikTfp9mxYQscQXtFspmJIuasGZ43icCeC3k,1510
30
30
  cmdbox/app/auth/google_signin.py,sha256=LErFkKniumKgfE5jlY9_lAneKlqD6BfLHxg2lZgv_zE,1382
@@ -67,7 +67,7 @@ cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=N_MUGdi2wckZe4UCU1Kgm_-nw
67
67
  cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=d7j6UaxepvjOr6SEy_biNT4nSp7gFjLEo2UqNmAYNjM,6617
68
68
  cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=8WQGtKtMdnGBhgI8_ZwUfenWLQGwj678daW5madZ_WY,7346
69
69
  cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=1UlFEFf9GA248qe0o_LjnnUPE8BwGxnhRgY7aBTThfg,6712
70
- cmdbox/app/features/cli/cmdbox_web_start.py,sha256=IbCS5DFfVhVx3k6Sesggl7qjHw2okGOrWUlWjtPPjPs,17706
70
+ cmdbox/app/features/cli/cmdbox_web_start.py,sha256=ixEhN4Id8Kni9DM-DiDQyMicVpHrxRf-XStE7wEv9Tw,17704
71
71
  cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=yRLHhCR1sQvNep4-9-OITQkzeEQr1M-ZSLzd059D3EA,3568
72
72
  cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=8STmtxwiCYuClcYGzK_kt7hzhxyFI7ZI0Lg1gpTiSY4,8599
73
73
  cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=2De84-SMYnOhl32tICUYe02g7m4EI991ZP9GGsfN4xU,6580
@@ -309,7 +309,7 @@ cmdbox/web/audit.html,sha256=pEYJPiL2Snkaas0u4XodnCq93zyZsd8jvQTOU_J8R9I,15273
309
309
  cmdbox/web/filer.html,sha256=95MhbY8k20qoh8aSzCKAVDRy0_ju3PKuOOhD3daD_4w,15698
310
310
  cmdbox/web/gui.html,sha256=LRmaYo4gvwpdu1fOi-yswbcv_MYaxKVsSYlWTWY6QmA,28127
311
311
  cmdbox/web/result.html,sha256=r2VxoeEIQzotJQOJpgihkLpJob_7n5wDPvx-N_yruOQ,10466
312
- cmdbox/web/signin.html,sha256=1_xXfoq5M_Zd7azwRPQenPfoDRQq26H9VeFFeauqQIw,8215
312
+ cmdbox/web/signin.html,sha256=LHPZOzdFU-G_Ne0P8-iydHMiegOPrSfPKcqk_sLhThA,8991
313
313
  cmdbox/web/users.html,sha256=G1w4QveONPLpBdS657vrVHKnUd3MgJu24YRGM6PB5no,15642
314
314
  cmdbox/web/assets/apexcharts/apexcharts.css,sha256=l-xkqykcV8a22g04B-Vpt4JFWcHlwGAnBi2SCI-lsPs,13079
315
315
  cmdbox/web/assets/apexcharts/apexcharts.min.js,sha256=zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix_4,570304
@@ -375,9 +375,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
375
375
  cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
376
376
  cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
377
377
  cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
378
- cmdbox-0.6.1.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
379
- cmdbox-0.6.1.dist-info/METADATA,sha256=mG6bMidMMUKGjesqEfEDKnI7NfrI554oNHgBj0Cbuwk,33446
380
- cmdbox-0.6.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
381
- cmdbox-0.6.1.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
382
- cmdbox-0.6.1.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
383
- cmdbox-0.6.1.dist-info/RECORD,,
378
+ cmdbox-0.6.1.1.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
379
+ cmdbox-0.6.1.1.dist-info/METADATA,sha256=8wuMlpiicJU3fpYc42EZhq8uQKuU3aVHxbrViGJwP-o,33448
380
+ cmdbox-0.6.1.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
381
+ cmdbox-0.6.1.1.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
382
+ cmdbox-0.6.1.1.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
383
+ cmdbox-0.6.1.1.dist-info/RECORD,,