Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@fstagni
fstagni committed Oct 7, 2024
1 parent bc21610 commit a4e3161
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 43 deletions.
11 changes: 11 additions & 0 deletions .setup/mermaid.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,14 @@ export default defineMermaidSetup(() => {
theme: 'forest',
}
})

pippo!

import mermaid from 'mermaid';

mermaid.registerIconPacks([
{
name: 'logos',
loader: () => import('@iconify-json/logos').then((module) => module.icons),
},
]);
112 changes: 69 additions & 43 deletions slides.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,30 @@ color: gray-light
# DiracX Web API


- DIRAC Web APIs are developed using FastAPI <devicon-fastapi-wordmark class="text-2xl mx-2" />
- Nicely documented in Swagger (or Redoc) <devicon-swagger-wordmark class="text-2xl mx-2" />
- this what you see on the right


&nbsp;
&nbsp;

<AdmonitionType type='caution' >
What is on the right is the certification Web API, loaded live. Use with caution!
</AdmonitionType>


<ul class="text-sm">
<li>
DIRAC Web APIs with
<devicon-fastapi-wordmark class="text-3xl align-middle inline-block mx-2"></devicon-fastapi-wordmark>
</li>
<li>
Nicely documented in
<devicon-swagger-wordmark class="text-3xl align-middle inline-block mx-2"></devicon-swagger-wordmark>
<ul class="text-xs ml-4">
<li>--> this is what you see on the right</li>
</ul>
</li>
<li>
Authorization with "standard" <a href="https://auth0.com/docs/get-started/authentication-and-authorization-flow/authorization-code-flow" class="text-blue-600 hover:underline">Authorization Code Flow</a> redirecting to IdP
</li>
</ul>



---
layout: side-title
side: left
Expand All @@ -379,6 +391,8 @@ align: rm-lt
title: CLI
---

Authorization with "standard" <a href="https://auth0.com/docs/get-started/authentication-and-authorization-flow/device-authorization-flow" class="text-blue-600 hover:underline">Device Authorization Flow</a>


:: title ::

Expand Down Expand Up @@ -435,21 +449,17 @@ color: gray-light

# DiracX web

We are also rewriting the WebApp from scratch.

Software stack:
- NextJS
- Material UI
- TypeScript

https://github.com/DIRACGrid/diracx-web

&nbsp;

<AdmonitionType type='caution' >
What is on the left is the certification WebApp, loaded live. Use with caution!
</AdmonitionType>

We are also rewriting [the Web App](https://github.com/DIRACGrid/diracx-web) from scratch.

Software stack:
- NextJS <devicon-nextjs-wordmark class="text-4xl align-middle inline-block mx-2" />
- Material UI <devicon-materialui class="text-3xl align-middle inline-block mx-2" />
- TypeScript <devicon-typescript class="text-3xl align-middle inline-block mx-2" />

---
layout: default
color: gray-light
Expand Down Expand Up @@ -488,7 +498,7 @@ title: tokens
- **Data access** : proxies. One day, will be token
- **Verifying a user's identity** :
- **DIRAC** uses only X509 proxies and certificates to verify identities
- **DiracX** uses only tokens
- **DiracX** uses only tokens ([link to security model](https://github.com/DIRACGrid/diracx/blob/main/security_model.md))
- --> For a (long) while, **users will have both a token and proxy**.

<AdmonitionType type='Note' >
Expand Down Expand Up @@ -516,20 +526,20 @@ sequenceDiagram
create participant VOMS
DIRAC_ProxyManager->>VOMS: get proxy
destroy VOMS
VOMS-->>DIRAC_ProxyManager: VOMS proxy
VOMS->>DIRAC_ProxyManager: VOMS proxy
DIRAC_ProxyManager-->>U: redirect to external IdP
create participant IAM
DIRAC_ProxyManager->>IAM : get token
U->>IAM: Authorization Code Flow or Device Flow
destroy IAM
IAM-->>DIRAC_ProxyManager: IAM token
IAM->>DIRAC_ProxyManager: IAM token
destroy DIRAC_ProxyManager
DIRAC_ProxyManager-->>U: proxy+token
DIRAC_ProxyManager->>U: DIRAC proxy and DiracX token
create participant DIRAC_service
U->>DIRAC_service: proxy
U->>DIRAC_service: DIRAC proxy
destroy DIRAC_service
create participant DiracX_service
U->>DiracX_service: token
create participant StorageElement
DIRAC_service->>StorageElement: proxy
DiracX_service->>StorageElement: token
U->>DiracX_service: DiracX token
destroy DiracX_service
```


Expand Down Expand Up @@ -601,8 +611,9 @@ Dirac has to support different Communities with different workflows and requirem
<ul class="text-sm">
<li>LHCb stores the metadata and provenance of every produced file in a LHCb-specific database (with an Oracle backend)
<ul class="text-xs ml-4">
<li>--> <a href="https://indico.cern.ch/event/1338689/contributions/6010069/" class="text-blue-600 hover:underline">see talk in Track 3 on Monday</a></li>
<li>--> See also poster #461 on <code>LbMCSubmit</code> tool</li>
<li>-->
<a href="https://indico.cern.ch/event/1338689/contributions/6010069/" class="text-blue-600 hover:underline">see talk in Track 3 on Monday</a> and poster #461 on <code>LbMCSubmit</code>
</li>
</ul>
</li>
<li>Belle2 is a HEP experiment. Uses Rucio as a data management solution.
Expand All @@ -620,12 +631,13 @@ Dirac has to support different Communities with different workflows and requirem
<li>--> <a href="https://indico.cern.ch/event/1338689/contributions/6011011/" class="text-blue-600 hover:underline">see talk in Track 4 tomorrow</a></li>
</ul>
</li>
<li>EGI uses DIRAC as WMS, and EGI-CheckIn as an identity provider.</li>
<li>WeNMR brings together complementary research teams in the structural biology and life science area.</li>
<li>EGI uses DIRAC as WMS, and EGI-CheckIn as an identity provider. Hosts (among others) WeNMR (structural biology and life science)</li>
</ul>

<span class="bg-cyan-100 text-cyan-600 p-4 border-l-6 border-2 border-cyan-400 rounded-lg pl-8 pr-8 w-full block">
It is sometimes necessary to extend all Dirac(X) components (including Web and Pilot). DiracX aims to provide an easy way to do so.
<span class="bg-cyan-100 text-cyan-600 text-center p-4 border-l-6 border-2 border-cyan-400 rounded-lg pl-8 pr-8 w-full block">
It is sometimes necessary to extend all Dirac(X) components (including Web and Pilot).

DiracX aims to provide an easy way to do so.
</span>


Expand Down Expand Up @@ -681,22 +693,34 @@ titlewidth: is-3

## The obvious ways:

- tests: (as you could see we have a somewhat open test deployment infrastructure). You *can* try something out, and let us know!
- code: https://github.com/DIRACGrid/diracx
<ul class="text-sm">
<li>
tests: (as you could see we have a somewhat open test deployment infrastructure). You *can* try something out, and let us know!
</li>
<li>
code: https://github.com/DIRACGrid/diracx
</li>
</ul>

## Run the demo:

```sh
git clone https://github.com/DIRACGrid/diracx-charts
diracx-charts/run_demo.sh # do not do it now!
```

&nbsp;


## Discuss:
- **mattermost** : https://mattermost.web.cern.ch/diracx/
- **meetings**: (almost) every week on Thursday morning (CET)
- **hackathons**: we have been doing 2-days DiracX hackathons every quarter. At CERN. [Next one in January](https://indico.cern.ch/event/1458873/)
<ul class="text-sm">
<li><strong>mattermost</strong>: <a href="https://mattermost.web.cern.ch/diracx/" class="text-blue-600 hover:underline">https://mattermost.web.cern.ch/diracx/</a></li>
<li><strong>meetings</strong>: (almost) every week on Thursday morning (CET)</li>
<li><strong>hackathons</strong>: we have been doing 2-days DiracX hackathons every quarter, at CERN
<ul class="text-xs ml-4">
<li>--> <a href="https://indico.cern.ch/event/1458873/" class="text-blue-600 hover:underline">Next one in January</a></li>
</ul>
</li>
</ul>




Expand Down Expand Up @@ -832,4 +856,6 @@ Q/A

--> It will probably be possible, but we do not know when.

- ?
- What is in a DiracX token (is it "special")?

--> It carries the `dirac_properties` (which are the same as in current DIRAC)

0 comments on commit a4e3161

Please sign in to comment.