patchman 2.0.17__tar.gz → 3.0.0__tar.gz

{patchman-2.0.17 → patchman-3.0.0}/INSTALL.md

@@ -5,43 +5,48 @@ mysql or postgresql instead, see the database configuration section.
 
 
 ## Supported Install Options
-  - [Ubuntu 20.04](#ubuntu-2004-focal)
-  - [Debian 11](#debian-11-bullseye)
-  - [CentOS 8](#centos-8)
+  - [Ubuntu 22.04](#ubuntu-2204-jammy)
+  - [Debian 12](#debian-12-bookworm)
+  - [CentOS 9](#centos-9)
   - [virtualenv + pip](#virtualenv--pip)
   - [Source](#source)
 
 
-### Ubuntu 20.04 (focal)
+### Ubuntu 22.04 (jammy)
 
 ```shell
 curl -sS https://repo.openbytes.ie/openbytes.gpg > /usr/share/keyrings/openbytes.gpg
-echo "deb [signed-by=/usr/share/keyrings/openbytes.gpg] https://repo.openbytes.ie/patchman/ubuntu focal main" > /etc/apt/sources.list.d/patchman.list
+echo "deb [signed-by=/usr/share/keyrings/openbytes.gpg] https://repo.openbytes.ie/patchman/ubuntu jammy main" > /etc/apt/sources.list.d/patchman.list
 apt update
 apt -y install python3-patchman patchman-client
 patchman-manage createsuperuser
 ```
 
-### Debian 11 (bullseye)
+### Debian 12 (bookworm)
 
 ```shell
 curl -sS https://repo.openbytes.ie/openbytes.gpg > /usr/share/keyrings/openbytes.gpg
-echo "deb [signed-by=/usr/share/keyrings/openbytes.gpg] https://repo.openbytes.ie/patchman/debian bullseye main" > /etc/apt/sources.list.d/patchman.list
+echo "deb [signed-by=/usr/share/keyrings/openbytes.gpg] https://repo.openbytes.ie/patchman/debian bookworm main" > /etc/apt/sources.list.d/patchman.list
 apt update
 apt -y install python3-patchman patchman-client
 patchman-manage createsuperuser
 ```
 
-### CentOS 8
+### CentOS 9
+
+This also applies to Rocky/Alma/RHEL
 
 ```shell
+curl -sS https://repo.openbytes.ie/openbytes.gpg > /etc/pki/rpm-gpg/RPM-GPG-KEY-openbytes
 cat <<EOF >> /etc/yum.repos.d/openbytes.repo
 [openbytes]
 name=openbytes
-baseurl=https://repo.openbytes.ie/patchman/el8
+baseurl=https://repo.openbytes.ie/patchman/el9
 enabled=1
-gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openbytes
 EOF
+update-crypto-policies --set DEFAULT:SHA1
 dnf -y install epel-release
 dnf makecache
 dnf -y install patchman patchman-client
@@ -55,7 +60,7 @@ TBD - not working yet
 
 ```shell
 apt -y install gcc libxml2-dev libxslt1-dev virtualenv python3-dev zlib1g-dev  # (debian/ubuntu)
-dnf -y install gcc libxml2-devel libxslt-devel python3-virtualenv              # (centos/rhel)
+dnf -y install gcc libxml2-devel libxslt-devel python3-virtualenv              # (centos/rocky/alma)
 mkdir /srv/patchman
 cd /srv/patchman
 virtualenv .
@@ -69,7 +74,7 @@ gunicorn patchman.wsgi -b 0.0.0.0:80
 
 ### Source
 
-#### Ubuntu 20.04 (focal)
+#### Ubuntu 22.04 (jammy)
 
 1. Install dependencies
 
@@ -111,7 +116,7 @@ be configured:
 
    * ADMINS - set up an admin email address
    * SECRET_KEY - create a random secret key
-   * STATICFILES_DIRS - should point to /srv/patchman/patchman/static if installing from
+   * STATIC_ROOT - should point to `/srv/patchman/run/static` if installing from
      source
 
 
@@ -212,6 +217,8 @@ postgres=# ALTER ROLE patchman SET timezone TO 'UTC';
 ALTER ROLE
 postgres=# GRANT ALL PRIVILEGES ON DATABASE patchman to patchman;
 GRANT
+postgres=# GRANT ALL ON SCHEMA public TO patchman;
+GRANT
 ```
 
 3. Modify `/etc/patchman/local_settings.py` as follows:
@@ -314,7 +321,9 @@ apt -y install python3-celery redis python3-redis python-celery-common
 C_FORCE_ROOT=1 celery -b redis://127.0.0.1:6379/0 -A patchman worker -l INFO -E
 ```
 
-#### CentOS / RHEL
+#### CentOS / Rocky / Alma
+
+Currently waiting on https://bugzilla.redhat.com/show_bug.cgi?id=2032543
 
 ```shell
 dnf -y install python3-celery redis python3-redis
@@ -334,8 +343,8 @@ Enable celery by adding `USE_ASYNC_PROCESSING = True` to `/etc/patchman/local_se
 Memcached can optionally be run to reduce the load on the server.
 
 ```shell
-apt -y install memcached python3-memcache   # (debian/ubuntu)
-dnf -y install memcached python3-memcached  # (centos/rhel)
+apt -y install memcached python3-pymemcache  # (debian/ubuntu)
+dnf -y install memcached python3-pymemcache  # (centos/rocky/alma)
 systemctl restart memcached
 ```
 
@@ -344,8 +353,11 @@ and add the following to `/etc/patchman/local_settings.py`
 ```
 CACHES = {
    'default': {
-       'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+       'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
        'LOCATION': '127.0.0.1:11211',
+        'OPTIONS': {
+            'ignore_exc': True,
+        },
    }
 }
 ```

{patchman-2.0.17 → patchman-3.0.0}/MANIFEST.in

@@ -15,5 +15,6 @@ recursive-include operatingsystems *
 recursive-include packages *
 recursive-include repos *
 recursive-include reports *
+recursive-include modules *
 recursive-include sbin *
 recursive-include etc *

{patchman-2.0.17 → patchman-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: patchman
-Version: 2.0.17
+Version: 3.0.0
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong
@@ -15,23 +15,24 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS
-Requires-Dist: Django==2.2.28
+Requires-Dist: Django==3.2.23
 Requires-Dist: django-tagging==0.5.0
-Requires-Dist: django-extensions==3.1.5
-Requires-Dist: django-bootstrap3==15.0.0
+Requires-Dist: django-extensions==3.2.1
+Requires-Dist: django-bootstrap3==23.1
 Requires-Dist: progressbar==2.5
-Requires-Dist: python-debian==0.1.43
-Requires-Dist: lxml==4.7.1
+Requires-Dist: python-debian==0.1.49
+Requires-Dist: lxml==4.9.2
 Requires-Dist: defusedxml==0.7.1
+Requires-Dist: PyYAML==6.0
 Requires-Dist: chardet==4.0.0
-Requires-Dist: requests==2.27.1
+Requires-Dist: requests==2.31.0
 Requires-Dist: colorama==0.4.4
 Requires-Dist: djangorestframework==3.13.1
 Requires-Dist: django-filter==21.1
 Requires-Dist: humanize==3.13.1
 Requires-Dist: version-utils==0.3.0
 Requires-Dist: python-magic==0.4.25
-Requires-Dist: python-memcached==1.59
+Requires-Dist: pymemcache==4.0.0
 
 # Patchman
 

patchman-3.0.0/VERSION.txt

@@ -0,0 +1 @@
+3.0.0

{patchman-2.0.17 → patchman-3.0.0}/etc/patchman/local_settings.py

@@ -40,7 +40,10 @@ RUN_GUNICORN = False
 # Enable memcached
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
         'LOCATION': '127.0.0.1:11211',
+        'OPTIONS': {
+            'ignore_exc': True,
+        },
     }
 }

{patchman-2.0.17 → patchman-3.0.0}/hosts/models.py

@@ -31,6 +31,7 @@ from domains.models import Domain
 from repos.models import Repository
 from operatingsystems.models import OS
 from arch.models import MachineArchitecture
+from modules.models import Module
 from patchman.signals import info_message, error_message
 from packages.utils import get_or_create_package_update
 from repos.utils import find_best_repo
@@ -50,6 +51,7 @@ class Host(models.Model):
     lastreport = models.DateTimeField()
     packages = models.ManyToManyField(Package, blank=True)
     repos = models.ManyToManyField(Repository, blank=True, through='HostRepo')
+    modules = models.ManyToManyField(Module, blank=True)
     updates = models.ManyToManyField(PackageUpdate, blank=True)
     reboot_required = models.BooleanField(default=False)
     host_repos_only = models.BooleanField(default=True)
@@ -122,15 +124,18 @@ class Host(models.Model):
     def get_host_repo_packages(self):
         if self.host_repos_only:
             hostrepos_q = Q(mirror__repo__in=self.repos.all(),
-                            mirror__enabled=True, mirror__repo__enabled=True,
+                            mirror__enabled=True,
+                            mirror__repo__enabled=True,
                             mirror__repo__hostrepo__enabled=True)
         else:
             hostrepos_q = \
                 Q(mirror__repo__osgroup__os__host=self,
-                  mirror__repo__arch=self.arch, mirror__enabled=True,
+                  mirror__repo__arch=self.arch,
+                  mirror__enabled=True,
                   mirror__repo__enabled=True) | \
                 Q(mirror__repo__in=self.repos.all(),
-                  mirror__enabled=True, mirror__repo__enabled=True)
+                  mirror__enabled=True,
+                  mirror__repo__enabled=True)
         return Package.objects.select_related().filter(hostrepos_q).distinct()
 
     def process_update(self, package, highest_package):
@@ -221,10 +226,21 @@ class Host(models.Model):
                 priority = best_repo.priority
 
             # find the packages that are potential updates
-            pu_q = Q(name=package.name, arch=package.arch,
+            pu_q = Q(name=package.name,
+                     arch=package.arch,
                      packagetype=package.packagetype)
             potential_updates = repo_packages.filter(pu_q)
             for pu in potential_updates:
+                pu_is_module_package = False
+                pu_in_enabled_modules = False
+                if pu.module_set.exists():
+                    pu_is_module_package = True
+                    for module in pu.module_set.all():
+                        if module in self.modules.all():
+                            pu_in_enabled_modules = True
+                if pu_is_module_package:
+                    if not pu_in_enabled_modules:
+                        continue
                 if highest_package.compare_version(pu) == -1 \
                         and package.compare_version(pu) == -1:
 
@@ -257,6 +273,16 @@ class Host(models.Model):
                      packagetype=package.packagetype)
             potential_updates = repo_packages.filter(pu_q)
             for pu in potential_updates:
+                pu_is_module_package = False
+                pu_in_enabled_modules = False
+                if pu.module_set.exists():
+                    pu_is_module_package = True
+                    for module in pu.module_set.all():
+                        if module in self.modules.all():
+                            pu_in_enabled_modules = True
+                if pu_is_module_package:
+                    if not pu_in_enabled_modules:
+                        continue
                 if highest_package.compare_version(pu) == -1 \
                         and package.compare_version(pu) == -1:
                     highest_package = pu

{patchman-2.0.17 → patchman-3.0.0}/hosts/templates/hosts/host_detail.html

@@ -14,6 +14,7 @@
   <li class="active"><a data-toggle="tab" href="#host_details">Details</a></li>
   <li><a data-toggle="tab" href="#host_updates">Updates Available</a></li>
   <li><a data-toggle="tab" href="#host_repos">Repos</a></li>
+  <li><a data-toggle="tab" href="#host_modules">Modules</a></li>
   <li><a data-toggle="tab" href="#host_packages">Packages</a></li>
 </ul>
 
@@ -135,6 +136,14 @@
     </div>
   </div>
 
+  <div class="tab-pane fade in" id="host_modules">
+    <div class="well well-sm">
+        <div class="well">
+          {% gen_table host.modules.all %}
+        </div>
+    </div>
+  </div>
+
   <div class="tab-pane fade in" id="host_packages">
     <div class="well well-sm">
       <button class="btn btn-primary btn-sm" data-toggle="collapse" data-target="#packages">Show/Hide Installed Packages</button>

patchman-3.0.0/modules/admin.py

@@ -0,0 +1,20 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.contrib import admin
+from modules.models import Module
+
+admin.site.register(Module)

patchman-3.0.0/modules/apps.py

@@ -0,0 +1,21 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.apps import AppConfig
+
+
+class ModulesConfig(AppConfig):
+    name = 'modules'

patchman-3.0.0/modules/managers.py

@@ -0,0 +1,22 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.db import models
+
+
+class ModuleManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().select_related()

patchman-3.0.0/modules/models.py

@@ -0,0 +1,44 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.db import models
+from django.urls import reverse
+
+from arch.models import PackageArchitecture
+from packages.models import Package
+from repos.models import Repository
+
+
+class Module(models.Model):
+
+    name = models.CharField(unique=True, max_length=255)
+    stream = models.CharField(unique=True, max_length=255)
+    version = models.CharField(max_length=255)
+    context = models.CharField(unique=True, max_length=255)
+    arch = models.ForeignKey(PackageArchitecture, on_delete=models.CASCADE)
+    repo = models.ForeignKey(Repository, on_delete=models.CASCADE)
+    packages = models.ManyToManyField(Package, blank=True)
+
+    class Meta:
+        verbose_name = 'Module'
+        verbose_name_plural = 'Modules'
+        ordering = ('name',)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('modules:module_detail', args=[str(self.id)])

patchman-3.0.0/modules/serializers.py

@@ -0,0 +1,25 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from rest_framework import serializers
+
+from modules.models import Module
+
+
+class ModuleSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Module
+        fields = ('id', 'name', 'stream', 'version', 'context', 'arch', 'repo', 'packages')

patchman-3.0.0/modules/templates/modules/module_detail.html

@@ -0,0 +1,69 @@
+{% extends "base.html" %}
+
+{% load common bootstrap3 %}
+
+{% block page_title %}Module - {{ module }} {% endblock %}
+
+{% block breadcrumbs %} {{ block.super }} <li><a href="{% url 'modules:module_list' %}">Modules</a></li><li class="active">{{ module }}</li>{% endblock %}
+
+{% block content_title %}Module - {{ module }} {% endblock %}
+
+{% block content %}
+
+<ul class="nav nav-tabs">
+  <li class="active"><a data-toggle="tab" href="#module_details">Details</a></li>
+  <li><a data-toggle="tab" href="#module_packages">Packages</a></li>
+  <li><a data-toggle="tab" href="#module_hosts">Hosts with this Module Enabled</a></li>
+</ul>
+
+<div class="tab-content">
+  <div class="tab-pane fade in active" id="module_details">
+    <div class="well well-sm">
+      <table class="table table-striped table-bordered table-hover table-condensed table-responsive">
+        <tr><th>Name</th><td> {{ module.name }} </td></tr>
+        <tr><th>ID</th><td> {{ module.id }} </td></tr>
+        <tr><th>Stream</th><td> {{ module.stream }} </td></tr>
+        <tr><th>Version</th><td> {{ module.version }} </td></tr>
+        <tr><th>Context</th><td> {{ module.context }} </td></tr>
+        <tr><th>Architecture</th><td> {{ module.arch }} </td></tr>
+        <tr><th>Repo</th><td><a href="{{ module.repo.get_absolute_url }}">{{ module.repo }}</a></td></tr>
+      </table>
+    </div>
+  </div>
+
+  <div class="tab-pane fade in" id="module_packages">
+    <div class="well well-sm">
+      <table class="table table-striped table-bordered table-hover table-condensed table-responsive">
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Epoch</th>
+            <th>Version</th>
+            <th>Release</th>
+            <th>Arch</th>
+            <th>Type</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for package in module.packages.all %}
+            <tr>
+              <td> {{ package.name }} </td>
+              <td> {{ package.epoch }} </td>
+              <td> {{ package.version }} </td>
+              <td> {{ package.release }} </td>
+              <td> {{ package.arch }} </td>
+              <td> {{ package.get_packagetype_display }} </td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+
+  <div class="tab-pane fade in" id="module_hosts">
+    <div class="well well-sm">
+      {% gen_table module.host_set.all.distinct %}
+    </div>
+  </div>
+</div>
+{% endblock %}

patchman-3.0.0/modules/templates/modules/module_list.html

@@ -0,0 +1,7 @@
+{% extends "objectlist.html" %}
+
+{% block page_title %}Modules{% endblock %}
+
+{% block breadcrumbs %} {{ block.super }} <li class="active"><a href="{% url 'modules:module_list' %}">Modules</a></li>{% endblock %}
+
+{% block content_title %} Modules {% endblock %}

patchman-3.0.0/modules/templates/modules/module_table.html

@@ -0,0 +1,23 @@
+{% load common %}
+<table class="table table-striped table-bordered table-hover table-condensed table-responsive">
+  <thead>
+    <tr>
+      <th class="col-sm-auto">Module</th>
+      <th class="col-sm-auto">ID</th>
+      <th class="col-sm-auto">Repo</th>
+      <th class="col-sm-auto">Packages</th>
+      <th class="col-md-auto">Enabled on Hosts</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for module in object_list %}
+      <tr>
+        <td><a href="{{ module.get_absolute_url }}">{{ module }}</a></td>
+        <td>{{ module.id }}</td>
+        <td><a href="{{ module.repo.get_absolute_url }}">{{ module.repo }}</a></td>
+        <td>{{ module.packages.count }}</td>
+        <td>{{ module.host_set.count }}</td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>

patchman-3.0.0/modules/urls.py

@@ -0,0 +1,26 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.urls import path
+
+from modules import views
+
+app_name = 'modules'
+
+urlpatterns = [
+    path('', views.module_list, name='module_list'),
+    path('<int:module_id>/', views.module_detail, name='module_detail'),
+]

patchman-3.0.0/modules/views.py

@@ -0,0 +1,74 @@
+# Copyright 2023 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.shortcuts import get_object_or_404, render
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.db.models import Q
+
+from rest_framework import viewsets, permissions
+
+from modules.models import Module
+from modules.serializers import ModuleSerializer
+
+
+@login_required
+def module_list(request):
+
+    modules = Module.objects.select_related()
+
+    if 'search' in request.GET:
+        terms = request.GET['search'].lower()
+        query = Q()
+        for term in terms.split(' '):
+            q = Q(name__icontains=term)
+            query = query & q
+        modules = modules.filter(query)
+    else:
+        terms = ''
+
+    page_no = request.GET.get('page')
+    paginator = Paginator(modules, 50)
+
+    try:
+        page = paginator.page(page_no)
+    except PageNotAnInteger:
+        page = paginator.page(1)
+    except EmptyPage:
+        page = paginator.page(paginator.num_pages)
+
+    return render(request,
+                  'modules/module_list.html',
+                  {'page': page,
+                   'terms': terms}, )
+
+
+@login_required
+def module_detail(request, module_id):
+
+    module = get_object_or_404(Module, id=module_id)
+    return render(request,
+                  'modules/module_detail.html',
+                  {'module': module}, )
+
+
+class ModuleViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows modules to be viewed or edited.
+    """
+    queryset = Module.objects.all()
+    serializer_class = ModuleSerializer
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)