Merge branch 'master' of https://github.com/Merlode11/pronote-api

Merlode11 · Dec 3, 2023 · e610c19 · e610c19
2 parents 3a7338a + f251665
commit e610c19
Show file tree

Hide file tree

Showing 10 changed files with 2,295 additions and 2,280 deletions.
diff --git a/bin/fetch.js b/bin/fetch.js
@@ -54,6 +54,10 @@ async function student()
     const discussions = await session.discussions();
     const seeDiscussion = discussions.length ? await session.seeDiscussion(discussions[0]) : null;
 
+    const timetable = await session.timetable(from, to);
+    const params = session.params;
+    const user = session.user;
+
 
     return {
         name: session.user.name,
@@ -62,7 +66,8 @@ async function student()
 
         marks, evaluations, absences,
         infos, contents, homeworks, menu, files,
-        report, recipients, discussions, seeDiscussion
+        report, recipients, discussions, seeDiscussion, timetable,
+        params, user
     };
 }
 
@@ -87,13 +92,17 @@ async function parent()
         const menu = await session.menu(student, from, to);
         const files = await session.files(student);
 
+        const params = session.params;
+        const user = session.user;
+
         students.push({
             name: student.name,
             studentClass: student.studentClass.name,
             avatar: student.avatar,
 
             timetable, marks, evaluations, absences,
-            infos, contents, homeworks, menu, files
+            infos, contents, homeworks, menu, files,
+            params, user
         });
     }
 

diff --git a/index.d.ts b/index.d.ts
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "start": "node ./bin/server.js",
     "lint": "eslint src/* bin/* index.js",
     "check": "eslint --fix src/* bin/* index.js",
-    "test": "eslint src/* bin* index.js && node ./bin/test.js"
+    "test": "eslint src/* bin/* index.js && node ./bin/test.js"
   },
   "keywords": [
     "pronote",

diff --git a/src/auth.js b/src/auth.js
@@ -24,10 +24,7 @@ async function login(url, username, password, cas, account)
         type: account,
 
         disableAES: !!start.sCrA,
-        disableCompress: !!start.sCoA,
-
-        keyModulus: start.MR,
-        keyExponent: start.ER
+        disableCompress: !!start.sCoA
     })
 
     session.params = await getParams(session);

diff --git a/src/cipher.js b/src/cipher.js
@@ -1,13 +1,17 @@
 const forge = require('node-forge');
 const pako = require('pako');
 
-function initCipher(session, keyModulus, keyExponent)
+// eslint-disable-next-line max-len
+const RSA_1024_MODULO = 'B99B77A3D72D3A29B4271FC7B7300E2F791EB8948174BE7B8024667E915446D4EEA0C2424B8D1EBF7E2DDFF94691C6E994E839225C627D140A8F1146D1B0B5F18A09BBD3D8F421CA1E3E4796B301EEBCCF80D81A32A1580121B8294433C38377083C5517D5921E8A078CDC019B15775292EFDA2C30251B1CCABE812386C893E5';
+const RSA_1024_EXPONENT = '65537'
+
+function initCipher(session)
 {
     session.aesIV = generateIV();
 
     session.publicKey = forge.pki.rsa.setPublicKey(
-        new forge.jsbn.BigInteger(keyModulus, 16),
-        new forge.jsbn.BigInteger(keyExponent, 16)
+        new forge.jsbn.BigInteger(RSA_1024_MODULO, 16),
+        new forge.jsbn.BigInteger(RSA_1024_EXPONENT, 10)
     );
 }
 
@@ -68,7 +72,8 @@ function createCipher(session, key, decipher, disableIV = false)
     }
 
     const cipher = forge.cipher[decipher ? 'createDecipher' : 'createCipher']('AES-CBC', md5(key));
-    const iv = disableIV ? forge.util.createBuffer('\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') : md5(session.aesIV);
+    const iv = disableIV ? forge.util.createBuffer('\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+        : md5(session.aesIV);
 
     cipher.start({ iv });
 
@@ -92,12 +97,15 @@ function inflate(data)
 
 function generateIV()
 {
-    return new forge.util.ByteBuffer(forge.random.generate(16));
+    return new forge.util.ByteBuffer(forge.random.getBytes(16));
 }
 
 function getUUID(session, iv)
 {
-    return forge.util.encode64(session.publicKey.encrypt(iv.bytes()), 64);
+    if (session.disableAES) {
+        return forge.util.encode64(iv.bytes());
+    }
+    return forge.util.encode64(session.publicKey.encrypt(iv.bytes()));
 }
 
 function getLoginKey(username, password, scramble, fromCas)

diff --git a/src/data/files.js b/src/data/files.js
@@ -7,12 +7,15 @@ const FileTypes = {
     1: 'file'
 }
 
-function getFileURL(session, { id, name, type })
+function getFileURL(session, { id, name, type, url })
 {
     const fileID = cipher(session, JSON.stringify(toPronote({ id, type })));
     const fileName = encodeURIComponent(encodeURIComponent(name)); // *Clown emoji*
 
     if (FileTypes[type] === 'link') {
+        if (url) {
+            return url;
+        }
         return session.server + EXTERNAL_FILES_FOLDER + fileID + '/link?Session=' + session.id;
     }
     return session.server + EXTERNAL_FILES_FOLDER + fileID + '/' + fileName + '?Session=' + session.id;

diff --git a/src/fetch/files.js b/src/fetch/files.js
@@ -27,7 +27,12 @@ async function files(session, user) {
             time: parseDate(file.date.V),
             subject: subjects[file.matiere.V.N],
             name: file.ressource.V.L,
-            url: getFileURL(session, { id: file.ressource.V.N, name: file.ressource.V.L, type: file.ressource.V.G }),
+            url: getFileURL(session, {
+                id: file.ressource.V.N,
+                name: file.ressource.V.L,
+                type: file.ressource.V.G,
+                url: file.ressource.V.url
+            }),
             type: file.ressource.V.G
         }, 'subject', 'name'));
     }

diff --git a/src/fetch/pronote/homeworks.js b/src/fetch/pronote/homeworks.js
@@ -38,13 +38,13 @@ async function getHomeworks(session, user, fromWeek = 1, toWeek = null)
         difficultyLevel: niveauDifficulte,
         duration: duree,
         color: CouleurFond,
-        files: parse(ListePieceJointe),
+        files: parse(ListePieceJointe)
     }));
     for (let i = 0; i < result.length; i++) { //  Add markAs function to each homework
         result[i].markAs = async done => {
             await markHomeworkAs(session, user, result[i].id, done)
         };
-    }d
+    }
 
     return result;
 }

diff --git a/src/fetch/pronote/user.js b/src/fetch/pronote/user.js
@@ -25,7 +25,7 @@ async function getUser(session)
             country: Coordonnees.Pays,
             website: Coordonnees.SiteInternet
         })),
-        userSettings: (({ version, EDT, theme, Communication }) => ({
+        userSettings: (({ version, EDT, Communication }) => ({
             version,
             timetable: {
                 displayCanceledLessons: EDT.afficherCoursAnnules,
@@ -38,7 +38,6 @@ async function getUser(session)
                 daysInTimetable: EDT.nbJoursEDT,
                 sequenceCount: EDT.nbSequences
             },
-            theme: theme.theme,
             unreadDiscussions: Communication.DiscussionNonLues
         }))(user.parametresUtilisateur),
         sessionAuthorizations: {

diff --git a/src/session.js b/src/session.js
@@ -28,7 +28,7 @@ const REQUESTS = {
 
 class PronoteSession
 {
-    constructor({ serverURL, sessionID, type, disableAES, disableCompress, keyModulus, keyExponent })
+    constructor({ serverURL, sessionID, type, disableAES, disableCompress })
     {
         this.id = ~~sessionID;
         this.server = serverURL;
@@ -37,7 +37,7 @@ class PronoteSession
         this.disableAES = disableAES;
         this.disableCompress = disableCompress;
 
-        initCipher(this, keyModulus, keyExponent);
+        initCipher(this);
 
         this.request = -1;
         this.isKeptAlive = false;