roadrecon 1.7.1__py3-none-any.whl → 1.7.2__py3-none-any.whl

{roadrecon-1.7.1.dist-info → roadrecon-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roadrecon
-Version: 1.7.1
+Version: 1.7.2
 Summary: Azure AD recon for red and blue
 Home-page: https://github.com/dirkjanm/ROADtools/
 Author: Dirk-jan Mollema

{roadrecon-1.7.1.dist-info → roadrecon-1.7.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 roadtools/roadrecon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-roadtools/roadrecon/gather.py,sha256=sIvQa--k7TvcPLthaLB2SbIffHOoZQ3g2gqDlPIIqeM,33462
+roadtools/roadrecon/gather.py,sha256=kjkC59AvQZH7fnVbFOzo-jR148ejEDifWzJzrfSuOSI,33768
 roadtools/roadrecon/main.py,sha256=nBmZ2bnU_KeRwTxUDPvY7gcJnGXFPC3JMjTCTi18eGQ,5534
 roadtools/roadrecon/server.py,sha256=6kvEoDQ5CxTP3t7PvqsgWf1Opi5JzbEc9s2Lc0rAdPs,27458
 roadtools/roadrecon/dist_gui/3rdpartylicenses.txt,sha256=NpRwYG69NGaZ9M0LBB6bXF5Pl9q-ZmSxGdnkp0Xa-HI,16301
@@ -17,8 +17,8 @@ roadtools/roadrecon/plugins/policies.py,sha256=aOyvOzGFL4bSpNzLM_1MorsIg5otnevmz
 roadtools/roadrecon/plugins/road2timeline.py,sha256=myUvQUEVZDgdOnBVYXIw0ro3i5GnIsTeWLYBTfEt_EA,10030
 roadtools/roadrecon/plugins/road2timeline.yaml,sha256=fhvJeMmFaMjKNrtIPpXNOuWPEBBPVPSF9hSHYtW7Evc,2173
 roadtools/roadrecon/plugins/xlsexport.py,sha256=_McjMhXFVQTFU4RDQRA_c8YeoH7orLYMfq2KX1P17yg,17413
-roadrecon-1.7.1.dist-info/METADATA,sha256=01hp7yoc8KTL-5MXywPmQ_NLUULGN_wo48XKDd4SaCU,1204
-roadrecon-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-roadrecon-1.7.1.dist-info/entry_points.txt,sha256=-pkFkO82D0vF4buwLSaBsR-eJjH5kNj6cO6kjQ_RJok,108
-roadrecon-1.7.1.dist-info/top_level.txt,sha256=JSG6t-icqbjsOrwGoaGqkpjXBih4CpLyzCioJovObps,10
-roadrecon-1.7.1.dist-info/RECORD,,
+roadrecon-1.7.2.dist-info/METADATA,sha256=DY-XPCYACDgVoBCZ9ody-ishg9O4rDySJyI51Od6bbw,1204
+roadrecon-1.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+roadrecon-1.7.2.dist-info/entry_points.txt,sha256=-pkFkO82D0vF4buwLSaBsR-eJjH5kNj6cO6kjQ_RJok,108
+roadrecon-1.7.2.dist-info/top_level.txt,sha256=JSG6t-icqbjsOrwGoaGqkpjXBih4CpLyzCioJovObps,10
+roadrecon-1.7.2.dist-info/RECORD,,

roadtools/roadrecon/gather.py

@@ -108,7 +108,15 @@ async def ratelimit():
     if tokencounter < 1:
         # print('Ratelimit reached')
         await asyncio.sleep(0.1)
-        await ratelimit()
+        while True:
+            now = time.time()
+            to_add = MAX_REQ_PER_SEC * (now - tokenfilltime)
+            tokencounter = min(MAX_REQ_PER_SEC, tokencounter + to_add)
+            tokenfilltime = now
+            if tokencounter > 1:
+                break
+            await asyncio.sleep(0.1)
+        tokencounter -= 1
     else:
         tokencounter -= 1